summaryrefslogtreecommitdiff
path: root/filter/source/msfilter
AgeCommit message (Collapse)Author
2013-09-27Save Commit: must be squashed!!! ObjectGraphic refactorNorbert Thiebaud
Change-Id: I69f0b8bef3a08d1a325ccbe2b5f128df9cc14880
2013-08-24Improved XFillBitmapItem constructor / cleanup.Michael Meeks
Change-Id: I3ddf6d5c7d3b31f339e51048a29c41ca2d98979b
2013-08-06initial cut at ref-counting GraphicObjectsMichael Meeks
Change-Id: Ia87c429fc9e8b470fe066ee2179928de01c1fa1b
2013-07-29Remove effectively unused INetURLObject OString overloadsStephan Bergmann
Change-Id: Icbbe27b229d5454d27be646e00e8b362a77359b3
2013-07-11Fix memory leak in SvxMSDffManager::CheckForConvertToSOObj.Mark Wielaard
Use boost::scoped_ptr for temporary SvMemoryStream. Change-Id: I6235d7868bd20963aa5fdda32b1dd3b82cf0b182 Reviewed-on: https://gerrit.libreoffice.org/4760 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-07-09Fix memory leak in SvxMSDffManager::ImportShape.Mark Wielaard
When a new DffPropertyReader is created and assigned to pSecPropSet make sure the old one is deleted first. Change-Id: Idd14fdf4e3a03a625a10a89dde71ad66cbdba792 Reviewed-on: https://gerrit.libreoffice.org/4761 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-06-29remove OUString wrap for string literalsThomas Arnhold
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-06-28remove toolkit/unohlp.hxx hackThomas Arnhold
Change-Id: Idb9971d848870f4d00dbf77e80e48bf7dfde8913 Reviewed-on: https://gerrit.libreoffice.org/4601 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-27roundtrip VBA project blob for pptNoel Power
Need to save out the VBA project storage to ensure we don't get any nasty warnings trying to open ppt files containing old controls Change-Id: Ic2ff3ac5863ee3b901b1ee48f7d45e82dcb27ff9
2013-06-26#119467# Form controls cannot be saved into .ppt file in AOO3.4Jianyuan Li
Reported by: Du Jing Patch by: Jianyuan Li Review by: sunying
2013-06-26fdo#65123 Revert "n#782833: (PPT) Fix font size at end of para."David Tardon
This reverts commit e36d227ee584aa07fa48dda7710ac6b7a850fcc3. The description in the orig. commit: "Font size at the end of the para when there is a new(empty) line is set using an extra charprops definition." That would mean the extra StyleTextPropAtom record does not have a record header, which seems pretty fishy. I suspect the real problem is somewhere else (or the ppt is broken). But I cannot check it, because I cannot access the bug. Conflicts: filter/source/msfilter/svdfppt.cxx Change-Id: I1d555cd2905ef8f297d1a96f56bebbea8f83ad62
2013-06-21take a copy of the prop rather than pointer to refCaolán McNamara
follow up to af2053c318564ef56235482f058d30ae26ecf77d Change-Id: I3493077076554b714600c4bb4e93ce44bc690190
2013-06-15Related: #i119520# rework this to not crashCaolán McNamara
Change-Id: I479101c5421b03932e69cbf63188f89ee92a1d2f
2013-06-15Resolves: #i119520# right brace shape not displayed after save to .docJianyuan Li
Reported by: louqle Patch by: Jianyuan Li Review by: sunying (cherry picked from commit 8be633def896c74867b9f9dcc929d7d210b4f192) Conflicts: filter/inc/filter/msfilter/escherex.hxx filter/source/msfilter/escherex.cxx Change-Id: I3311aad033ca321397c596452d60de5a7c58e223
2013-06-13Resolves: #i121504# Support for alpha channel in clipboard for all systemsArmin Le Grand
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519) Conflicts: automation/source/server/statemnt.cxx basic/source/runtime/methods.cxx canvas/source/vcl/devicehelper.cxx canvas/source/vcl/spritedevicehelper.cxx drawinglayer/source/processor2d/vclhelperbufferdevice.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx drawinglayer/source/tools/converters.cxx dtrans/source/win32/dtobj/FmtFilter.cxx editeng/source/items/bulitem.cxx extensions/source/scanner/sanedlg.cxx external/gcc3_specific/makefile.mk filter/source/graphicfilter/eos2met/eos2met.cxx filter/source/graphicfilter/ios2met/ios2met.cxx filter/source/msfilter/msdffimp.cxx fpicker/source/office/iodlg.cxx framework/source/fwe/classes/addonsoptions.cxx framework/source/fwe/helper/actiontriggerhelper.cxx sc/source/filter/excel/xiescher.cxx sc/source/ui/docshell/docsh.cxx sc/source/ui/inc/viewfunc.hxx sd/source/ui/app/sdxfer.cxx sd/source/ui/unoidl/unopage.cxx sd/source/ui/view/sdview3.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/linkmgr2.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/intro.cxx sfx2/source/doc/docinf.cxx sot/inc/sot/formats.hxx sot/source/base/formats.cxx svtools/bmpmaker/bmpcore.cxx svtools/bmpmaker/bmpsum.cxx svtools/inc/svtools/transfer.hxx svtools/source/filter/filter.cxx svtools/source/filter/wmf/emfwr.cxx svtools/source/filter/wmf/enhwmf.cxx svtools/source/filter/wmf/winwmf.cxx svtools/source/filter/wmf/wmfwr.cxx svtools/source/graphic/graphic.cxx svtools/source/graphic/provider.cxx svtools/source/misc/transfer.cxx svx/inc/svx/xoutbmp.hxx svx/source/sdr/overlay/overlaymanagerbuffered.cxx svx/source/xoutdev/_xoutbmp.cxx sw/source/core/view/viewsh.cxx sw/source/filter/ww1/w1filter.cxx sw/source/filter/ww8/ww8par.hxx sw/source/ui/dochdl/swdtflvr.cxx toolkit/source/awt/vclxbitmap.cxx toolkit/source/helper/vclunohelper.cxx vcl/Library_vcl.mk vcl/Package_inc.mk vcl/aqua/source/dtrans/DataFlavorMapping.cxx vcl/aqua/source/dtrans/OSXTransferable.cxx vcl/aqua/source/dtrans/PictToBmpFlt.cxx vcl/aqua/source/dtrans/PictToBmpFlt.hxx vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmapex.hxx vcl/inc/vcl/pngwrite.hxx vcl/inc/vcl/salbtype.hxx vcl/inc/vcl/wall.hxx vcl/source/gdi/animate.cxx vcl/source/gdi/bitmap2.cxx vcl/source/gdi/bitmapex.cxx vcl/source/gdi/bmpconv.cxx vcl/source/gdi/cvtsvm.cxx vcl/source/gdi/impgraph.cxx vcl/source/gdi/impimagetree.cxx vcl/source/gdi/metaact.cxx vcl/source/gdi/wall.cxx Change-Id: I79938bc412c048c3d4e64f430f216e73bec16167
2013-06-12removed unused variable bSuppressRotationArmin Le Grand
(cherry picked from commit b7a63f1dc7c1ddab8092f1b7b9641923aa857579) Conflicts: filter/inc/filter/msfilter/escherex.hxx Change-Id: I66b664c26d5db2dae2deea36490350d40deb3ccd
2013-06-11Resolves: #i121183# enhance export of ppt hatch masterpagebackgroundArmin Le Grand
(cherry picked from commit 60f299f255a8a2fd2c4aabde6933d4388af3643b) Conflicts: filter/source/msfilter/escherex.cxx sd/source/filter/eppt/eppt.cxx sd/source/filter/eppt/eppt.hxx Change-Id: I62d772ab67ed03bfa964040bd07b3684cf2dee8f
2013-06-07share spPaperSizeTable ( and associated access code ) in msfilterNoel Power
PageSetup.PaperSize implementation more or less copy&pasted the papersize conversion code from oox, this is a followup to remove the duplication. ( Probably the binary filter could be converted to use this also saving yet another nearly similar implementation ) Change-Id: I479f0322163161f7819c5d650a9511910ac2e781
2013-06-05Resolves: #i119521# Layout is corrupted on opening PPTJianyuan Li
Reported by: Du Jing Patch by: Jianyuan Li Review by: sunying (cherry picked from commit 1231c27a8f1db5df57071d30e2105e25baf77730) Change-Id: Iaa02a98e0fe06a242d56a120ab5acb149ebb6045
2013-06-05Resolves: #i119860# fix bent connector's type lost when save .ppt fileSun Ying
Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li (cherry picked from commit 8037c7164c747ea240b563af39a11f4f6bf037ef) Conflicts: filter/source/msfilter/escherex.cxx Change-Id: Iee39fc5c95f354a6fe68cd93b69f40e01d9fa9f8
2013-05-31Resolves: #i119631# Teardrop shape cannot be shown correctly in pptxZhe Wang
* subversion/main/filter/inc/filter/msfilter/escherex.hxx * subversion/main/filter/source/msfilter/escherex.cxx []check whether one shape is default shape of ppt by shape type * subversion/main/svx/inc/svx/msdffdef.hxx * subversion/main/oox/source/drawingml/customshapegeometry.cxx * subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx []add definition and declaration for tear drop * subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx []the content of tear drop shape which incudes "path, adjust value, handle" Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by: Zong Dongjun <zongdongjun@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com> (cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6) Conflicts: filter/inc/filter/msfilter/escherex.hxx oox/source/drawingml/customshapegeometry.cxx svx/inc/svx/msdffdef.hxx Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0
2013-05-29Related: #i119628# Arrow shape changed is save doc file by AOOJianyuan Li
Reported by: Yan Ji Review by: sunying Patch by: Jianyuan Li (cherry picked from commit 43ff744cb9411b13860c3c57f7a052a6ab56001e) Conflicts: filter/source/msfilter/msdffimp.cxx Change-Id: I88ab49daa7b82b573eaf6a22eb4a2ce97b871027 Signed-off-by: Xisco Fauli <anistenis@gmail.com>
2013-05-27Resolves: #i120158# fix picture shadow lost after saved as doc in some caseLei De Bin
Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit fe549458ef04384ba777e4a36f34b68efc5b8b6d) Conflicts: filter/source/msfilter/msdffimp.cxx sw/source/filter/ww8/wrtw8esh.cxx Change-Id: I863ea7193f3dee563a892a6d857ee2385f58a862
2013-05-27Resolves: #i119753# fix audio video object lost when save .ppt fileSun Ying
Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li (cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939) Conflicts: filter/inc/filter/msfilter/escherex.hxx filter/source/msfilter/escherex.cxx Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
2013-05-25Resolves: #i119874 Fixed text alignment in RTL layoutCaolán McNamara
This reverts commit 979def88090633bfee0e0445b19999a1dac71ed4, this time manually confirmed that the import layout does change, but that it appears to be all desirable changes Change-Id: Iee5e5ebd16989f65569b02f8b4f6570985157dfc
2013-05-24Revert "Resolves: #i119874 Fixed text alignment in RTL layout."Caolán McNamara
This reverts commit 54c679f481647890f18151f4db05cfc3eff5d98b. pushed that too soon before verifying if it does what it says it does
2013-05-24Resolves: #i119874 Fixed text alignment in RTL layout.Andre Fischer
Reported by: Li Feng Wang Patch by: Jianyuan Li Review by: Andre Fischer (cherry picked from commit 57fdcdd79d1682ee7d5e88fbab3803631496afa2) Conflicts: filter/inc/filter/msfilter/svdfppt.hxx filter/source/msfilter/svdfppt.cxx Change-Id: I6adae6d40ff106caeea2b9310a57228257d79404 Related: #i119874# Missing part of patch. Patch by: Jianyuan Li (cherry picked from commit a7dc3e8b82c87b138c973f1434717d634ed8dc67) Change-Id: Icff3e1167ab780612ad47775aaa39c9baa99c70f
2013-05-23Resolves: #i119537# Fixed extrusion of custom shapes to XLSAndre Fischer
Reported by: Terry Yang Patch by: Jianyuan Li Review by: Andre Fischer (cherry picked from commit 8954201783be3d0479dfa2338116427a17f0dab4) Conflicts: filter/source/msfilter/msdffimp.cxx Change-Id: I994a2b14877c4e291d622665ec3f4a8ea9f3041b
2013-05-23Resolves: #i119903# Alternative text for form control t import/exportAndre Fischer
Patch by: Jianyuan Li review by: Andre Fischer (cherry picked from commit 0ecc381c85bd4192add692d26fc60ba8e6341fd9) Conflicts: filter/source/msfilter/msdffimp.cxx sc/source/filter/excel/xiescher.cxx sc/source/filter/inc/xiescher.hxx svx/inc/svx/msdffdef.hxx Change-Id: Iac7282e50fd86244381ca174ba3f906aab89c7d9
2013-05-22Use the new type-checking Reference constructor to reduce code noiseNoel Grandin
Also create a Clang compiler plugin to detect such cases. Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752 Reviewed-on: https://gerrit.libreoffice.org/4001 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2013-05-20WaE: use of unary operator that may be intended as compound assignmentTor Lillqvist
Change-Id: Ib1718e5d3a0f7f1e4d1941674743900be12d4e1f
2013-05-20Resolves: #i120554# Shape Gradient MS2003 import/export EnhancementJianyuan Li
Reported by: Jianyuan Li Patch by: Jianyuan Li Review by: SunYing (cherry picked from commit 09c33de80a0e5fa321979e53bf88c4d17271eba8) Conflicts: filter/inc/filter/msfilter/escherex.hxx filter/inc/filter/msfilter/msdffimp.hxx filter/source/msfilter/escherex.cxx filter/source/msfilter/msdffimp.cxx Change-Id: I80a60af4862eb99523ea59e4f788b685d6de1fbd WaE fixes: reorder initialization, handle all cases in switch, ... (cherry picked from commit 350f294badf378806348e77e6a8ed0b5f1d5b77d) Conflicts: filter/source/msfilter/msdffimp.cxx Change-Id: I4f1bde463921d48d1e014d0521427eaa9294663e Add default to switch statements to avoid compiler warnings. Patch by: Jianyuan Li (cherry picked from commit f1302af0d803ca969022e69bcf7deeb62459f789) Change-Id: I4e78e3b565d5922d452d2cfd1bf473af1587d29b
2013-05-20Resolves: #i121420# merge sidebar featureOliver-Rainer Wittmann
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
2013-05-19typoJulien Nabet
Change-Id: Ia0d96771a6ae97922b3ceedc1529829eb85d1fa2
2013-05-19Resolves: #i119885# corrected AutoGrowHeight setting...Armin Le Grand
when importing PPT text boxes (cherry picked from commit 887c740e39ec1d00366228aae49ef62087a6feb2) Change-Id: I27e6cd8c0d1f1a34fe0c17529451641e1de9953c
2013-05-19Resolves: #i119496# Correct flags AutoGrowWidth/Height for WordArtArmin Le Grand
Patch by: SunYing Review by: Jianyuan Li, alg(cherry picked from commit 3048c821bb664f39c7b5e2533af4568fbcd22f73) Change-Id: Ib0ea2de7699e94bda81768e210ad7d921aefce48
2013-05-19Resolves: #i119443# Import lines from ppt as one point connectorsArmin Le Grand
Patch by: Jianjuan Li Review by: alg (cherry picked from commit acd62709ad0d1d54764f00aabbd6c59ccb41a409) Change-Id: I1978444641d5f7c053dfae815096e7f2bacce15a
2013-05-19Resolves: #i119703# Corrected bound rect for ms graphic object...Armin Le Grand
export for grouped objects to reflect rotated sub-objects better (cherry picked from commit 6b30b279363793da14e320e7c0dc9bf8409da23c) Conflicts: filter/source/msfilter/eschesdo.cxx Change-Id: I39289c271bc13b1edd5922f53db968312a345fad
2013-05-18Resolves: #i119570# fix chaotically grouped object when importedJianyuan Li
Reported by: Du Jing Patch by: Jianyuan Li Review by: SunYing (cherry picked from commit cbdcdbffea20596ab0547fab57e601a9633fe2b8) Conflicts: filter/source/msfilter/msdffimp.cxx Change-Id: I8a6e87a949d1fe10b2e6c6c9a2a7be0da843eb5d
2013-05-18Resolves: #i120437# Connector corrections in groups and PPT importsArmin Le Grand
(cherry picked from commit b26e298d31cad25c326041287acb6544efac21c6) Conflicts: svx/source/svdraw/svdoedge.cxx Change-Id: Id4bed1c85bccdae878872557fd3e625d772228ff
2013-05-15Resolves: #i119493# Fixed import of tables with connectors.Andre Fischer
Reported by: liupingtan Patch by: SunYing Review by: Andre Fischer (cherry picked from commit 8be0972c9b38efbb43a0b8fc3658028ede58378c) Change-Id: Ic9a1325ccc9bc9c9a4501269df9de0f7e29a8e1d
2013-05-14sal_Int*/sal_uInt* to boolTakeshi Abe
Change-Id: I133445673895e26d6f19a7843f005dc13870f9ca
2013-05-12bnc#758621: Set the attribs for the entire para if a placeholder.Jan Holesovsky
Setting attributes for empty paragraphs does nothing, we have to apply it to the style directly. Change-Id: Id2a63c961e408906fa7c6457091405692262c6b7
2013-05-12bnc#758621: Kill unused aPlacementId, it is never set.Jan Holesovsky
Based on work of Felix Zhang <fezhang@suse.com>, thank you! Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
2013-05-10resolved fdo#35756 import more than 64k HTML table cellsEike Rathke
Enhanced EditEngine to be able to hold more than 64k paragraphs. Used also in RTF import Calc and Writer, so that could benefit as well. * changed all EditEngine,Outliner,... related paragraph index/count variables from sal_uInt16 to sal_Int32 * sal_Int32 instead of sal_uInt32 to match accessibility API * matched some Outliner methods' paragraph parameters from sal_uLong to sal_Int32 * containers capable to hold size_t nevertheless are limited to a maximum of sal_Int32 * changed definition of EE_PARA_NOT_FOUND and EE_PARA_ALL to SAL_MAX_INT32 + added EE_PARA_MAX_COUNT and EE_TEXTPOS_MAX_COUNT to initialize ESelection with what previously were hard coded 0xFFFF all over the place + for similar reason added EE_TEXTPOS_ALL corresponding to EE_PARA_ALL to initialize an ESelection spanning all available text like aSel(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL) Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00 Reviewed-on: https://gerrit.libreoffice.org/3838 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-05-09Related: #119477#, nBuStart is initialized as -1, an unsigned int is requiredXisco Fauli
Otherwise 65536 will be printed as the firt bullet Change-Id: Ie200c1c67a9b73321990a55940115ae30b9e7c37
2013-05-09#119477# fix bullet's start with error when save .ppt fileSun Ying
Reported by: Liu Ping Tan Patch by: Ying Sun Review by: Steve Yin.
2013-05-09make conversions between BitmapColor and sal_uInt8 explicitHerbert Dürr
Implicit conversions are a dangerous cause of confusion as seen in http://markmail.org/thread/a4copx2di7cxeowg and require tricky rewrites to work around them, this change cleans them up and disables them. (cherry picked from commit 2d9d5c8d6beb7fb0a7dafa0c1c4d10a25d7200fd) Conflicts: filter/source/graphicfilter/egif/egif.cxx filter/source/graphicfilter/epbm/epbm.cxx filter/source/graphicfilter/epgm/epgm.cxx filter/source/graphicfilter/ipbm/ipbm.cxx filter/source/graphicfilter/ipsd/ipsd.cxx sd/source/ui/slidesorter/view/SlsButtonBar.cxx svtools/source/filter/igif/gifread.cxx svtools/source/filter/jpeg/jpeg.cxx svtools/source/filter/wmf/winwmf.cxx svtools/source/graphic/grfmgr2.cxx vcl/inc/vcl/bmpacc.hxx vcl/inc/vcl/salbtype.hxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/outdev2.cxx Change-Id: I1d163c66782c2750aeee00725dbb2b614507c0d4 (cherry picked from commit ff80c37b18b941712fb967a0c1d48813b47c0583)
2013-05-06Revert "properly prefix graphic filter methods"Peter Foley
This reverts commit eacf12eeb174e35a301570726bf74434a4dd4b94. Appears to be broken. Conflicts: vcl/source/filter/graphicfilter.cxx Change-Id: I9ae3fbac2e7e9d08484c063cdb10e080ca89def2
2013-05-06fix typos (wich instead of which)Philipp Riemer