Git commit 0ff212e36ba889b15c005463ffc31f14ccf80541 by Casper Boemann. Committed on 30/04/2011 at 22:26. Pushed by boemann into branch 'textlayout-anchors-boemann'. Merge branch 'master' into textlayout-anchors-boemann I +- -- braindump/data/import/zoom-two-pages.png I +12 -4 filters/kpresenter/powerpoint/PptToOdp.cpp I +10 -6 filters/kpresenter/powerpoint/pptstyle.cpp I +2 -1 filters/kpresenter/powerpoint/pptstyle.h I +- -- karbon/pics/action/hi16-action-14_pencil.png I +- -- kexi/pics/hi22-action-aobottom.png I +- -- kexi/pics/hi22-action-aoleft.png I +- -- kexi/pics/hi22-action-aoright.png I +- -- kexi/pics/hi22-action-aotop.png I +- -- kpresenter/pics/hi16-action-black.png I +- -- kpresenter/pics/hi16-action-highlight.png I +- -- kpresenter/pics/hi16-action-pen.png I +1 -1 krita/image/tiles3/kis_tile_data.h I +6 -5 krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc I +3 -2 krita/plugins/assistants/RulerAssistant/SplineAssistant.cc I +4 -2 krita/plugins/paintops/libpaintop/kis_curve_label.h I +3 -0 krita/plugins/paintops/sketch/CMakeLists.txt I +36 -0 krita/plugins/paintops/sketch/kis_density_option.cpp I +32 -0 krita/plugins/paintops/sketch/kis_density_option.h I +36 -0 krita/plugins/paintops/sketch/kis_linewidth_option.cpp I +32 -0 krita/plugins/paintops/sketch/kis_linewidth_option.h I +36 -0 krita/plugins/paintops/sketch/kis_offset_scale_option.cpp I +32 -0 krita/plugins/paintops/sketch/kis_offset_scale_option.h I +19 -16 krita/plugins/paintops/sketch/kis_sketch_paintop.cpp I +11 -5 krita/plugins/paintops/sketch/kis_sketch_paintop.h I +13 -7 krita/plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp I +2 -0 libs/flake/CMakeLists.txt I +37 -0 libs/flake/KoDeferredShapeFactoryBase.cpp I +79 -0 libs/flake/KoDeferredShapeFactoryBase.h I +78 -9 libs/flake/KoShapeFactoryBase.cpp I +24 -4 libs/flake/KoShapeFactoryBase.h I +97 -34 libs/flake/KoToolManager.cpp I +28 -10 libs/flake/KoToolManager.h I +7 -0 libs/flake/KoToolRegistry.cpp I +9 -3 libs/flake/KoToolRegistry.h I +4 -2 libs/kotext/opendocument/KoTextWriter.cpp I +1 -0 libs/main/CMakeLists.txt I +48 -367 libs/main/KoToolBox.cpp I +76 -0 libs/main/KoToolBoxDocker.cpp I +55 -0 libs/main/KoToolBoxDocker_p.h I +1 -0 libs/main/KoToolBoxFactory.cpp I +4 -0 libs/main/KoToolBoxFactory.h I +349 -0 libs/main/KoToolBoxLayout_p.h I +6 -18 libs/main/KoToolBox_p.h I +2 -2 libs/main/KoToolDocker_p.h MM +7 -0 libs/textlayout/KoTextDocumentLayout.cpp MM +6 -0 libs/textlayout/KoTextDocumentLayout.h I +1 -0 libs/textlayout/KoTextLayoutTableArea.cpp I +- -- libs/widgets/pics/hi22-action-zoom-two-pages.png I +- -- pics/hicolor/hi16-action-inline_image.png I +- -- pics/hicolor/hi16-action-inline_table.png I +- -- pics/hicolor/hi22-action-aobottom.png I +- -- pics/hicolor/hi22-action-aoleft.png I +- -- pics/hicolor/hi22-action-aoright.png I +- -- pics/hicolor/hi22-action-aotop.png I +- -- pics/hicolor/hi22-action-char.png I +- -- pics/hicolor/hi32-action-view-sort-ascending.png I +0 -0 pics/oxygen/oxsc-action-shape-choose.svgz I +1 -1 plugins/artistictextshape/MoveStartOffsetStrategy.cpp I +3 -18 plugins/textshape/TextShape.cpp I +- -- plugins/textshape/pics/hi22-action-kotext-character.png I +- -- plugins/textshape/pics/hi22-action-kotext-paragraph.png I +74 -2 plugins/vectorshape/libsvm/SPEC I +75 -6 plugins/vectorshape/libsvm/SvmParser.cpp I +2 -0 plugins/vectorshape/libsvm/SvmParser.h I +1 -0 servicetypes/CMakeLists.txt I +10 -0 servicetypes/README.txt I +4 -0 servicetypes/calligra_deferred_plugin.desktop I +13 -12 tables/shape/CMakeLists.txt I +84 -0 tables/shape/TableShapeDeferredFactory.cpp I +38 -0 tables/shape/TableShapeDeferredFactory.h I +2 -31 tables/shape/TableShapeFactory.cpp I +0 -3 tables/shape/TableShapeFactory.h I +7 -0 tables/shape/spreadsheetshape-deferred.desktop I +- -- tools/mobile/images/128x128/SpreadSheet.png I +- -- tools/mobile/images/48x48/SpreadSheet.png I +0 -1 tools/okularodpgenerator/okularApplication_odp.desktop I +29 -8 words/part/KWCanvasBase.cpp I +4 -1 words/part/KWCanvasBase.h I +0 -1 words/part/KWDLoader.cpp I +14 -18 words/part/KWDocument.cpp I +0 -2 words/part/KWOdfLoader.cpp I +0 -1 words/part/KWOdfSharedLoadingData.cpp I +3 -2 words/part/KWPageManager.cpp MM +6 -2 words/part/KWRootAreaProvider.cpp I +29 -2 words/part/frames/KWFrame.cpp I +2 -0 words/part/frames/KWFrame.h I +11 -3 words/part/frames/KWFrameLayout.cpp I +1 -186 words/part/frames/KWTextFrameSet.cpp I +0 -60 words/part/frames/KWTextFrameSet.h http://commits.kde.org/calligra/0ff212e36ba889b15c005463ffc31f14ccf80541