summaryrefslogtreecommitdiffstats
path: root/editeng
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/libreoffice-3-4'Jan Holesovsky2011-06-061-0/+16
|\ | | | | | | | | | | | | | | | | | | Conflicts: connectivity/qa/makefile.mk sfx2/source/appl/appdata.cxx sfx2/source/appl/appinit.cxx sfx2/source/inc/appdata.hxx sysui/desktop/productversion.mk xmloff/source/forms/elementimport.cxx
| * set all border lines, not only oneMarkus Mohrhard2011-05-271-0/+16
| | | | | | | | Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
* | Merge commit 'libreoffice-3.4.0.2'Jan Holesovsky2011-05-312-2/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: basic/source/app/app.cxx basic/source/runtime/iosys.cxx desktop/unx/source/start.c sfx2/source/appl/appdata.cxx sfx2/source/appl/appinit.cxx sfx2/source/inc/appdata.hxx svx/AllLangResTarget_svx.mk sysui/desktop/productversion.mk sysui/desktop/share/makefile.mk
| * Non-printable character.Kohei Yoshida2011-05-031-1/+1
| |
| * svx-fix-fit-to-frame-crash.diff: fix for crash on Windows (bnc#508621)Radek Doulik2011-04-281-1/+1
| | | | | | | | root cause unknown
| * fix-ppt-linespacing-import-export.diff: fix ppt import (bnc#355302)Radek Doulik2011-04-271-0/+15
| |
* | Merge remote-tracking branch 'origin/integration/dev300_m106'Jan Holesovsky2011-05-271-7/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: basic/source/classes/sbunoobj.cxx basic/source/inc/runtime.hxx basic/source/runtime/step1.cxx desktop/source/deployment/dp_services.cxx drawinglayer/prj/d.lst drawinglayer/source/primitive2d/makefile.mk sfx2/source/appl/appinit.cxx sfx2/source/appl/appquit.cxx sfx2/source/inc/appdata.hxx sfx2/source/view/viewfrm.cxx svx/source/fmcomp/gridctrl.cxx vbahelper/source/vbahelper/vbahelper.cxx
| * \ Merge commit 'ooo/DEV300_m106' into integration/dev300_m106Thorsten Behrens2011-04-281-7/+15
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx basic/inc/basic/sbxdef.hxx basic/source/classes/sbxmod.cxx basic/source/comp/makefile.mk basic/source/comp/sbcomp.cxx basic/source/inc/namecont.hxx basic/source/inc/scriptcont.hxx basic/source/runtime/methods.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step1.cxx basic/source/uno/namecont.cxx basic/util/makefile.mk connectivity/source/commontools/predicateinput.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/file/fcomp.cxx connectivity/source/drivers/jdbc/JConnection.cxx connectivity/source/drivers/odbcbase/OResultSet.cxx connectivity/source/drivers/odbcbase/OStatement.cxx connectivity/source/parse/sqlnode.cxx desktop/source/app/app.cxx drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx drawinglayer/source/processor2d/vclprocessor2d.cxx formula/inc/formula/token.hxx formula/source/core/api/token.cxx fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx fpicker/source/win32/filepicker/platform_vista.h framework/source/helper/persistentwindowstate.cxx framework/source/uielement/menubarmanager.cxx oovbaapi/ooo/vba/XFoundFiles.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/msforms/XCheckBox.idl oovbaapi/ooo/vba/msforms/XComboBox.idl oovbaapi/ooo/vba/msforms/XControl.idl oovbaapi/ooo/vba/msforms/XGroupBox.idl oovbaapi/ooo/vba/msforms/XLabel.idl oovbaapi/ooo/vba/msforms/XListBox.idl oovbaapi/ooo/vba/msforms/XNewFont.idl oovbaapi/ooo/vba/msforms/XRadioButton.idl oovbaapi/ooo/vba/msforms/XTextBox.idl oovbaapi/ooo/vba/msforms/XToggleButton.idl scripting/source/dlgprov/dlgevtatt.cxx sfx2/source/control/unoctitm.cxx sfx2/source/doc/objstor.cxx sfx2/source/doc/objxtor.cxx svx/inc/svx/svdograf.hxx svx/source/form/fmpage.cxx svx/source/form/fmpgeimp.cxx svx/source/svdraw/svdedtv.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdouno.cxx svx/source/xml/xmlgrhlp.cxx uui/source/iahndl-ssl.cxx vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/source/msforms/vbacombobox.cxx vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrols.cxx vbahelper/source/msforms/vbaframe.cxx vbahelper/source/msforms/vbaframe.hxx vbahelper/source/msforms/vbalabel.cxx vbahelper/source/msforms/vbalabel.hxx vbahelper/source/msforms/vbalistbox.cxx vbahelper/source/msforms/vbalistbox.hxx vbahelper/source/msforms/vbamultipage.cxx vbahelper/source/msforms/vbatogglebutton.cxx vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrols.hxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbawindowbase.cxx xmloff/source/meta/xmlmetai.cxx xmloff/source/style/PageMasterExportPropMapper.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/text/txtexppr.cxx xmloff/source/text/txtprmap.cxx
| | * CWS-TOOLING: integrate CWS dr78Vladimir Glazunov2011-03-211-7/+15
| | |\
| | | * dr78: rebase to DEV300_m101Daniel Rentz [dr]2011-02-28193-6523/+6060
| | | |\
| | | * | dr78: #i107201# find word boundaries in ImpInsertText only if online ↵Niklas Nebel2011-02-111-7/+15
| | | | | | | | | | | | | | | | | | | | spelling is active
| | | * | dr78: rebase to DEV300_m97Daniel Rentz [dr]2011-01-121-2/+2
| | | |\ \
| * | | | | i#20348: made the ordinal suffixe autocorrection internationalizedCédric Bosdonnat2011-04-071-34/+45
| | | | | |
| * | | | | removed mess added during the merge from libreoffice-3-3Petr Mladek2011-04-062-57/+3
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4Petr Mladek2011-04-052-3/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: basic/source/runtime/dllmgr.cxx drawinglayer/source/processor2d/vclpixelprocessor2d.cxx editeng/inc/editeng/boxitem.hxx editeng/source/items/frmitems.cxx sfx2/workben/custompanel/makefile.mk
| | * | | | | fdo#34226: Fixed BorderLine(2) convertion to SvxBorderLineCédric Bosdonnat2011-02-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Meeks <michael.meeks@novell.com> Signed-off-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: David Tardon <dtardon@redhat.com>
| | * | | | | handle css::table::BorderLine in addition to css::table::BorderLine2David Tardon2011-02-082-72/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That means that table cell properties are correctly set on OpenXML import again, whoo! Signed-off-by: Cédric Bosdonnat <cedricbosdo@openoffice.org>
| | * | | | | RTF: port last changes from CWSMiklos Vajna2010-11-304-13/+41
| | | | | | |
* | | | | | | return by ref instead of pointerCaolán McNamara2011-05-206-31/+28
| | | | | | |
* | | | | | | make this a singleton that dtors on desktop::terminationCaolán McNamara2011-05-201-1/+2
| | | | | | |
* | | | | | | valgrind: strange leak, bad merge maybeCaolán McNamara2011-05-201-5/+1
| | | | | | |
* | | | | | | make this a well-behaved singletonCaolán McNamara2011-05-201-10/+11
| | | | | | |
* | | | | | | adapt for singleton api changeCaolán McNamara2011-05-201-1/+1
| | | | | | |
* | | | | | | resolve merge conflictsCaolán McNamara2011-05-201-4/+4
| | | | | | |
* | | | | | | adjust for return by referenceCaolán McNamara2011-05-201-1/+1
| | | | | | |
* | | | | | | Unify Display Grid/ Grid Visible and other menu itemsChristian Dywan2011-05-181-1/+1
| | | | | | |
* | | | | | | avoid possible memory leakDavid Tardon2011-05-161-4/+5
| | | | | | |
* | | | | | | do not leak memoryDavid Tardon2011-05-161-9/+2
| | | | | | |
* | | | | | | do not leak memoryDavid Tardon2011-05-161-0/+1
| | | | | | |
* | | | | | | do not leak memoryDavid Tardon2011-05-161-0/+1
| | | | | | |
* | | | | | | external-apm-header.diff: fix WMF scaling in RTF import, n#417818Florian Reuter2011-05-041-2/+9
| | | | | | |
* | | | | | | bug id's from Oracle internal database removedJúlio Hoffimann2011-04-181-1/+1
| | | | | | |
* | | | | | | WaE in dbgutil modeCaolán McNamara2011-04-121-4/+4
| | | | | | |
* | | | | | | i#20348: made the ordinal suffixe autocorrection internationalizedCédric Bosdonnat2011-04-071-34/+45
| | | | | | |
* | | | | | | WaE: class vs structCaolán McNamara2011-04-071-1/+1
|/ / / / / /
* | | | | | change autofit feature so that it ignores trailing empty paragraphsRadek Doulik2011-03-308-6/+59
| | | | | |
* | | | | | drop bogus executable flag from idl/build/src and config filesFrancisco Saito2011-03-299-0/+0
| | | | | |
* | | | | | drop bogus executable flag from [ch]xx/bas/asm filesFrancisco Saito2011-03-29207-0/+0
| | | | | |
* | | | | | convert DBG_ assertions to OSL_David Tardon2011-03-292-117/+117
| | | | | |
* | | | | | convert DBG_ assertions to OSL_David Tardon2011-03-291-13/+12
| | | | | |
* | | | | | WaE: unused variableDavid Tardon2011-03-291-4/+0
| | | | | |
* | | | | | WaE: unused variableDavid Tardon2011-03-291-12/+0
| | | | | |
* | | | | | WaE: unused variableDavid Tardon2011-03-291-12/+0
| | | | | |
* | | | | | use PartialWeakComponentImplHelperX for overloaded-virtualDavid Tardon2011-03-281-1/+1
| | | | | |
* | | | | | add PartialWeakComponentImplHelperX for overloaded-virtualCaolán McNamara2011-03-281-1/+1
| | | | | |
* | | | | | use PartialWeakComponentImplHelperX for overloaded-virtualCaolán McNamara2011-03-281-1/+1
| | | | | |
* | | | | | Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windowsCédric Bosdonnat2011-03-287-165/+183
| | | | | |
* | | | | | set build depencencies against the new "translations" modulePetr Mladek2011-03-251-1/+1
| | | | | |
* | | | | | Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-coreJan Holesovsky2011-03-233-91/+122
|\ \ \ \ \ \
| * | | | | | global uno::Sequences are very problematic at shutdown timeCaolán McNamara2011-03-233-91/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because the underlying uno infrastructure has been shutdown already, we need to ensure their lifecycle more carefully.
generated by cgit (git 2.34.1) at 2024-08-28 20:59:14 +0000