chart2/Library_chartcore.mk | 1
chart2/source/inc/ChartDebugTrace.hxx | 63 --------------------
chart2/source/model/main/ChartModel_Persistence.cxx | 6 -
chart2/source/model/template/ChartTypeTemplate.cxx | 10 ---
chart2/source/tools/ChartDebugTrace.cxx | 61 -------------------
include/vcl/metric.hxx | 4 -
oox/source/drawingml/shape.cxx | 3
sc/source/core/data/column.cxx | 4 -
sc/source/filter/oox/workbookhelper.cxx | 2
vcl/source/window/openglwin.cxx | 1
10 files changed, 8 insertions(+), 147 deletions(-)
New commits:
commit 9ea3e3a2fbe9c200a2b7fe11e48765d1d8389eb3
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Sat Jun 7 04:46:39 2014 +0200
column storage might be changed, related lp#990868
Change-Id: Ibd196484c8c5199e7398726a250082c266a89229
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7d6ebb1..f0dc03a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1709,7 +1709,6 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol,
ScColumn& rDestCol ) const
void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
{
// This is the scenario table, the data is copied into it
- sc::CopyToDocContext aCxt(*pDocument);
ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
SCROW nStart = -1, nEnd = -1;
const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1718,6 +1717,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG
)).IsScenario() )
{
DeleteArea( nStart, nEnd, IDF_CONTENTS );
+ sc::CopyToDocContext aCxt(*pDocument);
((ScColumn&)rSrcCol).
CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, *this);
@@ -1741,7 +1741,6 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
{
// This is the scenario table, the data is copied to the other
- sc::CopyToDocContext aCxt(*rDestCol.pDocument);
ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
SCROW nStart = -1, nEnd = -1;
const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1750,6 +1749,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG
)).IsScenario() )
{
rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS );
+ sc::CopyToDocContext aCxt(*rDestCol.pDocument);
CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, rDestCol);
// UpdateUsed not needed, is already done in TestCopyScenario
(obsolete comment ?)
commit 86f8772131a0588f3bfa4f09cc03746a2afe8cc8
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Sat Jun 7 03:56:56 2014 +0200
don't try to import invalid document, fdo#79135
Change-Id: I3b601d629550078a8fa353bf838619f8d7b34718
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 4648c25..f59c478 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -433,6 +433,8 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject(
{
ScDocument& rDoc = getScDocument();
ScRangeName* pNames = rDoc.GetRangeName( nTab );
+ if(!pNames)
+ throw RuntimeException("invalid sheet index used");
// find an unused name
orName = findUnusedName( pNames, orName );
// create the named range
commit 127b11cbf944d51640c45801693b93ab3b18b14b
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Sat Jun 7 03:43:47 2014 +0200
make sure all objects exist, related fdo#75692
fdo75692-2.xlsx and fdo#75692-3.xlsx crash.
Change-Id: I56353e7da1850a49e18d3a570641843600d34b1c
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8c97b87..0737830 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1249,7 +1249,8 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const
Reference< XShapes >&
{
Reference< chart2::data::XDataReceiver > xDataRec(
xChartDoc, UNO_QUERY );
Reference< chart2::data::XDataSource > xData(
xDataRec->getUsedData(), UNO_QUERY );
- if( xData->getDataSequences().getLength() <= 0 ||
xData->getDataSequences()[0]->getValues()->getData().getLength() <= 0 )
+ if( xData->getDataSequences().getLength() <= 0 ||
!xData->getDataSequences()[0]->getValues().is() ||
+
xData->getDataSequences()[0]->getValues()->getData().getLength() <= 0 )
{
rFilter.useInternalChartDataTable( true );
rFilter.getChartConverter()->convertFromModel(
rFilter, aModel, xChartDoc, xExternalPage, mxShape->getPosition(),
mxShape->getSize() );
commit af8ebb607c5c4a37d549cf8a49be02fe7830c55a
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 5 06:26:37 2014 +0200
remove debug output
Change-Id: I7c56adf0cd91f6474145708d91988c974e1ea854
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index f7b3cf3..e0c2c59 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -72,7 +72,6 @@ void OpenGLWindow::MouseButtonUp( const MouseEvent& rMEvt )
if(aPoint == maStartPoint)
{
Color aColor = GetPixel(aPoint);
- SAL_WARN("vcl.opengl", aColor.GetColor());
mpRenderer->clickedAt(aPoint, rMEvt.GetButtons());
}
else
commit 4d12fecb5b3891a316d405a9e61280465172a319
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Wed Jun 4 23:37:40 2014 +0200
make that variable protected again
Change-Id: I17235397e490458c250165c36bec97bf1ce326d7
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 160b9b3..a0ef288 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -34,9 +34,10 @@ namespace vcl {
// avoid problems where poppler's FontInfo is picked up
class VCL_DLLPUBLIC FontInfo : public Font
{
- friend class OutputDevice;
+ friend class ::OutputDevice;
protected:
+ ImplFontMetric* mpImplMetric; // Implementation
public:
FontInfo();
@@ -49,7 +50,6 @@ public:
bool operator==( const FontInfo& ) const;
bool operator!=( const FontInfo& rInfo ) const
{ return !operator==( rInfo ); }
- ImplFontMetric* mpImplMetric; // Implementation
};
}
commit 439550c9f1c848023b4b95266f9d78671c468ee3
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Wed Jun 4 23:37:06 2014 +0200
remove unnecessary and unused chart debug functionality
Change-Id: Ic8100b2afebe469709723b324394e08b7669d911
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 97245ca..094762d 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -183,7 +183,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/tools/BaseGFXHelper \
chart2/source/tools/CachedDataSequence \
chart2/source/tools/CharacterProperties \
- chart2/source/tools/ChartDebugTrace \
chart2/source/tools/ChartModelHelper \
chart2/source/tools/ChartTypeHelper \
chart2/source/tools/ChartViewHelper \
diff --git a/chart2/source/inc/ChartDebugTrace.hxx
b/chart2/source/inc/ChartDebugTrace.hxx
deleted file mode 100644
index f8eb950..0000000
--- a/chart2/source/inc/ChartDebugTrace.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-#define INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include "charttoolsdllapi.hxx"
-
-#define CHART_TRACE_OSL_DEBUG_LEVEL 2
-
-namespace chart
-{
-namespace debug
-{
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-/** Does several OSL_TRACEs that show information about the given chart
document
- (e.g. the chart-type manager, diagrams etc.)
-
- If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this
- function does nothing.
- */
-OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDocument(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xDoc,
- int nIndent = 0 );
-
-/** Does several OSL_TRACEs that show information about the given diagram
- (e.g. coordinate systems, data series etc.)
-
- If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this
- function does nothing.
- */
-OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDiagram(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram,
- int nIndent = 0 );
-#endif
-
-} // namespace debug
-} // namespace chart
-
-// INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-#endif
-
-/* 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 80ddf7a..f976a30 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -19,7 +19,6 @@
#include "ChartModel.hxx"
#include "MediaDescriptorHelper.hxx"
-#include "ChartDebugTrace.hxx"
#include "macros.hxx"
#include "ChartViewHelper.hxx"
#include "ChartModelHelper.hxx"
@@ -480,11 +479,6 @@ void SAL_CALL ChartModel::initNew()
}
setModified( sal_False );
unlockControllers();
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartModel::initNew: Showing ChartDocument structure" );
- ::chart::debug::ChartDebugTraceDocument( Reference< chart2::XChartDocument
>( this ));
-#endif
}
void SAL_CALL ChartModel::load(
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1940305..8be651a 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -30,7 +30,6 @@
#include "AxisHelper.hxx"
#include "LegendHelper.hxx"
#include "DiagramHelper.hxx"
-#include "ChartDebugTrace.hxx"
#include "AxisIndexDefines.hxx"
#include <cppuhelper/component_context.hxx>
#include <com/sun/star/chart/ChartSolidType.hpp>
@@ -304,10 +303,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
Reference< XDataSeriesContainer > xDSCnt( aChartTypes[i],
uno::UNO_QUERY_THROW );
xDSCnt->setDataSeries( aSeriesSeq[i] );
}
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartTypeTemplate::changeDiagramData: Showing Diagram
structure" );
- ::chart::debug::ChartDebugTraceDiagram( xDiagram );
-#endif
}
catch( const uno::Exception & ex )
{
@@ -805,11 +800,6 @@ void ChartTypeTemplate::FillDiagram(
{
ASSERT_EXCEPTION( ex );
}
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartTypeTemplate::FillDiagram: Showing Diagram structure" );
- ::chart::debug::ChartDebugTraceDiagram( xDiagram );
-#endif
}
void ChartTypeTemplate::createChartTypes(
diff --git a/chart2/source/tools/ChartDebugTrace.cxx
b/chart2/source/tools/ChartDebugTrace.cxx
deleted file mode 100644
index 6c6ddd1..0000000
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "ChartDebugTrace.hxx"
-#include "macros.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/StackingDirection.hpp>
-#include <rtl/math.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-
-namespace chart
-{
-namespace debug
-{
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-
-void ChartDebugTraceDocument(
- const Reference< XChartDocument > & /*xDoc*/,
- int /*nIndent*/ )
-{
-
-}
-
-void ChartDebugTraceDiagram(
- const Reference< XDiagram > & /*xDiagram*/,
- int /*nIndent*/ )
-{
-
-}
-#endif
-
-} // namespace debug
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
