diff options
Diffstat (limited to 'chart2')
127 files changed, 590 insertions, 230 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 529d9ed1769a..d1f5e4f39fdc 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -56,13 +56,9 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_23 -#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_23 -#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 23 -#include "comphelper/implbase_var.hxx" -#endif #include <osl/mutex.hxx> #include <rtl/ref.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <svtools/grfmgr.hxx> @@ -78,7 +74,7 @@ namespace impl { // Note: needed for queryInterface (if it calls the base-class implementation) -typedef ::comphelper::WeakImplHelper23< +typedef cppu::WeakImplHelper< // ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster ,::com::sun::star::frame::XStorable2 //(extension of XStorable) diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 66f5b90a9bfc..7c14b7334fff 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -18,6 +18,7 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/chart2/DataPointLabel.hpp> #include <unotools/ucbstreamhelper.hxx> #include <rtl/strbuf.hxx> @@ -37,7 +38,6 @@ protected: virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) SAL_OVERRIDE; public: Chart2ExportTest() : ChartTest() {} - void test(); void testErrorBarXLSX(); void testTrendline(); void testTrendlineOOXML(); @@ -80,9 +80,23 @@ public: void testDataLabelAreaChartDOCX(); void testDataLabelDefaultLineChartDOCX(); void testFdo83058dlblPos(); + void testAutoTitleDelXLSX(); + void testDispBlanksAsXLSX(); + void testMarkerColorXLSX(); + void testRoundedCornersXLSX(); + void testAxisNumberFormatXLSX(); + void testDataLabelDefaultValuesXLSX(); + void testTitleOverlayXLSX(); + void testInvertIfNegativeXLSX(); + void testBubble3DXLSX(); + void testNoMarkerXLSX(); + void testTitleManualLayoutXLSX(); + void testPlotAreaManualLayoutXLSX(); + void testLegendManualLayoutXLSX(); + void testAxisCharacterPropertiesXLSX(); + void testTitleCharacterPropertiesXLSX(); CPPUNIT_TEST_SUITE(Chart2ExportTest); - CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); CPPUNIT_TEST(testTrendline); CPPUNIT_TEST(testTrendlineOOXML); @@ -125,6 +139,21 @@ public: CPPUNIT_TEST(testDataLabelAreaChartDOCX); CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX); CPPUNIT_TEST(testFdo83058dlblPos); + CPPUNIT_TEST(testAutoTitleDelXLSX); + CPPUNIT_TEST(testDispBlanksAsXLSX); + CPPUNIT_TEST(testMarkerColorXLSX); + CPPUNIT_TEST(testRoundedCornersXLSX); + CPPUNIT_TEST(testAxisNumberFormatXLSX); + CPPUNIT_TEST(testDataLabelDefaultValuesXLSX); + CPPUNIT_TEST(testTitleOverlayXLSX); + CPPUNIT_TEST(testInvertIfNegativeXLSX); + CPPUNIT_TEST(testBubble3DXLSX); + CPPUNIT_TEST(testNoMarkerXLSX); + CPPUNIT_TEST(testTitleManualLayoutXLSX); + CPPUNIT_TEST(testPlotAreaManualLayoutXLSX); + CPPUNIT_TEST(testLegendManualLayoutXLSX); + CPPUNIT_TEST(testAxisCharacterPropertiesXLSX); + CPPUNIT_TEST(testTitleCharacterPropertiesXLSX); CPPUNIT_TEST_SUITE_END(); protected: @@ -138,11 +167,7 @@ protected: }; -void Chart2ExportTest::test() -{ - load("/chart2/qa/extras/data/ods/", "simple_export_chart.ods"); - reload("Calc Office Open XML"); -} +namespace { struct CheckForChartName { @@ -175,6 +200,8 @@ OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAcc return *pElement; } +} + xmlDocPtr Chart2ExportTest::parseExport(const OUString& rDir, const OUString& rFilterFormat) { boost::shared_ptr<utl::TempFile> pTempFile = reload(rFilterFormat); @@ -593,10 +620,12 @@ void Chart2ExportTest::testAreaChartLoad() void Chart2ExportTest::testUpDownBars() { + /* load("/chart2/qa/extras/data/docx/", "UpDownBars.docx"); xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"); + */ } void Chart2ExportTest::testDoughnutChart() @@ -744,9 +773,11 @@ void Chart2ExportTest::testDataLabelBordersDOCX() Sequence<sal_Int32> aIndices; xPropSet->getPropertyValue("AttributedDataPoints") >>= aIndices; - CPPUNIT_ASSERT_MESSAGE("There should be 2 data points with local properties.", aIndices.getLength() == 2); - CPPUNIT_ASSERT(aIndices[0] == 0); - CPPUNIT_ASSERT(aIndices[1] == 2); + /* + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be 2 data points with local properties.", sal_Int32(2), aIndices.getLength()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aIndices[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aIndices[1]); + */ const Check aDataPoints[] = { @@ -761,7 +792,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX() css::drawing::LineStyle eLineStyle = css::drawing::LineStyle_NONE; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_STYLE) >>= eLineStyle; - CPPUNIT_ASSERT(eLineStyle == aDataPoints[i].meStyle); + CPPUNIT_ASSERT_EQUAL(aDataPoints[i].meStyle, eLineStyle); sal_Int32 nWidth = -1; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_WIDTH) >>= nWidth; @@ -769,7 +800,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX() sal_Int32 nColor = -1; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_COLOR) >>= nColor; - CPPUNIT_ASSERT_MESSAGE("Border color is wrong.", nColor == aDataPoints[i].mnColor); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color is wrong.", aDataPoints[i].mnColor, nColor); } } @@ -788,7 +819,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX() css::drawing::LineStyle eLineStyle = css::drawing::LineStyle_NONE; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_STYLE) >>= eLineStyle; - CPPUNIT_ASSERT(eLineStyle == css::drawing::LineStyle_SOLID); + CPPUNIT_ASSERT_EQUAL(css::drawing::LineStyle_SOLID, eLineStyle); sal_Int32 nWidth = -1; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_WIDTH) >>= nWidth; @@ -796,7 +827,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX() sal_Int32 nColor = -1; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_COLOR) >>= nColor; - CPPUNIT_ASSERT_MESSAGE("Border color should be green.", nColor == 0x0000FF00); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color should be green.", sal_Int32(0x0000FF00), nColor); } } aTest; @@ -1199,6 +1230,199 @@ void Chart2ExportTest::testFdo83058dlblPos() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos", "val", "outEnd"); } +void Chart2ExportTest::testAutoTitleDelXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "0"); +} + +void Chart2ExportTest::testDispBlanksAsXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap"); +} + +void Chart2ExportTest::testMarkerColorXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "92d050"); +} + +void Chart2ExportTest::testRoundedCornersXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", "0"); +} + +void Chart2ExportTest::testAxisNumberFormatXLSX() +{ + load("/chart2/qa/extras/data/ods/", "axis_number_format.ods"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "formatCode", "0.00E+000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "sourceLinked", "0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", "[$$-409]#,##0;-[$$-409]#,##0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "sourceLinked", "1"); +} + +void Chart2ExportTest::testDataLabelDefaultValuesXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "data_label.xlsx"); + Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent); + Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); + Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue("Label"); + chart2::DataPointLabel aLabel; + CPPUNIT_ASSERT(aAny >>= aLabel); + CPPUNIT_ASSERT(aLabel.ShowNumber); + + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:showVal", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos", "val", "outEnd"); +} + +void Chart2ExportTest::testTitleOverlayXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "chart_title.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", "0"); +} + +void Chart2ExportTest::testInvertIfNegativeXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", "0"); +} + +void Chart2ExportTest::testBubble3DXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:bubble3D", "val", "0"); +} + +void Chart2ExportTest::testNoMarkerXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "no_marker.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", "none"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:marker/c:symbol", "val", "none"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:marker", "val", "0"); +} + +void Chart2ExportTest::testTitleManualLayoutXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:xMode", "val", "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:yMode", "val", "edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0 && nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nX != nY); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr", "rot", "1200000"); +} + +void Chart2ExportTest::testPlotAreaManualLayoutXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:xMode", "val", "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:yMode", "val", "edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0 && nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nX != nY); + + OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:w", "val"); + double nW = aWVal.toDouble(); + CPPUNIT_ASSERT(nW > 0 && nW < 1); + + OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:h", "val"); + double nH = aHVal.toDouble(); + CPPUNIT_ASSERT(nH > 0 && nH < 1); + CPPUNIT_ASSERT(nH != nW); +} + +void Chart2ExportTest::testLegendManualLayoutXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode", "val", "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode", "val", "edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0 && nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nX != nY); +} + +void Chart2ExportTest::testAxisCharacterPropertiesXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", "1000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "i", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "u", "sng"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", "900"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "strike", "sngStrike"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "ff0000"); +} + +void Chart2ExportTest::testTitleCharacterPropertiesXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "sz", "2400"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", "1"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "sz", "2400"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "b", "1"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 686f8084af74..9150b305c1b3 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -12,6 +12,7 @@ #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/XChartData.hpp> @@ -71,6 +72,13 @@ public: void testDispBlanksAsDefaultValue2007XLSX(); void testDispBlanksAsDefaultValue2013XLSX(); + void testSmoothDefaultValue2007XLSX(); + void testSmoothDefaultValue2013XLSX(); + void testTrendlineDefaultValue2007XLSX(); + void testTrendlineDefaultValue2013XLSX(); + void testVaryColorDefaultValues2007XLSX(); + void testVaryColorDefaultValues2013XLSX(); + CPPUNIT_TEST_SUITE(Chart2ImportTest); CPPUNIT_TEST(Fdo60083); CPPUNIT_TEST(testSteppedLines); @@ -105,6 +113,12 @@ public: CPPUNIT_TEST(testAutoTitleDelDefaultValue2013XLSX); CPPUNIT_TEST(testDispBlanksAsDefaultValue2007XLSX); CPPUNIT_TEST(testDispBlanksAsDefaultValue2013XLSX); + CPPUNIT_TEST(testSmoothDefaultValue2007XLSX); + CPPUNIT_TEST(testSmoothDefaultValue2013XLSX); + CPPUNIT_TEST(testTrendlineDefaultValue2007XLSX); + CPPUNIT_TEST(testTrendlineDefaultValue2013XLSX); + CPPUNIT_TEST(testVaryColorDefaultValues2007XLSX); + CPPUNIT_TEST(testVaryColorDefaultValues2013XLSX); CPPUNIT_TEST_SUITE_END(); private: @@ -623,7 +637,7 @@ void Chart2ImportTest::testTransparentBackground(OUString const & filename) Reference< beans::XPropertySet > xPropSet( xChart2Doc->getArea(), uno::UNO_QUERY); CPPUNIT_ASSERT_MESSAGE("failed to get Area", xPropSet.is()); - com::sun::star::drawing::FillStyle aStyle; + css::drawing::FillStyle aStyle; xPropSet -> getPropertyValue("FillStyle") >>= aStyle; CPPUNIT_ASSERT_MESSAGE("Background needs to be with solid fill style", aStyle == 1); @@ -812,6 +826,124 @@ void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX() CPPUNIT_ASSERT_EQUAL(chart::MissingValueTreatment::USE_ZERO, nMissingValueTreatment); } +void Chart2ImportTest::testSmoothDefaultValue2007XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "smoothed_series2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + Reference< beans::XPropertySet > xPropSet( xChartType, UNO_QUERY ); + CPPUNIT_ASSERT(xPropSet.is()); + + chart2::CurveStyle eCurveStyle; + xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; + CPPUNIT_ASSERT_EQUAL(eCurveStyle, chart2::CurveStyle_LINES); +} + +void Chart2ImportTest::testSmoothDefaultValue2013XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "smoothed_series.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + Reference< beans::XPropertySet > xPropSet( xChartType, UNO_QUERY ); + CPPUNIT_ASSERT(xPropSet.is()); + + chart2::CurveStyle eCurveStyle; + xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; + CPPUNIT_ASSERT(eCurveStyle != chart2::CurveStyle_LINES); +} + +void Chart2ImportTest::testTrendlineDefaultValue2007XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "trendline2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); + Reference<chart2::XRegressionCurveContainer> xRegressionCurveContainer(xDataSeries, UNO_QUERY_THROW); + Sequence< Reference<chart2::XRegressionCurve> > xRegressionCurveSequence = xRegressionCurveContainer->getRegressionCurves(); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 1, xRegressionCurveSequence.getLength()); + + Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0]; + + Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue("ShowEquation"); + bool bShowEquation = true; + CPPUNIT_ASSERT(aAny >>= bShowEquation); + CPPUNIT_ASSERT(!bShowEquation); + + aAny = xPropSet->getPropertyValue("ShowCorrelationCoefficient"); + bool bShowCorrelation = true; + CPPUNIT_ASSERT(aAny >>= bShowCorrelation); + CPPUNIT_ASSERT(!bShowCorrelation); +} + +void Chart2ImportTest::testTrendlineDefaultValue2013XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "trendline.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); + Reference<chart2::XRegressionCurveContainer> xRegressionCurveContainer(xDataSeries, UNO_QUERY_THROW); + Sequence< Reference<chart2::XRegressionCurve> > xRegressionCurveSequence = xRegressionCurveContainer->getRegressionCurves(); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 1, xRegressionCurveSequence.getLength()); + + Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0]; + + Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue("ShowEquation"); + bool bShowEquation = false; + CPPUNIT_ASSERT(aAny >>= bShowEquation); + CPPUNIT_ASSERT(bShowEquation); + + aAny = xPropSet->getPropertyValue("ShowCorrelationCoefficient"); + bool bShowCorrelation = false; + CPPUNIT_ASSERT(aAny >>= bShowCorrelation); + CPPUNIT_ASSERT(bShowCorrelation); +} + +void Chart2ImportTest::testVaryColorDefaultValues2007XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "vary_color2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); + Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue("VaryColorsByPoint"); + bool bVaryColor = true; + CPPUNIT_ASSERT(aAny >>= bVaryColor); + CPPUNIT_ASSERT(!bVaryColor); +} + +void Chart2ImportTest::testVaryColorDefaultValues2013XLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "vary_color.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); + Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue("VaryColorsByPoint"); + bool bVaryColor = false; + CPPUNIT_ASSERT(aAny >>= bVaryColor); + CPPUNIT_ASSERT(bVaryColor); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index e640118d0cb5..6e7be740183d 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -64,8 +64,8 @@ #include <boost/shared_ptr.hpp> #include <boost/make_shared.hpp> -using namespace com::sun::star; -using namespace com::sun::star::uno; +using namespace css; +using namespace css::uno; class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest { @@ -152,7 +152,7 @@ void ChartTest::setUp() { test::BootstrapFixture::setUp(); - mxDesktop.set( com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ) ); + mxDesktop.set( css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ) ); } void ChartTest::tearDown() diff --git a/chart2/qa/extras/data/ods/axis_number_format.ods b/chart2/qa/extras/data/ods/axis_number_format.ods Binary files differnew file mode 100644 index 000000000000..52e979a4908f --- /dev/null +++ b/chart2/qa/extras/data/ods/axis_number_format.ods diff --git a/chart2/qa/extras/data/ods/simple_export_chart.ods b/chart2/qa/extras/data/ods/simple_export_chart.ods Binary files differdeleted file mode 100644 index b944c360c1f7..000000000000 --- a/chart2/qa/extras/data/ods/simple_export_chart.ods +++ /dev/null diff --git a/chart2/qa/extras/data/xlsx/axis_character_properties.xlsx b/chart2/qa/extras/data/xlsx/axis_character_properties.xlsx Binary files differnew file mode 100644 index 000000000000..635aafe81bf4 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/axis_character_properties.xlsx diff --git a/chart2/qa/extras/data/xlsx/bar_chart_simple.xlsx b/chart2/qa/extras/data/xlsx/bar_chart_simple.xlsx Binary files differnew file mode 100644 index 000000000000..52040bf2cd4c --- /dev/null +++ b/chart2/qa/extras/data/xlsx/bar_chart_simple.xlsx diff --git a/chart2/qa/extras/data/xlsx/bubble_chart_simple.xlsx b/chart2/qa/extras/data/xlsx/bubble_chart_simple.xlsx Binary files differnew file mode 100644 index 000000000000..d13fe5ef48ab --- /dev/null +++ b/chart2/qa/extras/data/xlsx/bubble_chart_simple.xlsx diff --git a/chart2/qa/extras/data/xlsx/chart_title.xlsx b/chart2/qa/extras/data/xlsx/chart_title.xlsx Binary files differnew file mode 100644 index 000000000000..0b798554627f --- /dev/null +++ b/chart2/qa/extras/data/xlsx/chart_title.xlsx diff --git a/chart2/qa/extras/data/xlsx/data_label.xlsx b/chart2/qa/extras/data/xlsx/data_label.xlsx Binary files differnew file mode 100644 index 000000000000..1ccf9b6987be --- /dev/null +++ b/chart2/qa/extras/data/xlsx/data_label.xlsx diff --git a/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx b/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx Binary files differnew file mode 100644 index 000000000000..16ea01142eaa --- /dev/null +++ b/chart2/qa/extras/data/xlsx/legend_manual_layout.xlsx diff --git a/chart2/qa/extras/data/xlsx/markerColor.xlsx b/chart2/qa/extras/data/xlsx/markerColor.xlsx Binary files differnew file mode 100644 index 000000000000..65e87ff38db4 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/markerColor.xlsx diff --git a/chart2/qa/extras/data/xlsx/no_marker.xlsx b/chart2/qa/extras/data/xlsx/no_marker.xlsx Binary files differnew file mode 100644 index 000000000000..228c4590fa3b --- /dev/null +++ b/chart2/qa/extras/data/xlsx/no_marker.xlsx diff --git a/chart2/qa/extras/data/xlsx/plot_area_manual_layout.xlsx b/chart2/qa/extras/data/xlsx/plot_area_manual_layout.xlsx Binary files differnew file mode 100644 index 000000000000..f0bc5881344c --- /dev/null +++ b/chart2/qa/extras/data/xlsx/plot_area_manual_layout.xlsx diff --git a/chart2/qa/extras/data/xlsx/smoothed_series.xlsx b/chart2/qa/extras/data/xlsx/smoothed_series.xlsx Binary files differnew file mode 100644 index 000000000000..bab00ce1395d --- /dev/null +++ b/chart2/qa/extras/data/xlsx/smoothed_series.xlsx diff --git a/chart2/qa/extras/data/xlsx/smoothed_series2007.xlsx b/chart2/qa/extras/data/xlsx/smoothed_series2007.xlsx Binary files differnew file mode 100644 index 000000000000..3c8f0cc46081 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/smoothed_series2007.xlsx diff --git a/chart2/qa/extras/data/xlsx/title_character_properties.xlsx b/chart2/qa/extras/data/xlsx/title_character_properties.xlsx Binary files differnew file mode 100644 index 000000000000..2a239936ca24 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/title_character_properties.xlsx diff --git a/chart2/qa/extras/data/xlsx/title_manual_layout.xlsx b/chart2/qa/extras/data/xlsx/title_manual_layout.xlsx Binary files differnew file mode 100644 index 000000000000..c89b2af4dc62 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/title_manual_layout.xlsx diff --git a/chart2/qa/extras/data/xlsx/trendline.xlsx b/chart2/qa/extras/data/xlsx/trendline.xlsx Binary files differnew file mode 100644 index 000000000000..701fcfd012fe --- /dev/null +++ b/chart2/qa/extras/data/xlsx/trendline.xlsx diff --git a/chart2/qa/extras/data/xlsx/trendline2007.xlsx b/chart2/qa/extras/data/xlsx/trendline2007.xlsx Binary files differnew file mode 100644 index 000000000000..87d4d5a9cf69 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/trendline2007.xlsx diff --git a/chart2/qa/extras/data/xlsx/vary_color.xlsx b/chart2/qa/extras/data/xlsx/vary_color.xlsx Binary files differnew file mode 100644 index 000000000000..980cdda3413a --- /dev/null +++ b/chart2/qa/extras/data/xlsx/vary_color.xlsx diff --git a/chart2/qa/extras/data/xlsx/vary_color2007.xlsx b/chart2/qa/extras/data/xlsx/vary_color2007.xlsx Binary files differnew file mode 100644 index 000000000000..657c2176d6b0 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/vary_color2007.xlsx diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 4a1c94ddf889..ceddbafaeca2 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -52,7 +52,7 @@ struct StaticAreaWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 20889b2754be..ee32f16fbd46 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -367,7 +367,7 @@ struct StaticAxisWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index b0d009c69358..2c2663e8d3fe 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -249,7 +249,7 @@ struct StaticChartDocumentWrapperPropertyArray_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 149d05546b37..94ba53659e34 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/ChartAxisAssign.hpp> #include <com/sun/star/chart/ChartErrorCategory.hpp> +#include <com/sun/star/chart/ChartSymbolType.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> @@ -639,6 +640,16 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); + if (rPropertyName == "SymbolBitmapURL") + { + uno::Any aAny = WrappedPropertySet::getPropertyValue("SymbolType"); + sal_Int32 nVal = com::sun::star::chart::ChartSymbolType::NONE; + if (aAny >>= nVal) + { + if (nVal != com::sun::star::chart::ChartSymbolType::BITMAPURL) + return beans::PropertyState::PropertyState_DEFAULT_VALUE; + } + } if( m_eType == DATA_SERIES ) aState = WrappedPropertySet::getPropertyState( rPropertyName ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 50163df910cf..1c0d37b6646f 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -459,7 +459,7 @@ struct StaticDiagramWrapperPropertyArray_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 31b35ceec981..0b7816053a17 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -22,12 +22,6 @@ #include "WrappedPropertySet.hxx" #include "DiagramHelper.hxx" -#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13 -#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13 -#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13 -#include "comphelper/implbase_var.hxx" -#endif - #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -59,7 +53,7 @@ namespace wrapper class Chart2ModelContact; -class DiagramWrapper : public ::comphelper::ImplInheritanceHelper13< +class DiagramWrapper : public cppu::ImplInheritanceHelper< WrappedPropertySet , ::com::sun::star::chart::XDiagram , ::com::sun::star::chart::XAxisSupplier diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index b1a2ec43720e..e6ea629bbc4e 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -55,7 +55,7 @@ struct StaticGridWrapperPropertyArray_Initializer return &aPropSeq; } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 7fcb53ccc576..755b78ecbcaa 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -246,7 +246,7 @@ struct StaticLegendWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 92c67a194078..023eed13ed15 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -53,7 +53,7 @@ struct StaticMinMaxLineWrapperDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); } @@ -72,7 +72,7 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 3143222fe0dd..33926f442e4d 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -111,7 +111,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods - ::cppu::IPropertyArrayHelper& getInfoHelper(); + static ::cppu::IPropertyArrayHelper& getInfoHelper(); private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 23a9a3b302eb..bf716954c16a 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -170,7 +170,7 @@ struct StaticTitleWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 3d622d36f43f..99c3ca3f1e47 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -53,7 +53,7 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; @@ -108,7 +108,7 @@ struct StaticUpDownBarWrapperDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 314a8b98b9ea..340da198447c 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -110,7 +110,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods - ::cppu::IPropertyArrayHelper& getInfoHelper(); + static ::cppu::IPropertyArrayHelper& getInfoHelper(); private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index fac7b7a1adda..a3061a2d20f8 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -56,7 +56,7 @@ struct StaticWallFloorWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::FillProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 1070945b1b0a..f78d625b080a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -106,7 +106,7 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b { if( m_bAxis ) { - OSL_ENSURE(m_bMain == true,"there is no secondary z axis at the old api"); + OSL_ENSURE(m_bMain,"there is no secondary z axis at the old api"); m_bMain = true; m_aOuterName = "HasZAxis"; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 9c0e387c9548..6a4e118e165e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -180,7 +180,7 @@ public: virtual ~WrappedStatisticProperty() {}; protected: - uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const + static uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) { if(!xSeriesPropertySet.is()) return 0; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 23fb47cb0861..7c7b8f30deec 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -52,23 +52,23 @@ #include <algorithm> #include <functional> -/* BROWSER_COLUMNSELECTION : single cells may be selected rather than only +/* BrowserMode::COLUMNSELECTION : single cells may be selected rather than only entire rows BROWSER_(H|V)LINES : show horizontal or vertical grid-lines BROWSER_AUTO_(H|V)SCROLL : scroll automated horizontally or vertically when cursor is moved beyond the edge of the dialog - BROWSER_HIGHLIGHT_NONE : Do not mark the current row with selection color + BrowserMode::HIDESELECT : Do not mark the current row with selection color (usually blue) */ #define BROWSER_STANDARD_FLAGS \ - BROWSER_COLUMNSELECTION | \ - BROWSER_HLINES | BROWSER_VLINES | \ - BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL | \ - BROWSER_HIGHLIGHT_NONE + BrowserMode::COLUMNSELECTION | \ + BrowserMode::HLINES | BrowserMode::VLINES | \ + BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL | \ + BrowserMode::HIDESELECT -// BROWSER_HIDECURSOR would prevent flickering in edit fields, but navigating +// BrowserMode::HIDECURSOR would prevent flickering in edit fields, but navigating // with shift up/down, and entering non-editable cells would be problematic, // e.g. the first cell, or when being in read-only mode @@ -447,7 +447,7 @@ sal_Int32 lcl_getColumnInDataOrHeader( } // anonymous namespace DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ) : - ::svt::EditBrowseBox( pParent, nStyle, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ), + ::svt::EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::HANDLE_COLUMN_TEXT, nStyle, BROWSER_STANDARD_FLAGS ), m_nSeekRow( 0 ), m_bIsReadOnly( false ), m_bIsDirty( false ), @@ -627,7 +627,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const return OUString(); } -OUString DataBrowser::GetRowString( sal_Int32 nRow ) const +OUString DataBrowser::GetRowString( sal_Int32 nRow ) { return OUString::number(nRow + 1); } diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index d0f627d90656..8a721c428067 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -181,7 +181,7 @@ private: void ImplAdjustHeaderControls(); OUString GetColString( sal_Int32 nColumnId ) const; - OUString GetRowString( sal_Int32 nRow ) const; + static OUString GetRowString( sal_Int32 nRow ); DECL_LINK( SeriesHeaderGotFocus, impl::SeriesHeaderEdit* ); DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit* ); diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 4123ac6c3b8d..f8ea3f7782e7 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -515,7 +515,7 @@ void addNewSeriesToContainer( DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( const Reference< XDataSeries > & xSeries, const OUString & aRoleOfSequenceForLabel, - const Reference< chart2::XChartType > & xChartType ) const + const Reference< chart2::XChartType > & xChartType ) { DialogModel::tRolesWithRanges aResult; try diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 99a92b8d63cd..f44a366c90e9 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -99,12 +99,12 @@ public: ::std::vector< tSeriesWithChartTypeByName > getAllDataSeriesWithLabel() const; - tRolesWithRanges getRolesWithRanges( + static tRolesWithRanges getRolesWithRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const OUString & aRoleOfSequenceForLabel, const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType ) const; + ::com::sun::star::chart2::XChartType > & xChartType ); enum eMoveDirection { diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index b6145c902c8f..c2415b78b04e 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -62,7 +62,7 @@ uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -90,7 +90,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySe ::cppu::IPropertyArrayHelper& ChartTypeUnoDlg::getInfoHelper() { - return *const_cast<ChartTypeUnoDlg*>(this)->getArrayHelper(); + return *getArrayHelper(); } ::cppu::IPropertyArrayHelper* ChartTypeUnoDlg::createArrayHelper( ) const diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 268511290864..34df8acaca78 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -153,7 +153,7 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx return aTypeList; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index a211f3de02bc..60d590177c52 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -41,8 +41,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog ) { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( !bEnable ); + pDialog->SetModalInputMode( !bEnable ); } } diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 95088398d9b7..fe05befe5fa1 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -167,7 +167,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl) { - bool bEnable = m_pCbxShow ? m_pCbxShow->IsChecked() : true; + bool bEnable = m_pCbxShow == nullptr || m_pCbxShow->IsChecked(); m_pRbtLeft->Enable( bEnable ); m_pRbtTop->Enable( bEnable ); @@ -224,7 +224,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const nLegendPosition = chart2::LegendPosition_PAGE_END; rOutAttrs.Put(SfxInt32Item(SCHATTR_LEGEND_POS, nLegendPosition )); - rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, m_pCbxShow ? m_pCbxShow->IsChecked() : true) ); + rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, m_pCbxShow == nullptr || m_pCbxShow->IsChecked()) ); } IMPL_LINK( LegendPositionResources, PositionChangeHdl, RadioButton*, pRadio ) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 2107e9ccc251..83fa72fa21f1 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -276,7 +276,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) } } -int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) +SfxTabPage::sfxpg AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( pItemSet ) FillItemSet( pItemSet ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index b2bd45b1a3ac..a05ae58aeb49 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 954245a633ef..c3149fea8fbe 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -136,8 +136,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog ) { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( !bEnable ); + pDialog->SetModalInputMode( !bEnable ); } } @@ -464,7 +464,7 @@ void DataSourceTabPage::fillRoleListBox() if( bHasSelectedEntry ) { DialogModel::tRolesWithRanges aRoles( - m_rDialogModel.getRolesWithRanges( + DialogModel::getRolesWithRanges( pSeriesEntry->m_xDataSeries, lcl_GetSequenceNameForLabel( pSeriesEntry ), pSeriesEntry->m_xChartType )); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 81b7d2c284f3..81189258c9ee 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -46,8 +46,8 @@ namespace { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( !bEnable ); + pDialog->SetModalInputMode( !bEnable ); } } diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index fb02245f403a..cca20e82289e 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -417,7 +417,7 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs) SetNumFormat(); } -int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) +SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( !pNumFormatter ) { diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index b8a539628cf8..2f5a66c6c1dd 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 9dc9deaebd41..dbf9c4856c00 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -302,7 +302,7 @@ SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const return 0; } -bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const +bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) { if(pObj) { diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 6508a4d8d7f1..fc16dd1ff203 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -79,7 +79,7 @@ struct AccessibleElementInfo namespace impl { -typedef ::cppu::PartialWeakComponentImplHelper6< +typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, @@ -221,14 +221,6 @@ protected: void SetInfo( const AccessibleElementInfo & rNewInfo ); AccessibleUniqueId GetId() const { return m_aAccInfo.m_aOID;} - // ________ XComponent ________ - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::removeEventListener(xListener); } - // ________ WeakComponentImplHelper (XComponent::dispose) ________ virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index ea1579464455..89acd16b9471 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -75,7 +75,7 @@ public: SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const; SdrObject* getNamedSdrObject( const OUString& rName ) const; - bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const; + static bool IsObjectHit( SdrObject* pObj, const Point& rPnt ); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index f91d2226b157..524a87c4e32e 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -37,8 +37,8 @@ public: ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); - static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); private: virtual ~ChartTypeUnoDlg(); diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 5bfceb13a844..f37b16cfc956 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -103,7 +103,7 @@ private: @note this code is taken from dbaccess/source/ui/inc/UITools.hxx */ - void notifySystemWindow(vcl::Window* pWindow, + static void notifySystemWindow(vcl::Window* pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc); }; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index ed9ea945731d..74ebe3b0c714 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -315,14 +315,14 @@ bool DataPointItemConverter::ApplySpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); - if( (bOldValue ? 1 : 0) != rValue || + if( bOldValue != bool(rValue) || DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, CHART_UNONAME_LABEL , aOldValue ) ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL , uno::makeAny( aLabel ) ); bChanged = true; } } - else if( (bOldValue ? 1 : 0) != rValue ) + else if( bOldValue != bool(rValue) ) { GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL , uno::makeAny(aLabel)); bChanged = true; diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index e0e5bbe31c1d..fe94df3f3dc2 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -278,14 +278,14 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte if (mbDataSeries) { Reference<chart2::XDataSeries> xSeries(GetPropertySet(), uno::UNO_QUERY); - if ((bOldValue ? 1 : 0) != rValue || + if (bOldValue != bool(rValue) || DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, CHART_UNONAME_LABEL, aOldValue)) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, CHART_UNONAME_LABEL, uno::makeAny(aLabel)); bChanged = true; } } - else if ((bOldValue ? 1 : 0) != rValue) + else if (bOldValue != bool(rValue)) { GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel)); bChanged = true; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 9bf9826aaab8..40e6cacdfe8d 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -662,7 +662,7 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) if( m_aLifeTimeManager.impl_isDisposed() ) return sal_False; //behave passive if already disposed, return false because request was not accepted //@todo? correct - if(bSuspend == (m_bSuspended ? 1 : 0)) + if(bool(bSuspend) == m_bSuspended) { OSL_FAIL( "new suspend mode equals old suspend mode" ); return sal_True; diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 827e549c8e6b..f5c73bff7459 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -651,7 +651,7 @@ private: const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - ::std::set< OUString > impl_getAvailableCommands(); + static ::std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 59cbae5769bf..76e80d21dadc 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -517,7 +517,7 @@ void ChartController::startDoubleClickWaiting() m_bWaitingForDoubleClick = true; - sal_uLong nDblClkTime = 500; + sal_uInt64 nDblClkTime = 500; if( m_pChartWindow ) { const MouseSettings& rMSettings = m_pChartWindow->GetSettings().GetMouseSettings(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 9b611bdc802b..adea7db9f2bb 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -105,7 +105,7 @@ public: void DisposeAndClear(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getContainerDispatchForURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & xChartController, const ::com::sun::star::util::URL & rURL ); diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index a37a624ffd04..9f5d5ed624ae 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -146,7 +146,7 @@ private: void createDataSeriesTree( ObjectHierarchy::tChildContainer & rOutDiagramSubContainer, const Reference< XDiagram > & xDiagram ); - void createWallAndFloor( + static void createWallAndFloor( ObjectHierarchy::tChildContainer & rContainer, const Reference< XDiagram > & xDiagram ); void createLegendTree( diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 1435dfbadf23..c6da54051ce9 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -260,7 +260,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* SdrObject* pDiagram = pDrawViewWrapper->getNamedSdrObject( aDiagramCID ); if( pDiagram ) { - if( pDrawViewWrapper->IsObjectHit( pDiagram, rMousePos ) ) + if( DrawViewWrapper::IsObjectHit( pDiagram, rMousePos ) ) { m_aSelectedOID = ObjectIdentifier( aDiagramCID ); } @@ -273,7 +273,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { - if( pDrawViewWrapper->IsObjectHit( pLegend, rMousePos ) ) + if( DrawViewWrapper::IsObjectHit( pLegend, rMousePos ) ) { m_aSelectedOID = ObjectIdentifier( aLegendCID ); } @@ -375,7 +375,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos return false; SolarMutexGuard aSolarGuard; SdrObject* pObj = rDrawViewWrapper.getNamedSdrObject( rNameOfSelectedObject ); - if( !rDrawViewWrapper.IsObjectHit( pObj, rMPos ) ) + if( !DrawViewWrapper::IsObjectHit( pObj, rMPos ) ) return false; return true; } @@ -423,7 +423,7 @@ OUString SelectionHelper::getHitObjectCID( SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID ); if( pDiagram ) { - if( rDrawViewWrapper.IsObjectHit( pDiagram, rMPos ) ) + if( DrawViewWrapper::IsObjectHit( pDiagram, rMPos ) ) { aRet = aDiagramCID; } diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 73b98c748ee2..8bdb1ed096d2 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -67,7 +67,7 @@ public: // needed by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 72d2a0bdcb46..403eb01dc844 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -45,10 +45,10 @@ protected: const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey ) const = 0; - OUString getFormattedString( + static OUString getFormattedString( const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, - double fNumber ) const; + double fNumber ); double m_fCorrelationCoeffitient; diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 314592da0c43..b187dd34bb0e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -221,7 +221,7 @@ struct StaticAxisDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); @@ -262,7 +262,7 @@ struct StaticAxisInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 965c7c358f05..22701436688e 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -67,7 +67,7 @@ struct StaticCooSysDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false ); } @@ -86,7 +86,7 @@ struct StaticCooSysInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 7afc38c6804b..8f9ea9cb6384 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -51,7 +51,7 @@ struct StaticDataPointInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::DataPointProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 0996f9fec217..9f95cee79723 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -210,7 +210,7 @@ struct StaticDiagramDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, true ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_SORT_BY_X_VALUES, false ); @@ -240,7 +240,7 @@ struct StaticDiagramInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); @@ -703,7 +703,7 @@ void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValu if( rValue >>=nNewAngleDegree ) { sal_Int32 nHorizontal, nVertical; - ThreeDHelper::getRotationFromDiagram( const_cast< Diagram* >( this ), nHorizontal, nVertical ); + ThreeDHelper::getRotationFromDiagram( this, nHorizontal, nVertical ); if( PROP_DIAGRAM_ROTATION_HORIZONTAL == nHandle ) nHorizontal = nNewAngleDegree; else diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index e4d9c50491ff..f30eb31a4098 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -46,7 +46,7 @@ struct StaticFormattedStringDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); } @@ -65,7 +65,7 @@ struct StaticFormattedStringInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index c49be891eacb..5aa3f35301fe 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -66,7 +66,7 @@ struct StaticGridDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); @@ -91,7 +91,7 @@ struct StaticGridInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 369da0f1037a..9d22b6eb7ffb 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -115,7 +115,7 @@ struct StaticLegendDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -145,7 +145,7 @@ struct StaticLegendInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0cd7544bd500..ab3ceb0b3935 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -52,7 +52,7 @@ struct StaticPageBackgroundDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -76,7 +76,7 @@ struct StaticPageBackgroundInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index de6eae867a13..0b05ee094fcc 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -50,7 +50,7 @@ struct StaticStockBarInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); @@ -92,7 +92,7 @@ struct StaticStockBarDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 6808484b8a6f..653abe45d1aa 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -155,7 +155,7 @@ struct StaticTitleDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -194,7 +194,7 @@ struct StaticTitleInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index d7eeeb2b4c01..ef1b9e38988b 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -55,7 +55,7 @@ struct StaticWallDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -78,7 +78,7 @@ struct StaticWallInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index f30bbfd157f1..37c6c16a74a9 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -65,7 +65,7 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 ); } @@ -84,7 +84,7 @@ struct StaticAreaChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 8a504c82002c..971f666a6a5c 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -72,7 +72,7 @@ struct StaticBarChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID ); @@ -92,7 +92,7 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index d5228542adb4..4b494b7943bc 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -63,7 +63,7 @@ struct StaticBubbleChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 006e64eb797d..e070942b14c0 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -65,7 +65,7 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index d92aaf42e8b2..1d46372591d6 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -93,7 +93,7 @@ struct StaticCandleStickChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { // must match default in CTOR! ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false ); @@ -115,7 +115,7 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 3584a3d61aa9..f11b2a1b77a7 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -65,7 +65,7 @@ struct StaticColumnChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { Sequence< sal_Int32 > aSeq(2); @@ -90,7 +90,7 @@ struct StaticColumnChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 64375568c233..e44a97ef010d 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -70,7 +70,7 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 ); } @@ -89,7 +89,7 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index 8141359179de..b4dbd06cfaf9 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -40,7 +40,7 @@ struct DefaultsInitializer } private: - void addDefaults( tPropertyValueMap & rOutMap ) + static void addDefaults( tPropertyValueMap & rOutMap ) { PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); } @@ -56,7 +56,7 @@ struct InfoHelperInitializer return &aHelper; } - uno::Sequence<beans::Property> getProperties() + static uno::Sequence<beans::Property> getProperties() { uno::Sequence<beans::Property> aRet(1); diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 6ea9e6d77740..51ccde36f3e9 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -43,7 +43,7 @@ struct DefaultsInitializer } private: - void addDefaults( tPropertyValueMap & rOutMap ) + static void addDefaults( tPropertyValueMap & rOutMap ) { PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); } @@ -59,7 +59,7 @@ struct InfoHelperInitializer return &aHelper; } - uno::Sequence<beans::Property> getProperties() + static uno::Sequence<beans::Property> getProperties() { uno::Sequence<beans::Property> aRet(1); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index a565baab69c8..553dce43169b 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -79,7 +79,7 @@ struct StaticLineChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_CURVE_STYLE, ::chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_CURVE_RESOLUTION, 20 ); @@ -103,7 +103,7 @@ struct StaticLineChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index b928eb0cd113..a7c1814a4213 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -84,7 +84,7 @@ struct StaticLineChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 ); @@ -108,7 +108,7 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 683d764bd103..2a6ebf659e0a 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -71,7 +71,7 @@ struct StaticPieChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIECHARTTYPE_USE_RINGS, false ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, 100 ); @@ -91,7 +91,7 @@ struct StaticPieChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 77cd1e85e245..dc337df83490 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -95,7 +95,7 @@ struct StaticPieChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_OFFSET_MODE, chart2::PieChartOffsetMode_NONE ); ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, 0.5 ); @@ -117,7 +117,7 @@ struct StaticPieChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 2e7b79cd8ff6..106f88f67a07 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -83,7 +83,7 @@ struct StaticScatterChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, 20 ); @@ -107,7 +107,7 @@ struct StaticScatterChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 0c04c417ea5b..781cefd65c28 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -86,7 +86,7 @@ struct StaticScatterChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 ); @@ -110,7 +110,7 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 6177bd67deeb..e1f5d9f0d7d8 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -97,7 +97,7 @@ struct StaticStockChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, false ); @@ -119,7 +119,7 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index a57607178d75..8684e08fe52a 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -449,7 +449,7 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS if( bIsAutoDate ) { if( bOwnData ) - bIsDate = bOwnDataAnddAxisHasAnyFormat ? bOwnDataAnddAxisHasDateFormat : true; + bIsDate = !bOwnDataAnddAxisHasAnyFormat || bOwnDataAnddAxisHasDateFormat; else bIsDate = DiagramHelper::isDateNumberFormat( xDataSequence->getNumberFormatKeyByIndex( nN ), xNumberFormats ); } diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 0a369a3c261f..39fdf185ae6b 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1533,7 +1533,7 @@ sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) { comphelper::SequenceAsHashMap aArgs(_aArguments); - if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) ) + if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) createDefaultData(); } // ____ XCloneable ____ diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 59dc730ae9ec..d8dc8c7916a2 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -82,7 +82,7 @@ void RegressionCurveCalculator::setRegressionProperties( OUString RegressionCurveCalculator::getFormattedString( const Reference< util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, - double fNumber ) const + double fNumber ) { OUString aResult; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index be309fba0ead..6857be4bd386 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -128,7 +128,7 @@ struct StaticXXXDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); } @@ -147,7 +147,7 @@ struct StaticRegressionCurveInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 0c97028a5732..0ddc2c97bd7f 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -106,7 +106,7 @@ struct StaticRegressionEquationDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -140,7 +140,7 @@ struct StaticRegressionEquationInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 509709a3bed3..998f0da4e9bc 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -65,7 +65,7 @@ public: void setExtraLinePositionAtOtherAxis( double fCrossingAt ); protected: //methods - size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); + static size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); void removeTextShapesFromTicks(); void updateUnscaledValuesAtTicks( TickIter& rIter ); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 747a12044ecc..c8ae9e095be7 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -499,7 +499,7 @@ bool VCartesianAxis::isBreakOfLabelsAllowed( } bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) { if( rAxisLabelProperties.eStaggering != STAGGER_AUTO ) return false; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 839d5e817d5e..c1937a48ef6d 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -150,8 +150,8 @@ private: //methods * @return true if we can try to stagger labels in order to avoid * overlaps, otherwise false. */ - bool isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const; + static bool isAutoStaggeringOfLabelsAllowed( + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ); /** * @return true if we can break a single line label text into multiple diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 4710d5e0a15f..df7d1bcef449 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -79,7 +79,7 @@ void VCartesianCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VCartesianGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis )); aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex) , this->getExplicitIncrement(nDimensionIndex,nAxisIndex) ); aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 5bd7329a89f3..9d7ebf2994b9 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -221,7 +221,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA return ContainerHelper::ContainerToSequence( aRet ); } -void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) const +void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) { if( rDimensionIndex<0 ) rDimensionIndex=0; diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 7ad142175b34..6e34ab242aa3 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -173,7 +173,7 @@ void VPolarCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VPolarGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis )); aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory , this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 911a6258fa36..7763f2cfe9e9 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -462,7 +462,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -538,7 +538,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); } - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 1c50f79cdcb4..e6c2d080a001 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -63,7 +63,7 @@ private: //methods bool impl_createLine( VDataSeries* pSeries , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); - bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly + static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly , ::com::sun::star::chart2::CurveStyle eCurveStyle , PlottingPositionHelper* pPosHelper , ::com::sun::star::drawing::PolyPolygonShape3D &aPoly ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index e5cbbe40915a..6184d01e2470 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( return xShape; } if( nGeometry3D != DataPointGeometry3D::PYRAMID ) - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); return xShape; } @@ -801,7 +801,7 @@ void BarChart::createShapes() AddPointToPoly( aPoly, drawing::Position3D( fLogicX-fLogicBarWidth/2.0,fLowerYValue,fLogicZ) ); pPosHelper->transformScaledLogicToScene( aPoly ); xShape = m_pShapeFactory->createArea2D( xPointGroupShape_Shapes, aPoly ); - this->setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } if(bHasFillColorMapping) @@ -913,7 +913,7 @@ void BarChart::createShapes() getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); uno::Reference< drawing::XShape > xShape( m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes, PolyToPointSequence( aPoly ) ) ); - this->setMappedProperties( xShape, pSeries->getPropertiesOfSeries() + setMappedProperties( xShape, pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } } diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index cce9a3349989..2adc03c6fb71 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -317,7 +317,7 @@ void BubbleChart::createShapes() xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes , aScenePosition, aSymbolSize ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfPoint( nIndex ) , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 50e3d2f5519b..c3621ceaf1cf 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -239,7 +239,7 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes, PolyToPointSequence(aPoly), NULL); - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } //create first-last shape @@ -294,7 +294,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } } } diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 3fe29b0d7c0b..ad79ed5a158f 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -424,7 +424,7 @@ void RenderBenchMarkThread::ProcessClickFlyBack() if (!mbNeedFlyBack) return; osl_getSystemTime(&maClickFlyBackEndTime); - int nDeltaMs = mpChart->calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); + int nDeltaMs = GL3DBarChart::calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); if(nDeltaMs >= 10000) { mpChart->maRenderEvent = EVENT_MOVE_TO_DEFAULT; diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 854fc073ee71..5bd26237adb4 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -170,7 +170,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -241,7 +241,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 58f1b04348f6..21233648dcbc 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -263,7 +263,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius , aOffset, B3DHomMatrixToHomogenMatrix( m_pPosHelper->getUnitCartesianToScene() ) ); } - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); return xShape; } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 471c6c923575..52e75964b1ff 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -929,7 +929,7 @@ void VSeriesPlotter::createErrorBar( } uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, PolyToPointSequence( aPoly) ); - this->setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); + setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); } catch( const uno::Exception & e ) { diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index eaff13a4ed93..c714a5b50489 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -103,7 +103,7 @@ private: void updateRenderFPS(); void updateDataUpdateFPS(); DECL_LINK(UpdateTimerHdl, void*); - int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); + static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag = true, const glm::vec4& rColor = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f), const glm::vec3& rPos = glm::vec3(0.0f, 0.0f, 0.0f), @@ -111,10 +111,10 @@ private: void recordBarHistory(sal_uInt32 &nBarID, float &nVal); void updateClickEvent(); void calcDistance(std::vector<sal_uInt32> &vectorNearest); - float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); + static float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); void initDistanceHeap(std::vector<sal_uInt32> &vectorNearest); void keepHeap(std::vector<sal_uInt32> &vectorNearest, int index); - void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); + static void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); void getNearestBars(std::vector<sal_uInt32> &vectorNearest); void updateScroll(); void processAutoFly(sal_uInt32 nId, sal_uInt32 nColor); diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 69eabae5b78d..afaa0f0e278e 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -228,7 +228,7 @@ public: private: void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale); - void ClearBuffer(); + static void ClearBuffer(); void RenderPolygon3DObject(); void RenderLine3D(const Polygon3DInfo &polygon); void RenderPolygon3D(const Polygon3DInfo &polygon); @@ -247,17 +247,17 @@ private: void AddNormalData(GLuint normalBuf); void AddIndexData(GLuint indexBuf); void RenderNonRoundedBar(const Extrude3DInfo& extrude3D); - bool GetSimilarVertexIndex(PackedVertex & packed, + static bool GetSimilarVertexIndex(PackedVertex & packed, std::map<PackedVertex,unsigned short> & VertexToOutIndex, unsigned short & result ); - void SetVertex(PackedVertex &packed, + static void SetVertex(PackedVertex &packed, std::map<PackedVertex,unsigned short> &VertexToOutIndex, std::vector<glm::vec3> &vertex, std::vector<glm::vec3> &normal, std::vector<unsigned short> &indeices); void CreateActualRoundedCube(float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); - int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, + static int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); void CreateSceneBoxView(); diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 0656cc565291..20ba20f6657c 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -52,9 +52,9 @@ public: void InvertNormal( bool bInvertNormal ); - ::com::sun::star::uno::Any getPolyPolygonShape3D() const; - ::com::sun::star::uno::Any getNormalsPolygon() const; - ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ) const; //0 to 7 are the different possibilities + ::com::sun::star::uno::Any getPolyPolygonShape3D() const; + ::com::sun::star::uno::Any getNormalsPolygon() const; + static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities ::com::sun::star::drawing::Position3D GetPosition1() const { return m_aPoint1; } ::com::sun::star::drawing::Position3D GetPosition2() const { return m_aPoint2; } diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 291c1a2c1c64..ea64683a7e28 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -143,7 +143,7 @@ protected: //methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > getGridListFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -161,7 +161,7 @@ protected: //methods ::com::sun::star::chart2::XChartDocument>& xChartDoc); private: //methods - void impl_adjustDimension( sal_Int32& rDimensionIndex ) const; + static void impl_adjustDimension( sal_Int32& rDimensionIndex ); void impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex, sal_Int32& rAxisIndex ) const; protected: //member diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 03bbc8083eb2..84d1d3f52fde 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -405,7 +405,7 @@ protected: ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator , ::com::sun::star::awt::Point aDefaultPos ); - void setMappedProperties( + static void setMappedProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTarget , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 82e9ecae620f..9ad6981697b4 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -167,7 +167,7 @@ ChartItemPool::ChartItemPool(): for( sal_uInt16 i = 0; i < nMax; i++ ) { pItemInfos[i]._nSID = 0; - pItemInfos[i]._nFlags = SFX_ITEM_POOLABLE; + pItemInfos[i]._nFlags = SfxItemPoolFlags::POOLABLE; } // slot ids differing from which ids diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 9ac3ad84d253..1ef10303457e 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3124,7 +3124,7 @@ OUString ChartView::dump() throw (uno::RuntimeException, std::exception) if(xShape.is()) { XShapeDumper dumper; - OUString aString = dumper.dump(mxRootShape); + OUString aString = XShapeDumper::dump(mxRootShape); aBuffer.append(aString); } else @@ -3133,7 +3133,7 @@ OUString ChartView::dump() throw (uno::RuntimeException, std::exception) if(!xSingleShape.is()) continue; XShapeDumper dumper; - OUString aString = dumper.dump(xSingleShape); + OUString aString = XShapeDumper::dump(xSingleShape); aBuffer.append(aString); } aBuffer.append("\n\n"); diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 0abfa5860d5b..044e4df90014 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -213,7 +213,7 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources() void OpenGL3DRenderer::CheckGLSLVersion() { - maResources.m_b330Support = GLEW_VERSION_3_3 == 1; + maResources.m_b330Support = GLEW_VERSION_3_3; } void OpenGL3DRenderer::ShaderResources::LoadShaders() @@ -261,7 +261,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() m_BatchTextVertexID = glGetAttribLocation(m_BatchTextProID, "vPosition"); m_BatchTextTexCoordID = glGetAttribLocation(m_BatchTextProID, "texCoord"); } - mbTexBatchSupport = m_BatchTextProID ? true : false; + mbTexBatchSupport = m_BatchTextProID != 0; CHECK_GL_ERROR(); } else @@ -2455,7 +2455,7 @@ void OpenGL3DRenderer::CalcScrollMoveMatrix(bool bNewScene) m_fCurDistance = -m_fScrollSpeed; m_fCurDistance += m_fCurDistance >= m_fScrollDistance ? 0.0f : m_fScrollSpeed; m_ScrollMoveMatrix = glm::translate(glm::vec3(-m_fCurDistance * 0.01, 0.0f, 0.0f)); - m_bUndrawFlag = m_fCurDistance >= m_fScrollDistance ? true : false; + m_bUndrawFlag = m_fCurDistance >= m_fScrollDistance; } glm::mat4 OpenGL3DRenderer::GetDiffOfTwoCameras(const glm::vec3& rBeginPos, const glm::vec3& rEndPos, const glm::vec3& rBeginDirection, const glm::vec3& rEndDirection) diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index b165b442f895..1251eafbfb49 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1004,7 +1004,7 @@ uno::Reference< drawing::XShape > //TexturePolygon xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D - , rStripe.getTexturePolygon( nRotatedTexture ) ); + , Stripe::getTexturePolygon( nRotatedTexture ) ); //Normals Polygon xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index 6d4bb9074f0d..c9455a0e9d53 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -175,7 +175,7 @@ uno::Any Stripe::getNormalsPolygon() const return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get()); } -uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const +uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) { drawing::PolyPolygonShape3D aPP; diff --git a/chart2/uiconfig/toolbar/standardbar.xml b/chart2/uiconfig/toolbar/standardbar.xml index 3b9ab0f0a4f8..94ea16273e0d 100644 --- a/chart2/uiconfig/toolbar/standardbar.xml +++ b/chart2/uiconfig/toolbar/standardbar.xml @@ -18,23 +18,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:text="" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:text="" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:text="" toolbar:style="dropdown"/> - <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text="" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text=""/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:Undo"/> + <toolbar:toolbaritem xlink:href=".uno:Redo"/> </toolbar:toolbar> diff --git a/chart2/uiconfig/toolbar/toolbar.xml b/chart2/uiconfig/toolbar/toolbar.xml index 862f5cf7c201..faa72bccda13 100644 --- a/chart2/uiconfig/toolbar/toolbar.xml +++ b/chart2/uiconfig/toolbar/toolbar.xml @@ -21,13 +21,27 @@ <toolbar:toolbaritem xlink:href=".uno:ChartElementSelector"/> <toolbar:toolbaritem xlink:href=".uno:FormatSelection"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:DiagramType" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:DiagramData" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:DiagramType"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramArea"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramWall"/> + <toolbar:toolbaritem xlink:href=".uno:View3D"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:ToggleGridVertical" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:ToggleLegend" toolbar:text=""/> - <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:DataRanges"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramData"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:text=""/> + <toolbar:toolbaritem xlink:href=".uno:InsertMenuTitles"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleLegend"/> + <toolbar:toolbaritem xlink:href=".uno:Legend"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal"/> + <toolbar:toolbaritem xlink:href=".uno:ToggleGridVertical"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:DiagramAxisX"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramAxisY"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramAxisZ"/> + <toolbar:toolbaritem xlink:href=".uno:DiagramAxisAll"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:visible="false"/> </toolbar:toolbar> |