[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra/words-change=5Ftracking-ganeshp=5D_/=3A_Me?=
From: Ganesh Paramasivam <ganesh () crystalfab ! com>
Date: 2011-04-10 11:37:37
Message-ID: 20110410113737.2B568A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit ef0542604d017002347d5aeb8c1960c193e17fff by Ganesh Paramasivam.
Committed on 10/04/2011 at 08:52.
Pushed by ganeshp into branch 'words-change_tracking-ganeshp'.
Merging from master. Merge conflicts have not been resolved yet since more \
investigations are needed. The conflicts will be resolved in subsequent commits
I +2 -0 gitignore
I +20 -0 CMakeLists.txt
I +2 -2 doc/CMakeLists.txt
I +1 -1 filters/filter-status.txt
I +2 -2 filters/generic_wrapper/generic_filter.cc
I +3 -2 filters/karbon/svg/CMakeLists.txt
I +78 -0 filters/karbon/svg/SvgExport.cpp
I +51 -0 filters/karbon/svg/SvgExport.h
I +197 -0 filters/karbon/svg/SvgImport.cpp
I +55 -0 filters/karbon/svg/SvgImport.h
I +824 -0 filters/karbon/svg/SvgWriter.cpp
I +112 -0 filters/karbon/svg/SvgWriter.h
I +0 -818 filters/karbon/svg/svgexport.cc
I +0 -104 filters/karbon/svg/svgexport.h
I +0 -197 filters/karbon/svg/svgimport.cc
I +0 -55 filters/karbon/svg/svgimport.h
I +2 -13 filters/kpresenter/powerpoint/PowerPointImport.cpp
I +6 -1 filters/kpresenter/powerpoint/PptToOdp.cpp
I +0 -19 filters/kpresenter/powerpoint/PptToOdp.h
I +1 -1 filters/kpresenter/pptx/PptxXmlDocumentReader.cpp
I +3 -3 filters/kpresenter/pptx/PptxXmlSlideReader.cpp
I +1 -3 filters/libmso/ODrawToOdf.cpp
I +27 -6 filters/libmso/ODrawToOdf.h
I +20 -1 filters/libmso/pictures.cpp
I +5 -0 filters/libmso/pictures.h
I +1 -1 filters/libmso/pole.cpp
I +226 -62 filters/libmso/shapes.cpp
I +2 -2 filters/libmsooxml/MsooXmlCommonReader.cpp
I +22 -24 filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
I +24 -1 filters/libmsooxml/MsooXmlTableStyle.cpp
I +6 -1 filters/libmsooxml/MsooXmlTableStyle.h
I +13 -4 filters/libmsooxml/MsooXmlVmlReaderImpl.h
I +0 -0 filters/libmsooxml/generated/tempo.txt
I +21 -3 filters/tables/xlsx/ChartExport.cpp
I +47 -5 filters/tables/xlsx/XlsxXmlChartReader.cpp
I +2 -1 filters/tables/xlsx/XlsxXmlChartReader.h
I +28 -1 filters/tables/xlsx/XlsxXmlCommonReader.cpp
I +1 -0 filters/tables/xlsx/XlsxXmlCommonReader.h
I +5 -3 filters/tables/xlsx/XlsxXmlStylesReader.cpp
I +7 -0 filters/tables/xlsx/XlsxXmlStylesReader.h
I +43 -24 filters/tables/xlsx/XlsxXmlWorksheetReader.cpp
I +181 -42 filters/words/docx/DocxXmlDocumentReader.cpp
I +7 -1 filters/words/docx/DocxXmlDocumentReader.h
I +2 -0 filters/words/msword-odf/CMakeLists.txt
I +6 -0 filters/words/msword-odf/conversion.cpp
I +2 -0 filters/words/msword-odf/conversion.h
I +26 -19 filters/words/msword-odf/document.cpp
I +34 -23 filters/words/msword-odf/document.h
I +176 -0 filters/words/msword-odf/drawclient.cpp
I +144 -0 filters/words/msword-odf/fibbase.cpp
I +233 -0 filters/words/msword-odf/fibbase.h
I +74 -90 filters/words/msword-odf/graphicshandler.cpp
I +68 -21 filters/words/msword-odf/graphicshandler.h
I +46 -59 filters/words/msword-odf/mswordodfimport.cpp
I +0 -3 filters/words/msword-odf/mswordodfimport.h
I +7 -12 filters/words/msword-odf/texthandler.cpp
I +1 -3 filters/words/msword-odf/texthandler.h
I +3 -1 filters/words/msword-odf/versionmagic.h
I +2 -2 filters/words/msword-odf/wv2/src/CMakeLists.txt
I +122 -21 filters/words/msword-odf/wv2/src/bookmark.cpp
I +11 -2 filters/words/msword-odf/wv2/src/bookmark.h
I +1 -1 filters/words/msword-odf/wv2/src/global.h
I +4 -4 filters/words/msword-odf/wv2/src/graphics.h
I +1 -1 filters/words/msword-odf/wv2/src/parser.h
I +28 -15 filters/words/msword-odf/wv2/src/parser9x.cpp
I +1 -1 filters/words/msword-odf/wv2/src/parser9x.h
I +5 -1 filters/words/msword-odf/wv2/src/parserfactory.cpp
I +8 -0 filters/words/msword-odf/wv2/src/word95_generated.h
I +11 -1 filters/words/msword-odf/wv2/src/word97_generated.h
I +2 -0 filters/words/msword-odf/wv2/src/wv2version.cpp
I +2 -0 filters/words/msword-odf/wv2/src/wv2version.h
I +1 -1 filters/xsltfilter/export/xsltexport.cc
I +1 -1 filters/xsltfilter/import/xsltimport.cc
I +4 -2 flow/CMakeLists.txt
I +1 -1 flow/Messages.sh
I +52 -0 flow/part/CMakeLists.txt
I +41 -0 flow/part/FlowAboutData.h
I +35 -0 flow/part/FlowCanvas.cpp
I +44 -0 flow/part/FlowCanvas.h
I +64 -0 flow/part/FlowDocument.cpp
I +48 -0 flow/part/FlowDocument.h
I +89 -0 flow/part/FlowFactory.cpp
I +50 -0 flow/part/FlowFactory.h
I +22 -0 flow/part/FlowFactoryInit.cpp
I +160 -0 flow/part/FlowLayout.cpp
I +78 -0 flow/part/FlowLayout.h
I +0 -0 flow/part/FlowPage.cpp
I +27 -0 flow/part/FlowPage.h
I +68 -0 flow/part/FlowView.cpp
I +54 -0 flow/part/FlowView.h
I +81 -0 flow/part/flow.desktop
I +80 -0 flow/part/flow.rc
I +45 -0 flow/part/flow_export.h
I +106 -0 flow/part/flowpart.desktop
I +3 -0 flow/part/flowrc
I +43 -0 flow/part/main.cpp
I +1 -0 flow/plugins/CMakeLists.txt
I +24 -0 flow/plugins/dockers/CMakeLists.txt
I +38 -0 flow/plugins/dockers/Plugin.cpp
I +34 -0 flow/plugins/dockers/Plugin.h
I +22 -0 flow/plugins/dockers/flowdockersplugin.desktop
I +199 -0 flow/plugins/dockers/layoutdocker/LayoutDocker.ui
I +135 -0 flow/plugins/dockers/stencilboxdocker/CollectionItemModel.cpp
I +76 -0 flow/plugins/dockers/stencilboxdocker/CollectionItemModel.h
I +377 -0 flow/plugins/dockers/stencilboxdocker/StencilBoxDocker.cpp
I +94 -0 flow/plugins/dockers/stencilboxdocker/StencilBoxDocker.h
I +344 -0 flow/plugins/dockers/stencilboxdocker/StencilBoxView.cpp
I +108 -0 flow/plugins/dockers/stencilboxdocker/StencilBoxView.h
I +145 -0 flow/plugins/dockers/stencilboxdocker/StencilShapeFactory.cpp
I +43 -0 flow/plugins/dockers/stencilboxdocker/StencilShapeFactory.h
I +5 -0 flow/plugins/dockers/stencilboxdocker/flow_stencils.knsrc
I +1510 -0 flow/plugins/layouts/libavoid/Doxyfile
I +460 -0 flow/plugins/layouts/libavoid/LICENSE.LGPL
I +48 -0 flow/plugins/layouts/libavoid/Makefile.am
I +35 -0 flow/plugins/layouts/libavoid/README
I +49 -0 flow/plugins/layouts/libavoid/assertions.h
I +372 -0 flow/plugins/layouts/libavoid/connectionpin.cpp
I +240 -0 flow/plugins/layouts/libavoid/connectionpin.h
I +2137 -0 flow/plugins/layouts/libavoid/connector.cpp
I +406 -0 flow/plugins/layouts/libavoid/connector.h
I +333 -0 flow/plugins/layouts/libavoid/connend.cpp
I +202 -0 flow/plugins/layouts/libavoid/connend.h
I +58 -0 flow/plugins/layouts/libavoid/debug.h
I +612 -0 flow/plugins/layouts/libavoid/geometry.cpp
I +128 -0 flow/plugins/layouts/libavoid/geometry.h
I +591 -0 flow/plugins/layouts/libavoid/geomtypes.cpp
I +330 -0 flow/plugins/layouts/libavoid/geomtypes.h
I +748 -0 flow/plugins/layouts/libavoid/graph.cpp
I +122 -0 flow/plugins/layouts/libavoid/graph.h
I +201 -0 flow/plugins/layouts/libavoid/junction.cpp
I +136 -0 flow/plugins/layouts/libavoid/junction.h
I +51 -0 flow/plugins/layouts/libavoid/libavoid.h
I +877 -0 flow/plugins/layouts/libavoid/makepath.cpp
I +43 -0 flow/plugins/layouts/libavoid/makepath.h
I +361 -0 flow/plugins/layouts/libavoid/obstacle.cpp
I +141 -0 flow/plugins/layouts/libavoid/obstacle.h
I +2847 -0 flow/plugins/layouts/libavoid/orthogonal.cpp
I +39 -0 flow/plugins/layouts/libavoid/orthogonal.h
I +2261 -0 flow/plugins/layouts/libavoid/router.cpp
I +526 -0 flow/plugins/layouts/libavoid/router.h
I +250 -0 flow/plugins/layouts/libavoid/shape.cpp
I +153 -0 flow/plugins/layouts/libavoid/shape.h
I +156 -0 flow/plugins/layouts/libavoid/timer.cpp
I +100 -0 flow/plugins/layouts/libavoid/timer.h
I +597 -0 flow/plugins/layouts/libavoid/vertices.cpp
I +204 -0 flow/plugins/layouts/libavoid/vertices.h
I +114 -0 flow/plugins/layouts/libavoid/viscluster.cpp
I +125 -0 flow/plugins/layouts/libavoid/viscluster.h
I +715 -0 flow/plugins/layouts/libavoid/visibility.cpp
I +43 -0 flow/plugins/layouts/libavoid/visibility.h
I +1304 -0 flow/plugins/layouts/libavoid/vpsc.cpp
I +261 -0 flow/plugins/layouts/libavoid/vpsc.h
I +0 -2 flow/src/CMakeLists.txt
I +0 -49 flow/src/part/CMakeLists.txt
I +0 -41 flow/src/part/FlowAboutData.h
I +0 -64 flow/src/part/FlowDocument.cpp
I +0 -48 flow/src/part/FlowDocument.h
I +0 -89 flow/src/part/FlowFactory.cpp
I +0 -50 flow/src/part/FlowFactory.h
I +0 -22 flow/src/part/FlowFactoryInit.cpp
I +0 -68 flow/src/part/FlowView.cpp
I +0 -54 flow/src/part/FlowView.h
I +0 -81 flow/src/part/flow.desktop
I +0 -80 flow/src/part/flow.rc
I +0 -45 flow/src/part/flow_export.h
I +0 -106 flow/src/part/flowpart.desktop
I +0 -3 flow/src/part/flowrc
I +0 -43 flow/src/part/main.cpp
I +0 -1 flow/src/plugins/CMakeLists.txt
I +0 -24 flow/src/plugins/dockers/CMakeLists.txt
I +0 -38 flow/src/plugins/dockers/Plugin.cpp
I +0 -34 flow/src/plugins/dockers/Plugin.h
I +0 -22 flow/src/plugins/dockers/flowdockersplugin.desktop
I +0 -122 flow/src/plugins/dockers/stencilboxdocker/CollectionItemModel.cpp
I +0 -72 flow/src/plugins/dockers/stencilboxdocker/CollectionItemModel.h
I +0 -479 flow/src/plugins/dockers/stencilboxdocker/StencilBoxDocker.cpp
I +0 -109 flow/src/plugins/dockers/stencilboxdocker/StencilBoxDocker.h
I +0 -341 flow/src/plugins/dockers/stencilboxdocker/StencilBoxView.cpp
I +0 -108 flow/src/plugins/dockers/stencilboxdocker/StencilBoxView.h
I +0 -145 flow/src/plugins/dockers/stencilboxdocker/StencilShapeFactory.cpp
I +0 -43 flow/src/plugins/dockers/stencilboxdocker/StencilShapeFactory.h
I +0 -5 flow/src/plugins/dockers/stencilboxdocker/flow_stencils.knsrc
I +1 -0 flow/stencils/BPMN/Activity-Looping.desktop
I +1 -0 flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop
I +1 -0 flow/stencils/BPMN/Collapsed-Sub-Process.desktop
I +1 -0 flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop
I +1 -0 flow/stencils/BPMN/Compensation.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Cancel.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Compensation.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Error.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Link.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Message.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Multiple.desktop
I +1 -0 flow/stencils/BPMN/End-Event-Terminate.desktop
I +1 -0 flow/stencils/BPMN/End-Event.desktop
I +1 -0 flow/stencils/BPMN/Gateway-Complex.desktop
I +1 -0 flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop
I +1 -0 flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop
I +1 -0 flow/stencils/BPMN/Gateway-Inclusive-OR.desktop
I +1 -0 flow/stencils/BPMN/Gateway-Parallel-AND.desktop
I +1 -0 flow/stencils/BPMN/Gateway.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Cancel.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Compensation.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Error.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Link.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Message.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Multiple.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Rule.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event-Timer.desktop
I +1 -0 flow/stencils/BPMN/Intermediate-Event.desktop
I +1 -0 flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop
I +1 -0 flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop \
I +1 -0 flow/stencils/BPMN/Multiple-Instance-Task.desktop
I +1 -0 flow/stencils/BPMN/Start-Event-Link.desktop
I +1 -0 flow/stencils/BPMN/Start-Event-Message.desktop
I +1 -0 flow/stencils/BPMN/Start-Event-Multiple.desktop
I +1 -0 flow/stencils/BPMN/Start-Event-Rule.desktop
I +1 -0 flow/stencils/BPMN/Start-Event-Timer.desktop
I +1 -0 flow/stencils/BPMN/Start-Event.desktop
I +1 -0 flow/stencils/BPMN/Task.desktop
I +1 -0 flow/stencils/BPMN/Text-Annotation.desktop
I +1 -0 flow/stencils/BPMN/Transaction.desktop
I +1 -0 flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop \
I +1 -0 flow/stencils/Building_Site/pre_silo.desktop
I +1 -0 flow/stencils/Building_Site/proportioning_batcher.desktop
I +1 -0 flow/stencils/Building_Site/road_rotated_tee.desktop
I +1 -0 flow/stencils/Building_Site/road_tee.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_15.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_32.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_36.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_42.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_44.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_5.desktop
I +1 -0 flow/stencils/Central_Data_Processing/CPD_rack_7.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Litter.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Path_Painel_24P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Router.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop \
I +1 -0 flow/stencils/Central_Data_Processing/Storage_Rack_3U.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Switch_Rack_16P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Switch_Rack_24P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Switch_Rack_48P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop
I +1 -0 flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop
I +1 -0 flow/stencils/ChemEng/ACgen.desktop
I +1 -0 flow/stencils/ChemEng/aircooler.desktop
I +1 -0 flow/stencils/ChemEng/airforced.desktop
I +1 -0 flow/stencils/ChemEng/airinduced.desktop
I +1 -0 flow/stencils/ChemEng/coil.desktop
I +1 -0 flow/stencils/ChemEng/coilv.desktop
I +1 -0 flow/stencils/ChemEng/collection.desktop
I +1 -0 flow/stencils/ChemEng/compr.desktop
I +1 -0 flow/stencils/ChemEng/coveredtank.desktop
I +1 -0 flow/stencils/ChemEng/cyclone.desktop
I +1 -0 flow/stencils/ChemEng/ejector.desktop
I +1 -0 flow/stencils/ChemEng/fluidcont.desktop
I +1 -0 flow/stencils/ChemEng/measure.desktop
I +1 -0 flow/stencils/ChemEng/regval.desktop
I +1 -0 flow/stencils/ChemEng/regvalv.desktop
I +1 -0 flow/stencils/ChemEng/sealedtank.desktop
I +1 -0 flow/stencils/ChemEng/settling.desktop
I +1 -0 flow/stencils/ChemEng/spray.desktop
I +1 -0 flow/stencils/ChemEng/spraydrier.desktop
I +1 -0 flow/stencils/ChemEng/val.desktop
I +1 -1 flow/stencils/ChemEng/valv.desktop
I +1 -0 flow/stencils/ChemEng/vessel.desktop
I +1 -0 flow/stencils/ChemEng/wcool.desktop
I +1 -0 flow/stencils/ChemEng/wcoolv.desktop
I +1 -0 flow/stencils/Chemistry_Lab/30-degree-bend.desktop
I +1 -0 flow/stencils/Chemistry_Lab/beaker.desktop
I +1 -0 flow/stencils/Chemistry_Lab/buechner-funnel.desktop
I +1 -0 flow/stencils/Chemistry_Lab/burette.desktop
I +1 -0 flow/stencils/Chemistry_Lab/clamp-extra-large.desktop
I +1 -0 flow/stencils/Chemistry_Lab/clamp-front.desktop
I +1 -0 flow/stencils/Chemistry_Lab/clamp-large.desktop
I +1 -0 flow/stencils/Chemistry_Lab/clamp.desktop
I +1 -0 flow/stencils/Chemistry_Lab/column-reflux-red-blue.desktop
I +1 -0 flow/stencils/Chemistry_Lab/column-reflux-red.desktop
I +1 -0 flow/stencils/Chemistry_Lab/column-reflux.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-black.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-blue.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-green.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-orange.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser-red.desktop
I +1 -0 flow/stencils/Chemistry_Lab/condenser.desktop
I +1 -0 flow/stencils/Chemistry_Lab/erlenmeyer.desktop
I +1 -0 flow/stencils/Chemistry_Lab/lab-stand-front.desktop
I +1 -0 flow/stencils/Chemistry_Lab/lab-stand.desktop
I +1 -0 flow/stencils/Chemistry_Lab/ring-front.desktop
I +1 -0 flow/stencils/Chemistry_Lab/ring.desktop
I +1 -0 flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop
I +1 -0 flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop
I +1 -0 flow/stencils/Chemistry_Lab/sep-funnel.desktop
I +1 -0 flow/stencils/Chemistry_Lab/stirplate-front.desktop
I +1 -0 flow/stencils/Chemistry_Lab/stirplate.desktop
I +2 -0 flow/stencils/Circuit2/dpcapacitor.desktop
I +2 -0 flow/stencils/Circuit2/hpcapacitor.desktop
I +1 -0 flow/stencils/Circuit2/opto.desktop
I +1 -0 flow/stencils/Circuit2/relay.desktop
I +1 -0 flow/stencils/Circuit2/triac.desktop
I +2 -0 flow/stencils/Circuit2/vpcapacitor.desktop
I +1 -0 flow/stencils/Cisco/branch_office_subdued.desktop
I +1 -0 flow/stencils/Cisco/detector.desktop
I +1 -0 flow/stencils/Cisco/firewall_subdued.desktop
I +1 -0 flow/stencils/Cisco/generic_building_subdued.desktop
I +1 -0 flow/stencils/Cisco/hub_subdued.desktop
I +1 -0 flow/stencils/Cisco/ip_old-style.desktop
I +1 -0 flow/stencils/Cisco/medium_building_subdued.desktop
I +1 -0 flow/stencils/Cisco/microwebserver.desktop
I +1 -0 flow/stencils/Cisco/mobile_access_ip_phone.desktop
I +1 -0 flow/stencils/Cisco/mobile_access_router.desktop
I +1 -0 flow/stencils/Cisco/multilayer_remote_switch.desktop
I +1 -0 flow/stencils/Cisco/multilayer_switch_with_silicon.desktop
I +1 -0 flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop \
I +1 -0 flow/stencils/Cisco/multiswitch_device.desktop
I +1 -0 flow/stencils/Cisco/optical_fiber.desktop
I +1 -0 flow/stencils/Cisco/route_switch_processor_with_si.desktop
I +1 -0 flow/stencils/Cisco/router.desktop
I +1 -0 flow/stencils/Cisco/router_subdued.desktop
I +1 -0 flow/stencils/Cisco/running_man_subdued.desktop
I +1 -0 flow/stencils/Cisco/stb.desktop
I +1 -0 flow/stencils/Cisco/telecommuter_house_subdued.desktop
I +1 -0 flow/stencils/Cisco/terminal_server.desktop
I +1 -0 flow/stencils/Cisco/voice-enabled_atm_switch.desktop
I +1 -0 flow/stencils/Cisco/wan.desktop
I +1 -0 flow/stencils/Cisco/wireless_connectivity.desktop
I +1 -0 flow/stencils/Cisco/wlan_controller.desktop
I +1 -0 flow/stencils/Cisco/workgroup_switch_subdued.desktop
I +1 -0 flow/stencils/Cybernetics/hpf.desktop
I +1 -0 flow/stencils/Cybernetics/lpf.desktop
I +1 -0 flow/stencils/Electric/vcommand.desktop
I +1 -0 flow/stencils/Electric/vcontact_f.desktop
I +1 -0 flow/stencils/Electric/vcontact_o.desktop
I +1 -0 flow/stencils/Electric/vlamp.desktop
I +1 -0 flow/stencils/Electric/vrelay.desktop
I +1 -0 flow/stencils/Electronic/contact_pair.desktop
I +1 -0 flow/stencils/Electronic/diode_inverse.desktop
I +1 -0 flow/stencils/Electronic/photo_sensitive_part.desktop
I +1 -0 flow/stencils/Electronic/triac.desktop
I +1 -0 flow/stencils/Electronic/tyristor_triode.desktop
I +1 -0 flow/stencils/Electronic/vacuum_diode.desktop
I +1 -0 flow/stencils/Electronic/vacuum_pentode.desktop
I +1 -0 flow/stencils/Electronic/vacuum_triode.desktop
I +1 -0 flow/stencils/Electronic/variable_linear_part.desktop
I +1 -0 flow/stencils/Electronic/variable_nonlinear_part.desktop
I +1 -0 flow/stencils/Electronic/varicap.desktop
I +1 -0 flow/stencils/Flags/flags.desktop
I +1 -0 flow/stencils/Flowchart/collate.desktop
I +1 -0 flow/stencils/Flowchart/display.desktop
I +1 -0 flow/stencils/Flowchart/extract.desktop
I +1 -0 flow/stencils/Flowchart/magdrum.desktop
I +1 -0 flow/stencils/Flowchart/manualinput.desktop
I +1 -0 flow/stencils/Flowchart/manualop.desktop
I +1 -0 flow/stencils/Flowchart/merge.desktop
I +1 -0 flow/stencils/Flowchart/offlinestore.desktop
I +1 -0 flow/stencils/Flowchart/or.desktop
I +1 -0 flow/stencils/Flowchart/preparation.desktop
I +1 -0 flow/stencils/Flowchart/punchedtape.desktop
I +1 -0 flow/stencils/Flowchart/sort.desktop
I +1 -0 flow/stencils/Gane_and_Sarson/alt-entity.desktop
I +1 -0 flow/stencils/Gane_and_Sarson/collection.desktop
I +1 -0 flow/stencils/Gane_and_Sarson/data_store.desktop
I +1 -0 flow/stencils/Gane_and_Sarson/entity.desktop
I +1 -0 flow/stencils/Gradient/collection.desktop
I +1 -0 flow/stencils/Gradient/dark_light_horizontal_gradient.desktop
I +1 -0 flow/stencils/Gradient/dark_light_horizontal_gradient_box.desktop
I +1 -0 flow/stencils/Gradient/dark_light_vertical_gradient.desktop
I +1 -0 flow/stencils/Gradient/dark_light_vertical_gradient_box.desktop
I +1 -0 flow/stencils/Gradient/light_dark_horizontal_gradient.desktop
I +1 -0 flow/stencils/Gradient/light_dark_horizontal_gradient_box.desktop
I +1 -0 flow/stencils/Gradient/light_dark_vertical_gradient.desktop
I +1 -0 flow/stencils/Gradient/light_dark_vertical_gradient_box.desktop
I +1 -0 flow/stencils/LST/cn_subsystem.desktop
I +1 -0 flow/stencils/LST/decode_subsystem.desktop
I +1 -0 flow/stencils/LST/decoder.desktop
I +1 -0 flow/stencils/LST/encode_subsystem.desktop
I +1 -0 flow/stencils/LST/encoder.desktop
I +5 -9 flow/stencils/Lights/PC.desktop
I +6 -7 flow/stencils/Lights/Stroboscope.desktop
I +1 -0 flow/stencils/Lights/collection.desktop
I +1 -0 flow/stencils/Logic/collection.desktop
I +1 -0 flow/stencils/Logic/nand.desktop
I +1 -0 flow/stencils/Logic/nor.desktop
I +1 -0 flow/stencils/Logic/not.desktop
I +1 -0 flow/stencils/Logic/or.desktop
I +1 -0 flow/stencils/Logic/xor.desktop
I +1 -0 flow/stencils/MSE/multiplexer.desktop
I +1 -0 flow/stencils/Map/FootBridge.desktop
I +1 -0 flow/stencils/Misc/file.desktop
I +1 -0 flow/stencils/Misc/folder.desktop
I +1 -0 flow/stencils/Network/computer.desktop
I +1 -0 flow/stencils/Network/dat_external.desktop
I +1 -0 flow/stencils/Network/flash.desktop
I +1 -0 flow/stencils/Network/genmonitor.desktop
I +1 -0 flow/stencils/Network/mobile_phone.desktop
I +1 -0 flow/stencils/Network/patch-panel.desktop
I +1 -0 flow/stencils/Optics/detector.desktop
I +1 -0 flow/stencils/Optics/detector_vert.desktop
I +1 -0 flow/stencils/Optics/fibre_vert.desktop
I +1 -0 flow/stencils/Optics/isolator_vert.desktop
I +1 -0 flow/stencils/Optics/phasemod.desktop
I +1 -0 flow/stencils/Optics/phasemod_vert.desktop
I +1 -0 flow/stencils/RDP/transition.desktop
I +1 -0 flow/stencils/Racks/equipment_10u.desktop
I +1 -0 flow/stencils/Racks/equipment_11u.desktop
I +1 -0 flow/stencils/Racks/equipment_12u.desktop
I +1 -0 flow/stencils/Racks/equipment_1u.desktop
I +1 -0 flow/stencils/Racks/equipment_2u.desktop
I +1 -0 flow/stencils/Racks/equipment_3u.desktop
I +1 -0 flow/stencils/Racks/equipment_4u.desktop
I +1 -0 flow/stencils/Racks/equipment_5u.desktop
I +1 -0 flow/stencils/Racks/equipment_6u.desktop
I +1 -0 flow/stencils/Racks/equipment_7u.desktop
I +1 -0 flow/stencils/Racks/equipment_8u.desktop
I +1 -0 flow/stencils/Racks/equipment_9u.desktop
I +1 -0 flow/stencils/Racks/rack_12u.desktop
I +1 -0 flow/stencils/Racks/rack_16u.desktop
I +1 -0 flow/stencils/Racks/rack_20u.desktop
I +1 -0 flow/stencils/Racks/rack_38u.desktop
I +1 -0 flow/stencils/Racks/rack_42u.desktop
I +1 -0 flow/stencils/Renewable_Energy/collection.desktop
I +1 -0 flow/stencils/Renewable_Energy/cup_anemometer.desktop
I +1 -0 flow/stencils/Renewable_Energy/data_logger.desktop
I +1 -0 flow/stencils/Renewable_Energy/meas_tower.desktop
I +1 -0 flow/stencils/Renewable_Energy/solar_module.desktop
I +1 -0 flow/stencils/Renewable_Energy/temp_humi_sensor.desktop
I +1 -0 flow/stencils/Renewable_Energy/wind_vane.desktop
I +1 -0 flow/stencils/SDL/collection.desktop
I +1 -0 flow/stencils/SDL/task.desktop
I +1 -0 flow/stencils/Value_Stream_Mapping/happy_face.desktop
I +2 -0 karbon/data/karbon.rc
I +7 -7 karbon/plugins/tools/KarbonGradientTool.cpp
I +10 -9 karbon/plugins/tools/KarbonPatternTool.cpp
I +3 -5 karbon/plugins/tools/KarbonPencilTool.cpp
I +4 -4 karbon/plugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp
I +0 -10 karbon/ui/KarbonPart.cpp
I +74 -3 karbon/ui/KarbonView.cpp
I +4 -1 karbon/ui/KarbonView.h
I +23 -41 karbon/ui/dockers/KarbonLayerModel.cpp
I +1 -0 kexi/.gitignore
I +7 -0 kexi/CMakeSettings-default.txt
I +7 -0 kexi/doc/dev/CHANGELOG-Kexi-js
I +8 -5 kexi/kexidb/queryschema.cpp
I +2 -0 kexi/plugins/forms/kexiformmanager.cpp
I +3 -1 kexi/plugins/forms/kexiformview.cpp
I +2 -2 kexi/widget/utils/kexicontextmenuutils.cpp
I +6 -0 kplato/CHANGELOG
I +4 -4 kplato/kptview.cpp
I +1 -1 kplato/libs/kernel/kptcommand.cpp
I +1 -1 kplato/libs/kernel/kptcommand.h
I +4 -4 kplato/libs/kernel/kptproject.cpp
I +7 -7 kplato/libs/kernel/kptproject.h
I +1 -1 kplato/libs/kernel/tests/AccountsTester.cpp
I +8 -0 kplato/libs/kernel/tests/CMakeLists.txt
I +538 -0 kplato/libs/kernel/tests/CommandsTester.cpp
I +62 -0 kplato/libs/kernel/tests/CommandsTester.h
I +5 -5 kplato/libs/kernel/tests/PerformanceTester.cpp
I +33 -33 kplato/libs/kernel/tests/ProjectTester.cpp
I +1 -1 kplato/libs/models/kptdocumentmodel.cpp
I +2 -2 kplato/libs/models/kptflatproxymodel.cpp
I +1 -1 kplato/libs/models/kptnodeitemmodel.cpp
I +2 -2 kplato/libs/models/kptpertcpmmodel.cpp
I +2 -2 kplato/libs/models/kptschedulemodel.cpp
I +1 -1 kplato/libs/models/kpttaskstatusmodel.cpp
I +1 -1 kplato/libs/models/tests/ResourceModelTester.cpp
I +8 -8 kplato/libs/ui/kpthtmlview.cpp
I +4 -4 kplato/libs/ui/kpthtmlview.h
I +8 -8 kplato/libs/ui/kpttaskeditor.cpp
I +2 -2 kplato/libs/ui/reports/report.h
I +2 -1 kplato/libs/ui/reports/reportexportpanel.cpp
I +16 -1 kplato/libs/ui/reports/reportview.cpp
I +2 -1 kplato/libs/ui/reports/reportview.h
I +6 -6 kplato/plugins/schedulers/rcps/tests/ProjectTester.cpp
I +1 -1 krita/image/kis_fill_painter.cc
I +63 -75 krita/image/kis_paint_device.cc
I +19 -3 krita/image/kis_paint_device.h
I +111 -0 krita/image/kis_painter.cc
I +13 -0 krita/image/kis_painter.h
I +25 -99 krita/image/kis_pixel_selection.cpp
I +20 -60 krita/image/kis_pixel_selection.h
I +1 -36 krita/image/kis_selection.cc
I +0 -16 krita/image/kis_selection.h
I +0 -6 krita/image/kis_selection_based_layer.cpp
I +0 -3 krita/image/kis_selection_mask.cpp
I +1 -1 krita/image/tests/kis_filter_test.cpp
I +37 -0 krita/image/tests/kis_paint_device_test.cpp
I +1 -0 krita/image/tests/kis_paint_device_test.h
I +6 -3 krita/image/tests/kis_painter_test.cpp
I +29 -39 krita/image/tests/kis_pixel_selection_test.cpp
I +0 -1 krita/image/tests/kis_pixel_selection_test.h
I +16 -16 krita/image/tests/kis_selection_test.cpp
I +5 -1 krita/image/tiles3/kis_tile_data.cc
I +4 -1 krita/image/tiles3/kis_tile_data.h
I +5 -3 krita/image/tiles3/kis_tile_data_pooler.cc
I +2 -0 krita/image/tiles3/kis_tile_data_store.cc
I +5 -3 krita/image/tiles3/swap/kis_tile_data_swapper.cpp
I +6 -0 krita/plugins/colorspaces/ctlcs/KoCtlColorSpaceInfo.cpp
I +1 -0 krita/plugins/colorspaces/ctlcs/KoCtlColorSpaceInfo.h
I +1 -1 krita/plugins/colorspaces/ctlcs/ctlcolorspaces/gray32f.ctlcs
I +1 -1 krita/plugins/extensions/colorrange/dlg_colorrange.cc
I +6 -0 krita/plugins/extensions/imagesplit/kritaimagesplit.desktop
I +7 -7 krita/plugins/formats/psd/psd.h
I +24 -21 krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
I +7 -4 krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.h
I +2 -0 krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp \
I +1 -0 krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop \
I +47 -45 krita/plugins/paintops/libbrush/kis_auto_brush.cpp
I +17 -0 krita/plugins/paintops/libbrush/kis_brush.cpp
I +13 -2 krita/plugins/paintops/libbrush/kis_brush.h
I +38 -31 krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
I +2 -0 krita/plugins/paintops/libbrush/kis_imagepipe_brush.h
I +1 -0 krita/plugins/paintops/libpaintop/CMakeLists.txt
I +36 -0 krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.cpp \
I +37 -0 krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.h
I +4 -4 krita/plugins/tools/defaulttools/kis_tool_line.cc
I +13 -0 krita/sdk/tests/testutil.h
I +25 -13 krita/ui/kisexiv2/kis_exif_io.cpp
I +4 -2 krita/ui/tests/kis_shape_selection_test.cpp
I +3 -4 krita/ui/tool/kis_selection_tool_helper.cpp
I +1 -1 krita/ui/tool/kis_tool_freehand.cc
I +15 -6 krita/ui/widgets/kis_paintop_presets_popup.cpp
I +8 -7 krita/ui/widgets/kis_paintop_presets_popup.h
I +0 -2 libs/flake/CMakeLists.txt
I +9 -1 libs/flake/KoOdfWorkaround.cpp
I +11 -0 libs/flake/KoOdfWorkaround.h
I +10 -2 libs/flake/KoPathShape.cpp
I +6 -6 libs/flake/KoResourceManager.cpp
I +4 -4 libs/flake/KoResourceManager.h
I +6 -97 libs/flake/KoShape.cpp
I +0 -19 libs/flake/KoShape.h
I +4 -1 libs/flake/KoShapeController.cpp
I +6 -3 libs/flake/KoShapeController.h
I +5 -0 libs/flake/KoShapeControllerBase.cpp
I +5 -3 libs/flake/KoShapeManager.cpp
I +0 -307 libs/flake/KoShapeManagerCachedPaintingStrategy.cpp
I +0 -45 libs/flake/KoShapeManagerCachedPaintingStrategy.h
I +0 -50 libs/flake/KoShape_p.h
I +1 -1 libs/flake/KoSnapData.h
I +2 -0 libs/flake/KoSnapProxy.cpp
I +2 -2 libs/flake/KoSnapProxy.h
I +87 -41 libs/flake/KoSnapStrategy.cpp
I +11 -8 libs/flake/KoSnapStrategy.h
I +38 -4 libs/flake/KoToolBase.cpp
I +15 -0 libs/flake/KoToolBase.h
I +15 -1 libs/flake/KoToolManager.cpp
I +9 -0 libs/flake/KoToolManager.h
I +3 -2 libs/flake/commands/KoShapeGroupCommand.cpp
I +4 -0 libs/flake/tests/CMakeLists.txt
I +27 -7 libs/flake/tests/MockShapes.h
I +816 -0 libs/flake/tests/TestSnapStrategy.cpp
I +195 -0 libs/flake/tests/TestSnapStrategy.h
I +2 -2 libs/flake/tools/KoCreatePathTool.cpp
I +1 -1 libs/flake/tools/KoCreatePathTool_p.h
I +14 -0 libs/flake/tools/KoInteractionStrategy.cpp
I +7 -0 libs/flake/tools/KoInteractionStrategy.h
I +6 -4 libs/flake/tools/KoPathTool.cpp
I +8 -4 libs/flake/tools/KoPathToolHandle.cpp
I +1 -0 libs/flake/tools/KoPathToolHandle.h
I +2 -1 libs/flake/tools/KoPathToolSelection.cpp
I +1 -0 libs/kopageapp/CMakeLists.txt
I +1 -0 libs/kopageapp/dialogs/KoPAConfigureDialog.cpp
MM +12 -1 libs/kotext/CMakeLists.txt
I +1 -1 libs/kotext/KoInlineObject.h
I +18 -0 libs/kotext/KoText.cpp
I +13 -0 libs/kotext/KoText.h
MM +1 -0 libs/kotext/KoTextDocument.cpp
MM +1 -1 libs/kotext/KoTextDocument.h
I +1 -0 libs/kotext/KoTextEditor_p.h
MM +139 -1 libs/kotext/opendocument/KoTextLoader.cpp
MM +153 -1 libs/kotext/opendocument/KoTextWriter.cpp
I +185 -0 libs/kotext/styles/KoCharacterStyle.cpp
I +7 -1 libs/kotext/styles/KoCharacterStyle.h
I +138 -10 libs/kotext/styles/KoTableCellStyle.cpp
I +41 -21 libs/kotext/styles/KoTableColumnStyle.cpp
I +16 -5 libs/kotext/styles/KoTableColumnStyle.h
I +32 -14 libs/kotext/styles/KoTableRowStyle.cpp
I +8 -4 libs/kotext/styles/KoTableRowStyle.h
I +121 -76 libs/kotext/styles/KoTableStyle.cpp
I +18 -6 libs/kotext/styles/KoTableStyle.h
I +8 -0 libs/kotext/styles/tests/CMakeLists.txt
I +300 -0 libs/kotext/styles/tests/TestOpenDocumentStyle.cpp
I +73 -0 libs/kotext/styles/tests/TestOpenDocumentStyle.h
I +17891 -0 libs/kotext/styles/tests/specs/OpenDocument-schema-v1.1.rng
I +1 -0 libs/main/KoDocument.h
I +4 -11 libs/main/config/KoConfigMiscPage.cpp
I +187 -0 libs/odf/KoBorder.cpp
I +24 -1 libs/odf/KoBorder.h
I +28 -0 libs/odf/KoCellStyle.cpp
I +10 -2 libs/odf/KoCellStyle.h
I +15 -0 libs/odf/KoGenStyle.h
I +32 -19 libs/odf/KoOdfNumberStyles.cpp
I +3 -2 libs/odf/KoOdfNumberStyles.h
I +12 -1 libs/odf/KoStyle.cpp
I +5 -1 libs/odf/KoStyle.h
I +1 -1 libs/pigment/compositeops/KoCompositeOpCopy2.h
I +22 -25 plugins/artistictextshape/ArtisticTextShape.cpp
I +1 -0 plugins/artistictextshape/ArtisticTextShapeFactory.cpp
I +200 -88 plugins/artistictextshape/ArtisticTextTool.cpp
I +20 -11 plugins/artistictextshape/ArtisticTextTool.h
I +1 -0 plugins/artistictextshape/CMakeLists.txt
I +122 -0 plugins/artistictextshape/MoveStartOffsetStrategy.cpp
I +51 -0 plugins/artistictextshape/MoveStartOffsetStrategy.h
I +10 -11 plugins/chartshape/Axis.cpp
I +18 -10 plugins/chartshape/ChartLayout.cpp
I +6 -0 plugins/chartshape/ChartLayout.h
I +2 -1 plugins/chartshape/ChartShape.cpp
I +125 -5 plugins/chartshape/DataSet.cpp
I +1 -0 plugins/chartshape/PlotArea.cpp
I +8 -8 plugins/defaultTools/connectionTool/ConnectionTool.cpp
I +1 -1 plugins/defaultTools/connectionTool/MoveConnectionPointStrategy.cpp \
I +2 -3 plugins/defaultTools/defaulttool/DefaultTool.cpp
I +3 -3 plugins/defaultTools/defaulttool/DefaultToolWidget.cpp
I +1 -1 plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp
I +1 -1 plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp
I +1 -1 plugins/defaultTools/defaulttool/ShapeRotateStrategy.cpp
I +1 -1 plugins/defaultTools/defaulttool/ShapeShearStrategy.cpp
I +1 -2 plugins/defaultTools/guidestool/GuidesTool.cpp
I +3 -2 plugins/dockers/styledocker/StyleDocker.cpp
I +14 -2 plugins/staging/googledocs/googledocumentservice.cpp
I +1 -0 plugins/staging/googledocs/googledocumentservice.h
I +1 -1 plugins/staging/googledocs/loginwindow.cpp
I +22 -23 plugins/staging/googledocs/onlinedocument.cpp
I +8 -7 plugins/staging/googledocs/onlinedocument.h
I +1 -0 plugins/textshape/FloatingAnchorStrategy.cpp
I +0 -1 plugins/textshape/TextShape.cpp
MM +24 -5 plugins/textshape/TextShapeLayout.cpp
MM +1 -2 plugins/textshape/TextTool.cpp
I +17 -17 plugins/textshape/ToCGenerator.cpp
I +1 -0 plugins/textshape/tests/TestChangeTrackedDelete.cpp
I +0 -2 plugins/vectorshape/VectorShape.cpp
I +2 -0 plugins/vectorshape/libemf/EmfOutputPainterStrategy.cpp
I +1 -2 tables/Cell.cpp
I +34 -9 tables/Style.cpp
I +7 -3 tables/Style.h
I +21 -7 tables/ValueFormatter.cpp
I +7 -3 tables/ValueFormatter.h
I +2 -2 tables/part/CanvasItem.cpp
I +2 -2 tables/part/View.cpp
I +13 -4 tables/tests/TestValueFormatter.cpp
I +5 -1 tables/ui/CellView.cpp
I +2 -0 tables/ui/PixmapCachingSheetView.cpp
I +1 -0 tools/mobile/calligramobile.desktop
I +4 -4 tools/quickprint/CMakeLists.txt
I +69 -0 tools/quickprint/flow_konqi.desktop
I +0 -69 tools/quickprint/kivio_konqi.desktop
I +1 -0 words/part/CMakeLists.txt
I +1 -1 words/part/KWAboutData.h
I +1 -1 words/part/KWCanvas.h
I +193 -28 words/part/KWCanvasBase.cpp
I +25 -0 words/part/KWCanvasBase.h
I +1 -0 words/part/KWDocument.cpp
I +24 -0 words/part/KWPage.cpp
I +13 -1 words/part/KWPage.h
I +109 -0 words/part/KWPageCacheManager.cpp
I +82 -0 words/part/KWPageCacheManager.h
I +3 -3 words/part/KWViewMode.h
I +3 -3 words/part/dockers/KWStatisticsDocker.ui
I +3 -7 words/part/frames/KWCopyShape.cpp
I +13 -5 words/part/frames/KWFrameLayout.cpp
I +1 -0 words/part/words.desktop
http://commits.kde.org/calligra/ef0542604d017002347d5aeb8c1960c193e17fff
diff --cc libs/kotext/opendocument/KoTextLoader.cpp
index 4d7678a,96ba4d1..ed36bff
--- a/libs/kotext/opendocument/KoTextLoader.cpp
+++ b/libs/kotext/opendocument/KoTextLoader.cpp
@@@ -2000,33 -1233,132 +2003,160 @@@ void KoTextLoader::loadTable(const KoXm
if (! tblTag.isNull()) {
const QString tblLocalName = tblTag.localName();
if (tblTag.namespaceURI() == KoXmlNS::table) {
++<<<<<<< HEAD
+ if (tblLocalName == "table-column") {
+ loadTableColumn(tblTag, tbl, columns);
+ } else if (tblLocalName == "table-row") {
+ if (tblTag.attributeNS(KoXmlNS::delta, "insertion-type") != "")
+ d->openChangeRegion(tblTag);
+ loadTableRow(tblTag, tbl, spanStore, cursor, rows);
+ if (tblTag.attributeNS(KoXmlNS::delta, "insertion-type") != "")
+ d->closeChangeRegion(tblTag);
+ }
+ } else if(tblTag.namespaceURI() == KoXmlNS::delta) {
+ if (tblLocalName == "removed-content")
+ d->openChangeRegion(tblTag);
+
+ KoXmlElement deltaTblTag;
+ forEachElement (deltaTblTag, tblTag) {
+ if (!deltaTblTag.isNull() && (deltaTblTag.namespaceURI() == \
KoXmlNS::table)) { + const QString deltaTblLocalName = \
deltaTblTag.localName(); + if (deltaTblLocalName == \
"table-column") { + loadTableColumn(deltaTblTag, tbl, \
columns); + } else if (deltaTblLocalName == "table-row") {
+ loadTableRow(deltaTblTag, tbl, spanStore, cursor, \
rows); + }
++=======
+ if (tblLocalName == "table-header-rows") {
+ KoXmlElement subTag;
+ forEachElement(subTag, tblTag) {
+ if (!subTag.isNull()) {
+ if ((subTag.namespaceURI() == KoXmlNS::table) && \
(subTag.localName() == "table-row")) { + rowTags << \
subTag; + headingRowCounter++;
+ }
+ }
+ }
+
+ } if (tblLocalName == "table-rows") {
+ KoXmlElement subTag;
+ forEachElement(subTag, tblTag) {
+ if (!subTag.isNull()) {
+ if ((subTag.namespaceURI() == KoXmlNS::table) && \
(subTag.localName() == "table-row")) { + rowTags << \
subTag; + }
+ }
+ }
+ } else if (tblLocalName == "table-column") {
+ // Do some parsing with the column, see §8.2.1, ODF 1.1 spec
+ int repeatColumn = tblTag.attributeNS(KoXmlNS::table, \
"number-columns-repeated", "1").toInt(); + QString \
columnStyleName = tblTag.attributeNS(KoXmlNS::table, "style-name", ""); + \
if (!columnStyleName.isEmpty()) { + KoTableColumnStyle \
*columnStyle = d->textSharedData->tableColumnStyle(columnStyleName, d->stylesDotXml); \
+ #ifdef KOOPENDOCUMENTLOADER_DEBUG + kDebug() << \
columnStyleName << "gave" << columnStyle << d->stylesDotXml; + #endif
+ if (columnStyle) {
+ for (int c = columns; c < columns + repeatColumn; c++) \
{ + tcarManager.setColumnStyle(c, *columnStyle);
+ }
+ }
+ }
+
+ QString defaultCellStyleName = \
tblTag.attributeNS(KoXmlNS::table, "default-cell-style-name", ""); + \
if (!defaultCellStyleName.isEmpty()) { + KoTableCellStyle \
*cellStyle = d->textSharedData->tableCellStyle(defaultCellStyleName, \
d->stylesDotXml); + for (int c = columns; c < columns + \
repeatColumn; c++) { + \
tcarManager.setDefaultColumnCellStyle(c, cellStyle); + }
+ }
+
+ columns = columns + repeatColumn;
+ tbl->resize(qMax(1, rows), columns);
+ } else if (tblLocalName == "table-row") {
+ rowTags << tblTag;
+ }
+ }
+ }
+ }
+
+ foreach (tblTag, rowTags) {
+ QString rowStyleName = tblTag.attributeNS(KoXmlNS::table, "style-name", \
""); + if (!rowStyleName.isEmpty()) {
+ KoTableRowStyle *rowStyle = \
d->textSharedData->tableRowStyle(rowStyleName, d->stylesDotXml); + if \
(rowStyle) { + tcarManager.setRowStyle(rows, *rowStyle);
+ }
+ }
+
+ QString defaultCellStyleName = tblTag.attributeNS(KoXmlNS::table, \
"default-cell-style-name", ""); + if (!defaultCellStyleName.isEmpty()) {
+ KoTableCellStyle *cellStyle = \
d->textSharedData->tableCellStyle(defaultCellStyleName, d->stylesDotXml); + \
tcarManager.setDefaultRowCellStyle(rows, cellStyle); + }
+
+ rows++;
+ tbl->resize(rows, qMax(1, columns));
+ // Added a row
+ int currentCell = 0;
+ KoXmlElement rowTag;
+ forEachElement(rowTag, tblTag) {
+ if (!rowTag.isNull()) {
+ const QString rowLocalName = rowTag.localName();
+ if (rowTag.namespaceURI() == KoXmlNS::table) {
+ if (rowLocalName == "table-cell") {
+ // Ok, it's a cell...
+ const int currentRow = tbl->rows() - 1;
+ QTextTableCell cell = tbl->cellAt(currentRow, currentCell);
+
+ // store spans until entire table have been loaded
+ int rowsSpanned = rowTag.attributeNS(KoXmlNS::table, \
"number-rows-spanned", "1").toInt(); + int columnsSpanned = \
rowTag.attributeNS(KoXmlNS::table, "number-columns-spanned", "1").toInt(); + \
spanStore.append(QRect(currentCell, currentRow, columnsSpanned, rowsSpanned)); +
+ if (cell.isValid()) {
+ QString cellStyleName = \
rowTag.attributeNS(KoXmlNS::table, "style-name", ""); + \
KoTableCellStyle *cellStyle = 0; + if \
(!cellStyleName.isEmpty()) { + cellStyle = \
d->textSharedData->tableCellStyle(cellStyleName, d->stylesDotXml); + \
} else if (tcarManager.defaultRowCellStyle(currentRow)) { + \
cellStyle = tcarManager.defaultRowCellStyle(currentRow); + \
} else if (tcarManager.defaultColumnCellStyle(currentCell)) { + \
cellStyle = tcarManager.defaultColumnCellStyle(currentCell); + \
} +
+ QTextTableCellFormat cellFormat = \
cell.format().toTableCellFormat(); + if (cellStyle)
+ cellStyle->applyStyle(cellFormat);
+ cell.setFormat(cellFormat);
+
+ // handle inline Rdf
+ // rowTag is the current table cell.
+ if (rowTag.hasAttributeNS(KoXmlNS::xhtml, "property")
+ || rowTag.hasAttribute("id")) {
+ KoTextInlineRdf* inlineRdf =
+ new \
KoTextInlineRdf((QTextDocument*)cursor.block().document(), + \
cell); + inlineRdf->loadOdf(rowTag);
+ QTextTableCellFormat cellFormat = \
cell.format().toTableCellFormat(); + \
cellFormat.setProperty(KoTableCellStyle::InlineRdf, + \
QVariant::fromValue(inlineRdf)); + \
cell.setFormat(cellFormat); + }
+
+ cursor = cell.firstCursorPosition();
+ loadBody(rowTag, cursor);
+ } else
+ kDebug(32500) << "Invalid table-cell row=" << \
currentRow << " column=" << currentCell; + currentCell++;
+ } else if (rowLocalName == "covered-table-cell") {
+ currentCell++;
++>>>>>>> master
}
}
+
+ if (tblLocalName == "removed-content")
+ d->closeChangeRegion(tblTag);
}
}
}
diff --cc libs/kotext/opendocument/KoTextWriter.cpp
index e520838,489e437..f9dd1b7
--- a/libs/kotext/opendocument/KoTextWriter.cpp
+++ b/libs/kotext/opendocument/KoTextWriter.cpp
@@@ -56,7 -54,8 +57,12 @@@
#include <KoXmlWriter.h>
#include <KoGenStyle.h>
#include <KoGenStyles.h>
++<<<<<<< HEAD
+#include <KoXmlNS.h>
++=======
+ #include <KoTableColumnAndRowStyleManager.h>
+ #include <KoTableColumnStyle.h>
++>>>>>>> master
#include <opendocument/KoTextSharedSavingData.h>
#include <changetracker/KoChangeTracker.h>
@@@ -71,50 -69,8 +77,51 @@@
#ifdef SHOULD_BUILD_RDF
#include <Soprano/Soprano>
#endif
+ #include <KoTableRowStyle.h>
+class KoTextWriter::TagInformation
+{
+ public:
+ TagInformation():tagName(NULL), attributeList()
+ {
+ }
+
+ void setTagName(const char *tagName)
+ {
+ this->tagName = tagName;
+ }
+
+ void addAttribute(const QString& attributeName, const QString& \
attributeValue) + {
+ attributeList.push_back(QPair<QString,QString>(attributeName, \
attributeValue)); + }
+
+ void addAttribute(const QString& attributeName, int value)
+ {
+ addAttribute(attributeName, QString::number(value));
+ }
+
+ void clear()
+ {
+ tagName = NULL;
+ attributeList.clear();
+ }
+
+ const char *name() const
+ {
+ return tagName;
+ }
+
+ const QVector<QPair<QString, QString> >& attributes() const
+ {
+ return attributeList;
+ }
+
+ private:
+ const char *tagName;
+ QVector<QPair<QString, QString> > attributeList;
+};
+
class KoTextWriter::Private
{
public:
@@@ -138,29 -88,15 +145,34 @@@
~Private() {}
+ enum ElementType {
+ Span,
+ ParagraphOrHeader,
+ ListItem,
+ List,
+ NumberedParagraph,
+ Table,
+ TableRow,
+ TableColumn,
+ TableCell
+ };
+
void saveChange(QTextCharFormat format);
+ void saveChange(int changeId);
+ void saveODF12Change(QTextCharFormat format);
+ QString generateDeleteChangeXml(KoDeleteChangeMarker *marker);
+ int openTagRegion(int position, ElementType elementType, \
KoTextWriter::TagInformation& tagInformation); + void closeTagRegion(int \
changeId); + QStack<const char *> openedTagStack;
QString saveParagraphStyle(const QTextBlock &block);
+ QString saveParagraphStyle(const QTextBlockFormat &blockFormat, const \
QTextCharFormat &charFormat);
QString saveCharacterStyle(const QTextCharFormat &charFormat, const \
QTextCharFormat &blockCharFormat); + QString saveTableStyle(const QTextTable \
&table); + QString saveTableColumnStyle(const KoTableColumnStyle &columnStyle, \
int columnNumber, const QString &tableStyleName); + QString \
saveTableRowStyle(const KoTableRowStyle &rowStyle, int rowNumber, const QString \
&tableStyleName); + QString saveTableCellStyle(const QTextTableCellFormat \
&cellFormat, int columnNumber, const QString &tableStyleName); +
QHash<QTextList *, QString> saveListStyles(QTextBlock block, int to);
void saveParagraph(const QTextBlock &block, int from, int to);
void saveTable(QTextTable *table, QHash<QTextList *, QString> &listStyles);
@@@ -1189,50 -643,78 +1281,110 @@@ int KoTextWriter::Private::checkForTabl
void KoTextWriter::Private::saveTable(QTextTable *table, QHash<QTextList *, \
QString> &listStyles) {
++<<<<<<< HEAD
+ TagInformation tableTagInformation;
+ tableTagInformation.setTagName("table:table");
+ int changeId = openTagRegion(table->firstCursorPosition().position(), \
KoTextWriter::Private::Table, tableTagInformation); +
+ for (int c = 0 ; c < table->columns() ; c++) {
+ TagInformation tableColumnInformation;
+ tableColumnInformation.setTagName("table:table-column");
+ int changeId = \
openTagRegion(table->cellAt(0,c).firstCursorPosition().position(), \
KoTextWriter::Private::TableColumn, tableColumnInformation); + \
closeTagRegion(changeId); ++=======
+ KoTableColumnAndRowStyleManager tcarManager = \
KoTableColumnAndRowStyleManager::getManager(table); + \
writer->startElement("table:table"); + QString tableStyleName = \
saveTableStyle(*table); + writer->addAttribute("table:style-name", \
tableStyleName); + int numberHeadingRows = \
table->format().property(KoTableStyle::NumberHeadingRows).toInt(); +
+ for (int c = 0 ; c < table->columns() ; c++) {
+ KoTableColumnStyle columnStyle = tcarManager.columnStyle(c);
+ int repetition = 0;
+ for (; repetition < (table->columns() - c) ; repetition++)
+ {
+ if (columnStyle != tcarManager.columnStyle(c + repetition + 1))
+ break;
+ }
+ writer->startElement("table:table-column");
+ QString columnStyleName = saveTableColumnStyle(columnStyle, c, \
tableStyleName); + writer->addAttribute("table:style-name", columnStyleName);
+ if (repetition > 0)
+ {
+ writer->addAttribute("table:number-columns-repeated", repetition + 1);
+ }
+ writer->endElement(); // table:table-column
+ c += repetition;
++>>>>>>> master
}
+
+ if (numberHeadingRows)
+ writer->startElement("table:table-header-rows");
+
for (int r = 0 ; r < table->rows() ; r++) {
++<<<<<<< HEAD
+ TagInformation tableRowInformation;
+ tableRowInformation.setTagName("table:table-row");
+ int changeId = \
openTagRegion(table->cellAt(r,0).firstCursorPosition().position(), \
KoTextWriter::Private::TableRow, tableRowInformation); +
++=======
+ writer->startElement("table:table-row");
+
+ KoTableRowStyle rowStyle = tcarManager.rowStyle(r);
+ if (!rowStyle.isEmpty())
+ {
+ QString rowStyleName = saveTableRowStyle(rowStyle, r, tableStyleName);
+ writer->addAttribute("table:style-name", rowStyleName);
+ }
+
++>>>>>>> master
for (int c = 0 ; c < table->columns() ; c++) {
QTextTableCell cell = table->cellAt(r, c);
- if ((cell.row() == r) && (cell.column() == c)) {
- writer->startElement("table:table-cell");
- if (cell.rowSpan() > 1)
- writer->addAttribute("table:number-rows-spanned", \
cell.rowSpan());
- if (cell.columnSpan() > 1)
- writer->addAttribute("table:number-columns-spanned", \
cell.columnSpan()); + int changeId = 0;
+ if ((cell.row() == r) && (cell.column() == c)) {
+ TagInformation tableCellInformation;
+ tableCellInformation.setTagName("table:table-cell");
+ tableCellInformation.addAttribute("rowSpan", cell.rowSpan());
+ tableCellInformation.addAttribute("columnSpan", cell.columnSpan());
+ changeId = \
openTagRegion(table->cellAt(r,c).firstCursorPosition().position(), \
KoTextWriter::Private::TableCell, tableCellInformation); +
// Save the Rdf for the table cell
QTextTableCellFormat cellFormat = \
cell.format().toTableCellFormat();
QVariant v = cellFormat.property(KoTableCellStyle::InlineRdf);
if (KoTextInlineRdf* inlineRdf = v.value<KoTextInlineRdf*>()) {
inlineRdf->saveOdf(context, writer);
}
+
+ QString cellStyleName = saveTableCellStyle(cellFormat, c, \
tableStyleName); + writer->addAttribute("table:style-name", \
cellStyleName);
writeBlocks(table->document(), cell.firstPosition(), \
cell.lastPosition(), listStyles, table); } else {
- writer->startElement("table:covered-table-cell");
+ TagInformation tableCellInformation;
+ tableCellInformation.setTagName("table:covered-table-cell");
+ changeId = \
openTagRegion(table->cellAt(r,c).firstCursorPosition().position(), \
KoTextWriter::Private::TableCell, tableCellInformation); }
++<<<<<<< HEAD
+
+ closeTagRegion(changeId);
+ }
+ closeTagRegion(changeId);
+ }
+ closeTagRegion(changeId);
++=======
+ writer->endElement(); // table:table-cell OR table:covered-table-cell
+ }
+ writer->endElement(); // table:table-row
+
+ if (r + 1 == numberHeadingRows) {
+ writer->endElement(); // table:table-header-rows
+ writer->startElement("table:table-rows");
+ }
+ }
+ if (numberHeadingRows)
+ writer->endElement(); // table:table-rows
+ writer->endElement(); // table:table
++>>>>>>> master
}
void KoTextWriter::Private::saveTableOfContents(QTextDocument *document, int from, \
int to, QHash<QTextList *, QString> &listStyles, QTextTable *currentTable, QTextFrame \
*toc)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic