[ooo-build-commit] .: patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Feb 12 16:20:44 PST 2010
patches/dev300/writer-doc-comparison.diff | 504 +++++++++++++++++-------------
1 file changed, 301 insertions(+), 203 deletions(-)
New commits:
commit cbdcb30faa15c19fb926ccf533b4910d0f967d7a
Author: Thorsten Behrens <thb at openoffice.org>
Date: Sat Feb 13 01:16:20 2010 +0100
Updated, defuzzed, made work writer doc comp on 3.2
* patches/dev300/writer-doc-comparison.diff: updated patch
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index e511018..23cc606 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -10,8 +10,8 @@ From: Thorsten Behrens <thb at openoffice.org>
svx/inc/svx/rsiditem.hxx | 57 +
svx/inc/svx/svxenum.hxx | 6
svx/prj/d.lst | 1
- svx/source/dialog/treeopt.cxx | 1
- svx/source/dialog/treeopt.src | 1
+ svx/source/cui/treeopt.cxx | 1
+ svx/source/cui/treeopt.src | 1
svx/source/items/textitem.cxx | 39 +
sw/inc/cmdid.h | 1
sw/inc/doc.hxx | 10
@@ -21,12 +21,11 @@ From: Thorsten Behrens <thb at openoffice.org>
sw/inc/modcfg.hxx | 41 +
sw/inc/ndtxt.hxx | 7
sw/inc/swmodule.hxx | 10
- sw/inc/txatbase.hxx | 7
sw/inc/undobj.hxx | 1
sw/inc/unoprnms.hxx | 4
sw/source/core/bastyp/init.cxx | 11
sw/source/core/doc/doc.cxx | 73 ++
- sw/source/core/doc/doccomp.cxx | 966 +++++++++++++++++++-
+ sw/source/core/doc/doccomp.cxx | 968 +++++++++++++++++++-
sw/source/core/doc/docnew.cxx | 9
sw/source/core/edit/editsh.cxx | 9
sw/source/core/frmedt/fecopy.cxx | 21
@@ -39,7 +38,6 @@ From: Thorsten Behrens <thb at openoffice.org>
sw/source/filter/html/css1atr.cxx | 3
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/rtf/rtfatr.cxx | 3
- sw/source/filter/ww8/ww8atr.cxx | 3
sw/source/ui/app/appopt.cxx | 1
sw/source/ui/app/docsh.cxx | 3
sw/source/ui/app/swmodul1.cxx | 40 +
@@ -59,13 +57,14 @@ From: Thorsten Behrens <thb at openoffice.org>
xmloff/source/style/xmlbahdl.cxx | 42 +
xmloff/source/style/xmlbahdl.hxx | 12
xmloff/source/text/txtprmap.cxx | 8
- 59 files changed, 1967 insertions(+), 154 deletions(-)
- create mode 100644 helpcontent2/source/text/shared/optionen/comparisonopt.xhp
+ 52 files changed, 1876 insertions(+), 153 deletions(-)
create mode 100644 svx/inc/svx/rsiditem.hxx
---- officecfg/registry/schema/org/openoffice/Office/Writer.xcs.old 2009-10-31 19:21:45.000000000 +0100
-+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs 2009-10-31 19:23:18.000000000 +0100
+diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+index 8aeada7..102d287 100644
+--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2804,6 +2804,36 @@
</prop>
</group>
@@ -103,9 +102,11 @@ From: Thorsten Behrens <thb at openoffice.org>
<group oor:name="Insert">
<info>
<desc>Specifies the settings for inserting various object types.</desc>
---- svx/inc/svx/dialogs.hrc.old 2009-10-31 19:21:53.000000000 +0100
-+++ svx/inc/svx/dialogs.hrc 2009-10-31 19:23:18.000000000 +0100
-@@ -1570,6 +1570,7 @@
+diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
+index e3f6940..0e0421c 100644
+--- svx/inc/svx/dialogs.hrc
++++ svx/inc/svx/dialogs.hrc
+@@ -1573,6 +1573,7 @@
#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress
#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
@@ -113,8 +114,11 @@ From: Thorsten Behrens <thb at openoffice.org>
//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001
#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998)
---- svx/inc/svx/rsiditem.hxx.old 1970-01-01 01:00:00.000000000 +0100
-+++ svx/inc/svx/rsiditem.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git svx/inc/svx/rsiditem.hxx svx/inc/svx/rsiditem.hxx
+new file mode 100644
+index 0000000..53abf3d
+--- /dev/null
++++ svx/inc/svx/rsiditem.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
@@ -173,9 +177,11 @@ From: Thorsten Behrens <thb at openoffice.org>
+};
+
+#endif // _SVX_RSIDITEM_HXX
---- svx/inc/svx/svxenum.hxx.old 2009-08-11 10:10:21.000000000 +0200
-+++ svx/inc/svx/svxenum.hxx 2009-10-31 19:23:18.000000000 +0100
-@@ -217,5 +217,11 @@ enum SvxExtNumType
+diff --git svx/inc/svx/svxenum.hxx svx/inc/svx/svxenum.hxx
+index fecec0a..23ed61d 100644
+--- svx/inc/svx/svxenum.hxx
++++ svx/inc/svx/svxenum.hxx
+@@ -224,5 +224,11 @@ enum SvxExtNumType
SVX_NUM_CHARS_LOWER_LETTER_N
};
@@ -187,8 +193,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+};
#endif
---- svx/prj/d.lst.old 2009-10-31 19:21:53.000000000 +0100
-+++ svx/prj/d.lst 2009-10-31 19:23:18.000000000 +0100
+diff --git svx/prj/d.lst svx/prj/d.lst
+index 0d3a0f4..a34524b 100644
+--- svx/prj/d.lst
++++ svx/prj/d.lst
@@ -338,6 +338,7 @@ mkdir: %_DEST%\inc%_EXT%\svx
..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx
..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx
@@ -197,9 +205,11 @@ From: Thorsten Behrens <thb at openoffice.org>
..\inc\svx\widwitem.hxx %_DEST%\inc%_EXT%\svx\widwitem.hxx
..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
..\inc\svx\wrlmitem.hxx %_DEST%\inc%_EXT%\svx\wrlmitem.hxx
---- svx/source/cui/treeopt.cxx.old 2009-10-31 19:21:29.000000000 +0100
-+++ svx/source/cui/treeopt.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -440,6 +440,7 @@ static OptionsMapping_Impl __READONLY_DA
+diff --git svx/source/cui/treeopt.cxx svx/source/cui/treeopt.cxx
+index 4525b15..f3c4d3b 100644
+--- svx/source/cui/treeopt.cxx
++++ svx/source/cui/treeopt.cxx
+@@ -440,6 +440,7 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
{ "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE },
{ "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE },
{ "Writer", "Changes", RID_SW_TP_REDLINE_OPT },
@@ -207,8 +217,10 @@ From: Thorsten Behrens <thb at openoffice.org>
{ "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE },
{ "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE },
{ "Writer", "MailMerge", RID_SW_TP_MAILCONFIG },
---- svx/source/cui/treeopt.src.old 2009-10-31 19:21:29.000000000 +0100
-+++ svx/source/cui/treeopt.src 2009-10-31 19:23:18.000000000 +0100
+diff --git svx/source/cui/treeopt.src svx/source/cui/treeopt.src
+index 9d4a19c..9abe6be 100644
+--- svx/source/cui/treeopt.src
++++ svx/source/cui/treeopt.src
@@ -206,6 +206,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ;
< "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ;
@@ -217,8 +229,10 @@ From: Thorsten Behrens <thb at openoffice.org>
< "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
< "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
< "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
---- svx/source/items/textitem.cxx.old 2009-10-08 18:58:49.000000000 +0200
-+++ svx/source/items/textitem.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git svx/source/items/textitem.cxx svx/source/items/textitem.cxx
+index 8460558..0b1f41b 100644
+--- svx/source/items/textitem.cxx
++++ svx/source/items/textitem.cxx
@@ -81,7 +81,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <svx/unomid.hxx>
@@ -228,7 +242,7 @@ From: Thorsten Behrens <thb at openoffice.org>
#include "flstitem.hxx"
#include "fontitem.hxx"
#include <svx/postitem.hxx>
-@@ -167,7 +167,7 @@ TYPEINIT1_FACTORY(SvxScriptTypeItem, Sfx
+@@ -167,7 +167,7 @@ TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, sal_False, 0));
TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
TYPEINIT1_FACTORY(SvxCharReliefItem, SfxEnumItem, new SvxCharReliefItem(RELIEF_NONE, 0));
@@ -237,7 +251,7 @@ From: Thorsten Behrens <thb at openoffice.org>
TYPEINIT1(SvxScriptSetItem, SfxSetItem );
-@@ -3847,3 +3847,38 @@ short GetI18NScriptType( USHORT nItemTyp
+@@ -3847,3 +3847,38 @@ short GetI18NScriptType( USHORT nItemType )
}
return 0;
}
@@ -276,9 +290,11 @@ From: Thorsten Behrens <thb at openoffice.org>
+ return new SvxRsidItem( rIn, Which() );
+}
+
---- sw/inc/cmdid.h.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/inc/cmdid.h 2009-10-31 19:23:18.000000000 +0100
-@@ -1196,7 +1196,6 @@ Achtung: Ab sofort sind in diesem File k
+diff --git sw/inc/cmdid.h sw/inc/cmdid.h
+index 900a110..e42ce70 100644
+--- sw/inc/cmdid.h
++++ sw/inc/cmdid.h
+@@ -1196,7 +1196,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
// --> OD 2004-10-28 #i36248#
#define FN_SHAPE_STARTPOSITION_IN_HORI_L2R (FN_PARAM2+25)
#define FN_SHAPE_ENDPOSITION_IN_HORI_L2R (FN_PARAM2+26)
@@ -286,9 +302,11 @@ From: Thorsten Behrens <thb at openoffice.org>
// <--
/*--------------------------------------------------------------------
Bereich: Druckoptionen
---- sw/inc/doc.hxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/inc/doc.hxx 2009-10-31 19:23:18.000000000 +0100
-@@ -434,6 +434,9 @@ private:
+diff --git sw/inc/doc.hxx sw/inc/doc.hxx
+index 5052f96..2309d52 100644
+--- sw/inc/doc.hxx
++++ sw/inc/doc.hxx
+@@ -436,6 +436,9 @@ private:
RedlineMode_t eRedlineMode; // aktueller Redline Modus
SwCharCompressType eChrCmprType; // for ASIAN: compress punctuation/kana
@@ -298,7 +316,7 @@ From: Thorsten Behrens <thb at openoffice.org>
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
sal_Int8 nLockExpFld; // Wenn != 0 hat UpdateExpFlds() keine Wirkung
-@@ -752,6 +755,10 @@ public:
+@@ -754,6 +757,10 @@ public:
virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode );
virtual SwCharCompressType getCharacterCompressionType() const;
virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType );
@@ -309,7 +327,7 @@ From: Thorsten Behrens <thb at openoffice.org>
/** IDocumentDeviceAccess
*/
-@@ -909,6 +916,9 @@ public:
+@@ -911,6 +918,9 @@ public:
virtual bool Overwrite(const SwPaM &rRg, const String& rStr);
virtual bool InsertString(const SwPaM &rRg, const String&,
const enum InsertFlags nInsertMode = INS_EMPTYEXPAND );
@@ -319,8 +337,10 @@ From: Thorsten Behrens <thb at openoffice.org>
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const String& rGrfName, const String& rFltName, const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
---- sw/inc/globals.hrc.old 2009-05-20 15:27:37.000000000 +0200
-+++ sw/inc/globals.hrc 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/globals.hrc sw/inc/globals.hrc
+index 2216249..c8dedcd 100644
+--- sw/inc/globals.hrc
++++ sw/inc/globals.hrc
@@ -277,6 +277,7 @@
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
@@ -329,8 +349,10 @@ From: Thorsten Behrens <thb at openoffice.org>
//maximum: RC_GLOBALS_BEGIN + 119
#if STR_DOC_STAT > RC_GLOBALS_END
---- sw/inc/helpid.h.old 2009-05-20 15:27:37.000000000 +0200
-+++ sw/inc/helpid.h 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/helpid.h sw/inc/helpid.h
+index 3172447..b4afd73 100644
+--- sw/inc/helpid.h
++++ sw/inc/helpid.h
@@ -313,6 +313,7 @@
#define HID_TEXTGRID_PAGE (HID_BASE + 482)
#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483)
@@ -339,8 +361,10 @@ From: Thorsten Behrens <thb at openoffice.org>
// AutoPilot Help-IDs *********************************************************
---- sw/inc/hintids.hxx.old 2009-10-31 19:21:53.000000000 +0100
-+++ sw/inc/hintids.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/hintids.hxx sw/inc/hintids.hxx
+index 4181183..20b6296 100644
+--- sw/inc/hintids.hxx
++++ sw/inc/hintids.hxx
@@ -98,8 +98,8 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
RES_CHRATR_RELIEF, // 36
RES_CHRATR_HIDDEN, // 37
@@ -475,9 +499,7 @@ From: Thorsten Behrens <thb at openoffice.org>
RES_GRFATR_BEGIN = RES_FRMATR_END,
- RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN, // 121
- RES_GRFATR_CROPGRF, // 122
-+ RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN, // 122
-+ RES_GRFATR_CROPGRF, // 123
-
+-
- RES_GRFATR_ROTATION, // 123
- RES_GRFATR_LUMINANCE, // 124
- RES_GRFATR_CONTRAST, // 125
@@ -494,6 +516,9 @@ From: Thorsten Behrens <thb at openoffice.org>
- RES_GRFATR_DUMMY3, // 135
- RES_GRFATR_DUMMY4, // 136
- RES_GRFATR_DUMMY5, // 137
++ RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN, // 122
++ RES_GRFATR_CROPGRF, // 123
++
+ RES_GRFATR_ROTATION, // 124
+ RES_GRFATR_LUMINANCE, // 125
+ RES_GRFATR_CONTRAST, // 126
@@ -533,8 +558,10 @@ From: Thorsten Behrens <thb at openoffice.org>
RES_UNKNOWNATR_END
};
---- sw/inc/modcfg.hxx.old 2009-05-20 15:27:37.000000000 +0200
-+++ sw/inc/modcfg.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/modcfg.hxx sw/inc/modcfg.hxx
+index 8b5b1c7..c92520f 100644
+--- sw/inc/modcfg.hxx
++++ sw/inc/modcfg.hxx
@@ -41,6 +41,7 @@
#include "tblenum.hxx"
#include "itabenum.hxx"
@@ -543,7 +570,7 @@ From: Thorsten Behrens <thb at openoffice.org>
class SwModuleOptions;
//-----------------------------------------------------------------------------
-@@ -166,7 +167,27 @@ class SwMiscConfig : public utl::ConfigI
+@@ -166,7 +167,27 @@ class SwMiscConfig : public utl::ConfigItem
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -605,8 +632,10 @@ From: Thorsten Behrens <thb at openoffice.org>
};
#endif
---- sw/inc/ndtxt.hxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/inc/ndtxt.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/ndtxt.hxx sw/inc/ndtxt.hxx
+index e124aeb..2d05b82 100644
+--- sw/inc/ndtxt.hxx
++++ sw/inc/ndtxt.hxx
@@ -823,6 +823,13 @@ public:
bool IsCollapse() const;
@@ -621,8 +650,10 @@ From: Thorsten Behrens <thb at openoffice.org>
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
};
---- sw/inc/swmodule.hxx.old 2009-10-31 19:21:27.000000000 +0100
-+++ sw/inc/swmodule.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/swmodule.hxx sw/inc/swmodule.hxx
+index bdf5e54..76956af 100644
+--- sw/inc/swmodule.hxx
++++ sw/inc/swmodule.hxx
@@ -42,6 +42,7 @@
#include <fldupde.hxx>
#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
@@ -647,8 +678,10 @@ From: Thorsten Behrens <thb at openoffice.org>
// returne den definierten DocStat - WordDelimiter
const String& GetDocStatWordDelim() const;
---- sw/inc/undobj.hxx.old 2009-10-08 18:56:53.000000000 +0200
-+++ sw/inc/undobj.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/undobj.hxx sw/inc/undobj.hxx
+index f45806e..74ddf5b 100644
+--- sw/inc/undobj.hxx
++++ sw/inc/undobj.hxx
@@ -519,6 +519,7 @@ class SwUndoSplitNode: public SwUndo
xub_StrLen nCntnt;
BOOL bTblFlag : 1;
@@ -657,8 +690,10 @@ From: Thorsten Behrens <thb at openoffice.org>
public:
SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl );
virtual ~SwUndoSplitNode();
---- sw/inc/unoprnms.hxx.old 2009-10-31 19:21:44.000000000 +0100
-+++ sw/inc/unoprnms.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/inc/unoprnms.hxx sw/inc/unoprnms.hxx
+index 14338d4..23a9b6f 100644
+--- sw/inc/unoprnms.hxx
++++ sw/inc/unoprnms.hxx
@@ -810,7 +810,9 @@ enum SwPropNameIds
/* 0738 */ UNO_NAME_META, // #i91565#
/* 0739 */ UNO_NAME_IS_TEMPLATE,
@@ -670,8 +705,10 @@ From: Thorsten Behrens <thb at openoffice.org>
};
---- sw/source/core/bastyp/init.cxx.old 2009-10-19 10:54:28.000000000 +0200
-+++ sw/source/core/bastyp/init.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/bastyp/init.cxx sw/source/core/bastyp/init.cxx
+index b78699f..5a769aa 100644
+--- sw/source/core/bastyp/init.cxx
++++ sw/source/core/bastyp/init.cxx
@@ -138,6 +138,7 @@
#include <fmtfollowtextflow.hxx>
// OD 2004-05-05 #i28701#
@@ -726,8 +763,10 @@ From: Thorsten Behrens <thb at openoffice.org>
// --> OD 2008-02-19 #refactorlists#
aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, aEmptyStr );
aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 );
---- sw/source/core/doc/doc.cxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/source/core/doc/doc.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx
+index 8aa72ad..74a09c1 100644
+--- sw/source/core/doc/doc.cxx
++++ sw/source/core/doc/doc.cxx
@@ -35,6 +35,7 @@
#include <tools/shl.hxx>
@@ -744,7 +783,7 @@ From: Thorsten Behrens <thb at openoffice.org>
#include <unotools/charclass.hxx>
#include <swmodule.hxx>
#include <fmtpdsc.hxx>
-@@ -413,6 +415,33 @@ void SwDoc::setLinkUpdateMode( /*[in]*/s
+@@ -414,6 +416,33 @@ void SwDoc::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
nLinkUpdMode = eMode;
}
@@ -778,7 +817,7 @@ From: Thorsten Behrens <thb at openoffice.org>
SwFldUpdateFlags SwDoc::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
{
SwFldUpdateFlags eRet = eFldUpdMode;
-@@ -656,6 +685,15 @@ bool SwDoc::SplitNode( const SwPosition
+@@ -657,6 +686,15 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
}
}
@@ -794,7 +833,7 @@ From: Thorsten Behrens <thb at openoffice.org>
//JP 28.01.97: Sonderfall fuer SplitNode am Tabellenanfang:
// steht die am Doc/Fly/Footer/..-Anfang oder direkt
// hinter einer Tabelle, dann fuege davor
-@@ -997,6 +1035,41 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPa
+@@ -998,6 +1036,41 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
pFrmFmt );
}
@@ -807,8 +846,8 @@ From: Thorsten Behrens <thb at openoffice.org>
+ }
+
+ SvxRsidItem aRsid( nRsid, RES_CHRATR_RSID );
-+ SwTxtAttr* pAttr = pTxtNode->MakeTxtAttr( aRsid, nStt, nEnd );
-+ return pTxtNode->Insert( pAttr, INS_DEFAULT );
++ SwTxtAttr* pAttr = MakeTxtAttr( *this, aRsid, nStt, nEnd );
++ return pTxtNode->InsertHint( pAttr, INS_DEFAULT );
+}
+
+// Set the rsid of the next nLen symbols of rRg to the current session number
@@ -836,8 +875,10 @@ From: Thorsten Behrens <thb at openoffice.org>
/*************************************************************************
|* SwDoc::GetFldType()
|* Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
---- sw/source/core/doc/doccomp.cxx.old 2009-10-08 18:56:53.000000000 +0200
-+++ sw/source/core/doc/doccomp.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/doc/doccomp.cxx sw/source/core/doc/doccomp.cxx
+index 5fa7731..1a3ed81 100644
+--- sw/source/core/doc/doccomp.cxx
++++ sw/source/core/doc/doccomp.cxx
@@ -38,7 +38,9 @@
#include <svx/crsditem.hxx>
#include <svx/colritem.hxx>
@@ -1008,7 +1049,7 @@ From: Thorsten Behrens <thb at openoffice.org>
// ====================================================================
CompareLine::~CompareLine() {}
-@@ -262,24 +410,21 @@ ULONG CompareData::ShowDiffs( const Comp
+@@ -262,24 +410,21 @@ ULONG CompareData::ShowDiffs( const CompareData& rData )
{
if( rData.GetChanged( nStt1 ) || GetChanged( nStt2 ) )
{
@@ -1041,7 +1082,7 @@ From: Thorsten Behrens <thb at openoffice.org>
return nCnt;
}
-@@ -450,8 +595,6 @@ Compare::Compare( ULONG nDiff, CompareDa
+@@ -450,8 +595,6 @@ Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
delete pMD2;
}
@@ -1059,7 +1100,7 @@ From: Thorsten Behrens <thb at openoffice.org>
// ----------------------------------------------------------------------
// Suche die verschobenen Lines
-@@ -979,7 +1122,8 @@ BOOL SwCompareLine::CompareNode( const S
+@@ -979,7 +1122,8 @@ BOOL SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
switch( rDstNd.GetNodeType() )
{
case ND_TEXTNODE:
@@ -1069,7 +1110,7 @@ From: Thorsten Behrens <thb at openoffice.org>
break;
case ND_TABLENODE:
-@@ -1131,6 +1275,7 @@ BOOL SwCompareLine::CompareTxtNd( const
+@@ -1131,6 +1275,7 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
const SwTxtNode& rSrcNd )
{
BOOL bRet = FALSE;
@@ -1077,7 +1118,7 @@ From: Thorsten Behrens <thb at openoffice.org>
// erstmal ganz einfach!
if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
{
-@@ -1143,70 +1288,128 @@ BOOL SwCompareLine::CompareTxtNd( const
+@@ -1143,70 +1288,128 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const
@@ -1095,18 +1136,29 @@ From: Thorsten Behrens <thb at openoffice.org>
+ SwDoc* pDstDoc = rDstNd.GetDoc();
+
+ int nLcsLen = 0;
-+
+
+- xub_StrLen nDEnd = rDestNd.GetTxt().Len(), nSEnd = rSrcNd.GetTxt().Len();
+- xub_StrLen nStt;
+- xub_StrLen nEnd;
+ int nDstLen = rDstNd.GetTxt().Len();
+ int nSrcLen = rSrcNd.GetTxt().Len();
-+
+
+- for( nStt = 0, nEnd = Min( nDEnd, nSEnd ); nStt < nEnd; ++nStt )
+- if( rDestNd.GetTxt().GetChar( nStt ) !=
+- rSrcNd.GetTxt().GetChar( nStt ) )
+- break;
+ int nMinLen = std::min( nDstLen , nSrcLen );
+ int nAvgLen = ( nDstLen + nSrcLen )/2;
+
+ int *pLcsDst = new int[ nMinLen + 1 ];
+ int *pLcsSrc = new int[ nMinLen + 1 ];
-+
+
+- while( nStt < nDEnd && nStt < nSEnd )
+ if( CmpOptions.eCmpMode == SVX_CMP_BY_WORD )
-+ {
+ {
+- --nDEnd, --nSEnd;
+- if( rDestNd.GetTxt().GetChar( nDEnd ) !=
+- rSrcNd.GetTxt().GetChar( nSEnd ) )
+ int *pTmpLcsDst = new int[ nMinLen + 1 ];
+ int *pTmpLcsSrc = new int[ nMinLen + 1 ];
+
@@ -1115,21 +1167,7 @@ From: Thorsten Behrens <thb at openoffice.org>
+ LgstCommonSubseq aSeq( aCmp );
+
+ nLcsLen = aSeq.Find( pTmpLcsDst, pTmpLcsSrc );
-
-- xub_StrLen nDEnd = rDestNd.GetTxt().Len(), nSEnd = rSrcNd.GetTxt().Len();
-- xub_StrLen nStt;
-- xub_StrLen nEnd;
--
-- for( nStt = 0, nEnd = Min( nDEnd, nSEnd ); nStt < nEnd; ++nStt )
-- if( rDestNd.GetTxt().GetChar( nStt ) !=
-- rSrcNd.GetTxt().GetChar( nStt ) )
-- break;
--
-- while( nStt < nDEnd && nStt < nSEnd )
-- {
-- --nDEnd, --nSEnd;
-- if( rDestNd.GetTxt().GetChar( nDEnd ) !=
-- rSrcNd.GetTxt().GetChar( nSEnd ) )
++
+ if( CmpOptions.nIgnoreLen )
{
- ++nDEnd, ++nSEnd;
@@ -1142,12 +1180,6 @@ From: Thorsten Behrens <thb at openoffice.org>
- if( nStt || !nDEnd || !nSEnd || nDEnd < rDestNd.GetTxt().Len() ||
- nSEnd < rSrcNd.GetTxt().Len() )
-- {
-- // jetzt ist zwischen nStt bis nDEnd das neu eingefuegte
-- // und zwischen nStt und nSEnd das geloeschte
-- SwDoc* pDoc = rDestNd.GetDoc();
-- SwPaM aPam( rDestNd, nDEnd );
-- if( nStt != nDEnd )
+ nLcsLen = aCmp.GetCharSequence( pTmpLcsDst, pTmpLcsSrc,
+ pLcsDst, pLcsSrc, nLcsLen );
+
@@ -1173,7 +1205,12 @@ From: Thorsten Behrens <thb at openoffice.org>
+ int nSqSum = 0;
+ int nCnt = 1;
+ for( int i = 0; i < nLcsLen; i++ )
-+ {
+ {
+- // jetzt ist zwischen nStt bis nDEnd das neu eingefuegte
+- // und zwischen nStt und nSEnd das geloeschte
+- SwDoc* pDoc = rDestNd.GetDoc();
+- SwPaM aPam( rDestNd, nDEnd );
+- if( nStt != nDEnd )
+ if( i != nLcsLen - 1 && pLcsDst[i] + 1 == pLcsDst[i + 1]
+ && pLcsSrc[i] + 1 == pLcsSrc[i + 1] )
+ {
@@ -1250,7 +1287,7 @@ From: Thorsten Behrens <thb at openoffice.org>
if( rpInsRing )
{
-@@ -1215,9 +1418,14 @@ BOOL SwCompareLine::ChangesInLine( const
+@@ -1215,9 +1418,14 @@ BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
*pCorr->GetPoint() = *pTmp->GetMark();
}
}
@@ -1266,19 +1303,11 @@ From: Thorsten Behrens <thb at openoffice.org>
return bRet;
}
-@@ -1396,15 +1604,52 @@ void SwCompareData::CheckForChangesInLin
+@@ -1396,15 +1604,52 @@ void SwCompareData::CheckForChangesInLine( const CompareData& rData,
ULONG& rStt, ULONG& rEnd,
ULONG& rThisStt, ULONG& rThisEnd )
{
- while( rStt < rEnd && rThisStt < rThisEnd )
-- {
-- SwCompareLine* pDstLn = (SwCompareLine*)GetLine( rThisStt );
-- SwCompareLine* pSrcLn = (SwCompareLine*)rData.GetLine( rStt );
-- if( !pDstLn->ChangesInLine( *pSrcLn, pInsRing, pDelRing ) )
-- break;
--
-- ++rStt;
-- ++rThisStt;
+ LineArrayComparator aCmp( (CompareData&)*this, rData, rThisStt, rThisEnd,
+ rStt, rEnd );
+
@@ -1289,7 +1318,14 @@ From: Thorsten Behrens <thb at openoffice.org>
+ FastCommonSubseq subseq( aCmp );
+ int nLcsLen = subseq.Find( pLcsDst, pLcsSrc );
+ for (int i = 0; i <= nLcsLen; i++)
-+ {
+ {
+- SwCompareLine* pDstLn = (SwCompareLine*)GetLine( rThisStt );
+- SwCompareLine* pSrcLn = (SwCompareLine*)rData.GetLine( rStt );
+- if( !pDstLn->ChangesInLine( *pSrcLn, pInsRing, pDelRing ) )
+- break;
+-
+- ++rStt;
+- ++rThisStt;
+ // Beginning of inserted lines (inclusive)
+ int nDstFrom = i ? pLcsDst[i - 1] + 1 : 0;
+ // End of inserted lines (exclusive)
@@ -1328,7 +1364,7 @@ From: Thorsten Behrens <thb at openoffice.org>
}
}
-@@ -1531,6 +1776,29 @@ long SwDoc::CompareDoc( const SwDoc& rDo
+@@ -1531,6 +1776,29 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
long nRet = 0;
@@ -1358,12 +1394,12 @@ From: Thorsten Behrens <thb at openoffice.org>
StartUndo(UNDO_EMPTY, NULL);
BOOL bDocWasModified = IsModified();
SwDoc& rSrcDoc = (SwDoc&)rDoc;
-@@ -1826,4 +2094,576 @@ long SwDoc::MergeDoc( const SwDoc& rDoc
+@@ -1826,4 +2094,576 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
return nRet;
}
+// LineArrayComparator ---------------------------------------------------------
-
++
+LineArrayComparator::LineArrayComparator( const CompareData &rD1,
+ const CompareData &rD2, int nStt1,
+ int nEnd1, int nStt2, int nEnd2 )
@@ -1670,7 +1706,7 @@ From: Thorsten Behrens <thb at openoffice.org>
+}
+
+// LgstCommonSubseq ------------------------------------------------------------
-+
+
+LgstCommonSubseq::LgstCommonSubseq( ArrayComparator &rComparator )
+ : CommonSubseq( rComparator, CUTOFF )
+{
@@ -1935,8 +1971,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+
+ return nLen + nCutBeg + nCutEnd;
+}
---- sw/source/core/doc/docnew.cxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/source/core/doc/docnew.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/doc/docnew.cxx sw/source/core/doc/docnew.cxx
+index 2c9fb54..6c7f632 100644
+--- sw/source/core/doc/docnew.cxx
++++ sw/source/core/doc/docnew.cxx
@@ -43,6 +43,7 @@
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
@@ -1960,9 +1998,11 @@ From: Thorsten Behrens <thb at openoffice.org>
ResetModified();
}
---- sw/source/core/edit/editsh.cxx.old 2009-10-08 18:56:53.000000000 +0200
-+++ sw/source/core/edit/editsh.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -124,6 +124,13 @@ void SwEditShell::Insert2(const String &
+diff --git sw/source/core/edit/editsh.cxx sw/source/core/edit/editsh.cxx
+index 8e79603..ed5de92 100644
+--- sw/source/core/edit/editsh.cxx
++++ sw/source/core/edit/editsh.cxx
+@@ -124,6 +124,13 @@ void SwEditShell::Insert2(const String &rStr, const bool bForceExpandHints )
ASSERT( bSuccess, "Doc->Insert() failed." );
(void) bSuccess;
@@ -1976,7 +2016,7 @@ From: Thorsten Behrens <thb at openoffice.org>
SaveTblBoxCntnt( _pStartCrsr->GetPoint() );
} while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr );
-@@ -206,7 +213,7 @@ long SwEditShell::SplitNode( BOOL bAutoF
+@@ -206,7 +213,7 @@ long SwEditShell::SplitNode( BOOL bAutoFormat, BOOL bCheckTableStart )
StartAllAction();
GetDoc()->StartUndo(UNDO_EMPTY, NULL);
@@ -1985,9 +2025,11 @@ From: Thorsten Behrens <thb at openoffice.org>
// eine Tabellen Zelle wird jetzt zu einer normalen Textzelle!
GetDoc()->ClearBoxNumAttrs( PCURCRSR->GetPoint()->nNode );
GetDoc()->SplitNode( *PCURCRSR->GetPoint(), bCheckTableStart );
---- sw/source/core/frmedt/fecopy.cxx.old 2009-10-08 18:56:53.000000000 +0200
-+++ sw/source/core/frmedt/fecopy.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -1049,11 +1049,12 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, B
+diff --git sw/source/core/frmedt/fecopy.cxx sw/source/core/frmedt/fecopy.cxx
+index bc66235..0b96f86 100644
+--- sw/source/core/frmedt/fecopy.cxx
++++ sw/source/core/frmedt/fecopy.cxx
+@@ -1049,11 +1049,12 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
// es wird mehr als 1 Node in die akt. Box kopiert. Dann
// muessen die BoxAttribute aber entfernt werden.
GetDoc()->ClearBoxNumAttrs( rInsPos.nNode );
@@ -2002,7 +2044,7 @@ From: Thorsten Behrens <thb at openoffice.org>
{
SwNodeIndex aIndexBefore(rInsPos.nNode);
-@@ -1070,6 +1071,22 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, B
+@@ -1070,6 +1071,22 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
}
}
@@ -2025,9 +2067,11 @@ From: Thorsten Behrens <thb at openoffice.org>
SaveTblBoxCntnt( &rInsPos );
if(bIncludingPageFrames && bStartWithTable)
{
---- sw/source/core/text/atrstck.cxx.old 2009-10-19 10:54:28.000000000 +0200
-+++ sw/source/core/text/atrstck.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -126,8 +126,8 @@ const BYTE StackPos[ static_cast<USHORT>
+diff --git sw/source/core/text/atrstck.cxx sw/source/core/text/atrstck.cxx
+index 4ac576d..76a80fd 100644
+--- sw/source/core/text/atrstck.cxx
++++ sw/source/core/text/atrstck.cxx
+@@ -126,8 +126,8 @@ const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) -
33, // RES_CHRATR_RELIEF, // 36
34, // RES_CHRATR_HIDDEN, // 37
35, // RES_CHRATR_OVERLINE, // 38
@@ -2038,8 +2082,10 @@ From: Thorsten Behrens <thb at openoffice.org>
36, // RES_TXTATR_REFMARK, // 41
37, // RES_TXTATR_TOXMARK, // 42
38, // RES_TXTATR_META, // 43
---- sw/source/core/txtnode/ndtxt.cxx.old 2009-10-19 10:54:28.000000000 +0200
-+++ sw/source/core/txtnode/ndtxt.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/ndtxt.cxx
+index 84e650d..958d7df 100644
+--- sw/source/core/txtnode/ndtxt.cxx
++++ sw/source/core/txtnode/ndtxt.cxx
@@ -37,6 +37,7 @@
#include <svx/brkitem.hxx>
#include <svx/escpitem.hxx>
@@ -2048,7 +2094,7 @@ From: Thorsten Behrens <thb at openoffice.org>
// --> OD 2008-01-17 #newlistlevelattrs#
#include <svx/tstpitem.hxx>
// <--
-@@ -4957,7 +4958,45 @@ USHORT SwTxtNode::ResetAllAttr()
+@@ -4958,7 +4959,45 @@ USHORT SwTxtNode::ResetAllAttr()
return nRet;
}
@@ -2095,9 +2141,11 @@ From: Thorsten Behrens <thb at openoffice.org>
// sw::Metadatable
---- sw/source/core/undo/unspnd.cxx.old 2009-08-11 10:11:12.000000000 +0200
-+++ sw/source/core/undo/unspnd.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -76,6 +76,8 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc*
+diff --git sw/source/core/undo/unspnd.cxx sw/source/core/undo/unspnd.cxx
+index 0e39363..8dc714b 100644
+--- sw/source/core/undo/unspnd.cxx
++++ sw/source/core/undo/unspnd.cxx
+@@ -76,6 +76,8 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, pDoc->GetRedlineAuthor() );
SetRedlineMode( pDoc->GetRedlineMode() );
}
@@ -2106,7 +2154,7 @@ From: Thorsten Behrens <thb at openoffice.org>
}
-@@ -157,6 +159,8 @@ void SwUndoSplitNode::Undo( SwUndoIter&
+@@ -157,6 +159,8 @@ void SwUndoSplitNode::Undo( SwUndoIter& rUndoIter )
pDoc->RstTxtAttrs( rPam, TRUE );
pHistory->TmpRollback( pDoc, 0, false );
}
@@ -2115,9 +2163,11 @@ From: Thorsten Behrens <thb at openoffice.org>
}
}
---- sw/source/core/unocore/unomap.cxx.old 2009-10-31 19:21:44.000000000 +0100
-+++ sw/source/core/unocore/unomap.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -104,6 +104,7 @@ SwUnoPropertyMapProvider::~SwUnoProperty
+diff --git sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unomap.cxx
+index a3cd81f..ac4bf1e 100644
+--- sw/source/core/unocore/unomap.cxx
++++ sw/source/core/unocore/unomap.cxx
+@@ -104,6 +104,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
{ SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
{ SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
@@ -2125,7 +2175,7 @@ From: Thorsten Behrens <thb at openoffice.org>
{ SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
#define _CJK_FONT_PROPERTIES \
-@@ -177,6 +178,7 @@ SwUnoPropertyMapProvider::~SwUnoProperty
+@@ -177,6 +178,7 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
// UNO_NAME_BREAK_TYPE and UNO_NAME_PAGE_DESC_NAME which can not be used
// by the SwXTextTableCursor
#define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \
@@ -2133,19 +2183,23 @@ From: Thorsten Behrens <thb at openoffice.org>
{ SW_PROP_NMID(UNO_NAME_PARA_IS_HYPHENATION), RES_PARATR_HYPHENZONE, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN }, \
{ SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS), RES_PARATR_HYPHENZONE, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD }, \
{ SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS), RES_PARATR_HYPHENZONE, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL }, \
---- sw/source/core/unocore/unoprnms.cxx.old 2009-10-31 19:21:44.000000000 +0100
-+++ sw/source/core/unocore/unoprnms.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unoprnms.cxx
+index 85ff600..27814d7 100644
+--- sw/source/core/unocore/unoprnms.cxx
++++ sw/source/core/unocore/unoprnms.cxx
@@ -783,6 +783,8 @@ const SwPropNameTab aPropNameTab = {
/* 0738 UNO_NAME_META */ {MAP_CHAR_LEN("InContentMetadata")},
/* 0739 UNO_NAME_IS_TEMPLATE */ {MAP_CHAR_LEN("IsTemplate")},
/* 0740 UNO_NAME_VBA_DOCOBJ */ {MAP_CHAR_LEN("ThisVBADocObj")},
-+/* 0741 UNO_NAME_RSID */ {MAP_CHAR_LEN("Rsid")},
-+/* 0742 UNO_NAME_PARRSID */ {MAP_CHAR_LEN("ParRsid")},
++/* 0741 UNO_NAME_RSID */ {MAP_CHAR_LEN("Rsid")},
++/* 0742 UNO_NAME_PARRSID */ {MAP_CHAR_LEN("ParRsid")},
+
};
- const SwPropNameLen& SwGetPropName( USHORT nId )
---- sw/source/filter/ascii/parasc.cxx.old 2009-10-08 18:56:54.000000000 +0200
-+++ sw/source/filter/ascii/parasc.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/filter/ascii/parasc.cxx sw/source/filter/ascii/parasc.cxx
+index b713190..9ca1cb7 100644
+--- sw/source/filter/ascii/parasc.cxx
++++ sw/source/filter/ascii/parasc.cxx
@@ -529,6 +529,9 @@ ULONG SwASCIIParser::ReadChars()
void SwASCIIParser::InsertText( const String& rStr )
{
@@ -2156,8 +2210,10 @@ From: Thorsten Behrens <thb at openoffice.org>
if( pItemSet && pBreakIt && nScript != ( SCRIPTTYPE_LATIN |
SCRIPTTYPE_ASIAN |
SCRIPTTYPE_COMPLEX ) )
---- sw/source/filter/html/css1atr.cxx.old 2009-10-19 10:54:28.000000000 +0200
-+++ sw/source/filter/html/css1atr.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/filter/html/css1atr.cxx sw/source/filter/html/css1atr.cxx
+index 38f82ba..30cb06b 100644
+--- sw/source/filter/html/css1atr.cxx
++++ sw/source/filter/html/css1atr.cxx
@@ -3752,8 +3752,8 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_CHRATR_RELIEF */ 0,
/* RES_CHRATR_HIDDEN */ 0,
@@ -2176,8 +2232,10 @@ From: Thorsten Behrens <thb at openoffice.org>
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
---- sw/source/filter/html/htmlatr.cxx.old 2009-10-19 10:54:28.000000000 +0200
-+++ sw/source/filter/html/htmlatr.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlatr.cxx
+index 45e5ce7..e094a72 100644
+--- sw/source/filter/html/htmlatr.cxx
++++ sw/source/filter/html/htmlatr.cxx
@@ -3388,8 +3388,8 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_CHRATR_RELIEF */ 0,
/* RES_CHRATR_HIDDEN */ 0,
@@ -2188,8 +2246,10 @@ From: Thorsten Behrens <thb at openoffice.org>
/* RES_TXTATR_REFMARK */ 0,
/* RES_TXTATR_TOXMARK */ 0,
---- sw/source/filter/rtf/rtfatr.cxx.old 2009-10-31 19:21:45.000000000 +0100
-+++ sw/source/filter/rtf/rtfatr.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/filter/rtf/rtfatr.cxx sw/source/filter/rtf/rtfatr.cxx
+index bbe9030..faeb5ed 100644
+--- sw/source/filter/rtf/rtfatr.cxx
++++ sw/source/filter/rtf/rtfatr.cxx
@@ -4248,8 +4248,8 @@ SwAttrFnTab aRTFAttrFnTab = {
/* RES_CHRATR_RELIEF */ OutRTF_SwCharRelief,
/* RES_CHRATR_HIDDEN */ OutRTF_SvxCharHiddenItem,
@@ -2208,9 +2268,11 @@ From: Thorsten Behrens <thb at openoffice.org>
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
---- sw/source/ui/app/appopt.cxx.old 2009-10-31 19:21:27.000000000 +0100
-+++ sw/source/ui/app/appopt.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -612,6 +612,7 @@ SfxTabPage* SwModule::CreateTabPage( USH
+diff --git sw/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
+index 1f178d4..e77bf2a 100644
+--- sw/source/ui/app/appopt.cxx
++++ sw/source/ui/app/appopt.cxx
+@@ -612,6 +612,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
case RID_SW_TP_OPTSHDWCRSR:
case RID_SW_TP_HTML_OPTSHDWCRSR:
case RID_SW_TP_REDLINE_OPT:
@@ -2218,9 +2280,11 @@ From: Thorsten Behrens <thb at openoffice.org>
case RID_SW_TP_OPTLOAD_PAGE:
case RID_SW_TP_OPTCOMPATIBILITY_PAGE:
case RID_SW_TP_MAILCONFIG:
---- sw/source/ui/app/docsh.cxx.old 2009-10-31 19:21:44.000000000 +0100
-+++ sw/source/ui/app/docsh.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -535,6 +535,9 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
+diff --git sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh.cxx
+index 2998a60..e1ba959 100644
+--- sw/source/ui/app/docsh.cxx
++++ sw/source/ui/app/docsh.cxx
+@@ -535,6 +535,9 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
pDoc->SetOle2Link( aOldOLELnk );
SW_MOD()->SetEmbeddedLoadSave( FALSE );
@@ -2230,9 +2294,11 @@ From: Thorsten Behrens <thb at openoffice.org>
}
SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
---- sw/source/ui/app/swmodul1.cxx.old 2009-10-31 19:21:27.000000000 +0100
-+++ sw/source/ui/app/swmodul1.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -741,3 +741,43 @@ void SwModule::ApplyDefaultPageMode(sal_
+diff --git sw/source/ui/app/swmodul1.cxx sw/source/ui/app/swmodul1.cxx
+index edd2ea4..33690fd 100644
+--- sw/source/ui/app/swmodul1.cxx
++++ sw/source/ui/app/swmodul1.cxx
+@@ -741,3 +741,43 @@ void SwModule::ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode)
GetUsrPref(sal_False);
pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
}
@@ -2276,8 +2342,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+{
+ pModuleConfig->SetPieceLen( nLen );
+}
---- sw/source/ui/config/modcfg.cxx.old 2009-05-20 15:27:38.000000000 +0200
-+++ sw/source/ui/config/modcfg.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/config/modcfg.cxx sw/source/ui/config/modcfg.cxx
+index 3f004af..e87925f 100644
+--- sw/source/ui/config/modcfg.cxx
++++ sw/source/ui/config/modcfg.cxx
@@ -1385,3 +1385,92 @@ void SwMiscConfig::Load()
}
}
@@ -2371,8 +2439,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+ }
+ }
+}
---- sw/source/ui/config/optdlg.hrc.old 2009-05-20 15:27:38.000000000 +0200
-+++ sw/source/ui/config/optdlg.hrc 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/config/optdlg.hrc sw/source/ui/config/optdlg.hrc
+index 0045f2b..bdc49c6 100644
+--- sw/source/ui/config/optdlg.hrc
++++ sw/source/ui/config/optdlg.hrc
@@ -206,3 +206,11 @@
#define FL_CRSR_OPT 13
#define FL_SEPARATOR_SHDW 14
@@ -2385,8 +2455,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+#define CB_RSID 146
+#define CB_IGNORE 147
+#define NF_LEN 148
---- sw/source/ui/config/optdlg.src.old 2009-10-31 19:21:28.000000000 +0100
-+++ sw/source/ui/config/optdlg.src 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/config/optdlg.src sw/source/ui/config/optdlg.src
+index 1a4c970..c268a14 100644
+--- sw/source/ui/config/optdlg.src
++++ sw/source/ui/config/optdlg.src
@@ -935,3 +935,77 @@ TabPage TP_OPTSHDWCRSR
};
};
@@ -2465,8 +2537,10 @@ From: Thorsten Behrens <thb at openoffice.org>
+ };
+};
+
---- sw/source/ui/config/optpage.cxx.old 2009-10-31 19:21:27.000000000 +0100
-+++ sw/source/ui/config/optpage.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/config/optpage.cxx sw/source/ui/config/optpage.cxx
+index e96e434..e87b2d9 100644
+--- sw/source/ui/config/optpage.cxx
++++ sw/source/ui/config/optpage.cxx
@@ -103,7 +103,7 @@
#include <svtools/ctloptions.hxx>
@@ -2476,7 +2550,7 @@ From: Thorsten Behrens <thb at openoffice.org>
using namespace ::com::sun::star;
-@@ -2456,6 +2456,139 @@ void SwRedlineOptionsTabPage::InitFontSt
+@@ -2456,6 +2456,139 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
}
@@ -2616,7 +2690,7 @@ From: Thorsten Behrens <thb at openoffice.org>
#ifndef PRODUCT
/*******************************************************
******************************************************/
-@@ -2607,6 +2740,8 @@ IMPL_LINK_INLINE_START( SwTestTabPage, A
+@@ -2607,6 +2740,8 @@ IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
return 0;
}
IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
@@ -2625,9 +2699,11 @@ From: Thorsten Behrens <thb at openoffice.org>
#endif
---- sw/source/ui/dialog/swdlgfact.cxx.old 2009-08-26 01:33:19.000000000 +0200
-+++ sw/source/ui/dialog/swdlgfact.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -1665,6 +1665,7 @@ GlossarySetActGroup SwAbstractDialogFact
+diff --git sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.cxx
+index 4e27969..033f532 100644
+--- sw/source/ui/dialog/swdlgfact.cxx
++++ sw/source/ui/dialog/swdlgfact.cxx
+@@ -1665,6 +1665,7 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHOR
return 0;
}
@@ -2635,7 +2711,7 @@ From: Thorsten Behrens <thb at openoffice.org>
//------------------ Factories for TabPages
CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
{
-@@ -1724,6 +1725,10 @@ CreateTabPage SwAbstractDialogFactory_Im
+@@ -1724,6 +1725,10 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
case RID_SW_TP_MAILCONFIG:
pRet = SwMailConfigPage::Create;
break;
@@ -2646,8 +2722,10 @@ From: Thorsten Behrens <thb at openoffice.org>
}
return pRet;
---- sw/source/ui/inc/optpage.hxx.old 2009-05-20 15:27:38.000000000 +0200
-+++ sw/source/ui/inc/optpage.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/inc/optpage.hxx sw/source/ui/inc/optpage.hxx
+index 050ea9f..d41862a 100644
+--- sw/source/ui/inc/optpage.hxx
++++ sw/source/ui/inc/optpage.hxx
@@ -58,6 +58,7 @@ class SfxPrinter;
class SwStdFontConfig;
class SwWrtShell;
@@ -2690,8 +2768,10 @@ From: Thorsten Behrens <thb at openoffice.org>
#endif
---- sw/source/ui/uno/SwXDocumentSettings.cxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ sw/source/ui/uno/SwXDocumentSettings.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git sw/source/ui/uno/SwXDocumentSettings.cxx sw/source/ui/uno/SwXDocumentSettings.cxx
+index 039cfb4..290d14b 100644
+--- sw/source/ui/uno/SwXDocumentSettings.cxx
++++ sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -128,6 +128,8 @@ enum SwDocumentSettingsPropertyHandles
HANDLE_USE_OLD_PRINTER_METRICS,
HANDLE_PROTECT_FORM,
@@ -2701,7 +2781,7 @@ From: Thorsten Behrens <thb at openoffice.org>
// --> OD 2008-06-05 #i89181#
HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST
// <--
-@@ -183,6 +185,8 @@ MasterPropertySetInfo * lcl_createSettin
+@@ -183,6 +185,8 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM("UnxForceZeroExtLeading"), HANDLE_UNIX_FORCE_ZERO_EXT_LEADING, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("UseOldPrinterMetrics"), HANDLE_USE_OLD_PRINTER_METRICS, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("TabsRelativeToIndent"), HANDLE_TABS_RELATIVE_TO_INDENT, CPPUTYPE_BOOLEAN, 0, 0},
@@ -2710,7 +2790,7 @@ From: Thorsten Behrens <thb at openoffice.org>
{ RTL_CONSTASCII_STRINGPARAM("ProtectForm"), HANDLE_PROTECT_FORM, CPPUTYPE_BOOLEAN, 0, 0},
// --> OD 2008-06-05 #i89181#
{ RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0},
-@@ -667,6 +671,20 @@ void SwXDocumentSettings::_setSingleValu
+@@ -667,6 +671,20 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
mpDoc->set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp);
}
break;
@@ -2731,7 +2811,7 @@ From: Thorsten Behrens <thb at openoffice.org>
case HANDLE_PROTECT_FORM:
{
sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
-@@ -1006,6 +1024,16 @@ void SwXDocumentSettings::_getSingleValu
+@@ -1006,6 +1024,16 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
rValue.setValue( &bTmp, ::getBooleanCppuType() );
}
break;
@@ -2748,9 +2828,11 @@ From: Thorsten Behrens <thb at openoffice.org>
case HANDLE_PROTECT_FORM:
{
sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::PROTECT_FORM);
---- xmloff/inc/xmloff/xmltoken.hxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ xmloff/inc/xmloff/xmltoken.hxx 2009-10-31 19:23:18.000000000 +0100
-@@ -1490,6 +1490,8 @@ namespace xmloff { namespace token {
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index 12c57b7..c87e917 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -1498,6 +1498,8 @@ namespace xmloff { namespace token {
XML_ROW_HEIGHT,
XML_ROW_NUMBER,
XML_ROWS,
@@ -2759,8 +2841,10 @@ From: Thorsten Behrens <thb at openoffice.org>
XML_RUBY,
XML_RUBY_ALIGN,
XML_RUBY_BASE,
---- xmloff/inc/xmloff/xmltypes.hxx.old 2009-05-20 15:28:09.000000000 +0200
-+++ xmloff/inc/xmloff/xmltypes.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git xmloff/inc/xmloff/xmltypes.hxx xmloff/inc/xmloff/xmltypes.hxx
+index cd3e443..3d011e0 100644
+--- xmloff/inc/xmloff/xmltypes.hxx
++++ xmloff/inc/xmloff/xmltypes.hxx
@@ -154,6 +154,7 @@
#define XML_TYPE_NEG_PERCENT8 0x00002022 // (100-x)%
#define XML_TYPE_NEG_PERCENT16 0x00002023 // (100-x)
@@ -2769,8 +2853,10 @@ From: Thorsten Behrens <thb at openoffice.org>
// special basic types
#define XML_TYPE_RECTANGLE_LEFT 0x00000100 // the Left member of a awt::Rectangle as a measure
---- xmloff/inc/xmloff/xmluconv.hxx.old 2009-05-20 15:28:09.000000000 +0200
-+++ xmloff/inc/xmloff/xmluconv.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git xmloff/inc/xmloff/xmluconv.hxx xmloff/inc/xmloff/xmluconv.hxx
+index 8f700ab..ac7456a 100644
+--- xmloff/inc/xmloff/xmluconv.hxx
++++ xmloff/inc/xmloff/xmluconv.hxx
@@ -237,6 +237,14 @@ public:
/** convert color to string */
static void convertColor( ::rtl::OUStringBuffer &rBuffer,
@@ -2786,9 +2872,11 @@ From: Thorsten Behrens <thb at openoffice.org>
/** convert number to string */
static void convertNumber( ::rtl::OUStringBuffer& rBuffer,
---- xmloff/source/core/xmltoken.cxx.old 2009-10-31 19:21:54.000000000 +0100
-+++ xmloff/source/core/xmltoken.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -1498,6 +1498,8 @@ namespace xmloff { namespace token {
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index f01a7ce..ea7c77d 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -1505,6 +1505,8 @@ namespace xmloff { namespace token {
TOKEN( "row-height", XML_ROW_HEIGHT ),
TOKEN( "row-number", XML_ROW_NUMBER ),
TOKEN( "rows", XML_ROWS ),
@@ -2797,9 +2885,11 @@ From: Thorsten Behrens <thb at openoffice.org>
TOKEN( "ruby", XML_RUBY ),
TOKEN( "ruby-align", XML_RUBY_ALIGN ),
TOKEN( "ruby-base", XML_RUBY_BASE ),
---- xmloff/source/core/xmluconv.cxx.old 2009-08-11 10:10:22.000000000 +0200
-+++ xmloff/source/core/xmluconv.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -647,6 +647,34 @@ void SvXMLUnitConverter::convertColor( O
+diff --git xmloff/source/core/xmluconv.cxx xmloff/source/core/xmluconv.cxx
+index 968cf5c..4fa75b1 100644
+--- xmloff/source/core/xmluconv.cxx
++++ xmloff/source/core/xmluconv.cxx
+@@ -647,6 +647,34 @@ void SvXMLUnitConverter::convertColor( OUStringBuffer& rBuffer,
rBuffer.append( sal_Unicode( aHexTab[ nCol & 0xf ] ) );
}
@@ -2834,9 +2924,11 @@ From: Thorsten Behrens <thb at openoffice.org>
/** convert number to string */
void SvXMLUnitConverter::convertNumber( OUStringBuffer& rBuffer,
sal_Int32 nNumber )
---- xmloff/source/style/prhdlfac.cxx.old 2009-05-20 15:28:09.000000000 +0200
-+++ xmloff/source/style/prhdlfac.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -213,6 +213,9 @@ const XMLPropertyHandler* XMLPropertyHan
+diff --git xmloff/source/style/prhdlfac.cxx xmloff/source/style/prhdlfac.cxx
+index 81530e1..7f8b397 100644
+--- xmloff/source/style/prhdlfac.cxx
++++ xmloff/source/style/prhdlfac.cxx
+@@ -213,6 +213,9 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_
case XML_TYPE_COLOR :
pPropHdl = new XMLColorPropHdl;
break;
@@ -2846,9 +2938,11 @@ From: Thorsten Behrens <thb at openoffice.org>
case XML_TYPE_NUMBER :
pPropHdl = new XMLNumberPropHdl( 4 );
break;
---- xmloff/source/style/xmlbahdl.cxx.old 2009-05-20 15:28:09.000000000 +0200
-+++ xmloff/source/style/xmlbahdl.cxx 2009-10-31 19:23:18.000000000 +0100
-@@ -559,6 +559,48 @@ sal_Bool XMLColorPropHdl::exportXML( OUS
+diff --git xmloff/source/style/xmlbahdl.cxx xmloff/source/style/xmlbahdl.cxx
+index 152b1ad..f99a866 100644
+--- xmloff/source/style/xmlbahdl.cxx
++++ xmloff/source/style/xmlbahdl.cxx
+@@ -559,6 +559,48 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
///////////////////////////////////////////////////////////////////////////////
//
@@ -2897,8 +2991,10 @@ From: Thorsten Behrens <thb at openoffice.org>
// class XMLStringPropHdl
//
---- xmloff/source/style/xmlbahdl.hxx.old 2009-05-20 15:28:09.000000000 +0200
-+++ xmloff/source/style/xmlbahdl.hxx 2009-10-31 19:23:18.000000000 +0100
+diff --git xmloff/source/style/xmlbahdl.hxx xmloff/source/style/xmlbahdl.hxx
+index 9c4e1c3..fbbbbeb 100644
+--- xmloff/source/style/xmlbahdl.hxx
++++ xmloff/source/style/xmlbahdl.hxx
@@ -158,6 +158,18 @@ public:
};
@@ -2918,8 +3014,10 @@ From: Thorsten Behrens <thb at openoffice.org>
PropertyHandler for the XML-data-type: XML_TYPE_STRING
*/
class XMLStringPropHdl : public XMLPropertyHandler
---- xmloff/source/text/txtprmap.cxx.old 2009-07-21 10:40:36.000000000 +0200
-+++ xmloff/source/text/txtprmap.cxx 2009-10-31 19:23:18.000000000 +0100
+diff --git xmloff/source/text/txtprmap.cxx xmloff/source/text/txtprmap.cxx
+index e68469f..6a6e960 100644
+--- xmloff/source/text/txtprmap.cxx
++++ xmloff/source/text/txtprmap.cxx
@@ -149,6 +149,10 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
MT_E( "CharUnderlineHasColor", STYLE, TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, CTF_UNDERLINE_HASCOLOR ),
// RES_CHRATR_WEIGHT
More information about the ooo-build-commit
mailing list