Mathias Bauer
749c27fafb
CWS swlayoutrefactoring: fix merge conflicts
2011-02-09 15:55:27 +01:00
Mathias Bauer
53b8f0865f
CWS swlayoutrefactoring: resync to m100
2011-02-09 09:49:44 +01:00
Guillaume Poussel
7fecac774f
Remove bogus comments in writer.
2011-02-08 19:03:58 +01:00
Guillaume Poussel
2b0f7be0e3
Clean-up bogus comments in writer.
2011-02-08 18:49:16 +01:00
Carsten Driesner
40bb208a5d
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
2011-02-08 11:05:35 +01:00
Mikhail Voytenko
93c8eab829
removetooltypes01: #i112600# adjust rebase in sw
2011-02-07 16:48:14 +01:00
Carsten Driesner
a27e4b8ca5
removetooltypes01: Rebase to DEV300m99
2011-02-07 13:06:08 +01:00
shirahara
b7e0292a62
Remove comments (writer)
2011-02-03 09:26:50 +01:00
Thomas Arnhold
11670f4949
Remove double line spacing, unused code and some unnecessary brackets.
2011-01-29 15:39:56 +01:00
os
2d96b310b4
i#116420, fdo#33477: Implemented VertOrient on Writer table cell ranges
2011-01-28 13:19:20 +01:00
Frank Schoenheit [fs]
abb716d15e
undoapi: pulled and merged DEV300.m98
2011-01-28 11:44:02 +01:00
Caolán McNamara
0f2638cb1f
WaE: gcc 4.6.0 various warnings
2011-01-25 12:34:36 +00:00
Thomas Arnhold
5f8e1824c6
Remove OLD_INDEX directive.
2011-01-24 15:35:33 +01:00
Thomas Arnhold
5f1ec9bf73
Remove JP_DEBUG directive.
2011-01-24 10:37:11 +01:00
Carsten Driesner
6ef1b591fc
removetooltypes01: Rebase to DEV300m98
2011-01-21 17:18:37 +01:00
Michael Stahl
b359eb77b2
undoapi: fix 0-pointer in SwNodes::ChgNode that did not crash before by luck
2011-01-18 17:26:41 +01:00
Thomas Arnhold
1420bb328c
Remove duplicated includes and defines. Identified with "cat $i | grep '^#include' | sort | uniq -d".
2011-01-18 16:14:14 +01:00
Thomas Arnhold
b1059002cd
Remove some more dates..
2011-01-18 08:31:58 +01:00
Thomas Arnhold
9a9b5ec694
Remove dates and two unused code segments.
2011-01-18 08:19:55 +01:00
Thomas Arnhold
4395d24977
Remove dates and two sections of old code.
2011-01-17 21:50:08 +01:00
Thomas Arnhold
66f9ad3f69
Remove #refactorlists# comments.
2011-01-17 20:49:33 +01:00
Carsten Driesner
7f33ed417b
removetooltypes01: #i112600# Remove tools types from sw
2011-01-17 15:06:54 +01:00
Kayo Hamid
67bdb01f24
cppcheck: reduce variables scope
2011-01-08 21:56:24 -06:00
Mikhail Voytenko
e260bc4391
fwk162: merge to DEV300_m96
2011-01-03 13:57:25 +01:00
Mikhail Voytenko
07fa2a259a
fwk162: #i115902# review usage of SfxObjectShellRef, SfxObjecShellLock; remove unused some methods
2011-01-03 13:40:23 +01:00
Frank Schoenheit [fs]
5035c120da
undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system
2010-12-23 10:01:58 +01:00
Mathias Bauer
af69eeaeae
CWS swlayoutrefactoring: resync to m96, no conflict resolution
2010-12-21 20:49:11 +01:00
Mathias Bauer
09d6c9a395
CWS swlayoutrefactoring: #i115510#: use boost::noncopyable for SwClient; move some code from client iterations into SwClientNotify calls
2010-12-21 19:33:34 +01:00
Mathias Bauer
de60fd06b8
CWS swlayoutrefactoring: #i115510#: first step to clean up the SwClient mess
2010-12-17 09:02:23 +01:00
Michael Stahl
b28ffd0d44
undoapi: UndoCore.hxx: split out UndoSection.hxx
2010-12-15 09:14:18 +01:00
Michael Stahl
cab46df499
undoapi: UndoCore.hxx: split out UndoDelete.hxx
2010-12-15 09:14:18 +01:00
Michael Stahl
45a0fe36f1
undoapi: UndoCore.hxx: split out UndoRedline.hxx
2010-12-15 09:14:16 +01:00
Michael Stahl
b16214b411
undoapi: UndoCore.hxx: split out UndoTable.hxx
2010-12-15 09:14:15 +01:00
Michael Stahl
5ba8f48555
undoapi: move most of inc/undobj.hxx to source/core/inc/UndoCore.hxx
2010-12-15 09:14:14 +01:00
Michael Stahl
1ba0c18781
undoapi: #i115383#: derive sw::UndoManager from SfxUndoManager:
...
derive SwUndo from SfxUndoAction.
throw away most of docundo.cxx.
throw away SwUndoStart and SwUndoEnd.
replace SwUndoIter with sw::UndoRedoContext and sw::RepeatContext.
SwUndo::GetId() no longer public to prevent abuse.
add SwEditShell::HandleUndoRedoContext().
2010-12-15 09:14:11 +01:00
Michael Stahl
60d7850e64
undoapi: #i115383#: remove RemoveLastUndo() from IDocumentUndoRedo
2010-12-15 09:14:08 +01:00
Michael Stahl
8e7d7f0e14
undoapi: #i115383#: change return type of GetLastUndoInfo() to bool:
...
unfortunately several places need the ID, so add the ID as an out parameter.
a bool return is necessary in case the Undo action is not a writer action,
but created via the undo API.
2010-12-15 09:14:08 +01:00
Michael Stahl
d97bce1d29
undoapi: #i115383#: replace SwUndo->GetId() + static_cast with dynamic_cast:
...
the static_cast would become dangerous with SfxUndoManager.
also fix bogus cast in SwUndoTblCpyTbl::Undo(): happened to work by accident.
2010-12-15 09:14:07 +01:00
Michael Stahl
4b5b389708
undoapi: #i115383#: ensure that AppendUndo is only called when Undo is enabled:
...
SfxUndoManager differs from current AppendUndo() implementation here.
2010-12-15 09:14:06 +01:00
Michael Stahl
8fc6a5fc17
undoapi: #i114888#: move sw::UndoGuards:
...
in order to ensure that AppendUndo() is only called when Undo is enabled,
move some UndoGuards a couple lines downward.
2010-12-15 09:14:05 +01:00
Michael Stahl
44b1216c8f
undoapi: #i115383#: split up IDocumentUndoRedo::Get{Undo,Redo}Ids():
...
remove class SwUndoIdAndName and associated pointer abuse.
split up IDocumentUndoRedo::Get{Undo,Redo}Ids():
Get{LastUndo,FirstRedo,Repeat}Info() return string and ID for current action.
Get{Undo,Redo}Comments() return all Undo/Redo comments.
adapt SwEditShell interface as well.
2010-12-15 09:14:02 +01:00
Michael Stahl
1abef5bf64
undoapi: SwNodes: remove obsolete operator[](SwNodeIndex&)
2010-12-15 09:13:59 +01:00
Gert Faller
b343ca0dfb
change of __READONLY_DATA define to const
2010-12-12 10:15:19 +01:00
Michael Callahan
b76b4d9b64
remove obsolete __FAR_DATA
2010-12-06 10:36:22 +00:00
Mathias Bauer
112bfeec95
CWS gnumake2: resync to m94
2010-11-26 15:27:38 +01:00
Jan Holesovsky
1a6bf8c433
Merge remote branch 'origin/libreoffice-3-3'
...
Conflicts:
sw/inc/SwNumberTree.hxx
sw/inc/calbck.hxx
sw/inc/tox.hxx
sw/inc/viscrs.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/finalthreadmanager.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/text/makefile.mk
sw/source/core/txtnode/txtedt.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/srcedtw.cxx
2010-11-25 18:50:04 +01:00
Cédric Bosdonnat
c16ba8a04f
Removed DBG_UTIL from sw
...
* Fixed the different dbglevel builds
* This needed to change all the sw local ASSERT to OSL_ENSURE...
2010-11-25 17:12:34 +01:00
Michael Stahl
63b1df4f4c
unodapi: #i115383#: IDocumentUndoRedo: undo nodes array:
...
move the undo nodes array from SwDoc to sw::UndoManager.
replace GetUndoNds() with IsUndoNodes(), covering 90% of callers.
add sw::UndoManager::GetUndoNodes() for use by the Undo implementation itself.
remove unused horrible parameter from Writer::NewSwPaM().
2010-11-25 14:31:10 +01:00
Michael Stahl
56d8fb7501
unodapi: #i114888#: sw: clean up some more, using sw::UndoGuard.
...
note: some of this relies on ClearRedo() not checking DoesUndo().
2010-11-25 14:31:10 +01:00
Michael Stahl
c8c50a05e2
unodapi: #i115383#: clean up ClearRedo() usage:
...
ClearRedo() is already called by AppendUndo():
remove superfluous calls of ClearRedo.
implementation of ClearRedo() should not check DoesUndo();
that seems kinda pointless, and creates difficulties for refactoring.
2010-11-25 14:31:09 +01:00