[ooo-build-commit] 2 commits - patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Sat Oct 31 12:51:47 PDT 2009
patches/dev300/apply | 10
patches/dev300/writer-doc-comparison-help.diff | 141 ++++
patches/dev300/writer-doc-comparison.diff | 822 ++++++++-----------------
3 files changed, 414 insertions(+), 559 deletions(-)
New commits:
commit 34490000d570c1d9f4250b4e5fb774b12539e191
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Oct 31 20:38:13 2009 +0100
Remove fuzz from the document comparison patch.
* patches/dev300/writer-doc-comparison.diff: Update.
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index 88de807..e511018 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -64,10 +64,8 @@ From: Thorsten Behrens <thb at openoffice.org>
create mode 100644 svx/inc/svx/rsiditem.hxx
-diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-index 666a69f..bf953f0 100644
---- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+--- 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
@@ -2804,6 +2804,36 @@
</prop>
</group>
@@ -105,11 +103,9 @@ index 666a69f..bf953f0 100644
<group oor:name="Insert">
<info>
<desc>Specifies the settings for inserting various object types.</desc>
-diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
-index 53d5aae..04705b1 100644
---- svx/inc/svx/dialogs.hrc
-+++ svx/inc/svx/dialogs.hrc
-@@ -1555,6 +1555,7 @@
+--- 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 @@
#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 )
@@ -117,11 +113,8 @@ index 53d5aae..04705b1 100644
//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001
#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998)
-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
+--- 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
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
@@ -180,11 +173,9 @@ index 0000000..53abf3d
+};
+
+#endif // _SVX_RSIDITEM_HXX
-diff --git svx/inc/svx/svxenum.hxx svx/inc/svx/svxenum.hxx
-index ede33d5..9273451 100644
---- svx/inc/svx/svxenum.hxx
-+++ svx/inc/svx/svxenum.hxx
-@@ -260,5 +260,11 @@ enum SvxExtNumType
+--- 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
SVX_NUM_CHARS_LOWER_LETTER_N
};
@@ -196,11 +187,9 @@ index ede33d5..9273451 100644
+};
#endif
-diff --git svx/prj/d.lst svx/prj/d.lst
-index 5d34ef6..2fb31d7 100644
---- svx/prj/d.lst
-+++ svx/prj/d.lst
-@@ -337,6 +337,7 @@ mkdir: %_DEST%\inc%_EXT%\svx
+--- 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
+@@ -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
..\inc\svx\wghtitem.hxx %_DEST%\inc%_EXT%\svx\wghtitem.hxx
@@ -208,10 +197,9 @@ index 5d34ef6..2fb31d7 100644
..\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
-diff --git svx/source/cui/treeopt.cxx svx/source/cui/treeopt.cxx
---- svx/source/cui/treeopt.cxx
-+++ svx/source/cui/treeopt.cxx
-@@ -438,6 +438,7 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
+--- 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
{ "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE },
{ "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE },
{ "Writer", "Changes", RID_SW_TP_REDLINE_OPT },
@@ -219,9 +207,8 @@ diff --git svx/source/cui/treeopt.cxx svx/source/cui/treeopt.cxx
{ "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE },
{ "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE },
{ "Writer", "MailMerge", RID_SW_TP_MAILCONFIG },
-diff --git svx/source/cui/treeopt.src svx/source/cui/treeopt.src
---- svx/source/cui/treeopt.src
-+++ svx/source/cui/treeopt.src
+--- 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
@@ -206,6 +206,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ;
< "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ;
@@ -230,10 +217,8 @@ diff --git svx/source/cui/treeopt.src svx/source/cui/treeopt.src
< "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
< "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
< "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
-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
+--- 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
@@ -81,7 +81,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <svx/unomid.hxx>
@@ -243,7 +228,7 @@ index 8460558..0b1f41b 100644
#include "flstitem.hxx"
#include "fontitem.hxx"
#include <svx/postitem.hxx>
-@@ -167,7 +167,7 @@ TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
+@@ -167,7 +167,7 @@ TYPEINIT1_FACTORY(SvxScriptTypeItem, Sfx
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));
@@ -252,7 +237,7 @@ index 8460558..0b1f41b 100644
TYPEINIT1(SvxScriptSetItem, SfxSetItem );
-@@ -3847,3 +3847,38 @@ short GetI18NScriptType( USHORT nItemType )
+@@ -3847,3 +3847,38 @@ short GetI18NScriptType( USHORT nItemTyp
}
return 0;
}
@@ -291,11 +276,9 @@ index 8460558..0b1f41b 100644
+ return new SvxRsidItem( rIn, Which() );
+}
+
-diff --git sw/inc/cmdid.h sw/inc/cmdid.h
-index d2df79f..d1ed2c6 100644
---- sw/inc/cmdid.h
-+++ sw/inc/cmdid.h
-@@ -1196,7 +1196,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+--- 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
// --> 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)
@@ -303,11 +286,9 @@ index d2df79f..d1ed2c6 100644
// <--
/*--------------------------------------------------------------------
Bereich: Druckoptionen
-diff --git sw/inc/doc.hxx sw/inc/doc.hxx
-index 8507a8c..82f49d8 100644
---- sw/inc/doc.hxx
-+++ sw/inc/doc.hxx
-@@ -448,6 +448,9 @@ private:
+--- 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:
RedlineMode_t eRedlineMode; // aktueller Redline Modus
SwCharCompressType eChrCmprType; // for ASIAN: compress punctuation/kana
@@ -317,7 +298,7 @@ index 8507a8c..82f49d8 100644
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
sal_Int8 nLockExpFld; // Wenn != 0 hat UpdateExpFlds() keine Wirkung
-@@ -757,6 +760,10 @@ public:
+@@ -752,6 +755,10 @@ public:
virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode );
virtual SwCharCompressType getCharacterCompressionType() const;
virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType );
@@ -328,7 +309,7 @@ index 8507a8c..82f49d8 100644
/** IDocumentDeviceAccess
*/
-@@ -937,6 +944,9 @@ public:
+@@ -909,6 +916,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 );
@@ -338,10 +319,8 @@ index 8507a8c..82f49d8 100644
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,
-diff --git sw/inc/globals.hrc sw/inc/globals.hrc
-index 2216249..c8dedcd 100644
---- sw/inc/globals.hrc
-+++ sw/inc/globals.hrc
+--- 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
@@ -277,6 +277,7 @@
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
@@ -350,10 +329,8 @@ index 2216249..c8dedcd 100644
//maximum: RC_GLOBALS_BEGIN + 119
#if STR_DOC_STAT > RC_GLOBALS_END
-diff --git sw/inc/helpid.h sw/inc/helpid.h
-index 3172447..b4afd73 100644
---- sw/inc/helpid.h
-+++ sw/inc/helpid.h
+--- 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
@@ -313,6 +313,7 @@
#define HID_TEXTGRID_PAGE (HID_BASE + 482)
#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483)
@@ -362,10 +339,8 @@ index 3172447..b4afd73 100644
// AutoPilot Help-IDs *********************************************************
-diff --git sw/inc/hintids.hxx sw/inc/hintids.hxx
-index faad379..d0e9b35 100644
---- sw/inc/hintids.hxx
-+++ sw/inc/hintids.hxx
+--- 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
@@ -98,8 +98,8 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
RES_CHRATR_RELIEF, // 36
RES_CHRATR_HIDDEN, // 37
@@ -377,7 +352,7 @@ index faad379..d0e9b35 100644
RES_CHRATR_END
};
-@@ -160,6 +160,7 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
+@@ -170,6 +170,7 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_SNAPTOGRID, // 72
RES_PARATR_CONNECT_BORDER, // 73
RES_PARATR_OUTLINELEVEL, // 74
@@ -385,7 +360,7 @@ index faad379..d0e9b35 100644
RES_PARATR_END
};
-@@ -169,11 +170,11 @@ RES_PARATR_END
+@@ -179,11 +180,11 @@ RES_PARATR_END
enum RES_PARATR_LIST
{
RES_PARATR_LIST_BEGIN = RES_PARATR_END,
@@ -402,7 +377,7 @@ index faad379..d0e9b35 100644
RES_PARATR_LIST_END
};
// <--
-@@ -181,92 +182,92 @@ RES_PARATR_LIST_END
+@@ -191,92 +192,92 @@ RES_PARATR_LIST_END
enum RES_FRMATR
{
RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
@@ -500,7 +475,9 @@ index faad379..d0e9b35 100644
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
@@ -517,9 +494,6 @@ index faad379..d0e9b35 100644
- 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
@@ -559,10 +533,8 @@ index faad379..d0e9b35 100644
RES_UNKNOWNATR_END
};
-diff --git sw/inc/modcfg.hxx sw/inc/modcfg.hxx
-index 8b5b1c7..c92520f 100644
---- sw/inc/modcfg.hxx
-+++ sw/inc/modcfg.hxx
+--- 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
@@ -41,6 +41,7 @@
#include "tblenum.hxx"
#include "itabenum.hxx"
@@ -571,7 +543,7 @@ index 8b5b1c7..c92520f 100644
class SwModuleOptions;
//-----------------------------------------------------------------------------
-@@ -166,7 +167,27 @@ class SwMiscConfig : public utl::ConfigItem
+@@ -166,7 +167,27 @@ class SwMiscConfig : public utl::ConfigI
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -633,13 +605,11 @@ index 8b5b1c7..c92520f 100644
};
#endif
-diff --git sw/inc/ndtxt.hxx sw/inc/ndtxt.hxx
-index cf282c3..1341be1 100644
---- sw/inc/ndtxt.hxx
-+++ sw/inc/ndtxt.hxx
-@@ -808,6 +808,13 @@ public:
+--- 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
+@@ -823,6 +823,13 @@ public:
- USHORT GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const;
+ bool IsCollapse() const;
+ UINT32 GetRsid( xub_StrLen nStt, xub_StrLen nEnd ) const;
+ UINT32 GetParRsid() const;
@@ -651,10 +621,8 @@ index cf282c3..1341be1 100644
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
};
-diff --git sw/inc/swmodule.hxx sw/inc/swmodule.hxx
-index bdf5e54..76956af 100644
---- sw/inc/swmodule.hxx
-+++ sw/inc/swmodule.hxx
+--- 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
@@ -42,6 +42,7 @@
#include <fldupde.hxx>
#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
@@ -679,41 +647,9 @@ index bdf5e54..76956af 100644
// returne den definierten DocStat - WordDelimiter
const String& GetDocStatWordDelim() const;
-#diff --git sw/inc/txatbase.hxx sw/inc/txatbase.hxx
-#index 04b51ea..27b9526 100644
-#--- sw/inc/txatbase.hxx
-#+++ sw/inc/txatbase.hxx
-#@@ -39,6 +39,7 @@ class SvxBrushItem;
-# class SvxFontItem;
-# class SvxPostureItem;
-# class SvxWeightItem;
-#+class SvxRsidItem;
-# class SvxUnderlineItem;
-# class SvxOverlineItem;
-# class SvxFontHeightItem;
-#@@ -169,6 +170,7 @@ public:
-# inline const SvxCharRotateItem &GetCharRotate() const;
-# inline const SvxCharReliefItem &GetCharRelief() const;
-# inline const SvxCharHiddenItem &GetCharHidden() const;
-#+ inline const SvxRsidItem &GetRsid() const;
-#
-# private:
-# SwTxtAttr( const SwTxtAttr& );
-#@@ -447,4 +449,9 @@ inline const SvxCharHiddenItem& SwTxtAttr::GetCharHidden() const
-# return (const SvxCharHiddenItem&)*pAttr;
-# }
-#
-#+inline const SvxRsidItem& SwTxtAttr::GetRsid() const
-#+{
-#+ ASSERT( pAttr && pAttr->Which() == RES_CHRATR_RSID, "Wrong Request" );
-#+ return ( const SvxRsidItem& ) * pAttr;
-#+}
-# #endif
-diff --git sw/inc/undobj.hxx sw/inc/undobj.hxx
-index c1a3055..5fc1aff 100644
---- sw/inc/undobj.hxx
-+++ sw/inc/undobj.hxx
-@@ -506,6 +506,7 @@ class SwUndoSplitNode: public SwUndo
+--- 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
+@@ -519,6 +519,7 @@ class SwUndoSplitNode: public SwUndo
xub_StrLen nCntnt;
BOOL bTblFlag : 1;
BOOL bChkTblStt : 1;
@@ -721,11 +657,9 @@ index c1a3055..5fc1aff 100644
public:
SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl );
virtual ~SwUndoSplitNode();
-diff --git sw/inc/unoprnms.hxx sw/inc/unoprnms.hxx
-index 558facb..49d9494 100644
---- sw/inc/unoprnms.hxx
-+++ sw/inc/unoprnms.hxx
-@@ -806,7 +806,9 @@ enum SwPropNameIds
+--- 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
+@@ -810,7 +810,9 @@ enum SwPropNameIds
/* 0738 */ UNO_NAME_META, // #i91565#
/* 0739 */ UNO_NAME_IS_TEMPLATE,
/* 0740 */ UNO_NAME_VBA_DOCOBJ,
@@ -736,19 +670,17 @@ index 558facb..49d9494 100644
};
-diff --git sw/source/core/bastyp/init.cxx sw/source/core/bastyp/init.cxx
-index ca1a599..ab43b69 100644
---- sw/source/core/bastyp/init.cxx
-+++ sw/source/core/bastyp/init.cxx
-@@ -149,6 +149,7 @@
+--- 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
+@@ -138,6 +138,7 @@
#include <fmtfollowtextflow.hxx>
// OD 2004-05-05 #i28701#
#include <fmtwrapinfluenceonobjpos.hxx>
+#include <svx/rsiditem.hxx>
- using namespace ::com::sun::star;
+ #include <fmtmeta.hxx>
-@@ -316,8 +317,8 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
+@@ -308,8 +309,8 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // RES_CHRATR_RELIEF
{ SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE }, // RES_CHRATR_HIDDEN
{ SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_OVERLINE
@@ -756,9 +688,9 @@ index ca1a599..ab43b69 100644
{ 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY1
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY2
- { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_AUTOFMT
- { FN_TXTATR_INET, 0 }, // RES_TXTATR_INETFMT
-@@ -360,7 +361,7 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
+ { 0, 0 }, // RES_TXTATR_REFMARK
+ { 0, 0 }, // RES_TXTATR_TOXMARK
+@@ -352,7 +353,7 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ SID_ATTR_BORDER_CONNECT, SFX_ITEM_POOLABLE }, // RES_PARATR_CONNECT_BORDER
{ SID_ATTR_PARA_OUTLINE_LEVEL, SFX_ITEM_POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level,zhaojianwei
@@ -767,7 +699,7 @@ index ca1a599..ab43b69 100644
// --> OD 2008-02-19 #refactorlists#
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ID
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_LEVEL
-@@ -499,6 +500,7 @@ void _InitCore()
+@@ -495,6 +496,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_SHADOWED- POOLATTR_BEGIN ] = new SvxShadowedItem( sal_False, RES_CHRATR_SHADOWED );
aAttrTab[ RES_CHRATR_UNDERLINE- POOLATTR_BEGIN ] = new SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE );
aAttrTab[ RES_CHRATR_WEIGHT- POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT );
@@ -775,7 +707,7 @@ index ca1a599..ab43b69 100644
aAttrTab[ RES_CHRATR_WORDLINEMODE- POOLATTR_BEGIN ] = new SvxWordLineModeItem( sal_False, RES_CHRATR_WORDLINEMODE );
aAttrTab[ RES_CHRATR_AUTOKERN- POOLATTR_BEGIN ] = new SvxAutoKernItem( sal_False, RES_CHRATR_AUTOKERN );
aAttrTab[ RES_CHRATR_BLINK - POOLATTR_BEGIN ] = new SvxBlinkItem( FALSE, RES_CHRATR_BLINK );
-@@ -530,7 +532,7 @@ void _InitCore()
+@@ -526,7 +528,7 @@ void _InitCore()
// CharakterAttr - Dummies
aAttrTab[ RES_CHRATR_DUMMY1 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY1 );
@@ -784,7 +716,7 @@ index ca1a599..ab43b69 100644
// CharakterAttr - Dummies
aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
-@@ -578,7 +580,8 @@ void _InitCore()
+@@ -574,7 +576,8 @@ void _InitCore()
aAttrTab[ RES_PARATR_CONNECT_BORDER - POOLATTR_BEGIN ] = new SwParaConnectBorderItem;
aAttrTab[ RES_PARATR_OUTLINELEVEL - POOLATTR_BEGIN ] = new SfxUInt16Item( RES_PARATR_OUTLINELEVEL, 0 );//#outline level,zhaojianwei
@@ -794,10 +726,8 @@ index ca1a599..ab43b69 100644
// --> 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 );
-diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx
-index f5ec3e5..38d08e8 100644
---- sw/source/core/doc/doc.cxx
-+++ sw/source/core/doc/doc.cxx
+--- 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
@@ -35,6 +35,7 @@
#include <tools/shl.hxx>
@@ -814,7 +744,7 @@ index f5ec3e5..38d08e8 100644
#include <unotools/charclass.hxx>
#include <swmodule.hxx>
#include <fmtpdsc.hxx>
-@@ -410,6 +412,33 @@ void SwDoc::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
+@@ -413,6 +415,33 @@ void SwDoc::setLinkUpdateMode( /*[in]*/s
nLinkUpdMode = eMode;
}
@@ -848,8 +778,8 @@ index f5ec3e5..38d08e8 100644
SwFldUpdateFlags SwDoc::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
{
SwFldUpdateFlags eRet = eFldUpdMode;
-@@ -650,6 +679,15 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
- AppendUndo( pUndo = new SwUndoSplitNode( this, rPos, bChkTableStart ));
+@@ -656,6 +685,15 @@ bool SwDoc::SplitNode( const SwPosition
+ }
}
+ // Update the rsid of the old and the new node unless
@@ -864,7 +794,7 @@ index f5ec3e5..38d08e8 100644
//JP 28.01.97: Sonderfall fuer SplitNode am Tabellenanfang:
// steht die am Doc/Fly/Footer/..-Anfang oder direkt
// hinter einer Tabelle, dann fuege davor
-@@ -970,6 +1008,41 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
+@@ -997,6 +1035,41 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPa
pFrmFmt );
}
@@ -906,10 +836,8 @@ index f5ec3e5..38d08e8 100644
/*************************************************************************
|* SwDoc::GetFldType()
|* Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
-diff --git sw/source/core/doc/doccomp.cxx sw/source/core/doc/doccomp.cxx
-index 05d6209..8f7521f 100644
---- sw/source/core/doc/doccomp.cxx
-+++ sw/source/core/doc/doccomp.cxx
+--- 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
@@ -38,7 +38,9 @@
#include <svx/crsditem.hxx>
#include <svx/colritem.hxx>
@@ -1080,7 +1008,7 @@ index 05d6209..8f7521f 100644
// ====================================================================
CompareLine::~CompareLine() {}
-@@ -262,24 +410,21 @@ ULONG CompareData::ShowDiffs( const CompareData& rData )
+@@ -262,24 +410,21 @@ ULONG CompareData::ShowDiffs( const Comp
{
if( rData.GetChanged( nStt1 ) || GetChanged( nStt2 ) )
{
@@ -1113,7 +1041,7 @@ index 05d6209..8f7521f 100644
return nCnt;
}
-@@ -450,8 +595,6 @@ Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
+@@ -450,8 +595,6 @@ Compare::Compare( ULONG nDiff, CompareDa
delete pMD2;
}
@@ -1131,7 +1059,7 @@ index 05d6209..8f7521f 100644
// ----------------------------------------------------------------------
// Suche die verschobenen Lines
-@@ -979,7 +1122,8 @@ BOOL SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
+@@ -979,7 +1122,8 @@ BOOL SwCompareLine::CompareNode( const S
switch( rDstNd.GetNodeType() )
{
case ND_TEXTNODE:
@@ -1141,7 +1069,7 @@ index 05d6209..8f7521f 100644
break;
case ND_TABLENODE:
-@@ -1131,6 +1275,7 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
+@@ -1131,6 +1275,7 @@ BOOL SwCompareLine::CompareTxtNd( const
const SwTxtNode& rSrcNd )
{
BOOL bRet = FALSE;
@@ -1149,7 +1077,7 @@ index 05d6209..8f7521f 100644
// erstmal ganz einfach!
if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
{
-@@ -1143,70 +1288,128 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
+@@ -1143,70 +1288,128 @@ BOOL SwCompareLine::CompareTxtNd( const
BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const
@@ -1167,29 +1095,18 @@ index 05d6209..8f7521f 100644
+ 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 ];
+
@@ -1198,7 +1115,21 @@ index 05d6209..8f7521f 100644
+ 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;
@@ -1211,6 +1142,12 @@ index 05d6209..8f7521f 100644
- 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 );
+
@@ -1236,12 +1173,7 @@ index 05d6209..8f7521f 100644
+ 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] )
+ {
@@ -1318,7 +1250,7 @@ index 05d6209..8f7521f 100644
if( rpInsRing )
{
-@@ -1214,9 +1417,14 @@ BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
+@@ -1215,9 +1418,14 @@ BOOL SwCompareLine::ChangesInLine( const
*pCorr->GetPoint() = *pTmp->GetMark();
}
}
@@ -1334,11 +1266,19 @@ index 05d6209..8f7521f 100644
return bRet;
}
-@@ -1395,15 +1603,52 @@ void SwCompareData::CheckForChangesInLine( const CompareData& rData,
+@@ -1396,15 +1604,52 @@ void SwCompareData::CheckForChangesInLin
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 );
+
@@ -1349,14 +1289,7 @@ index 05d6209..8f7521f 100644
+ 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)
@@ -1395,7 +1328,7 @@ index 05d6209..8f7521f 100644
}
}
-@@ -1530,6 +1775,29 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
+@@ -1531,6 +1776,29 @@ long SwDoc::CompareDoc( const SwDoc& rDo
long nRet = 0;
@@ -1425,12 +1358,12 @@ index 05d6209..8f7521f 100644
StartUndo(UNDO_EMPTY, NULL);
BOOL bDocWasModified = IsModified();
SwDoc& rSrcDoc = (SwDoc&)rDoc;
-@@ -1823,4 +2091,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 )
@@ -1737,7 +1670,7 @@ index 05d6209..8f7521f 100644
+}
+
+// LgstCommonSubseq ------------------------------------------------------------
-
++
+LgstCommonSubseq::LgstCommonSubseq( ArrayComparator &rComparator )
+ : CommonSubseq( rComparator, CUTOFF )
+{
@@ -2002,11 +1935,9 @@ index 05d6209..8f7521f 100644
+
+ return nLen + nCutBeg + nCutEnd;
+}
-diff --git sw/source/core/doc/docnew.cxx sw/source/core/doc/docnew.cxx
-index 966255b..165fe2b 100644
---- sw/source/core/doc/docnew.cxx
-+++ sw/source/core/doc/docnew.cxx
-@@ -42,6 +42,7 @@
+--- 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
+@@ -43,6 +43,7 @@
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <rtl/logfile.hxx>
@@ -2014,7 +1945,7 @@ index 966255b..165fe2b 100644
#include <sfx2/printer.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
-@@ -473,6 +474,14 @@ SwDoc::SwDoc() :
+@@ -448,6 +449,14 @@ SwDoc::SwDoc() :
}
// <--
@@ -2029,13 +1960,11 @@ index 966255b..165fe2b 100644
ResetModified();
}
-diff --git sw/source/core/edit/editsh.cxx sw/source/core/edit/editsh.cxx
-index 0a033d9..b30958d 100644
---- sw/source/core/edit/editsh.cxx
-+++ sw/source/core/edit/editsh.cxx
-@@ -115,6 +115,13 @@ void SwEditShell::Insert(const String &rStr)
- ASSERT( FALSE, "Doc->Insert(Str) failed." )
- }
+--- 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 &
+ ASSERT( bSuccess, "Doc->Insert() failed." );
+ (void) bSuccess;
+ GetDoc()->UpdateRsid( *_pStartCrsr, rStr.Len() );
+
@@ -2047,7 +1976,7 @@ index 0a033d9..b30958d 100644
SaveTblBoxCntnt( _pStartCrsr->GetPoint() );
} while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr );
-@@ -197,7 +204,7 @@ long SwEditShell::SplitNode( BOOL bAutoFormat, BOOL bCheckTableStart )
+@@ -206,7 +213,7 @@ long SwEditShell::SplitNode( BOOL bAutoF
StartAllAction();
GetDoc()->StartUndo(UNDO_EMPTY, NULL);
@@ -2056,11 +1985,9 @@ index 0a033d9..b30958d 100644
// eine Tabellen Zelle wird jetzt zu einer normalen Textzelle!
GetDoc()->ClearBoxNumAttrs( PCURCRSR->GetPoint()->nNode );
GetDoc()->SplitNode( *PCURCRSR->GetPoint(), bCheckTableStart );
-diff --git sw/source/core/frmedt/fecopy.cxx sw/source/core/frmedt/fecopy.cxx
-index aa5dce2..3fd117e 100644
---- sw/source/core/frmedt/fecopy.cxx
-+++ sw/source/core/frmedt/fecopy.cxx
-@@ -1059,11 +1059,12 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
+--- 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
// es wird mehr als 1 Node in die akt. Box kopiert. Dann
// muessen die BoxAttribute aber entfernt werden.
GetDoc()->ClearBoxNumAttrs( rInsPos.nNode );
@@ -2075,7 +2002,7 @@ index aa5dce2..3fd117e 100644
{
SwNodeIndex aIndexBefore(rInsPos.nNode);
-@@ -1080,6 +1081,22 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
+@@ -1070,6 +1071,22 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, B
}
}
@@ -2098,11 +2025,9 @@ index aa5dce2..3fd117e 100644
SaveTblBoxCntnt( &rInsPos );
if(bIncludingPageFrames && bStartWithTable)
{
-diff --git sw/source/core/text/atrstck.cxx sw/source/core/text/atrstck.cxx
-index ff3009c..3b4ce82 100644
---- sw/source/core/text/atrstck.cxx
-+++ sw/source/core/text/atrstck.cxx
-@@ -130,8 +130,8 @@ const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) -
+--- 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>
33, // RES_CHRATR_RELIEF, // 36
34, // RES_CHRATR_HIDDEN, // 37
35, // RES_CHRATR_OVERLINE, // 38
@@ -2113,11 +2038,9 @@ index ff3009c..3b4ce82 100644
36, // RES_TXTATR_REFMARK, // 41
37, // RES_TXTATR_TOXMARK, // 42
38, // RES_TXTATR_META, // 43
-diff --git sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/ndtxt.cxx
-index 8730a52..2bf017e 100644
---- sw/source/core/txtnode/ndtxt.cxx
-+++ sw/source/core/txtnode/ndtxt.cxx
-@@ -40,6 +40,7 @@
+--- 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
+@@ -37,6 +37,7 @@
#include <svx/brkitem.hxx>
#include <svx/escpitem.hxx>
#include <svx/lrspitem.hxx>
@@ -2125,7 +2048,7 @@ index 8730a52..2bf017e 100644
// --> OD 2008-01-17 #newlistlevelattrs#
#include <svx/tstpitem.hxx>
// <--
-@@ -4842,4 +4843,42 @@ USHORT SwTxtNode::ResetAllAttr()
+@@ -4957,7 +4958,45 @@ USHORT SwTxtNode::ResetAllAttr()
return nRet;
}
@@ -2169,11 +2092,12 @@ index 8730a52..2bf017e 100644
+ return nThisRsid == nRsid;
+}
+
-diff --git sw/source/core/undo/unspnd.cxx sw/source/core/undo/unspnd.cxx
-index af6dc8b..81b46b2 100644
---- sw/source/core/undo/unspnd.cxx
-+++ sw/source/core/undo/unspnd.cxx
-@@ -76,6 +76,8 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
+
+
+ // 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*
pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, pDoc->GetRedlineAuthor() );
SetRedlineMode( pDoc->GetRedlineMode() );
}
@@ -2182,20 +2106,18 @@ index af6dc8b..81b46b2 100644
}
-@@ -157,6 +159,8 @@ void SwUndoSplitNode::Undo( SwUndoIter& rUndoIter )
+@@ -157,6 +159,8 @@ void SwUndoSplitNode::Undo( SwUndoIter&
pDoc->RstTxtAttrs( rPam, TRUE );
- pHistory->TmpRollback( pDoc, 0, FALSE );
+ pHistory->TmpRollback( pDoc, 0, false );
}
+
+ pDoc->UpdateParRsid( pTNd, nParRsid );
}
}
-diff --git sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unomap.cxx
-index 7956810..d3d7d84 100644
---- sw/source/core/unocore/unomap.cxx
-+++ sw/source/core/unocore/unomap.cxx
-@@ -216,6 +216,7 @@ void SwUnoPropertyMapProvider::Sort( sal_uInt16 nId )
+--- 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
{ 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}, \
@@ -2203,7 +2125,7 @@ index 7956810..d3d7d84 100644
{ SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
#define _CJK_FONT_PROPERTIES \
-@@ -289,6 +290,7 @@ void SwUnoPropertyMapProvider::Sort( sal_uInt16 nId )
+@@ -177,6 +178,7 @@ SwUnoPropertyMapProvider::~SwUnoProperty
// 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 \
@@ -2211,11 +2133,9 @@ index 7956810..d3d7d84 100644
{ 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 }, \
-diff --git sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unoprnms.cxx
-index b59ec8c..a657d96 100644
---- sw/source/core/unocore/unoprnms.cxx
-+++ sw/source/core/unocore/unoprnms.cxx
-@@ -781,6 +781,8 @@ const SwPropNameTab aPropNameTab = {
+--- 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
+@@ -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")},
@@ -2224,10 +2144,8 @@ index b59ec8c..a657d96 100644
};
const SwPropNameLen& SwGetPropName( USHORT nId )
-diff --git sw/source/filter/ascii/parasc.cxx sw/source/filter/ascii/parasc.cxx
-index 96d23ea..5e4722f 100644
---- sw/source/filter/ascii/parasc.cxx
-+++ sw/source/filter/ascii/parasc.cxx
+--- 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
@@ -529,6 +529,9 @@ ULONG SwASCIIParser::ReadChars()
void SwASCIIParser::InsertText( const String& rStr )
{
@@ -2238,10 +2156,8 @@ index 96d23ea..5e4722f 100644
if( pItemSet && pBreakIt && nScript != ( SCRIPTTYPE_LATIN |
SCRIPTTYPE_ASIAN |
SCRIPTTYPE_COMPLEX ) )
-diff --git sw/source/filter/html/css1atr.cxx sw/source/filter/html/css1atr.cxx
-index 0a6865d..2a6998f 100644
---- sw/source/filter/html/css1atr.cxx
-+++ sw/source/filter/html/css1atr.cxx
+--- 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
@@ -3752,8 +3752,8 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_CHRATR_RELIEF */ 0,
/* RES_CHRATR_HIDDEN */ 0,
@@ -2250,8 +2166,8 @@ index 0a6865d..2a6998f 100644
/* RES_CHRATR_DUMMY1 */ 0,
-/* RES_CHRATR_DUMMY2 */ 0,
- /* RES_TXTATR_NOLINEBREAK */ 0,
- /* RES_TXTATR_NOHYPHEN */ 0,
+ /* RES_TXTATR_REFMARK */ 0,
+ /* RES_TXTATR_TOXMARK */ 0,
@@ -3791,6 +3791,7 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_SNAPTOGRID*/ 0, // new
/* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
@@ -2260,11 +2176,9 @@ index 0a6865d..2a6998f 100644
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
-diff --git sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlatr.cxx
-index 38c48b2..81b7329 100644
---- sw/source/filter/html/htmlatr.cxx
-+++ sw/source/filter/html/htmlatr.cxx
-@@ -3398,8 +3398,8 @@ SwAttrFnTab aHTMLAttrFnTab = {
+--- 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
+@@ -3388,8 +3388,8 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_CHRATR_RELIEF */ 0,
/* RES_CHRATR_HIDDEN */ 0,
/* RES_CHRATR_OVERLINE */ OutHTML_CSS1Attr,
@@ -2272,13 +2186,11 @@ index 38c48b2..81b7329 100644
/* RES_CHRATR_DUMMY1 */ 0,
-/* RES_CHRATR_DUMMY2 */ 0,
- /* RES_TXTATR_DUMMY4 */ 0,
- /* RES_TXTATR_INETFMT */ OutHTML_SwFmtINetFmt,
-diff --git sw/source/filter/rtf/rtfatr.cxx sw/source/filter/rtf/rtfatr.cxx
-index e1191cb..99b9e65 100644
---- sw/source/filter/rtf/rtfatr.cxx
-+++ sw/source/filter/rtf/rtfatr.cxx
-@@ -4232,8 +4232,8 @@ SwAttrFnTab aRTFAttrFnTab = {
+ /* 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
+@@ -4248,8 +4248,8 @@ SwAttrFnTab aRTFAttrFnTab = {
/* RES_CHRATR_RELIEF */ OutRTF_SwCharRelief,
/* RES_CHRATR_HIDDEN */ OutRTF_SvxCharHiddenItem,
/* RES_CHRATR_OVERLINE */ OutRTF_SwOverline,
@@ -2286,9 +2198,9 @@ index e1191cb..99b9e65 100644
/* RES_CHRATR_DUMMY1 */ 0,
-/* RES_CHRATR_DUMMY2 */ 0,
- /* RES_TXTATR_AUTOFMT */ OutRTF_SwTxtAutoFmt,
- /* RES_TXTATR_INETFMT */ OutRTF_SwTxtINetFmt, // Dummy
-@@ -4271,6 +4271,7 @@ SwAttrFnTab aRTFAttrFnTab = {
+ /* RES_TXTATR_REFMARK */ 0, // NOT USED!! OutRTF_SwRefMark,
+ /* RES_TXTATR_TOXMARK */ 0, // NOT USED!! OutRTF_SwTOXMark,
+@@ -4287,6 +4287,7 @@ SwAttrFnTab aRTFAttrFnTab = {
/* RES_PARATR_SNAPTOGRID*/ 0, // new
/* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
/* RES_PARATR_OUTLINELEVEL */ 0, // new - outlinelevel
@@ -2296,33 +2208,9 @@ index e1191cb..99b9e65 100644
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
-#diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
-#index 0f5b576..63f0bd4 100644
-#--- sw/source/filter/ww8/ww8atr.cxx
-#+++ sw/source/filter/ww8/ww8atr.cxx
-#@@ -5064,8 +5064,8 @@ SwAttrFnTab aWW8AttrFnTab = {
-# /* RES_CHRATR_RELIEF*/ OutWW8_Relief,
-# /* RES_CHRATR_HIDDEN */ OutWW8_SvxCharHidden,
-# /* RES_CHRATR_OVERLINE */ 0,
-#+/* RES_CHRATR_RSID */ 0,
-# /* RES_CHRATR_DUMMY1 */ 0,
-#-/* RES_CHRATR_DUMMY2 */ 0,
-#
-# /* RES_TXTATR_DUMMY4 */ 0,
-# /* RES_TXTATR_INETFMT */ OutSwFmtINetFmt,
-#@@ -5103,6 +5103,7 @@ SwAttrFnTab aWW8AttrFnTab = {
-# /* RES_PARATR_SNAPTOGRID*/ OutWW8_SvxParaGridItem,
-# /* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
-# /* RES_PARATR_OUTLINELEVEL */ 0, // new - outlinelevel
-#+/* RES_PARATR_RSID */ 0, // new
-#
-# /* RES_PARATR_LIST_ID */ 0, // new
-# /* RES_PARATR_LIST_LEVEL */ 0, // new
-diff --git sw/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
-index c9774b5..dafc229 100644
---- sw/source/ui/app/appopt.cxx
-+++ sw/source/ui/app/appopt.cxx
-@@ -600,6 +600,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
+--- 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
case RID_SW_TP_OPTSHDWCRSR:
case RID_SW_TP_HTML_OPTSHDWCRSR:
case RID_SW_TP_REDLINE_OPT:
@@ -2330,11 +2218,9 @@ index c9774b5..dafc229 100644
case RID_SW_TP_OPTLOAD_PAGE:
case RID_SW_TP_OPTCOMPATIBILITY_PAGE:
case RID_SW_TP_MAILCONFIG:
-diff --git sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh.cxx
-index dd2f32d..28128ab 100644
---- sw/source/ui/app/docsh.cxx
-+++ sw/source/ui/app/docsh.cxx
-@@ -567,6 +567,9 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
+--- 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&
pDoc->SetOle2Link( aOldOLELnk );
SW_MOD()->SetEmbeddedLoadSave( FALSE );
@@ -2342,13 +2228,11 @@ index dd2f32d..28128ab 100644
+ // Increase RSID
+ pDoc->setRsid( pDoc->getRsid() );
}
- SetError( nErr ? nErr : nVBWarning );
+ SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-diff --git sw/source/ui/app/swmodul1.cxx sw/source/ui/app/swmodul1.cxx
-index ad46d70..917b829 100644
---- sw/source/ui/app/swmodul1.cxx
-+++ sw/source/ui/app/swmodul1.cxx
-@@ -741,3 +741,43 @@ void SwModule::ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode)
+--- 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_
GetUsrPref(sal_False);
pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
}
@@ -2392,10 +2276,8 @@ index ad46d70..917b829 100644
+{
+ pModuleConfig->SetPieceLen( nLen );
+}
-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
+--- 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
@@ -1385,3 +1385,92 @@ void SwMiscConfig::Load()
}
}
@@ -2489,10 +2371,8 @@ index 3f004af..e87925f 100644
+ }
+ }
+}
-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
+--- 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
@@ -206,3 +206,11 @@
#define FL_CRSR_OPT 13
#define FL_SEPARATOR_SHDW 14
@@ -2505,10 +2385,8 @@ index 0045f2b..bdc49c6 100644
+#define CB_RSID 146
+#define CB_IGNORE 147
+#define NF_LEN 148
-diff --git sw/source/ui/config/optdlg.src sw/source/ui/config/optdlg.src
-index e4d8ceb..4de9318 100644
---- sw/source/ui/config/optdlg.src
-+++ sw/source/ui/config/optdlg.src
+--- 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
@@ -935,3 +935,77 @@ TabPage TP_OPTSHDWCRSR
};
};
@@ -2587,10 +2465,8 @@ index e4d8ceb..4de9318 100644
+ };
+};
+
-diff --git sw/source/ui/config/optpage.cxx sw/source/ui/config/optpage.cxx
-index 054eaa1..f982abc 100644
---- sw/source/ui/config/optpage.cxx
-+++ sw/source/ui/config/optpage.cxx
+--- 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
@@ -103,7 +103,7 @@
#include <svtools/ctloptions.hxx>
@@ -2600,7 +2476,7 @@ index 054eaa1..f982abc 100644
using namespace ::com::sun::star;
-@@ -2446,6 +2446,139 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
+@@ -2456,6 +2456,139 @@ void SwRedlineOptionsTabPage::InitFontSt
}
@@ -2740,7 +2616,7 @@ index 054eaa1..f982abc 100644
#ifndef PRODUCT
/*******************************************************
******************************************************/
-@@ -2597,6 +2730,8 @@ IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
+@@ -2607,6 +2740,8 @@ IMPL_LINK_INLINE_START( SwTestTabPage, A
return 0;
}
IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
@@ -2749,11 +2625,9 @@ index 054eaa1..f982abc 100644
#endif
-diff --git sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.cxx
-index b8f48b3..d6f787e 100644
---- sw/source/ui/dialog/swdlgfact.cxx
-+++ sw/source/ui/dialog/swdlgfact.cxx
-@@ -1658,6 +1658,7 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHOR
+--- 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
return 0;
}
@@ -2761,7 +2635,7 @@ index b8f48b3..d6f787e 100644
//------------------ Factories for TabPages
CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
{
-@@ -1717,6 +1718,10 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+@@ -1724,6 +1725,10 @@ CreateTabPage SwAbstractDialogFactory_Im
case RID_SW_TP_MAILCONFIG:
pRet = SwMailConfigPage::Create;
break;
@@ -2772,10 +2646,8 @@ index b8f48b3..d6f787e 100644
}
return pRet;
-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
+--- 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
@@ -58,6 +58,7 @@ class SfxPrinter;
class SwStdFontConfig;
class SwWrtShell;
@@ -2818,10 +2690,8 @@ index 050ea9f..d41862a 100644
#endif
-diff --git sw/source/ui/uno/SwXDocumentSettings.cxx sw/source/ui/uno/SwXDocumentSettings.cxx
-index a65d367..eb18204 100644
---- sw/source/ui/uno/SwXDocumentSettings.cxx
-+++ sw/source/ui/uno/SwXDocumentSettings.cxx
+--- 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
@@ -128,6 +128,8 @@ enum SwDocumentSettingsPropertyHandles
HANDLE_USE_OLD_PRINTER_METRICS,
HANDLE_PROTECT_FORM,
@@ -2831,7 +2701,7 @@ index a65d367..eb18204 100644
// --> OD 2008-06-05 #i89181#
HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST
// <--
-@@ -182,6 +184,8 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
+@@ -183,6 +185,8 @@ MasterPropertySetInfo * lcl_createSettin
{ 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},
@@ -2840,7 +2710,7 @@ index a65d367..eb18204 100644
{ 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},
-@@ -665,6 +669,20 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
+@@ -667,6 +671,20 @@ void SwXDocumentSettings::_setSingleValu
mpDoc->set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp);
}
break;
@@ -2861,7 +2731,7 @@ index a65d367..eb18204 100644
case HANDLE_PROTECT_FORM:
{
sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
-@@ -998,6 +1016,16 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
+@@ -1006,6 +1024,16 @@ void SwXDocumentSettings::_getSingleValu
rValue.setValue( &bTmp, ::getBooleanCppuType() );
}
break;
@@ -2878,11 +2748,9 @@ index a65d367..eb18204 100644
case HANDLE_PROTECT_FORM:
{
sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::PROTECT_FORM);
-diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
-index 8e4cca2..e5a7a79 100644
---- xmloff/inc/xmloff/xmltoken.hxx
-+++ xmloff/inc/xmloff/xmltoken.hxx
-@@ -1488,6 +1488,8 @@ namespace xmloff { namespace token {
+--- 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 {
XML_ROW_HEIGHT,
XML_ROW_NUMBER,
XML_ROWS,
@@ -2891,10 +2759,8 @@ index 8e4cca2..e5a7a79 100644
XML_RUBY,
XML_RUBY_ALIGN,
XML_RUBY_BASE,
-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
+--- 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
@@ -154,6 +154,7 @@
#define XML_TYPE_NEG_PERCENT8 0x00002022 // (100-x)%
#define XML_TYPE_NEG_PERCENT16 0x00002023 // (100-x)
@@ -2903,10 +2769,8 @@ index cd3e443..3d011e0 100644
// special basic types
#define XML_TYPE_RECTANGLE_LEFT 0x00000100 // the Left member of a awt::Rectangle as a measure
-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
+--- 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
@@ -237,6 +237,14 @@ public:
/** convert color to string */
static void convertColor( ::rtl::OUStringBuffer &rBuffer,
@@ -2922,11 +2786,9 @@ index 8f700ab..ac7456a 100644
/** convert number to string */
static void convertNumber( ::rtl::OUStringBuffer& rBuffer,
-diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
-index 8d2c8d6..0852545 100644
---- xmloff/source/core/xmltoken.cxx
-+++ xmloff/source/core/xmltoken.cxx
-@@ -1496,6 +1496,8 @@ namespace xmloff { namespace token {
+--- 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 {
TOKEN( "row-height", XML_ROW_HEIGHT ),
TOKEN( "row-number", XML_ROW_NUMBER ),
TOKEN( "rows", XML_ROWS ),
@@ -2935,11 +2797,9 @@ index 8d2c8d6..0852545 100644
TOKEN( "ruby", XML_RUBY ),
TOKEN( "ruby-align", XML_RUBY_ALIGN ),
TOKEN( "ruby-base", XML_RUBY_BASE ),
-diff --git xmloff/source/core/xmluconv.cxx xmloff/source/core/xmluconv.cxx
-index 910b4fd..d044ffe 100644
---- xmloff/source/core/xmluconv.cxx
-+++ xmloff/source/core/xmluconv.cxx
-@@ -646,6 +646,34 @@ void SvXMLUnitConverter::convertColor( OUStringBuffer& rBuffer,
+--- 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
rBuffer.append( sal_Unicode( aHexTab[ nCol & 0xf ] ) );
}
@@ -2974,11 +2834,9 @@ index 910b4fd..d044ffe 100644
/** convert number to string */
void SvXMLUnitConverter::convertNumber( OUStringBuffer& rBuffer,
sal_Int32 nNumber )
-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_
+--- 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
case XML_TYPE_COLOR :
pPropHdl = new XMLColorPropHdl;
break;
@@ -2988,11 +2846,9 @@ index 81530e1..7f8b397 100644
case XML_TYPE_NUMBER :
pPropHdl = new XMLNumberPropHdl( 4 );
break;
-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,
+--- 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
///////////////////////////////////////////////////////////////////////////////
//
@@ -3041,10 +2897,8 @@ index 152b1ad..f99a866 100644
// class XMLStringPropHdl
//
-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
+--- 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
@@ -158,6 +158,18 @@ public:
};
@@ -3064,10 +2918,8 @@ index 9c4e1c3..fbbbbeb 100644
PropertyHandler for the XML-data-type: XML_TYPE_STRING
*/
class XMLStringPropHdl : public XMLPropertyHandler
-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
+--- 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
@@ -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
commit aef6903a0fec1769985116c1276860b40a18f771
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Oct 31 18:40:18 2009 +0100
Update Writer document comparison GSoC code to ooo320.
* patches/dev300/apply: Split the patch into 2.
* patches/dev300/writer-doc-comparison-help.diff: Help-related things.
* patches/dev300/writer-doc-comparison.diff: Update, remove help.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5cb80d7..e633b91 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -18,7 +18,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
OOXML, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
PopupRemoval, LinkWarningDlg, InternalCairo, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
- CalcRowLimit, Gcc44, BuildFix, OptionalIconThemes
+ CalcRowLimit, Gcc44, BuildFix, OptionalIconThemes
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -3295,7 +3295,15 @@ impress-autolayout.diff, cocofan
writer-navigation-buttons.diff, ovcica
[ WriterDocComparison ]
+SectionOwner => jholesov
+# GSoC 2009 task, implemented by Tzvetelina Tzeneva
+# http://gsoc-tzvetelina.blogspot.com/
+
+# Improved document comparison
writer-doc-comparison.diff, tzvetelina
+# Help files for the document comparison
+writer-doc-comparison-help.diff, tzvetelina
+
[ MySQL >= dev300-m62 < ooo320-m0 ]
cws-mysqlnative-20090916-dev300.diff
diff --git a/patches/dev300/writer-doc-comparison-help.diff b/patches/dev300/writer-doc-comparison-help.diff
new file mode 100644
index 0000000..c641912
--- /dev/null
+++ b/patches/dev300/writer-doc-comparison-help.diff
@@ -0,0 +1,141 @@
+diff --git helpcontent2/source/text/shared/00/00000406.xhp helpcontent2/source/text/shared/00/00000406.xhp
+index cd019d9..f49bc03 100644
+--- helpcontent2/source/text/shared/00/00000406.xhp
++++ helpcontent2/source/text/shared/00/00000406.xhp
+@@ -298,6 +298,8 @@
+ </variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
+ </variable></paragraph>
++ <paragraph xml-lang="en-US" id="par_id3147006" role="paragraph" l10n="U"><variable id="comparisonoptions">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Comparison</emph>
++</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
+ </variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
+diff --git helpcontent2/source/text/shared/optionen/01040000.xhp helpcontent2/source/text/shared/optionen/01040000.xhp
+index ed4aee9..3354f04 100644
+--- helpcontent2/source/text/shared/optionen/01040000.xhp
++++ helpcontent2/source/text/shared/optionen/01040000.xhp
+@@ -65,6 +65,7 @@
+ <embed href="text/shared/optionen/01040400.xhp#drucken"/>
+ <embed href="text/shared/optionen/01040500.xhp#tabelle"/>
+ <embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
++<embed href="text/shared/optionen/comparisonopt.xhp#comparison"/>
+ <embed href="text/shared/optionen/01041000.xhp#compatibility"/>
+ <embed href="text/shared/optionen/01041100.xhp#autocaption"/>
+ <embed href="text/shared/optionen/mailmerge.xhp#mailmerge"/>
+diff --git helpcontent2/source/text/shared/optionen/comparisonopt.xhp helpcontent2/source/text/shared/optionen/comparisonopt.xhp
+new file mode 100644
+index 0000000..b7fc427
+--- /dev/null
++++ helpcontent2/source/text/shared/optionen/comparisonopt.xhp
+@@ -0,0 +1,77 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++
++<!--
++ ***********************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: comparisonopt.xhp,v $
++ * $Revision: 1.0 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************
++ -->
++
++<helpdocument version="1.0">
++<meta>
++<topic id="textsharedoptionencomparexml" indexer="include" status="PUBLISH">
++<title id="tit" xml-lang="en-US">Comparison</title>
++<filename>/text/shared/optionen/comparisonopt.xhp</filename>
++</topic>
++<history>
++<created date="2009-08-04T00:00:00">New file created</created>
++<lastedited date="2009-08-04T16:30:58">...</lastedited>
++</history>
++</meta>
++<body>
++<section id="comparison">
++<bookmark xml-lang="en-US" branch="hid/HID_COMPARISON_OPT" id="bm_id3149795" localize="false"/>
++<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/optionen/comparisonopt.xhp" name="Comparison">Comparison</link></paragraph>
++<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U"><ahelp hid="HID_COMPARISON_OPT">Specifies the settings for comparing two documents.</ahelp></paragraph>
++</section>
++<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U">To compare the current document with another one choose <link href="text/shared/01/02240000.xhp" name="Edit - Compare Document"><emph>Edit - Compare Document</emph></link>.</paragraph>
++<section id="howtoget">
++ <embed href="text/shared/00/00000406.xhp#comparisonoptions"/>
++</section>
++<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U">Compare Documents</paragraph>
++<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U">Specifies the mode for comparing two documents.</paragraph>
++<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO" id="bm_id3153896" localize="false"/>
++<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="3" l10n="U">Auto</paragraph>
++<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO">Use the most appropirate comparison settings for the current document.</ahelp></paragraph>
++<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR" id="bm_id3150358" localize="false"/>
++<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="3" l10n="U">By word</paragraph>
++<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR">Compare documents with a word as the basic unit.</ahelp></paragraph>
++<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD" id="bm_id3149203" localize="false"/>
++<paragraph role="heading" id="hd_id3148674" xml-lang="en-US" level="3" l10n="U">By character</paragraph>
++<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD">Compare documents with a character as the basic unit.</ahelp></paragraph>
++<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="2" l10n="U">Settings</paragraph>
++<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U">Specifies more comparison settings if the chosen mode is not Auto.</paragraph>
++<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID" id="bm_id3161831" localize="false"/>
++<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U">Use RSID</paragraph>
++<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID">Specifies that RSIDs are used when the documents are compared. This has an effect only if both documents have RSIDs and their root RSIDs are the same.</ahelp></paragraph>
++<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE" id="bm_id3148618" localize="false"/>
++<paragraph role="heading" id="hd_id3163713" xml-lang="en-US" level="3" l10n="U">Ignore isolated pieces of length</paragraph>
++<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE">Specifies that matched sequences of words or characters (depending on the chosen compare mode) of length equal to or less than the entered one will be ignored and will be shown as inserted/deleted.</ahelp></paragraph>
++</body>
++</helpdocument>
+diff --git helpcontent2/source/text/shared/optionen/makefile.mk helpcontent2/source/text/shared/optionen/makefile.mk
+index 88d6249..70be0bb 100644
+--- helpcontent2/source/text/shared/optionen/makefile.mk
++++ helpcontent2/source/text/shared/optionen/makefile.mk
+@@ -117,6 +117,7 @@ XHPFILES = \
+ 01160100.xhp \
+ 01160200.xhp \
+ 01160201.xhp \
++ comparisonopt.xhp \
+ improvement.xhp \
+ java.xhp \
+ javaclasspath.xhp \
+@@ -130,7 +131,7 @@ XHPFILES = \
+ viewcertificate.xhp \
+ viewcertificate_c.xhp \
+ viewcertificate_d.xhp \
+- viewcertificate_g.xhp
++ viewcertificate_g.xhp
+
+ # --- Targets ------------------------------------------------------
+
+diff --git helpcontent2/util/swriter/makefile.mk helpcontent2/util/swriter/makefile.mk
+index f550ef9..4750400 100644
+--- helpcontent2/util/swriter/makefile.mk
++++ helpcontent2/util/swriter/makefile.mk
+@@ -1318,6 +1318,7 @@ LINKLINKFILES= \
+ text$/shared$/optionen$/01160100.xhp \
+ text$/shared$/optionen$/01160200.xhp \
+ text$/shared$/optionen$/01160201.xhp \
++ text$/shared$/optionen$/comparisonopt.xhp \
+ text$/shared$/optionen$/improvement.xhp \
+ text$/shared$/optionen$/java.xhp \
+ text$/shared$/optionen$/javaclasspath.xhp \
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index e3678a3..88de807 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -5,11 +5,6 @@ From: Thorsten Behrens <thb at openoffice.org>
---
- helpcontent2/source/text/shared/00/00000406.xhp | 2
- .../source/text/shared/optionen/01040000.xhp | 1
- .../source/text/shared/optionen/comparisonopt.xhp | 77 ++
- .../source/text/shared/optionen/makefile.mk | 3
- helpcontent2/util/swriter/makefile.mk | 1
.../schema/org/openoffice/Office/Writer.xcs | 30 +
svx/inc/svx/dialogs.hrc | 1
svx/inc/svx/rsiditem.hxx | 57 +
@@ -69,147 +64,6 @@ From: Thorsten Behrens <thb at openoffice.org>
create mode 100644 svx/inc/svx/rsiditem.hxx
-diff --git helpcontent2/source/text/shared/00/00000406.xhp helpcontent2/source/text/shared/00/00000406.xhp
-index cd019d9..f49bc03 100644
---- helpcontent2/source/text/shared/00/00000406.xhp
-+++ helpcontent2/source/text/shared/00/00000406.xhp
-@@ -297,6 +297,8 @@
- </variable></paragraph>
- <paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
- </variable></paragraph>
-+<paragraph role="paragraph" id="par_id3147006" xml-lang="en-US" l10n="U"><variable id="comparisonoptions">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Comparison</emph>
-+</variable></paragraph>
- <paragraph role="paragraph" id="par_id3159333" xml-lang="en-US" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
- </variable></paragraph>
- <paragraph role="paragraph" id="par_id3149448" xml-lang="en-US" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
-diff --git helpcontent2/source/text/shared/optionen/01040000.xhp helpcontent2/source/text/shared/optionen/01040000.xhp
-index ed4aee9..3354f04 100644
---- helpcontent2/source/text/shared/optionen/01040000.xhp
-+++ helpcontent2/source/text/shared/optionen/01040000.xhp
-@@ -65,6 +65,7 @@
- <embed href="text/shared/optionen/01040400.xhp#drucken"/>
- <embed href="text/shared/optionen/01040500.xhp#tabelle"/>
- <embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
-+<embed href="text/shared/optionen/comparisonopt.xhp#comparison"/>
- <embed href="text/shared/optionen/01041000.xhp#compatibility"/>
- <embed href="text/shared/optionen/01041100.xhp#autocaption"/>
- <embed href="text/shared/optionen/mailmerge.xhp#mailmerge"/>
-diff --git helpcontent2/source/text/shared/optionen/comparisonopt.xhp helpcontent2/source/text/shared/optionen/comparisonopt.xhp
-new file mode 100644
-index 0000000..b7fc427
---- /dev/null
-+++ helpcontent2/source/text/shared/optionen/comparisonopt.xhp
-@@ -0,0 +1,77 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+
-+<!--
-+ ***********************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: comparisonopt.xhp,v $
-+ * $Revision: 1.0 $
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************
-+ -->
-+
-+<helpdocument version="1.0">
-+<meta>
-+<topic id="textsharedoptionencomparexml" indexer="include" status="PUBLISH">
-+<title id="tit" xml-lang="en-US">Comparison</title>
-+<filename>/text/shared/optionen/comparisonopt.xhp</filename>
-+</topic>
-+<history>
-+<created date="2009-08-04T00:00:00">New file created</created>
-+<lastedited date="2009-08-04T16:30:58">...</lastedited>
-+</history>
-+</meta>
-+<body>
-+<section id="comparison">
-+<bookmark xml-lang="en-US" branch="hid/HID_COMPARISON_OPT" id="bm_id3149795" localize="false"/>
-+<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/optionen/comparisonopt.xhp" name="Comparison">Comparison</link></paragraph>
-+<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U"><ahelp hid="HID_COMPARISON_OPT">Specifies the settings for comparing two documents.</ahelp></paragraph>
-+</section>
-+<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U">To compare the current document with another one choose <link href="text/shared/01/02240000.xhp" name="Edit - Compare Document"><emph>Edit - Compare Document</emph></link>.</paragraph>
-+<section id="howtoget">
-+ <embed href="text/shared/00/00000406.xhp#comparisonoptions"/>
-+</section>
-+<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U">Compare Documents</paragraph>
-+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U">Specifies the mode for comparing two documents.</paragraph>
-+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO" id="bm_id3153896" localize="false"/>
-+<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="3" l10n="U">Auto</paragraph>
-+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO">Use the most appropirate comparison settings for the current document.</ahelp></paragraph>
-+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR" id="bm_id3150358" localize="false"/>
-+<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="3" l10n="U">By word</paragraph>
-+<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR">Compare documents with a word as the basic unit.</ahelp></paragraph>
-+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD" id="bm_id3149203" localize="false"/>
-+<paragraph role="heading" id="hd_id3148674" xml-lang="en-US" level="3" l10n="U">By character</paragraph>
-+<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD">Compare documents with a character as the basic unit.</ahelp></paragraph>
-+<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="2" l10n="U">Settings</paragraph>
-+<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U">Specifies more comparison settings if the chosen mode is not Auto.</paragraph>
-+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID" id="bm_id3161831" localize="false"/>
-+<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U">Use RSID</paragraph>
-+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID">Specifies that RSIDs are used when the documents are compared. This has an effect only if both documents have RSIDs and their root RSIDs are the same.</ahelp></paragraph>
-+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE" id="bm_id3148618" localize="false"/>
-+<paragraph role="heading" id="hd_id3163713" xml-lang="en-US" level="3" l10n="U">Ignore isolated pieces of length</paragraph>
-+<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE">Specifies that matched sequences of words or characters (depending on the chosen compare mode) of length equal to or less than the entered one will be ignored and will be shown as inserted/deleted.</ahelp></paragraph>
-+</body>
-+</helpdocument>
-diff --git helpcontent2/source/text/shared/optionen/makefile.mk helpcontent2/source/text/shared/optionen/makefile.mk
-index 88d6249..70be0bb 100644
---- helpcontent2/source/text/shared/optionen/makefile.mk
-+++ helpcontent2/source/text/shared/optionen/makefile.mk
-@@ -117,6 +117,7 @@ XHPFILES = \
- 01160100.xhp \
- 01160200.xhp \
- 01160201.xhp \
-+ comparisonopt.xhp \
- java.xhp \
- javaclasspath.xhp \
- javaparameters.xhp \
-@@ -130,7 +131,7 @@ XHPFILES = \
- viewcertificate.xhp \
- viewcertificate_c.xhp \
- viewcertificate_d.xhp \
-- viewcertificate_g.xhp
-+ viewcertificate_g.xhp
-
- # --- Targets ------------------------------------------------------
-
-diff --git helpcontent2/util/swriter/makefile.mk helpcontent2/util/swriter/makefile.mk
-index f550ef9..4750400 100644
---- helpcontent2/util/swriter/makefile.mk
-+++ helpcontent2/util/swriter/makefile.mk
-@@ -1318,6 +1318,7 @@ LINKLINKFILES= \
- text$/shared$/optionen$/01160100.xhp \
- text$/shared$/optionen$/01160200.xhp \
- text$/shared$/optionen$/01160201.xhp \
-+ text$/shared$/optionen$/comparisonopt.xhp \
- text$/shared$/optionen$/java.xhp \
- text$/shared$/optionen$/javaclasspath.xhp \
- text$/shared$/optionen$/javaparameters.xhp \
diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 666a69f..bf953f0 100644
--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -354,10 +208,9 @@ index 5d34ef6..2fb31d7 100644
..\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
-diff --git svx/source/dialog/treeopt.cxx svx/source/dialog/treeopt.cxx
-index 9af727e..4a099b1 100644
---- svx/source/dialog/treeopt.cxx
-+++ svx/source/dialog/treeopt.cxx
+diff --git svx/source/cui/treeopt.cxx svx/source/cui/treeopt.cxx
+--- svx/source/cui/treeopt.cxx
++++ svx/source/cui/treeopt.cxx
@@ -438,6 +438,7 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
{ "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE },
{ "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE },
@@ -366,10 +219,9 @@ index 9af727e..4a099b1 100644
{ "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE },
{ "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE },
{ "Writer", "MailMerge", RID_SW_TP_MAILCONFIG },
-diff --git svx/source/dialog/treeopt.src svx/source/dialog/treeopt.src
-index 9d4a19c..9abe6be 100644
---- svx/source/dialog/treeopt.src
-+++ svx/source/dialog/treeopt.src
+diff --git svx/source/cui/treeopt.src svx/source/cui/treeopt.src
+--- 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 ; > ;
@@ -459,8 +311,8 @@ index 8507a8c..82f49d8 100644
RedlineMode_t eRedlineMode; // aktueller Redline Modus
SwCharCompressType eChrCmprType; // for ASIAN: compress punctuation/kana
-+ sal_uInt32 nRsid; // current session ID of the document
-+ sal_uInt32 nRsidRoot; // session ID when the document was created
++ sal_uInt32 nRsid; // current session ID of the document
++ sal_uInt32 nRsidRoot; // session ID when the document was created
+
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
@@ -470,19 +322,19 @@ index 8507a8c..82f49d8 100644
virtual SwCharCompressType getCharacterCompressionType() const;
virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType );
+ virtual sal_uInt32 getRsid() const;
-+ virtual void setRsid( sal_uInt32 nVal );
-+ virtual sal_uInt32 getRsidRoot() const;
-+ virtual void setRsidRoot( sal_uInt32 nVal );
- SwBookmark* getFieldBookmarkFor(const SwPosition &pos) const;
- SwBookmark* getNextFieldBookmarkFor(const SwPosition &pos) const;
- SwBookmark* getPrevFieldBookmarkFor(const SwPosition &pos) const;
++ virtual void setRsid( sal_uInt32 nVal );
++ virtual sal_uInt32 getRsidRoot() const;
++ virtual void setRsidRoot( sal_uInt32 nVal );
+
+ /** IDocumentDeviceAccess
+ */
@@ -937,6 +944,9 @@ public:
virtual bool Overwrite(const SwPaM &rRg, const String& rStr);
- virtual bool Insert(const SwPaM &rRg, sal_Unicode c);
- virtual bool Insert(const SwPaM &rRg, const String&, bool bHintExpand);
-+ virtual bool UpdateRsid( SwTxtNode *pTxtNode, xub_StrLen nStt, xub_StrLen nEnd );
-+ virtual bool UpdateParRsid( SwTxtNode *pTxtNode, UINT32 nVal = 0 );
-+ virtual bool UpdateRsid( const SwPaM &rRg, xub_StrLen nLen );
+ virtual bool InsertString(const SwPaM &rRg, const String&,
+ const enum InsertFlags nInsertMode = INS_EMPTYEXPAND );
++ virtual bool UpdateRsid( SwTxtNode *pTxtNode, xub_StrLen nStt, xub_StrLen nEnd );
++ virtual bool UpdateParRsid( SwTxtNode *pTxtNode, UINT32 nVal = 0 );
++ virtual bool UpdateRsid( const SwPaM &rRg, xub_StrLen nLen );
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,
@@ -827,36 +679,36 @@ index bdf5e54..76956af 100644
// returne den definierten DocStat - WordDelimiter
const String& GetDocStatWordDelim() const;
-diff --git sw/inc/txatbase.hxx sw/inc/txatbase.hxx
-index 04b51ea..27b9526 100644
---- sw/inc/txatbase.hxx
-+++ sw/inc/txatbase.hxx
-@@ -39,6 +39,7 @@ class SvxBrushItem;
- class SvxFontItem;
- class SvxPostureItem;
- class SvxWeightItem;
-+class SvxRsidItem;
- class SvxUnderlineItem;
- class SvxOverlineItem;
- class SvxFontHeightItem;
-@@ -169,6 +170,7 @@ public:
- inline const SvxCharRotateItem &GetCharRotate() const;
- inline const SvxCharReliefItem &GetCharRelief() const;
- inline const SvxCharHiddenItem &GetCharHidden() const;
-+ inline const SvxRsidItem &GetRsid() const;
-
- private:
- SwTxtAttr( const SwTxtAttr& );
-@@ -447,4 +449,9 @@ inline const SvxCharHiddenItem& SwTxtAttr::GetCharHidden() const
- return (const SvxCharHiddenItem&)*pAttr;
- }
-
-+inline const SvxRsidItem& SwTxtAttr::GetRsid() const
-+{
-+ ASSERT( pAttr && pAttr->Which() == RES_CHRATR_RSID, "Wrong Request" );
-+ return ( const SvxRsidItem& ) * pAttr;
-+}
- #endif
+#diff --git sw/inc/txatbase.hxx sw/inc/txatbase.hxx
+#index 04b51ea..27b9526 100644
+#--- sw/inc/txatbase.hxx
+#+++ sw/inc/txatbase.hxx
+#@@ -39,6 +39,7 @@ class SvxBrushItem;
+# class SvxFontItem;
+# class SvxPostureItem;
+# class SvxWeightItem;
+#+class SvxRsidItem;
+# class SvxUnderlineItem;
+# class SvxOverlineItem;
+# class SvxFontHeightItem;
+#@@ -169,6 +170,7 @@ public:
+# inline const SvxCharRotateItem &GetCharRotate() const;
+# inline const SvxCharReliefItem &GetCharRelief() const;
+# inline const SvxCharHiddenItem &GetCharHidden() const;
+#+ inline const SvxRsidItem &GetRsid() const;
+#
+# private:
+# SwTxtAttr( const SwTxtAttr& );
+#@@ -447,4 +449,9 @@ inline const SvxCharHiddenItem& SwTxtAttr::GetCharHidden() const
+# return (const SvxCharHiddenItem&)*pAttr;
+# }
+#
+#+inline const SvxRsidItem& SwTxtAttr::GetRsid() const
+#+{
+#+ ASSERT( pAttr && pAttr->Which() == RES_CHRATR_RSID, "Wrong Request" );
+#+ return ( const SvxRsidItem& ) * pAttr;
+#+}
+# #endif
diff --git sw/inc/undobj.hxx sw/inc/undobj.hxx
index c1a3055..5fc1aff 100644
--- sw/inc/undobj.hxx
@@ -874,13 +726,13 @@ index 558facb..49d9494 100644
--- sw/inc/unoprnms.hxx
+++ sw/inc/unoprnms.hxx
@@ -806,7 +806,9 @@ enum SwPropNameIds
- /* 0736 */ UNO_NAME_OUTLINE_LEVEL, //#outline level,add<-zhaojianwei outlinelevel
- /* 0737 */ UNO_NAME_IS_TEMPLATE,
- /* 0738 */ UNO_NAME_VBA_DOCOBJ,
--/* 0739 */ SW_PROPNAME_END
-+/* 0739 */ UNO_NAME_RSID,
-+/* 0740 */ UNO_NAME_PARRSID,
-+/* 0741 */ SW_PROPNAME_END
+ /* 0738 */ UNO_NAME_META, // #i91565#
+ /* 0739 */ UNO_NAME_IS_TEMPLATE,
+ /* 0740 */ UNO_NAME_VBA_DOCOBJ,
+-/* 0741 */ SW_PROPNAME_END
++/* 0741 */ UNO_NAME_RSID,
++/* 0742 */ UNO_NAME_PARRSID,
++/* 0743 */ SW_PROPNAME_END
};
@@ -1297,7 +1149,7 @@ index 05d6209..8f7521f 100644
// erstmal ganz einfach!
if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
{
-@@ -1143,69 +1288,127 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
+@@ -1143,70 +1288,128 @@ BOOL SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const
@@ -1440,7 +1292,8 @@ index 05d6209..8f7521f 100644
- SwPaM aCpyPam( rSrcNd, nStt );
- aCpyPam.SetMark();
- aCpyPam.GetPoint()->nContent = nSEnd;
-- aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint() );
+- aCpyPam.GetDoc()->CopyRange( aCpyPam, *aPam.GetPoint(),
+- false );
- pDoc->DoUndo( bUndo );
- }
-
@@ -1450,7 +1303,8 @@ index 05d6209..8f7521f 100644
+ SwPaM aCpyPam( rSrcNd, nSrcFrom );
+ aCpyPam.SetMark();
+ aCpyPam.GetPoint()->nContent = nSrcTo;
-+ aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint() );
++ aCpyPam.GetDoc()->CopyRange( aCpyPam, *aPam.GetPoint(),
++ false );
+ pDstDoc->DoUndo( bUndo );
+
+ SwPaM* pTmp = new SwPaM( *aPam.GetPoint(), rpDelRing );
@@ -2256,9 +2110,9 @@ index ff3009c..3b4ce82 100644
- 0, // RES_CHRATR_DUMMY2, // 40
+ 0, // RES_CHRATR_RSID, // 39
+ 0, // RES_DUMMY1, // 40
- 0, // RES_TXTATR_AUTOFMT, // 41
- 0, // RES_TXTATR_INETFMT // 42
- 36, // RES_TXTATR_REFMARK, // 43
+ 36, // RES_TXTATR_REFMARK, // 41
+ 37, // RES_TXTATR_TOXMARK, // 42
+ 38, // RES_TXTATR_META, // 43
diff --git sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/ndtxt.cxx
index 8730a52..2bf017e 100644
--- sw/source/core/txtnode/ndtxt.cxx
@@ -2362,11 +2216,11 @@ index b59ec8c..a657d96 100644
--- sw/source/core/unocore/unoprnms.cxx
+++ sw/source/core/unocore/unoprnms.cxx
@@ -781,6 +781,8 @@ const SwPropNameTab aPropNameTab = {
- /* 0736 UNO_NAME_OUTLINE_LEVEL */ {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
- /* 0737 UNO_NAME_IS_TEMPLATE */ {MAP_CHAR_LEN("IsTemplate")},
- /* 0738 UNO_NAME_VBA_DOCOBJ */ {MAP_CHAR_LEN("ThisVBADocObj")},
-+/* 0739 UNO_NAME_RSID */ {MAP_CHAR_LEN("Rsid")},
-+/* 0740 UNO_NAME_PARRSID */ {MAP_CHAR_LEN("ParRsid")},
+ /* 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")},
};
const SwPropNameLen& SwGetPropName( USHORT nId )
@@ -2377,9 +2231,9 @@ index 96d23ea..5e4722f 100644
@@ -529,6 +529,9 @@ ULONG SwASCIIParser::ReadChars()
void SwASCIIParser::InsertText( const String& rStr )
{
- pDoc->Insert( *pPam, rStr, true );
-+ pDoc->UpdateRsid( *pPam, rStr.Len() );
-+ pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTxtNode() );
+ pDoc->InsertString( *pPam, rStr );
++ pDoc->UpdateRsid( *pPam, rStr.Len() );
++ pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTxtNode() );
+
if( pItemSet && pBreakIt && nScript != ( SCRIPTTYPE_LATIN |
SCRIPTTYPE_ASIAN |
@@ -2442,28 +2296,28 @@ index e1191cb..99b9e65 100644
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
-diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
-index 0f5b576..63f0bd4 100644
---- sw/source/filter/ww8/ww8atr.cxx
-+++ sw/source/filter/ww8/ww8atr.cxx
-@@ -5064,8 +5064,8 @@ SwAttrFnTab aWW8AttrFnTab = {
- /* RES_CHRATR_RELIEF*/ OutWW8_Relief,
- /* RES_CHRATR_HIDDEN */ OutWW8_SvxCharHidden,
- /* RES_CHRATR_OVERLINE */ 0,
-+/* RES_CHRATR_RSID */ 0,
- /* RES_CHRATR_DUMMY1 */ 0,
--/* RES_CHRATR_DUMMY2 */ 0,
-
- /* RES_TXTATR_DUMMY4 */ 0,
- /* RES_TXTATR_INETFMT */ OutSwFmtINetFmt,
-@@ -5103,6 +5103,7 @@ SwAttrFnTab aWW8AttrFnTab = {
- /* RES_PARATR_SNAPTOGRID*/ OutWW8_SvxParaGridItem,
- /* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
- /* RES_PARATR_OUTLINELEVEL */ 0, // new - outlinelevel
-+/* RES_PARATR_RSID */ 0, // new
-
- /* RES_PARATR_LIST_ID */ 0, // new
- /* RES_PARATR_LIST_LEVEL */ 0, // new
+#diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
+#index 0f5b576..63f0bd4 100644
+#--- sw/source/filter/ww8/ww8atr.cxx
+#+++ sw/source/filter/ww8/ww8atr.cxx
+#@@ -5064,8 +5064,8 @@ SwAttrFnTab aWW8AttrFnTab = {
+# /* RES_CHRATR_RELIEF*/ OutWW8_Relief,
+# /* RES_CHRATR_HIDDEN */ OutWW8_SvxCharHidden,
+# /* RES_CHRATR_OVERLINE */ 0,
+#+/* RES_CHRATR_RSID */ 0,
+# /* RES_CHRATR_DUMMY1 */ 0,
+#-/* RES_CHRATR_DUMMY2 */ 0,
+#
+# /* RES_TXTATR_DUMMY4 */ 0,
+# /* RES_TXTATR_INETFMT */ OutSwFmtINetFmt,
+#@@ -5103,6 +5103,7 @@ SwAttrFnTab aWW8AttrFnTab = {
+# /* RES_PARATR_SNAPTOGRID*/ OutWW8_SvxParaGridItem,
+# /* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
+# /* RES_PARATR_OUTLINELEVEL */ 0, // new - outlinelevel
+#+/* RES_PARATR_RSID */ 0, // new
+#
+# /* RES_PARATR_LIST_ID */ 0, // new
+# /* RES_PARATR_LIST_LEVEL */ 0, // new
diff --git sw/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
index c9774b5..dafc229 100644
--- sw/source/ui/app/appopt.cxx
More information about the ooo-build-commit
mailing list