[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/text-layoutrestructure-boemann=5D_plugins?=
From:       Casper Boemann <cbo () boemann ! dk>
Date:       2011-04-03 13:52:40
Message-ID: 20110403135240.C55E1A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit b8f6a4ac7b726ae99131b643f60a6f673c00266b by Casper Boemann.
Committed on 01/04/2011 at 17:10.
Pushed by boemann into branch 'text-layoutrestructure-boemann'.

Make chartshape compile again

M  +1    -1    plugins/CMakeLists.txt     
M  +1    -1    plugins/chartshape/ChartShape.cpp     
M  +5    -5    plugins/chartshape/tests/odf/TestLoadingBase.cpp     

http://commits.kde.org/calligra/b8f6a4ac7b726ae99131b643f60a6f673c00266b

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ce63f45..c9db5ec 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -32,7 +32,7 @@ ENDIF (NOT TINY)
 macro_optional_add_subdirectory( variables )
 macro_optional_add_subdirectory( defaultTools )
 macro_optional_add_subdirectory( pathshapes )
-#macro_optional_add_subdirectory( chartshape )
+macro_optional_add_subdirectory( chartshape )
 macro_optional_add_subdirectory( pictureshape )
 macro_optional_add_subdirectory( videoshape )
 macro_optional_add_subdirectory( textshape )
diff --git a/plugins/chartshape/ChartShape.cpp b/plugins/chartshape/ChartShape.cpp
index 9450ca6..1f430c7 100644
--- a/plugins/chartshape/ChartShape.cpp
+++ b/plugins/chartshape/ChartShape.cpp
@@ -500,7 +500,7 @@ ChartShape::ChartShape(KoResourceManager *resourceManager)
     foreach( KoShape *label, labels() ) {
         TextLabelData *labelData = qobject_cast<TextLabelData*>( label->userData() \
);  KoTextDocument doc( labelData->document() );
-        doc.setResizeMethod( KoTextDocument::AutoResize );
+//FIXME        doc.setResizeMethod( KoTextDocument::AutoResize );
     }
 
     KoColorBackground *background = new KoColorBackground( Qt::white );
diff --git a/plugins/chartshape/tests/odf/TestLoadingBase.cpp \
b/plugins/chartshape/tests/odf/TestLoadingBase.cpp index 7ba8f0d..124ad07 100644
--- a/plugins/chartshape/tests/odf/TestLoadingBase.cpp
+++ b/plugins/chartshape/tests/odf/TestLoadingBase.cpp
@@ -32,7 +32,7 @@
 // KOffice
 #include <KoStore.h>
 #include <KoOdfReadStore.h>
-#include <KoTextShapeData.h>
+#include <KoTextShapeDataBase.h>
 
 // KChart
 #include "ChartShape.h"
@@ -143,7 +143,7 @@ void TestLoadingBase::testInternalTableSize( int rowCount, int \
colCount )  void TestLoadingBase::testTitleText( const QString &text )
 {
     QVERIFY( m_chart->title() );
-    KoTextShapeData *data = dynamic_cast<KoTextShapeData*>( \
m_chart->title()->userData() ); +    KoTextShapeDataBase *data = \
dynamic_cast<KoTextShapeDataBase*>( m_chart->title()->userData() );  QVERIFY( data );
     QVERIFY( data->document() );
     QCOMPARE( data->document()->toPlainText(), text );
@@ -152,7 +152,7 @@ void TestLoadingBase::testTitleText( const QString &text )
 void TestLoadingBase::testSubTitleText( const QString &text )
 {
     QVERIFY( m_chart->subTitle() );
-    KoTextShapeData *data = dynamic_cast<KoTextShapeData*>( \
m_chart->subTitle()->userData() ); +    KoTextShapeDataBase *data = \
dynamic_cast<KoTextShapeDataBase*>( m_chart->subTitle()->userData() );  QVERIFY( data \
);  QVERIFY( data->document() );
     QCOMPARE( data->document()->toPlainText(), text );
@@ -161,7 +161,7 @@ void TestLoadingBase::testSubTitleText( const QString &text )
 void TestLoadingBase::testFooterText( const QString &text )
 {
     QVERIFY( m_chart->footer() );
-    KoTextShapeData *data = dynamic_cast<KoTextShapeData*>( \
m_chart->footer()->userData() ); +    KoTextShapeDataBase *data = \
dynamic_cast<KoTextShapeDataBase*>( m_chart->footer()->userData() );  QVERIFY( data \
);  QVERIFY( data->document() );
     QCOMPARE( data->document()->toPlainText(), text );
@@ -171,7 +171,7 @@ void TestLoadingBase::testAxisTitle( Axis *axis, const QString \
&text )  {
     QVERIFY( axis );
     QVERIFY( axis->title() );
-    KoTextShapeData *data = dynamic_cast<KoTextShapeData*>( \
axis->title()->userData() ); +    KoTextShapeDataBase *data = \
dynamic_cast<KoTextShapeDataBase*>( axis->title()->userData() );  QVERIFY( data );
     QVERIFY( data->document() );
     QCOMPARE( data->document()->toPlainText(), text );


[prev in list] [next in list] [prev in thread] [next in thread]