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

List:       kde-commits
Subject:    [calligra/report_odt_danders] /: Merge branch 'master' into report_odt_danders
From:       Dag Andersen <danders () get2net ! dk>
Date:       2012-08-16 12:58:12
Message-ID: 20120816125812.D0ED9A6096 () git ! kde ! org
[Download RAW message or body]

Git commit 784ab3de9e87cc122578da6ff40c2ca513a70e94 by Dag Andersen.
Committed on 14/08/2012 at 12:48.
Pushed by danders into branch 'report_odt_danders'.

Merge branch 'master' into report_odt_danders

Conflicts:
	plan/libs/ui/reports/report.h
	plan/libs/ui/reports/reportexportpanel.cpp
	plan/libs/ui/reports/reportview.cpp
	plan/libs/ui/reports/reportview.h

M  +6    -0    libs/koreport/CMakeLists.txt
M  +3    -0    plan/libs/ui/CMakeLists.txt
M  +1    -2    plan/libs/ui/reports/report.h
M  +941  -278  plan/libs/ui/reports/reportview.cpp

http://commits.kde.org/calligra/784ab3de9e87cc122578da6ff40c2ca513a70e94

diff --cc plan/libs/ui/reports/report.h
index b84fee5,d5991a2..7f17253
--- a/plan/libs/ui/reports/report.h
+++ b/plan/libs/ui/reports/report.h
@@@ -26,8 -26,8 +26,7 @@@ namespace KPlat
  namespace Reports
  {
      enum ItemRoles { TagRole = Qt::UserRole + 1 };
--    
-     enum ExportFormat { EF_Unknown, EF_OdtFrames, EF_OdtTables, EF_Ods, EF_Html, EF_XHtml };
+     enum ExportFormat { EF_Unknown, EF_OdtTable, EF_OdtFrames, EF_Ods, EF_Html, EF_XHtml };
  }
  
  }
diff --cc plan/libs/ui/reports/reportview.cpp
index e6b250d,922fc66..25e2277
--- a/plan/libs/ui/reports/reportview.cpp
+++ b/plan/libs/ui/reports/reportview.cpp
@@@ -26,18 -26,21 +26,20 @@@
  #include "reportsourceeditor.h"
  #include "reportscripts.h"
  #include "reportexportpanel.h"
- #include "KoReportODTRenderer.h"
- #include "kptnodechartmodel.h"
- #include "kptdebug.h"
 -#include "odt/ReportODTRenderer.h"
+ #include "ui_reportsectionswidget.h"
+ #include "ui_reporttoolswidget.h"
  
- #include <KoReportPage.h>
- #include <KoReportPreRenderer.h>
- #include <KoReportPrintRenderer.h>
- #include <renderobjects.h>
- #include <KoReportKSpreadRenderer.h>
- #include <KoReportHTMLCSSRenderer.h>
- #include <reportsection.h>
- #include <koproperty/EditorView.h>
 -#include "KoPageLayout.h"
++#include "KoReportODTRenderer.h"
+ #include "KoReportPage.h"
+ #include "KoReportPreRenderer.h"
+ #include "KoReportPrintRenderer.h"
+ #include "renderobjects.h"
+ #include "KoReportKSpreadRenderer.h"
+ #include "KoReportHTMLCSSRenderer.h"
+ #include "reportsection.h"
+ #include "reportsectiondetail.h"
+ #include "reportsectiondetailgroup.h"
+ #include "koproperty/EditorView.h"
  
  #include "kptglobal.h"
  #include "kptaccountsmodel.h"
@@@ -47,8 -50,11 +49,12 @@@
  #include "kptresourcemodel.h"
  #include "kptresourceappointmentsmodel.h"
  #include "kptschedule.h"
+ #include "kptnodechartmodel.h"
+ #include "kptdebug.h"
  
++#include "KoPageLayout.h"
  #include "KoDocument.h"
 -#include <KoIcon.h>
++#include "KoIcon.h"
  
  #include <KTabWidget>
  #include <KAction>
@@@ -350,13 -407,12 +407,12 @@@ void ReportWidget::slotExportFinished( 
      dia->deleteLater();
  }
  
- void ReportView::exportToOdtFrames( KoReportRendererContext &context )
+ void ReportWidget::exportToOdtTable( KoReportRendererContext &context )
  {
      kDebug(planDbg())<<"Export to odt:"<<context.destinationUrl;
- //    KoReportRendererBase *renderer = new ReportODTRenderer();
-     KoReportRendererBase *renderer = m_factory.createInstance("odtframes");
 -    KoReportRendererBase *renderer = m_factory.createInstance("odt");
++    KoReportRendererBase *renderer = m_factory.createInstance("odttable");
      if ( renderer == 0 ) {
-         kError()<<"Cannot create odt renderer";
+         kError()<<"Cannot create odt (table) renderer";
          return;
      }
      if (!renderer->render(context, m_reportDocument)) {
@@@ -364,13 -420,13 +420,12 @@@
      }
  }
  
- void ReportView::exportToOdtTables( KoReportRendererContext &context )
+ void ReportWidget::exportToOdtFrames( KoReportRendererContext &context )
  {
      kDebug(planDbg())<<"Export to odt:"<<context.destinationUrl;
-     //    KoReportRendererBase *renderer = new ReportODTRenderer();
-     KoReportRendererBase *renderer = m_factory.createInstance("odttables");
 -    KoReportRendererBase *renderer = new ReportODTRenderer();
 -    //    renderer = m_factory.createInstance("odt");
++    KoReportRendererBase *renderer = m_factory.createInstance("odtframes");
      if ( renderer == 0 ) {
--        kError()<<"Cannot create odt renderer";
++        kError()<<"Cannot create odt (frames) renderer";
          return;
      }
      if (!renderer->render(context, m_reportDocument)) {
[prev in list] [next in list] [prev in thread] [next in thread]