[Libreoffice-commits] core.git: 4 commits - chart2/qa chart2/source include/xmloff sc/source xmloff/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Wed Jul 2 14:07:51 PDT 2014
chart2/qa/extras/chart2import.cxx | 1
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 1
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 1
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 1
chart2/source/controller/dialogs/DataBrowser.cxx | 6
chart2/source/controller/dialogs/DataBrowserModel.cxx | 1
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 1
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 1
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 1
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 1
chart2/source/controller/inc/ItemConverter.hxx | 1
chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 1
chart2/source/controller/inc/res_ErrorBar.hxx | 1
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 1
chart2/source/controller/main/ChartController.cxx | 1
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/ObjectHierarchy.cxx | 1
chart2/source/controller/main/SelectionHelper.cxx | 1
chart2/source/inc/ServiceMacros.hxx | 4
chart2/source/model/main/ChartModel.cxx | 3
chart2/source/model/main/ChartModel_Persistence.cxx | 1
chart2/source/model/template/ChartType.cxx | 1
chart2/source/model/template/ChartTypeTemplate.cxx | 1
chart2/source/model/template/DataInterpreter.cxx | 1
chart2/source/model/template/StockDataInterpreter.cxx | 1
chart2/source/tools/ExplicitCategoriesProvider.cxx | 1
chart2/source/tools/ImplOPropertySet.cxx | 1
chart2/source/tools/InternalData.cxx | 3
chart2/source/tools/LifeTime.cxx | 2
chart2/source/tools/NumberFormatterWrapper.cxx | 1
chart2/source/tools/ObjectIdentifier.cxx | 2
chart2/source/tools/ReferenceSizeProvider.cxx | 2
chart2/source/tools/WrappedProperty.cxx | 1
chart2/source/view/axes/ScaleAutomatism.cxx | 2
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 2
chart2/source/view/axes/VAxisBase.cxx | 1
chart2/source/view/axes/VCoordinateSystem.cxx | 2
chart2/source/view/charttypes/AreaChart.cxx | 2
chart2/source/view/charttypes/BarChart.cxx | 1
chart2/source/view/charttypes/BubbleChart.cxx | 1
chart2/source/view/charttypes/NetChart.cxx | 2
chart2/source/view/charttypes/PieChart.cxx | 1
chart2/source/view/charttypes/VSeriesPlotter.cxx | 1
chart2/source/view/diagram/VDiagram.cxx | 1
chart2/source/view/inc/AbstractShapeFactory.hxx | 2
chart2/source/view/inc/GL3DBarChart.hxx | 1
chart2/source/view/inc/GL3DRenderer.hxx | 1
chart2/source/view/inc/PlottingPositionHelper.hxx | 1
chart2/source/view/inc/VCoordinateSystem.hxx | 2
chart2/source/view/inc/ViewDefines.hxx | 1
chart2/source/view/main/3DChartObjects.cxx | 1
chart2/source/view/main/AbstractShapeFactory.cxx | 1
chart2/source/view/main/ChartItemPool.cxx | 1
chart2/source/view/main/ChartView.cxx | 4
chart2/source/view/main/Clipping.cxx | 1
chart2/source/view/main/DummyXShape.cxx | 4
chart2/source/view/main/DummyXShape.hxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 3
chart2/source/view/main/OpenGLRender.cxx | 1
chart2/source/view/main/OpenGLRender.hxx | 1
chart2/source/view/main/OpenglShapeFactory.cxx | 1
chart2/source/view/main/PlottingPositionHelper.cxx | 1
chart2/source/view/main/ShapeFactory.cxx | 1
chart2/source/view/main/VDataSeries.cxx | 4
include/xmloff/xmlexppr.hxx | 10 -
sc/source/filter/xml/xmlstyle.cxx | 95 ++++------
xmloff/source/chart/XMLChartStyleContext.cxx | 2
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 2
xmloff/source/draw/XMLShapeStyleContext.cxx | 2
xmloff/source/style/impastpl.cxx | 7
xmloff/source/style/prstylei.cxx | 2
xmloff/source/style/xmlexppr.cxx | 8
xmloff/source/text/XMLTextShapeStyleContext.cxx | 2
xmloff/source/transform/StyleOASISTContext.cxx | 2
81 files changed, 67 insertions(+), 176 deletions(-)
New commits:
commit 9746dc9ad62e7f3a39961733f2ac204e90289034
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jul 2 22:58:56 2014 +0200
fix ODF validation errors
Introduced by 7d9bb549d498d6beed2c4050c402d09643febdfa
Change-Id: I09411486b93a031a0c405579d34d9e744b8002a7
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 8d98a1b..44fae06 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -126,7 +126,8 @@ public:
bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
const ::std::vector< XMLPropertyState >& aProperties2 ) const;
- /** fills the given attribute list with the items in the given set */
+ /** fills the given attribute list with the items in the given set
+ */
void exportXML(
SvXMLAttributeList& rAttrList,
const ::std::vector< XMLPropertyState >& rProperties,
@@ -149,12 +150,15 @@ public:
sal_uInt16 nFlags = 0 ) const;
/** like above but only properties whose property map index is within the
- specified range are exported */
+ * specified range are exported
+ *
+ * @param bExtensionNamespace use the extension namespace for graphic-properties
+ */
void exportXML(
SvXMLExport& rExport,
const ::std::vector< XMLPropertyState >& rProperties,
sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx,
- sal_uInt16 nFlags = 0 ) const;
+ sal_uInt16 nFlags = 0, bool bExtensionNamespace = false ) const;
/** this method is called for every item that has the
MID_FLAG_ELEMENT_EXPORT flag set */
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 7f33644..52e6ea0 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -115,7 +115,7 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext(
{
SvXMLImportContext* pContext = NULL;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
sal_uInt32 nFamily = 0;
if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) )
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index f7731db..64ca80c 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -57,7 +57,7 @@ SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPre
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
sal_uInt32 nFamily = 0;
if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) )
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 9068ceb..31c32d7 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -95,7 +95,7 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext(
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
sal_uInt32 nFamily = 0;
if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) )
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 1f0c4fb..5264850 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -685,10 +685,15 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
XML_NAMESPACE_STYLE, XML_NAME,
aExpStyles[i].mpProperties->GetName() );
+ bool bExtensionNamespace = false;
if( rFamily.mbAsFamily )
{
GetExport().AddAttribute(
XML_NAMESPACE_STYLE, XML_FAMILY, aStrFamilyName );
+ if(aStrFamilyName != "graphic" &&
+ aStrFamilyName != "presentation" &&
+ aStrFamilyName != "chart" )
+ bExtensionNamespace = true;
}
if( !aExpStyles[i].mpParent->isEmpty() )
@@ -741,7 +746,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
rFamily.mxMapper->exportXML(
GetExport(),
aExpStyles[i].mpProperties->GetProperties(),
- nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
+ nStart, nEnd, XML_EXPORT_FLAG_IGN_WS, bExtensionNamespace );
pAntiImpl->exportStyleContent(
GetExport().GetDocHandler(),
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 5397ce9..97019d3 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -163,7 +163,7 @@ SvXMLImportContext *XMLPropStyleContext::CreateChildContext(
SvXMLImportContext *pContext = 0;
sal_uInt32 nFamily = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
if( IsXMLToken( rLocalName, XML_GRAPHIC_PROPERTIES ) )
nFamily = XML_TYPE_PROP_GRAPHIC;
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index bf0f968..1148767 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -745,7 +745,7 @@ void SvXMLExportPropertyMapper::exportXML(
SvXMLExport& rExport,
const ::std::vector< XMLPropertyState >& rProperties,
sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx,
- sal_uInt16 nFlags ) const
+ sal_uInt16 nFlags, bool bExtensionNamespace ) const
{
sal_uInt16 nPropTypeFlags = 0;
for( sal_uInt16 i=0; i<MAX_PROP_TYPES; ++i )
@@ -766,7 +766,11 @@ void SvXMLExportPropertyMapper::exportXML(
(nFlags & XML_EXPORT_FLAG_EMPTY) != 0 ||
!aIndexArray.empty() )
{
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE,
+ sal_uInt16 nNamespace = XML_NAMESPACE_STYLE;
+ if(bExtensionNamespace && aPropTokens[i].eToken ==
+ xmloff::token::XML_GRAPHIC_PROPERTIES)
+ nNamespace = XML_NAMESPACE_LO_EXT;
+ SvXMLElementExport aElem( rExport, nNamespace,
aPropTokens[i].eToken,
(nFlags & XML_EXPORT_FLAG_IGN_WS) != 0,
false );
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 9a51d82..0c341fe 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -161,7 +161,7 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext(
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
sal_uInt32 nFamily = 0;
if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) )
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 4807b1d..e01e342 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -773,7 +773,7 @@ XMLTransformerContext *XMLStyleOASISTContext::CreateChildContext(
{
XMLTransformerContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix )
+ if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
XMLPropType ePropType =
XMLPropertiesTContext_Impl::GetPropType( rLocalName );
commit 0879c444ed5187f813827ae0e486ad9cc7a4c0d4
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jul 2 19:25:22 2014 +0200
improve indentation
Change-Id: I10917e6a6a73af68ddb72a2b45666892d318806b
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index a1d24f1..0a05a56 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -984,61 +984,52 @@ bool XmlScPropHdl_CellProtection::importXML(
}
if ((rValue >>= aCellProtection) || bDefault)
{
- if (!IsXMLToken(rStrImpValue, XML_NONE))
+ if (IsXMLToken(rStrImpValue, XML_NONE))
{
- if (!IsXMLToken(rStrImpValue, XML_HIDDEN_AND_PROTECTED))
- {
- if (!IsXMLToken(rStrImpValue, XML_PROTECTED))
- {
- if (!IsXMLToken(rStrImpValue, XML_FORMULA_HIDDEN))
- {
- sal_Int16 i(0);
- while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ')
- ++i;
- OUString sFirst(rStrImpValue.copy(0, i));
- OUString sSecond(rStrImpValue.copy(i + 1));
- aCellProtection.IsFormulaHidden = false;
- aCellProtection.IsHidden = false;
- aCellProtection.IsLocked = false;
- if ((IsXMLToken(sFirst, XML_PROTECTED)) || (IsXMLToken(sSecond, XML_PROTECTED)))
- aCellProtection.IsLocked = sal_True;
- if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN)))
- aCellProtection.IsFormulaHidden = sal_True;
- rValue <<= aCellProtection;
- bRetval = true;
- }
- else
- {
- aCellProtection.IsFormulaHidden = sal_True;
- aCellProtection.IsHidden = false;
- aCellProtection.IsLocked = false;
- rValue <<= aCellProtection;
- bRetval = true;
- }
- }
- else
- {
- aCellProtection.IsFormulaHidden = false;
- aCellProtection.IsHidden = false;
- aCellProtection.IsLocked = sal_True;
- rValue <<= aCellProtection;
- bRetval = true;
- }
- }
- else
- {
- aCellProtection.IsFormulaHidden = sal_True;
- aCellProtection.IsHidden = sal_True;
- aCellProtection.IsLocked = sal_True;
- rValue <<= aCellProtection;
- bRetval = true;
- }
+ aCellProtection.IsFormulaHidden = false;
+ aCellProtection.IsHidden = false;
+ aCellProtection.IsLocked = false;
+ rValue <<= aCellProtection;
+ bRetval = true;
+ }
+ else if (IsXMLToken(rStrImpValue, XML_HIDDEN_AND_PROTECTED))
+ {
+ aCellProtection.IsFormulaHidden = sal_True;
+ aCellProtection.IsHidden = sal_True;
+ aCellProtection.IsLocked = sal_True;
+ rValue <<= aCellProtection;
+ bRetval = true;
+ }
+ else if (IsXMLToken(rStrImpValue, XML_PROTECTED))
+ {
+ aCellProtection.IsFormulaHidden = false;
+ aCellProtection.IsHidden = false;
+ aCellProtection.IsLocked = sal_True;
+ rValue <<= aCellProtection;
+ bRetval = true;
+ }
+ else if (IsXMLToken(rStrImpValue, XML_FORMULA_HIDDEN))
+ {
+ aCellProtection.IsFormulaHidden = sal_True;
+ aCellProtection.IsHidden = false;
+ aCellProtection.IsLocked = false;
+ rValue <<= aCellProtection;
+ bRetval = true;
}
else
{
+ sal_Int16 i(0);
+ while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ')
+ ++i;
+ OUString sFirst(rStrImpValue.copy(0, i));
+ OUString sSecond(rStrImpValue.copy(i + 1));
aCellProtection.IsFormulaHidden = false;
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = false;
+ if ((IsXMLToken(sFirst, XML_PROTECTED)) || (IsXMLToken(sSecond, XML_PROTECTED)))
+ aCellProtection.IsLocked = sal_True;
+ if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN)))
+ aCellProtection.IsFormulaHidden = sal_True;
rValue <<= aCellProtection;
bRetval = true;
}
commit 63ea2d467b50452ae0cab18b4151107a747ae70d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jul 2 19:10:24 2014 +0200
replace while with for
Change-Id: I752376e42bf745b33a7be7478531eebd42893926
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 9763f3d..a1d24f1 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -623,7 +623,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes(
{
::std::vector< XMLPropertyState >::const_iterator i(rProperties.begin());
::std::vector< XMLPropertyState >::const_iterator endi(rProperties.end());
- while (i != endi)
+ for(; i != endi; ++i)
{
rtl::Reference< XMLPropertySetMapper > aPropMapper(rScXMLExport.GetCellStylesPropertySetMapper());
sal_Int16 nContextID(aPropMapper->GetEntryContextId(i->mnIndex));
@@ -646,14 +646,13 @@ void ScXMLAutoStylePoolP::exportStyleAttributes(
}
break;
}
- ++i;
}
}
else if (nFamily == XML_STYLE_FAMILY_TABLE_TABLE)
{
::std::vector< XMLPropertyState >::const_iterator i(rProperties.begin());
::std::vector< XMLPropertyState >::const_iterator endi(rProperties.end());
- while(i != endi)
+ for(; i != endi; ++i)
{
rtl::Reference< XMLPropertySetMapper > aPropMapper(rScXMLExport.GetTableStylesPropertySetMapper());
sal_Int16 nContextID(aPropMapper->GetEntryContextId(i->mnIndex));
@@ -692,7 +691,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
bool bNotFound = true;
::std::vector< XMLPropertyState >::const_iterator i(rProperties.begin());
::std::vector< XMLPropertyState >::const_iterator endi(rProperties.end());
- while ((i != endi) && bNotFound)
+ for(; i != endi && bNotFound; ++i)
{
if (i->mnIndex != -1)
{
@@ -793,7 +792,6 @@ void ScXMLAutoStylePoolP::exportStyleContent(
break;
}
}
- ++i;
}
}
}
commit 3575dba98d427cfe80716befea6f0f21748f88f5
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue Jul 1 22:37:23 2014 +0200
remove whitespaces
Change-Id: I05ef3c1ffd4e2179e0142a21abf8a4578718102e
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 1f31cad..16a0f03 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
#include "charttest.hxx"
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/chart2/CurveStyle.hpp>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 0c92a26..95992f4 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -442,7 +442,6 @@ void AccessibleBase::KillAllChildren()
m_bChildrenInitialized = false;
}
-
void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo )
{
m_aAccInfo = rNewInfo;
@@ -454,7 +453,6 @@ void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo )
true /* global notification */ );
}
-
// ________ (XComponent::dispose) ________
void SAL_CALL AccessibleBase::disposing()
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 0f89470..1379b7c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -116,7 +116,6 @@ void AccessibleChartElement::InitTextEdit()
}
}
-
// Interfaces
// ________ AccessibleBase::XAccessibleContext ________
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 283ffea..1588a2f 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -90,7 +90,6 @@ Reference< frame::XModel > Chart2ModelContact::getChartModel() const
return Reference< frame::XModel >( m_xChartModel.get(), uno::UNO_QUERY );
}
-
Reference< chart2::XChartDocument > Chart2ModelContact::getChart2Document() const
{
return Reference< chart2::XChartDocument >( m_xChartModel.get(), uno::UNO_QUERY );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 2fbe179..695ecb1 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1035,8 +1035,6 @@ void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram )
this->setDiagram( xDiagram );
}
-
-
void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAddIn )
{
if( m_xAddIn == xAddIn )
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 7199f97..e69042b 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -545,7 +545,6 @@ bool DataSeriesPointWrapper::isSupportingAreaProperties()
return ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount );
}
-
Reference< chart2::XDataSeries > DataSeriesPointWrapper::getDataSeries()
{
Reference< chart2::XDataSeries > xSeries( m_xDataSeries );
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 8c0c83f..5d6f1dd 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -130,7 +130,6 @@ void SeriesHeaderEdit::setStartColumn( sal_Int32 nStartColumn )
m_nStartColumn = nStartColumn;
}
-
void SeriesHeaderEdit::SetShowWarningBox( bool bShowWarning )
{
m_bShowWarningBox = bShowWarning;
@@ -312,8 +311,6 @@ void SeriesHeader::SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol )
m_spSeriesName->setStartColumn( nStartCol );
}
-
-
void SeriesHeader::Show()
{
m_spSymbol->Show();
@@ -478,7 +475,6 @@ DataBrowser::DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ) :
SetClean();
}
-
DataBrowser::~DataBrowser()
{
}
@@ -728,7 +724,6 @@ bool DataBrowser::SetReadOnly( bool bNewState )
return bResult;
}
-
void DataBrowser::SetClean()
{
m_bIsDirty = false;
@@ -799,7 +794,6 @@ bool DataBrowser::IsDataValid()
return bValid;
}
-
void DataBrowser::CellModified()
{
m_bDataValid = IsDataValid();
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 16ac3a2..0b1b1d6 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -783,7 +783,6 @@ sal_Int32 DataBrowserModel::getCategoryColumnCount()
return nLastTextColumnIndex+1;
}
-
void DataBrowserModel::updateFromModel()
{
if( !m_xChartDocument.is())
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index cc458e5..1c2877a 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -179,7 +179,6 @@ void CreationWizard::enterState(WizardState nState)
svt::RoadmapWizard::enterState(nState);
}
-
void CreationWizard::setInvalidPage( TabPage * /* pTabPage */ )
{
m_bCanTravel = false;
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index bff841e..92699fe 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -40,10 +40,8 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
aExistenceList[nN]=false;
}
-
// SchAxisDlg
-
SchAxisDlg::SchAxisDlg(Window* pWindow,
const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
: ModalDialog(pWindow,
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 834bf76..f5baf35 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -305,7 +305,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
}
}
-
const sal_uInt16 nNoArrowNoShadowDlg = 1101;
void SchAttribTabDlg::setSymbolInformation( SfxItemSet* pSymbolShapeProperties,
@@ -639,7 +638,6 @@ IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed)
return m_aOriginalOKClickHdl.Call( this );
}
-
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 86cbe1f..9185c15 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -337,7 +337,6 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
else
m_pLB_Separator->SelectEntryPos( 0 );
-
if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem) == SFX_ITEM_SET )
{
sal_Int32 nPlacement = ((const SfxInt32Item*)pPoolItem)->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index e5e469e..5cc56d6 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -67,7 +67,6 @@ void LightButton::switchLightOn(bool bOn)
}
}
-
struct LightSource
{
long nDiffuseColor;
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 711e09f..14892aa 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -63,7 +63,6 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn
m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
m_pOrientHlp->Enable( true );
-
m_pCbStacked->EnableTriState( false );
m_pOrientHlp->AddDependentWindow( *m_pFlOrient );
m_pOrientHlp->AddDependentWindow( *m_pFtRotate, TRISTATE_TRUE );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index afa5f87..2080c3a 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -76,7 +76,6 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn
// get(m_pCB_MinorGrid, "CB_MINOR_GRID");
// get(m_pPB_MinorGrid, "PB_MINOR_GRID");
-
m_pLB_CrossesAt->SetSelectHdl( LINK( this, AxisPositionsTabPage, CrossesAtSelectHdl ) );
m_pLB_CrossesAt->SetDropDownLineCount( m_pLB_CrossesAt->GetEntryCount() );
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index dcf3410..abacdf5 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -117,7 +117,6 @@ public:
protected:
-
/** implement this method to provide an array of which-ranges of the form:
const sal_uInt16 aMyPairs[] =
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 35268d4..a5cd5e2 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -24,7 +24,6 @@
#include <svl/itemset.hxx>
#include <boost/scoped_ptr.hpp>
-
class SvNumberFormatter;
namespace chart
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 7851418..b69f766 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -29,7 +29,6 @@
#include "chartview/ChartSfxItemIds.hxx"
#include "RangeSelectionListener.hxx"
-
#include <com/sun/star/chart2/XChartDocument.hpp>
class Dialog;
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 79410d8..9619f00 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -556,7 +556,6 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
return bChanged;
}
-
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 923d5e6..f8a3aa3 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -64,13 +64,11 @@ void ItemConverter::resetPropertySet(
}
}
-
SfxItemSet ItemConverter::CreateEmptyItemSet() const
{
return SfxItemSet( GetItemPool(), GetWhichPairs() );
}
-
void ItemConverter::_disposing( const lang::EventObject& rSource )
{
if( rSource.Source == m_xPropertySet )
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index a7a0b5c..64ad666 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -218,7 +218,6 @@ void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, uno::R
}
}
-
} // anonymous namespace
namespace chart
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 60a276c..b57045d 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1514,5 +1514,4 @@ com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponent
return cppu::acquire(new chart::ChartController(context));
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 905bcaa..ada5129 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -487,7 +487,6 @@ void ChartController::execute_Paint( const Rectangle& rRect )
xProp->setPropertyValue( "Resolution", uno::makeAny( aResolution ));
}
-
uno::Reference< util::XUpdatable > xUpdatable( m_xChartView, uno::UNO_QUERY );
if( xUpdatable.is() )
xUpdatable->update();
@@ -1242,7 +1241,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteLegend" );
}
-
xPopupMenu->insertSeparator( -1 );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramType" );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DataRanges" );
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 9498d37..a37a624 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -746,7 +746,6 @@ void ObjectKeyNavigation::setCurrentSelection( const ObjectHierarchy::tOID& rOID
m_aCurrentOID = rOID;
}
-
bool ObjectKeyNavigation::first()
{
ObjectHierarchy aHierarchy( m_xChartDocument, m_pExplicitValueProvider, m_bStepDownInDiagram );
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 8630526..8391011 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -77,7 +77,6 @@ uno::Reference< drawing::XShape > Selection::getSelectedAdditionalShape()
return m_aSelectedOID.getAdditionalShape();
}
-
bool Selection::setSelection( const OUString& rCID )
{
if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) )
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
index ad6ad44..05636f5 100644
--- a/chart2/source/inc/ServiceMacros.hxx
+++ b/chart2/source/inc/ServiceMacros.hxx
@@ -27,7 +27,6 @@ static com::sun::star::uno::Sequence< OUString >
Class::getSupportedServiceNames_Static();
*/
-
// XServiceInfo decl
namespace apphelper
@@ -48,10 +47,8 @@ namespace apphelper
static ::com::sun::star::uno::Sequence< OUString > \
getSupportedServiceNames_Static();
-
// XServiceInfo impl
-
#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \
OUString SAL_CALL Class::getImplementationName() \
throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
@@ -87,7 +84,6 @@ Class::getSupportedServiceNames() \
return getSupportedServiceNames_Static(); \
}
-
// Service factory helper decl+impl
//to use this macro you need to provide a constructor:
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index e127cf3..d765e95 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1363,7 +1363,6 @@ OUString SAL_CALL ChartModel::dump()
return OUString();
}
-
void ChartModel::setTimeBased(bool bTimeBased)
{
mbTimeBased = bTimeBased;
@@ -1408,7 +1407,6 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd)
mbTimeBased = true;
}
-
void ChartModel::setWindow( const sal_uInt64 nWindowPtr )
throw (uno::RuntimeException, std::exception)
{
@@ -1433,7 +1431,6 @@ void ChartModel::update()
mpChartView->updateOpenGLWindow();
}
-
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 87f74d7..0d2ac75 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -294,7 +294,6 @@ void SAL_CALL ChartModel::storeToURL(
return; //behave passive if already disposed or closed or throw exception @todo?
//do not change the internal state of the document here
-
aGuard.clear();
apphelper::MediaDescriptorHelper aMediaDescriptorHelper(rMediaDescriptor);
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index db542d0..0ead037 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -66,7 +66,6 @@ ChartType::~ChartType()
m_aDataSeries.clear();
}
-
// ____ XChartType ____
Reference< chart2::XCoordinateSystem > SAL_CALL
ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7c72e48..0e57e62 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -898,7 +898,6 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
comphelper::copyProperties( xSource, xDestination );
}
-
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 67e50fb..621bf1b 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -57,7 +57,6 @@ DataInterpreter::DataInterpreter(
DataInterpreter::~DataInterpreter()
{}
-
// ____ XDataInterpreter ____
InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
const Reference< data::XDataSource >& xSource,
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index a4adb84..364800c 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -52,7 +52,6 @@ StockDataInterpreter::StockDataInterpreter(
StockDataInterpreter::~StockDataInterpreter()
{}
-
// ____ XDataInterpreter ____
InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
const Reference< data::XDataSource >& xSource,
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 0ef0caa..51ee17e 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -140,7 +140,6 @@ Reference< chart2::data::XDataSequence > ExplicitCategoriesProvider::getOriginal
return 0;
}
-
bool ExplicitCategoriesProvider::hasComplexCategories() const
{
return m_aSplitCategoriesList.getLength() > 1;
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index de003b7..c8f39c4 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -181,7 +181,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle )
return true;
}
-
void ImplOPropertySet::cloneInterfaceProperties()
{
::std::for_each( m_aProperties.begin(), m_aProperties.end(),
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 5265602..e5b2db6 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -486,8 +486,6 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
dump();
}
-
-
void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels )
{
m_aRowLabels = rNewRowLabels;
@@ -498,7 +496,6 @@ void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNew
enlargeData( 0, nNewRowCount );
}
-
void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels )
{
m_aColumnLabels = rNewColumnLabels;
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 62996b7..36bf210 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -316,7 +316,6 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
m_bOwnership = bDeliverOwnership && bMyVeto;
}
-
void CloseableLifeTimeManager
::impl_apiCallCountReachedNull()
{
@@ -336,7 +335,6 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
if( m_bDisposed || m_bInDispose )
return; //behave as passive as possible, if disposed or closed already
-
m_bClosed = true;
NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex );
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index dc8b7b9..1a65728 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -67,7 +67,6 @@ NumberFormatterWrapper::~NumberFormatterWrapper()
{
}
-
Date NumberFormatterWrapper::getNullDate() const
{
sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index b0aee8b..707191c 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1544,8 +1544,6 @@ bool ObjectIdentifier::isAdditionalShape() const
return m_xAdditionalShape.is();
}
-
-
Any ObjectIdentifier::getAny() const
{
Any aAny;
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 0a0145b..268c3d1 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -48,8 +48,6 @@ ReferenceSizeProvider::ReferenceSizeProvider(
m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES )
{}
-
-
void ReferenceSizeProvider::impl_setValuesAtTitled(
const Reference< XTitled > & xTitled )
{
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 4666dbb..1aa4f32 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -37,7 +37,6 @@ WrappedProperty::~WrappedProperty()
{
}
-
OUString WrappedProperty::getInnerName() const
{
return m_aInnerName;
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index ff6b7d5..5747d81 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -228,8 +228,6 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
}
}
-
-
void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
ExplicitScaleData& rExplicitScale,
ExplicitIncrementData& rExplicitIncrement,
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 332600a..99fc3e3 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -102,11 +102,9 @@ EquidistantTickFactory::EquidistantTickFactory(
fMax = m_fScaledVisibleMax;
}
-
m_fOuterMajorTickBorderMin = EquidistantTickFactory::getMinimumAtIncrement( fMin, m_rIncrement );
m_fOuterMajorTickBorderMax = EquidistantTickFactory::getMaximumAtIncrement( fMax, m_rIncrement );
-
m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 457a211..1f0f9a0 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -49,7 +49,6 @@ VAxisBase::~VAxisBase()
{
}
-
void VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
, const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels )
{
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 7415b3e..a503703 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -147,7 +147,6 @@ void VCoordinateSystem::setTransformationSceneToScreen(
}
}
-
//better performance for big data
uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
const awt::Size& rPageSize, const awt::Size& rPageResolution )
@@ -201,7 +200,6 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
return aResolution;
}
-
Reference< XAxis > VCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
{
if( m_xCooSysModel.is() )
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 99ff6e4..8febf93 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -683,7 +683,6 @@ void AreaChart::createShapes()
sal_Int32 nSkippedPoints = 0;
sal_Int32 nCreatedPoints = 0;
-
bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis());
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
@@ -849,7 +848,6 @@ void AreaChart::createShapes()
}
aSeriesFormerPointMap[pSeries] = FormerPoint(aScaledLogicPosition.PositionX, aScaledLogicPosition.PositionY, aScaledLogicPosition.PositionZ);
-
//store point information for series polygon
//for area and/or line (symbols only do not need this)
if( isValidPosition(aScaledLogicPosition) )
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index cf46db8..6e9aa3e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -453,7 +453,6 @@ void BarChart::createShapes()
sal_Int32 nSkippedPoints = 0;
sal_Int32 nCreatedPoints = 0;
-
sal_Int32 nStartIndex = 0;
sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
//iterate through all x values per indices
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 0bf7e9f..dc1204e 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -218,7 +218,6 @@ void BubbleChart::createShapes()
sal_Int32 nSkippedPoints = 0;
sal_Int32 nCreatedPoints = 0;
-
calculateMaximumLogicBubbleSize();
calculateBubbleSizeScalingFactor();
if( m_fMaxLogicBubbleSize <= 0 || m_fBubbleSizeFactorToScreen <= 0 )
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 5d735f7..314af2e 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -378,7 +378,6 @@ void NetChart::createShapes()
sal_Int32 nSkippedPoints = 0;
sal_Int32 nCreatedPoints = 0;
-
bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis());
//iterate through all x values per indices
@@ -548,7 +547,6 @@ void NetChart::createShapes()
}
aSeriesFormerPointMap[pSeries] = FormerPoint(aScaledLogicPosition.PositionX, aScaledLogicPosition.PositionY, aScaledLogicPosition.PositionZ);
-
//store point information for series polygon
//for area and/or line (symbols only do not need this)
if( isValidPosition(aScaledLogicPosition) )
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 4059c12..48940f9 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -721,7 +721,6 @@ bool PieChart::detectLabelOverlapsAndMove( const awt::Size& rPageSize )
}
while( pCurrent != pStart );
-
bool bAlternativeMoveDirection = false;
if( !tryMoveLabels( pFirstBorder, pSecondBorder, pCenter, bSingleCenter, bAlternativeMoveDirection, rPageSize ) )
tryMoveLabels( pFirstBorder, pSecondBorder, pCenter, bSingleCenter, bAlternativeMoveDirection, rPageSize );
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6b147b6..26dfdce 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2002,7 +2002,6 @@ void VSeriesPlotter::setCoordinateSystemResolution( const Sequence< sal_Int32 >&
m_aCoordinateSystemResolution = rCoordinateSystemResolution;
}
-
bool VSeriesPlotter::WantToPlotInFrontOfAxisLine()
{
return ChartTypeHelper::isSeriesInFrontOfAxisLine( m_xChartTypeModel );
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 3298271..5a5ac45 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -675,7 +675,6 @@ void VDiagram::createShapes_3d()
adjustPosAndSize_3d( m_aAvailablePosIncludingAxes, m_aAvailableSizeIncludingAxes );
}
-
::basegfx::B2IRectangle VDiagram::getCurrentRectangle()
{
return BaseGFXHelper::makeRectangle(m_aCurrentPosWithoutAxes,m_aCurrentSizeWithoutAxes);
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx
index e4b3a88..9cb3e47 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -33,7 +33,6 @@ class OpenGLWindow;
namespace chart {
-
// Be careful here not to clash with the SYMBOL_FOO #defines in
// <rsc/rsc-vcl-shared-types.hxx>
enum SymbolEnum { Symbol_Square=0
@@ -250,7 +249,6 @@ public:
getChartRootShape( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage>& xPage );
-
static void makeShapeInvisible( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape );
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index d3426a3..b14de46 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -108,7 +108,6 @@ private:
sal_Int32 nIndex, sal_Int32 nSeriesIndex);
};
-
std::map<sal_uInt32, const BarInformation> maBarMap;
bool mbBlockUserInput;
bool mbNeedsNewRender;
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 9c4c03f..ffad3e0 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -160,7 +160,6 @@ struct TextInfoBatch
std::vector<glm::vec3> textureCoordList;
};
-
struct BatchBarInfo
{
std::vector <glm::mat4> modelMatrixList;
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index e355b27..27ee100 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -166,7 +166,6 @@ public:
double transformToAngleDegree( double fLogicValueOnAngleAxis, bool bDoScaling=true ) const;
double getWidthAngleDegree( double& fStartLogicValueOnAngleAxis, double& fEndLogicValueOnAngleAxis ) const;
-
virtual ::com::sun::star::drawing::Position3D
transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE;
virtual ::com::sun::star::drawing::Position3D
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index 4b5bc9f..3e7de00 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -155,7 +155,6 @@ protected: //member
typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis
-
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes > m_xLogicTargetForGrids;
::com::sun::star::uno::Reference<
@@ -170,7 +169,6 @@ protected: //member
CuboidPlanePosition m_eBackWallPos;
CuboidPlanePosition m_eBottomPos;
-
MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose
::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis;
diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx
index 724a0b9..6dd8da9 100644
--- a/chart2/source/view/inc/ViewDefines.hxx
+++ b/chart2/source/view/inc/ViewDefines.hxx
@@ -22,7 +22,6 @@
namespace chart
{
-
#define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32)
//There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls
#define GRID_TO_WALL_DISTANCE (1.0)
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index f1db16f..c5df687 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -120,7 +120,6 @@ void Text::render()
mnUniqueId);
}
-
void Text::setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight)
{
maTopLeft = rTopLeft;
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index c9b625e..58a0f5c 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -109,7 +109,6 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
#endif
}
-
if(!pShapeFactory)
pShapeFactory = new ShapeFactory(xFactory);
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index db67c01..82e9eca 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -124,7 +124,6 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,false);
ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, false );
-
ppPoolDefaults[SCHATTR_SYMBOL_BRUSH - SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH);
ppPoolDefaults[SCHATTR_STOCK_VOLUME - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,false);
ppPoolDefaults[SCHATTR_STOCK_UPDOWN - SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,false);
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 116791a..2e8dc25 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2399,7 +2399,6 @@ void formatPage(
if( !xShapeFactory.is() )
return;
-
//format page
tPropertyNameValueMap aNameValueMap;
aNameValueMap.insert( tPropertyNameValueMap::value_type( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )));
@@ -2751,7 +2750,6 @@ void ChartView::createShapes()
m_pDrawModelWrapper->getSdrModel().EnableUndo( true );
}
-
if(maTimeBased.bTimeBased)
{
maTimeBased.nFrame++;
@@ -3255,7 +3253,6 @@ void ChartView::createShapes3D()
m_pGL3DPlotter.reset(new GL3DBarChart(xChartType, *pWindow));
}
-
uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
OSL_ASSERT( xDataSeriesContainer.is());
if( !xDataSeriesContainer.is() )
@@ -3274,7 +3271,6 @@ void ChartView::createShapes3D()
boost::scoped_ptr<ExplicitCategoriesProvider> pCatProvider(new ExplicitCategoriesProvider(xCooSys, mrChartModel));
-
m_pGL3DPlotter->create3DShapes(aDataSeries, *pCatProvider);
m_pGL3DPlotter->render();
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index 98792ad..85f8762 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -220,7 +220,6 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg
}
}
-
std::vector< sal_Int32 > aResultPointCount;//per polygon index
//apply clipping:
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 3ab2f63..13a3731 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
-
#include "CommonConverters.hxx"
#include <rtl/ustring.hxx>
@@ -40,7 +39,6 @@
#include <com/sun/star/awt/XBitmap.hpp>
-
#define ENABLE_DEBUG_PROPERTIES 0
using namespace com::sun::star;
@@ -185,7 +183,6 @@ awt::Point SAL_CALL DummyXShape::getPosition()
return maPosition;
}
-
void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint )
throw(uno::RuntimeException, std::exception)
{
@@ -1191,7 +1188,6 @@ void DummyChart::clear()
maShapes.clear();
}
-
}
}
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index be1b86b..ee9e1af 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -62,7 +62,6 @@
#include <map>
#include <boost/unordered_map.hpp>
-
namespace chart {
namespace dummy {
@@ -151,7 +150,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
// XChild
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 810db33..52de7ce 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1052,7 +1052,6 @@ void OpenGL3DRenderer::AddShapePolygon3DObject(sal_uInt32 nColor, bool lineOnly,
//line or Polygon
m_Polygon3DInfo.lineOnly = lineOnly;
-
// if line only, use line color
if (m_Polygon3DInfo.lineOnly)
{
@@ -1062,7 +1061,6 @@ void OpenGL3DRenderer::AddShapePolygon3DObject(sal_uInt32 nColor, bool lineOnly,
//fillStyle
m_Polygon3DInfo.fillStyle= fillStyle;
-
//material specular;
m_Polygon3DInfo.material.specular = getColorAsVector(specular);
@@ -1694,7 +1692,6 @@ void OpenGL3DRenderer::CreateTextTextureSingle(const boost::shared_array<sal_uIn
}
-
void OpenGL3DRenderer::CreateTextTextureBatch(const boost::shared_array<sal_uInt8> &bitmapBuf,
::Size maSizePixels,
glm::vec3 vTopLeft,glm::vec3 vTopRight,
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 884e0af..02e87a7 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -750,7 +750,6 @@ int OpenGLRender::CreateTextTexture(::rtl::OUString const &textValue, Font aFont
return CreateTextTexture(aBitmap,aPos,aSize,rotation,aTrans);
}
-
int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Point&, const awt::Size& aSize, long rotation,
const drawing::HomogenMatrix3& rTrans)
{
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 23c397e..71e25e4 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -122,7 +122,6 @@ public:
void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, sal_uInt8 nAlpha);
-
private:
#if 0
//for performance
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 827b892..c486f01 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -399,7 +399,6 @@ uno::Reference< drawing::XShape >
return pText;
}
-
uno::Reference< drawing::XShape >
OpenglShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget,
const awt::Size& , const awt::Point& rPos,
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 9c6a8ed..d72b1dd 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -419,7 +419,6 @@ void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleDat
return aRet;
}
-
uno::Reference< XTransformation > PolarPlottingPositionHelper::getTransformationScaledLogicToScene() const
{
if( !m_xTransformationLogicToScene.is() )
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index a50175a..02dc249 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2289,7 +2289,6 @@ uno::Reference< drawing::XShape >
return xShape;
}
-
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 73f8956..30a95e5 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -313,7 +313,6 @@ void VDataSeries::doSortByXValues()
}
}
-
void VDataSeries::releaseShapes()
{
m_xGroupShape.set(0);
@@ -423,7 +422,6 @@ void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex )
m_nAxisIndex = nAttachedAxisIndex;
}
-
double VDataSeries::getXValue( sal_Int32 index ) const
{
double fRet = 0.0;
@@ -891,7 +889,6 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int
return this->getPropertiesOfSeries();
}
-
DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -1009,7 +1006,6 @@ void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment )
m_nMissingValueTreatment = nMissingValueTreatment;
}
-
VDataSeries::VDataSeries()
: m_nPolygonIndex(0)
, m_fLogicMinX(0)
More information about the Libreoffice-commits
mailing list