summaryrefslogtreecommitdiff
path: root/filter/source
AgeCommit message (Collapse)AuthorFilesLines
2013-07-26targetted clean of redundant header piece from 62badf3828Michael Meeks12-36/+0
Change-Id: Ic1240114d667fb7797afae4847427cc889f3cb48 (cherry picked from commit 03993b47c522dcc71f7cd73ee21df3de9650080d)
2013-07-22fdo#66274: Saving document as RTF result in text 'Use Rich Text Format Format'Julien Nabet1-1/+1
Change-Id: Id617816c8530b7536238b5aa4a471c57a2a0b82e Reviewed-on: https://gerrit.libreoffice.org/4999 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5036
2013-06-28fdo#65123 Revert "n#782833: (PPT) Fix font size at end of para."David Tardon1-15/+0
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 (cherry picked from commit 2022c84d1e7e88e65243c6dfd1a62ec17f1361a1) Change-Id: I1d555cd2905ef8f297d1a96f56bebbea8f83ad62 Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4572 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-26Related: fdo#65716 title substitutionsCaolán McNamara1-0/+1
Change-Id: I1d9fe14cdfd77ef79089cdf9c20a876238862bae (cherry picked from commit 9102d2517007db3afa867a9902ca526153439eb5) Reviewed-on: https://gerrit.libreoffice.org/4519 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-06-07share spPaperSizeTable ( and associated access code ) in msfilterNoel Power1-0/+121
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 (cherry picked from commit c76974576aa5eec6b86af39eaaadc8e382f214bd)
2013-06-06Related: #i119628# Arrow shape changed is save doc file by AOOJianyuan Li1-7/+4
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> (cherry picked from commit 60790b3f0ccc1779bcff2ddcc278a9027aedabee)
2013-06-03re-base on ALv2 code. Includes:Michael Meeks1-24/+15
Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-05-27Resolves: #i119753# fix audio video object lost when save .ppt fileSun Ying1-25/+48
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 (cherry picked from commit c05c16635b15a47591faa737947c2dce3dcb863e)
2013-05-25Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style"Stephan Bergmann1-21/+42
This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at <http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again" appears to fix things again: The problem is that the implementation of the css.awt.UnoControlDialogModel involves UNO aggregation (IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in toolkit/soruce/helper/registerservices.cxx creating a OGeometryControlModel<UnoControlDialogModel> instance that aggregates a UnoControlDialogModel instance). That means that queryInterface can return a reference to something that is technically a different object, and that's what's happening here, and explains why calling setPropertyValue in two different ways on what logically appears to be a single object can end up calling two different implementations (of two different physical objects). (UNO aggregation is known to be broken and should not be used. Nevertheless, there's still code that does---code that is a horrible mess and hard to clean up.) That all this worked as intended in the past is just sheer luck, but any way of substantially touching it is asking for trouble. I'm going to revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again. I wasn't able to revert without also reverting be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert awt::XUnoControlDialog to new style," as the two were tightly dependant. Also reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431 "-Werror,-Wuninitialized" (sans the const-ness fix in UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452 "Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get CreateUnoDialog() work again." Conflicts: basctl/source/dlged/dlged.cxx filter/source/t602/t602filter.cxx xmlscript/test/imexp.cxx Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998 (cherry picked from commit e36f83d81c462e1a5959b160886e481a8d449494)
2013-05-21fdo#46808, Clean up old usages of ExtToolkitNoel Grandin1-6/+2
This service no longer exists in LO, and no-one seems to know what this service was, so convert it to use the awt::Toolkit service, since that service returns the interface the code expects. Change-Id: I761effbd49a9a3a15ec9c8716c72d4220a3e987e
2013-05-21fdo#46808, Convert awt::XUnoControlDialog to new styleNoel Grandin1-21/+7
Change-Id: I40d2e2ddd92186a2ba22ebfbdda8367391e8d355
2013-05-21fdo#46808, Convert awt::UnoControlDialogModel to new styleNoel Grandin1-18/+14
Change-Id: I4b912034ef3f4855b87d6d6f18ff13bd1ecc8f72
2013-05-20WaE: use of unary operator that may be intended as compound assignmentTor Lillqvist1-1/+1
Change-Id: Ib1718e5d3a0f7f1e4d1941674743900be12d4e1f
2013-05-20Resolves: #i120554# Shape Gradient MS2003 import/export EnhancementJianyuan Li2-89/+322
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 Wittmann1-3/+3
(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 Nabet1-1/+1
Change-Id: Ia0d96771a6ae97922b3ceedc1529829eb85d1fa2
2013-05-19Resolves: #i119885# corrected AutoGrowHeight setting...Armin Le Grand1-2/+6
when importing PPT text boxes (cherry picked from commit 887c740e39ec1d00366228aae49ef62087a6feb2) Change-Id: I27e6cd8c0d1f1a34fe0c17529451641e1de9953c
2013-05-19Resolves: #i119496# Correct flags AutoGrowWidth/Height for WordArtArmin Le Grand1-0/+4
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 Grand1-1/+6
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 Grand1-6/+128
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 Li1-1/+11
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 Grand1-1/+9
(cherry picked from commit b26e298d31cad25c326041287acb6544efac21c6) Conflicts: svx/source/svdraw/svdoedge.cxx Change-Id: Id4bed1c85bccdae878872557fd3e625d772228ff
2013-05-17fdo#37222 and possibly fdo#37219anuragkanungo7-1/+35
Added an checkbox option "View PDF after Export" in Export as Pdf Dialog Box . If a user ticks the checkbox , pdf file will be opened after export else only export will be done . Goto File > Export as PDF >> Tick the checkbox "View PDF after Export " to observe changes . There is a lot of space in between last checkbox and this ViewPDF checkbox , because if we open impress and check export as pdf , there are more options in the dialog. If user export PDF and check view PDF after export, the PDF file is added to recent documents of the OS . ( tested on opensuse) It will require make dev-install to work properly . Change-Id: I76611c0e3382e27289d648942a98b092edc430ae Reviewed-on: https://gerrit.libreoffice.org/3948 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-15Resolves: #i119493# Fixed import of tables with connectors.Andre Fischer1-0/+10
Reported by: liupingtan Patch by: SunYing Review by: Andre Fischer (cherry picked from commit 8be0972c9b38efbb43a0b8fc3658028ede58378c) Change-Id: Ic9a1325ccc9bc9c9a4501269df9de0f7e29a8e1d
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist6-28/+28
2013-05-14sal_Int*/sal_uInt* to boolTakeshi Abe1-5/+5
Change-Id: I133445673895e26d6f19a7843f005dc13870f9ca
2013-05-12bnc#758621: Set the attribs for the entire para if a placeholder.Jan Holesovsky1-0/+8
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 Holesovsky1-3/+0
Based on work of Felix Zhang <fezhang@suse.com>, thank you! Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
2013-05-12Quiet cppcheck + simplify/optimize a bitJulien Nabet1-13/+13
Change-Id: Ibb89a7e5b2889ae996684bf4d7664d1fd0cea8ba
2013-05-10resolved fdo#35756 import more than 64k HTML table cellsEike Rathke2-5/+5
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 Fauli1-3/+1
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 Ying1-13/+7
Reported by: Liu Ping Tan Patch by: Ying Sun Review by: Steve Yin.
2013-05-09Resolves: #i121233# Added bitmap scaling methods BMP_SCALE_SUPERArmin Le Grand1-1/+1
added from symphony, also BMP_SCALE_LANCZOS, BMP_SCALE_BICUBIC, BMP_SCALE_BILINEAR and BMP_SCALE_BOX. Changed defaults for internal scalings, enhanced PDF export when reduched DPI is used, added BMP_SCALE_BESTQUALITY and BMP_SCALE_FASTESTINTERPOLATE as new default for Bitmap::Scale (cherry picked from commit bf734a151dc5169b65cf5d2a127e4142b765326c) Conflicts: canvas/source/vcl/canvasbitmaphelper.cxx canvas/source/vcl/canvashelper.cxx sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmapex.hxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/impgraph.cxx vcl/source/gdi/pdfwriter_impl2.cxx vcl/source/helper/canvasbitmap.cxx (cherry picked from commit 593c86280b64d97725adde0c0a0cc4f090fb2310) Change-Id: I41cf0a7e11bdbc6510e22e762486420995ba739b
2013-05-09Drop String.AppendAscii from filterRicardo Montania2-20/+13
Change-Id: I73f61b9a20297b6b704aca52b1fc9efac563a224 Reviewed-on: https://gerrit.libreoffice.org/3799 Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com> Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-05-09make conversions between BitmapColor and sal_uInt8 explicitHerbert Dürr18-97/+93
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-08zlib: remove ExternalPackage_zlibMichael Stahl1-6/+0
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
2013-05-06Revert "properly prefix graphic filter methods"Peter Foley24-24/+111
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 Riemer2-3/+3
2013-05-06remove usage of RTL_CONSTASCII_USTRINGPARAMLuboš Luňák7-32/+32
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
2013-05-06Java cleanup, convert more Vector to ArrayListNoel Grandin1-1/+1
Change-Id: Icb807382eaf50f515f2c9dfada0c061414baed33
2013-05-05resurrect Macromedia Flash export dialogDavid Tardon2-2/+2
This has never been enabled during the open source history of openoffice.org . Yet we have been building the code and the resource file for it. Should I be surprised? Change-Id: Iba8262f125d0ea3a35fa7f256a3cdbd353e598bc
2013-05-02Resolves: #i119554# Fixed export of viewpoint property.Andre Fischer1-2/+2
Patch by: Lei Debin Reviewed by: Andre (cherry picked from commit 9667c78f99156ff4dd49002da270bc610bf75920) Change-Id: I993ee9497e5da5d0af499fcab1d203766a18a4a9
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks10-205/+70
2013-04-30Kill reams of duplicated code in svg export.Thorsten Behrens1-214/+26
Change-Id: I381b2c5859f00cdd27736c50b39c6c6e50e39890
2013-04-28coverity#988424: Logically dead codeJulien Nabet1-6/+0
Change-Id: I916d72cb1104a4d6109a3c5a3a74fb74cea74769
2013-04-26token id 0 has a special meaning in the hashFridrich Štrba1-1/+1
Change-Id: I380c0d7640a0047fa53770ddfb6150dd2e3b61be
2013-04-22Changed the MPL header from v1 to v2Marco Cecchetti1-12/+4
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks18-382/+87
2013-04-21fdo#62699 Remove a few more pass-through headersMichael Dunphy3-29/+2
Change-Id: I4cc2dc7f1da3bc15921939e3bd5908a3f7049eab Reviewed-on: https://gerrit.libreoffice.org/3492 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-20Remove pass-through header file sot/inc/sot/clsids.hxxMichael Dunphy2-2/+2
Change-Id: I122669d4ffaf72fb1d5f6fccc98e8a648f31aa23 Reviewed-on: https://gerrit.libreoffice.org/3490 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>