ooo-build r11337 - in trunk: . distro-configs patches/src680
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11337 - in trunk: . distro-configs patches/src680
- Date: Mon, 21 Jan 2008 12:42:11 +0000 (GMT)
Author: pmladek
Date: Mon Jan 21 12:42:11 2008
New Revision: 11337
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11337&view=rev
Log:
2008-01-21 Petr Mladek <pmladek suse cz>
* default tag ooh680-m3
* distro-configs/SUSE.conf.in,
distro-configs/SUSE-10.0.conf.in,
distro-configs/SUSE-10.1.conf.in,
distro-configs/SUSE-10.2.conf.in,
distro-configs/SUSE-10.3.conf.in: bin unused --with-system-portaudio,
--with-system-sndfile; do not enable the layout dialogs (after
discussion with Michael; they are not translated, ...)
* distro-configs/SUSE-PPC.conf.in, configure.in, patches/src680/apply:
bin unused SUSE-PPC.conf
* patches/src680/xmloff-field-patch.diff,
patches/src680/sw-field-patch.diff,
patches/src680/apply: update for ooh680-m3; move to the end of apply
and enable
Removed:
trunk/distro-configs/SUSE-PPC.conf.in
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.in
trunk/distro-configs/SUSE-10.0.conf.in
trunk/distro-configs/SUSE-10.1.conf.in
trunk/distro-configs/SUSE-10.2.conf.in
trunk/distro-configs/SUSE-10.3.conf.in
trunk/distro-configs/SUSE.conf.in
trunk/patches/src680/apply
trunk/patches/src680/sw-field-patch.diff
trunk/patches/src680/xmloff-field-patch.diff
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Jan 21 12:42:11 2008
@@ -80,7 +80,7 @@
+ build on Solaris (Fridrich)
+ support for gcj-4.2.1 and gcj-4.2.2 (Miklos)
+ new option -m|--modules for cws-extract (Fridrich)
- + option --with-icecream-max-jobs renamed to --max-jobs (Äsmail)
+ + option --with-icecream-max-jobs renamed to --with-max-jobs (Äsmail)
+ use system STL for archs like x86-64 as the default (Kendy)
+ removed dependency on nas, sndfile, portaudio (Caolan)
+ fix the Hungarian strings only when really needed (Tor)
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Jan 21 12:42:11 2008
@@ -3,7 +3,7 @@
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=ooh680-m2
+DEFAULT_TAG=ooh680-m3
# For the upstream packages it is like:
# DEFAULT_TAG=OOG680_m5
@@ -1139,7 +1139,6 @@
distro-configs/UbuntuGutsy.conf
distro-configs/UbuntuGutsy64.conf
distro-configs/SUSE.conf
-distro-configs/SUSE-PPC.conf
distro-configs/SUSE-reduced.conf
distro-configs/SUSE-9.1.conf
distro-configs/SUSE-9.2.conf
Modified: trunk/distro-configs/SUSE-10.0.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.0.conf.in (original)
+++ trunk/distro-configs/SUSE-10.0.conf.in Mon Jan 21 12:42:11 2008
@@ -19,5 +19,4 @@
--with-system-mozilla=mozilla
--with-system-neon
--with-system-odbc-headers
---with-system-sndfile
--without-myspell-dicts
Modified: trunk/distro-configs/SUSE-10.1.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.1.conf.in (original)
+++ trunk/distro-configs/SUSE-10.1.conf.in Mon Jan 21 12:42:11 2008
@@ -2,7 +2,6 @@
--disable-access
--disable-odk
--enable-gnome-vfs
---enable-layout
--enable-libsn
--enable-lockdown
--enable-mono
@@ -20,6 +19,5 @@
--with-system-mozilla=xulrunner
--with-system-neon
--with-system-odbc-headers
---with-system-sndfile
--with-xulrunner
--without-myspell-dicts
Modified: trunk/distro-configs/SUSE-10.2.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.2.conf.in (original)
+++ trunk/distro-configs/SUSE-10.2.conf.in Mon Jan 21 12:42:11 2008
@@ -3,7 +3,6 @@
--disable-odk
--disable-qadevooo
--enable-libsn
---enable-layout
--enable-lockdown
--enable-mono
--enable-opengl
@@ -20,7 +19,6 @@
--with-system-neon
--with-system-odbc-headers
--with-system-sablot
---with-system-sndfile
--with-system-xerces
--with-system-xml-apis
--with-xulrunner
Modified: trunk/distro-configs/SUSE-10.3.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.3.conf.in (original)
+++ trunk/distro-configs/SUSE-10.3.conf.in Mon Jan 21 12:42:11 2008
@@ -2,7 +2,6 @@
--disable-access
--disable-odk
--disable-qadevooo
---enable-layout
--enable-libsn
--enable-lockdown
--enable-mono
@@ -21,9 +20,7 @@
--with-system-mozilla=xulrunner
--with-system-neon
--with-system-odbc-headers
---with-system-portaudio
--with-system-sablot
---with-system-sndfile
--with-system-xalan
--with-system-xerces
--with-system-xml-apis
Modified: trunk/distro-configs/SUSE.conf.in
==============================================================================
--- trunk/distro-configs/SUSE.conf.in (original)
+++ trunk/distro-configs/SUSE.conf.in Mon Jan 21 12:42:11 2008
@@ -2,7 +2,6 @@
--disable-access
--disable-odk
--disable-qadevooo
---enable-layout
--enable-libsn
--enable-lockdown
--enable-mono
@@ -21,9 +20,7 @@
--with-system-mozilla=xulrunner
--with-system-neon
--with-system-odbc-headers
---with-system-portaudio
--with-system-sablot
---with-system-sndfile
--with-system-xalan
--with-system-xerces
--with-system-xml-apis
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Mon Jan 21 12:42:11 2008
@@ -49,7 +49,6 @@
SUSE-10.2 : NovellBase, BerkeleyDB43
SUSE-10.3 : NovellBase, BerkeleyDB43
SUSE : NovellBase, BerkeleyDB43, Gcc43
-SUSE-PPC : NovellBase, BerkeleyDB43
SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
# Debian
DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, CalcSolver, BerkeleyDB43, Split, PostgreSQL
@@ -180,12 +179,6 @@
#realize extra piece of new feature named as Show Data Form about vba
sc-dataform-suppor-vba.diff, Amelia Wang
-#First work on field enhancements...
-#FIXME: please, make it unidiff and assure it actually applies
-#FIXME: sw-field-patch.diff, flr, n#248354
-#FIXME: xmloff-field-patch.diff, flr, n#248354
-#FIXME: offapi-field-patch.diff, flr, n#248354
-
# fixed for n#200505
Simplified_Traditional_Chinese_convertion_table_n200505.diff, Fong Lin, n#200505
@@ -2016,3 +2009,11 @@
[ Win32Only ]
mozilla-source-1.7.5.patch.diff, i#84961, tml
+
+[ TemporaryHacks ]
+
+# First work on field enhancements...
+# FIXME: please, make it unidiff
+sw-field-patch.diff, flr, n#248354
+xmloff-field-patch.diff, flr, n#248354
+offapi-field-patch.diff, flr, n#248354
Modified: trunk/patches/src680/sw-field-patch.diff
==============================================================================
--- trunk/patches/src680/sw-field-patch.diff (original)
+++ trunk/patches/src680/sw-field-patch.diff Mon Jan 21 12:42:11 2008
@@ -73,12 +73,12 @@
*** sw/inc/IDocumentSettingAccess.hxx 20 Jun 2007 10:10:38 -0000 1.6
--- sw/inc/IDocumentSettingAccess.hxx 21 Jan 2008 08:32:23 -0000
***************
-*** 87,92 ****
---- 87,93 ----
-
+*** 91,96 ****
+--- 91,97 ----
UNIX_FORCE_ZERO_EXT_LEADING,
USE_OLD_PRINTER_METRICS,
-+ PROTECT_FORM,
+ TABS_RELATIVE_TO_INDENT,
++ PROTECT_FORM,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
@@ -223,22 +223,15 @@
*** sw/inc/doc.hxx 18 Jul 2007 12:54:37 -0000 1.140
--- sw/inc/doc.hxx 21 Jan 2008 08:32:24 -0000
***************
-*** 612,618 ****
- bool mbClipAsCharacterAnchoredWriterFlyFrames : 1; // OD 2006-04-13 #b6402800#
- bool mbUnixForceZeroExtLeading : 1; // FME 2006-10-09 #i60945#
- bool mbOldPrinterMetrics : 1; // FME 2007-05-14 #147385#
-!
- //
- // COMPATIBILITY FLAGS END
- //
---- 612,618 ----
- bool mbClipAsCharacterAnchoredWriterFlyFrames : 1; // OD 2006-04-13 #b6402800#
+*** 619,624 ****
+--- 619,625 ----
bool mbUnixForceZeroExtLeading : 1; // FME 2006-10-09 #i60945#
bool mbOldPrinterMetrics : 1; // FME 2007-05-14 #147385#
-! bool mbProtectForm : 1;
- //
- // COMPATIBILITY FLAGS END
- //
+ bool mbTabRelativeToIndent; // #i24363# tab stops relative to indent
++ bool mbProtectForm : 1;
+
+ // #i78591#
+ sal_uInt32 n32DummyCompatabilityOptions1;
***************
*** 778,783 ****
--- 778,787 ----
@@ -303,21 +296,21 @@
*** sw/inc/unocoll.hxx 22 May 2007 16:21:18 -0000 1.21
--- sw/inc/unocoll.hxx 21 Jan 2008 08:32:25 -0000
***************
-*** 219,226 ****
- #define SW_SERVICE_IMAP_POLYGON 103
- #define SW_SERVICE_TYPE_TEXT_GRAPHIC 104
- #define SW_SERVICE_CHART2_DATA_PROVIDER 105
+*** 220,227 ****
+ #define SW_SERVICE_IMAP_POLYGON 104
+ #define SW_SERVICE_TYPE_TEXT_GRAPHIC 105
+ #define SW_SERVICE_CHART2_DATA_PROVIDER 106
-! #define SW_SERVICE_LAST SW_SERVICE_CHART2_DATA_PROVIDER
+! #define SW_SERVICE_LAST SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM
#define SW_SERVICE_INVALID USHRT_MAX
---- 219,228 ----
- #define SW_SERVICE_IMAP_POLYGON 103
- #define SW_SERVICE_TYPE_TEXT_GRAPHIC 104
- #define SW_SERVICE_CHART2_DATA_PROVIDER 105
-+ #define SW_SERVICE_TYPE_FIELDMARK 106
-+ #define SW_SERVICE_TYPE_FORMFIELDMARK 107
+--- 220,229 ----
+ #define SW_SERVICE_IMAP_POLYGON 104
+ #define SW_SERVICE_TYPE_TEXT_GRAPHIC 105
+ #define SW_SERVICE_CHART2_DATA_PROVIDER 106
++ #define SW_SERVICE_TYPE_FIELDMARK 107
++ #define SW_SERVICE_TYPE_FORMFIELDMARK 108
! #define SW_SERVICE_LAST SW_SERVICE_TYPE_FORMFIELDMARK
@@ -355,38 +348,30 @@
#include <cppuhelper/implbase3.hxx> // helper for implementations
#endif
***************
-*** 184,195 ****
+*** 184,189 ****
+--- 184,192 ----
#ifndef _CPPUHELPER_WEAKREF_HXX_
#include <cppuhelper/weakref.hxx>
#endif
-!
++ #ifndef _COM_SUN_STAR_TEXT_XFORMFIELD_HPP_
++ #include <com/sun/star/text/XFormField.hpp>
++ #endif
- #ifndef _LINK_HXX
- #include <tools/link.hxx>
- #endif
-
- #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
- #define C2S(cChar) UniString::CreateFromAscii(cChar)
+ #include <unomid.h>
---- 187,204 ----
- #ifndef _CPPUHELPER_WEAKREF_HXX_
- #include <cppuhelper/weakref.hxx>
- #endif
-! #ifndef _COM_SUN_STAR_TEXT_XFORMFIELD_HPP_
-! #include <com/sun/star/text/XFormField.hpp>
-! #endif
-
- #ifndef _LINK_HXX
+***************
+*** 191,196 ****
+--- 194,203 ----
#include <tools/link.hxx>
#endif
-+ #ifndef IDOCUMENTBOOKMARKACCESS_HXX_INCLUDED
-+ #include <IDocumentBookmarkAccess.hxx>
-+ #endif
++ #ifndef IDOCUMENTBOOKMARKACCESS_HXX_INCLUDED
++ #include <IDocumentBookmarkAccess.hxx>
++ #endif
+
- #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
- #define C2S(cChar) UniString::CreateFromAscii(cChar)
-
+ class SwUnoCrsr;
+ class SwCursor;
+ class SwBookmark;
***************
*** 680,685 ****
--- 689,695 ----
@@ -618,12 +603,12 @@
*** sw/source/core/doc/doc.cxx 3 Aug 2007 10:59:51 -0000 1.59
--- sw/source/core/doc/doc.cxx 21 Jan 2008 08:32:27 -0000
***************
-*** 298,303 ****
---- 298,304 ----
- // <--
+*** 300,305 ****
+--- 300,306 ----
case UNIX_FORCE_ZERO_EXT_LEADING: return mbUnixForceZeroExtLeading;
case USE_OLD_PRINTER_METRICS: return mbOldPrinterMetrics;
-+ case PROTECT_FORM: return mbProtectForm;
+ case TABS_RELATIVE_TO_INDENT : return mbTabRelativeToIndent;
++ case PROTECT_FORM: return mbProtectForm;
// COMPATIBILITY FLAGS END
case BROWSE_MODE: return mbBrowseMode;
@@ -947,11 +932,11 @@
*** sw/source/core/doc/docnew.cxx 18 Jul 2007 13:29:46 -0000 1.77
--- sw/source/core/doc/docnew.cxx 21 Jan 2008 08:32:30 -0000
***************
-*** 413,418 ****
---- 413,419 ----
- mbClipAsCharacterAnchoredWriterFlyFrames= false; // hidden
+*** 419,424 ****
+--- 419,425 ----
mbUnixForceZeroExtLeading = false; // hidden
mbOldPrinterMetrics = false; // hidden
+ mbTabRelativeToIndent = true; // hidden
+ mbProtectForm = false; // hidden
//
@@ -1163,36 +1148,35 @@
protected:
void Chg( SwTxtAttr *pHt );
void Rst( SwTxtAttr *pHt );
- void CtorInit( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
+ void CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
! inline SwAttrIter()
-! : pFnt(0), pLastOut(0), nChgCnt(0), nPropFont(0), pShell(0), pRedln(0){}
+! : pShell(0), pFnt(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0) {}
public:
// Konstruktor, Destruktor
inline SwAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf )
-! : pFnt(0), pLastOut(0), nChgCnt(0), nPropFont(0), pShell(0), pRedln(0)
- { CtorInit( rTxtNode, rScrInf ); }
+! : pShell(0), pFnt(0), pHints(0), pScriptInfo(0), pLastOut(0), nChgCnt(0), pRedln(0),nPropFont(0)
+ { CtorInitAttrIter( rTxtNode, rScrInf ); }
virtual ~SwAttrIter();
---- 82,101 ----
+--- 82,100 ----
inline void SetFnt( SwFont* pNew ) { pFnt = pNew; }
const void* aMagicNo[ SW_SCRIPTS ];
MSHORT aFntIdx[ SW_SCRIPTS ];
-+ const SwTxtNode* m_pTxtNode;
++ const SwTxtNode* m_pTxtNode;
protected:
void Chg( SwTxtAttr *pHt );
void Rst( SwTxtAttr *pHt );
- void CtorInit( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
-!
-! inline SwAttrIter(SwTxtNode* pTxtNode)
-! : pFnt(0), pLastOut(0), nChgCnt(0), nPropFont(0), pShell(0), pRedln(0), m_pTxtNode(pTxtNode){}
+ void CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
+! inline SwAttrIter(SwTxtNode* pTxtNode)
+! : pShell(0), pFnt(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0), m_pTxtNode(pTxtNode) {}
public:
// Konstruktor, Destruktor
inline SwAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf )
-! : pFnt(0), pLastOut(0), nChgCnt(0), nPropFont(0), pShell(0), pRedln(0), m_pTxtNode(&rTxtNode)
- { CtorInit( rTxtNode, rScrInf ); }
+! : pShell(0), pFnt(0), pHints(0), pScriptInfo(0), pLastOut(0), nChgCnt(0), pRedln(0),nPropFont(0), m_pTxtNode(&rTxtNode)
+ { CtorInitAttrIter( rTxtNode, rScrInf ); }
virtual ~SwAttrIter();
Index: sw/source/core/text/itrform2.cxx
@@ -1253,17 +1237,17 @@
*** 144,150 ****
sal_Bool CalcOnceMore();
- void CtorInit( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf );
-! inline SwTxtFormatter( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf )
- { CtorInit( pFrm, pInf ); }
+ void CtorInitTxtFormatter( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf );
+! inline SwTxtFormatter( SwTxtFrm *pTxtFrm, SwTxtFormatInfo *pTxtFmtInf )
+ { CtorInitTxtFormatter( pTxtFrm, pTxtFmtInf ); }
~SwTxtFormatter();
--- 144,150 ----
sal_Bool CalcOnceMore();
- void CtorInit( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf );
-! inline SwTxtFormatter( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf ) : SwTxtPainter(pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { CtorInit( pFrm, pInf ); }
+ void CtorInitTxtFormatter( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf );
+! inline SwTxtFormatter( SwTxtFrm *pTxtFrm, SwTxtFormatInfo *pTxtFmtInf ) : SwTxtPainter(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtFormatter( pTxtFrm, pTxtFmtInf ); }
~SwTxtFormatter();
Index: sw/source/core/text/itrpaint.hxx
@@ -1277,23 +1261,22 @@
*** 52,60 ****
long nAdjustBaseLine = 0 );
protected:
- void CtorInit( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
+ void CtorInitTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
! inline SwTxtPainter() { }
public:
-! inline SwTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf )
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtPainter( SwTxtFrm *pTxtFrm, SwTxtPaintInfo *pTxtPaintInf )
+ { CtorInitTxtPainter( pTxtFrm, pTxtPaintInf ); }
void DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
const sal_Bool bUnderSz );
---- 52,62 ----
+--- 52,61 ----
long nAdjustBaseLine = 0 );
protected:
- void CtorInit( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
+ void CtorInitTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
! inline SwTxtPainter(SwTxtNode* pTxtNode) : SwTxtCursor(pTxtNode) { }
!
public:
-! inline SwTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf ) : SwTxtCursor(
-! pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtPainter( SwTxtFrm *pTxtFrm, SwTxtPaintInfo *pTxtPaintInf ) : SwTxtCursor(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtPainter( pTxtFrm, pTxtPaintInf ); }
void DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
const sal_Bool bUnderSz );
Index: sw/source/core/text/itrtxt.hxx
@@ -1307,44 +1290,44 @@
*** 73,82 ****
// Zuruecksetzen in die erste Zeile.
void Init();
- void CtorInit( SwTxtFrm *pFrm, SwTxtInfo *pInf );
+ void CtorInitTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf );
! inline SwTxtIter() { }
public:
-! inline SwTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf )
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtIter( SwTxtFrm *pTxtFrm, SwTxtInfo *pTxtInf )
+ { CtorInitTxtIter( pTxtFrm, pTxtInf ); }
inline const SwLineLayout *GetCurr() const { return pCurr; } // niemals 0!
inline const SwLineLayout *GetNext() const { return pCurr->GetNext(); }
--- 73,82 ----
// Zuruecksetzen in die erste Zeile.
void Init();
- void CtorInit( SwTxtFrm *pFrm, SwTxtInfo *pInf );
+ void CtorInitTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf );
! inline SwTxtIter(SwTxtNode* pTxtNode) : SwAttrIter(pTxtNode) { }
public:
-! inline SwTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf ) : SwAttrIter(pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtIter( SwTxtFrm *pTxtFrm, SwTxtInfo *pTxtInf ) : SwAttrIter(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtIter( pTxtFrm, pTxtInf ); }
inline const SwLineLayout *GetCurr() const { return pCurr; } // niemals 0!
inline const SwLineLayout *GetNext() const { return pCurr->GetNext(); }
***************
*** 159,167 ****
inline void SetDropLeft( const KSHORT nNew ) { nDropLeft = nNew; }
- void CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
+ void CtorInitTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
! inline SwTxtMargin() { }
public:
-! inline SwTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf )
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtMargin( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf )
+ { CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
inline SwTwips GetLeftMargin() const;
inline SwTwips Left() const;
--- 159,167 ----
inline void SetDropLeft( const KSHORT nNew ) { nDropLeft = nNew; }
- void CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
-! inline SwTxtMargin(SwTxtNode* pTxtNode) : SwTxtIter(pTxtNode) { }
+ void CtorInitTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
+! inline SwTxtMargin(SwTxtNode* pTxtNode) : SwTxtIter(pTxtNode) { }
public:
-! inline SwTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf ) : SwTxtIter(pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtMargin( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtIter(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
inline SwTwips GetLeftMargin() const;
inline SwTwips Left() const;
***************
@@ -1358,8 +1341,8 @@
SwTwips nReal = 0 );
SwTwips CalcKanaAdj( SwLineLayout *pCurr );
public:
-! inline SwTxtAdjuster( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf )
- { SwTxtMargin::CtorInit( pFrm, pInf ); }
+! inline SwTxtAdjuster( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf )
+ { CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
// wird von SwTxtFormatter wegen UpdatePos ueberladen
--- 223,235 ----
@@ -1372,29 +1355,29 @@
SwTwips nReal = 0 );
SwTwips CalcKanaAdj( SwLineLayout *pCurr );
public:
-! inline SwTxtAdjuster( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf ) : SwTxtMargin(pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { SwTxtMargin::CtorInit( pFrm, pInf ); }
+! inline SwTxtAdjuster( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtMargin(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
// wird von SwTxtFormatter wegen UpdatePos ueberladen
***************
*** 262,270 ****
void _GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* );
protected:
- void CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
+ void CtorInitTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
! inline SwTxtCursor() { }
public:
-! inline SwTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf )
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf )
+ { CtorInitTxtCursor( pTxtFrm, pTxtSizeInf ); }
sal_Bool GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* = 0,
const long nMax = 0 );
--- 262,270 ----
void _GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* );
protected:
- void CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
+ void CtorInitTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
! inline SwTxtCursor(SwTxtNode* pTxtNode) : SwTxtAdjuster(pTxtNode) { }
public:
-! inline SwTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf ) : SwTxtAdjuster(pFrm!=NULL?pFrm->GetTxtNode():NULL)
- { CtorInit( pFrm, pInf ); }
+! inline SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtAdjuster(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
+ { CtorInitTxtCursor( pTxtFrm, pTxtSizeInf ); }
sal_Bool GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* = 0,
const long nMax = 0 );
Index: sw/source/core/text/portxt.cxx
@@ -1764,16 +1747,16 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
***************
-*** 270,275 ****
---- 270,277 ----
- "com.sun.star.image.ImageMapPolygonObject", SW_SERVICE_IMAP_POLYGON,
- "com.sun.star.text.TextGraphicObject", SW_SERVICE_TYPE_TEXT_GRAPHIC,
- "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER,
-+ "org.go-oo.text.Fieldmark", SW_SERVICE_TYPE_FIELDMARK,
-+ "org.go-oo.text.FormFieldmark", SW_SERVICE_TYPE_FORMFIELDMARK,
+*** 271,276 ****
+--- 271,278 ----
+ { "com.sun.star.image.ImageMapPolygonObject", SW_SERVICE_IMAP_POLYGON },
+ { "com.sun.star.text.TextGraphicObject", SW_SERVICE_TYPE_TEXT_GRAPHIC },
+ { "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER },
++ { "org.go-oo.text.Fieldmark", SW_SERVICE_TYPE_FIELDMARK },
++ { "org.go-oo.text.FormFieldmark", SW_SERVICE_TYPE_FORMFIELDMARK },
// case-correct versions of the service names (see #i67811)
- CSS_TEXT_TEXTFIELD_DATE_TIME, SW_SERVICE_FIELDTYPE_DATETIME,
+ { CSS_TEXT_TEXTFIELD_DATE_TIME, SW_SERVICE_FIELDTYPE_DATETIME },
***************
*** 441,446 ****
--- 443,460 ----
@@ -2007,19 +1990,19 @@
SwFltStackEntry(const SwPosition & rStartPos, SfxPoolItem* pHt );
SwFltStackEntry(const SwFltStackEntry& rEntry);
***************
-*** 137,143 ****
+*** 144,150 ****
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
- void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE,
-! long nHand = LONG_MAX);
+
+! virtual void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE, long nHand = LONG_MAX);
void StealAttr(const SwPosition* pPos, USHORT nAttrId = 0);
void MarkAllAttrsOld();
---- 138,144 ----
+--- 144,150 ----
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
- void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE,
-! long nHand = LONG_MAX, BOOL consumedByField=FALSE);
+
+! virtual void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE, long nHand = LONG_MAX, BOOL consumedByField=FALSE);
void StealAttr(const SwPosition* pPos, USHORT nAttrId = 0);
void MarkAllAttrsOld();
@@ -2122,9 +2105,9 @@
+ #include <bookmrk.hxx>
+ #endif
+
- using namespace com::sun::star::i18n;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n;
using namespace sw::util;
- using namespace sw::types;
***************
*** 394,405 ****
xub_StrLen nMinPos = STRING_MAXLEN;
@@ -3284,29 +3267,29 @@
*** sw/source/ui/uno/SwXDocumentSettings.cxx 17 Jul 2007 13:12:39 -0000 1.56
--- sw/source/ui/uno/SwXDocumentSettings.cxx 21 Jan 2008 08:32:55 -0000
***************
-*** 159,165 ****
- HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE,
+*** 160,166 ****
HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES,
HANDLE_UNIX_FORCE_ZERO_EXT_LEADING,
-! HANDLE_USE_OLD_PRINTER_METRICS
+ HANDLE_USE_OLD_PRINTER_METRICS,
+! HANDLE_TABS_RELATIVE_TO_INDENT
};
MasterPropertySetInfo * lcl_createSettingsInfo()
---- 159,166 ----
- HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE,
+--- 160,167 ----
HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES,
HANDLE_UNIX_FORCE_ZERO_EXT_LEADING,
-! HANDLE_USE_OLD_PRINTER_METRICS,
+ HANDLE_USE_OLD_PRINTER_METRICS,
+! HANDLE_TABS_RELATIVE_TO_INDENT,
! HANDLE_PROTECT_FORM
};
MasterPropertySetInfo * lcl_createSettingsInfo()
***************
-*** 209,214 ****
---- 210,216 ----
- { RTL_CONSTASCII_STRINGPARAM("ClipAsCharacterAnchoredWriterFlyFrames"), HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES, CPPUTYPE_BOOLEAN, 0, 0},
+*** 211,216 ****
+--- 212,218 ----
{ 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},
+ { RTL_CONSTASCII_STRINGPARAM("ProtectForm"), HANDLE_PROTECT_FORM, CPPUTYPE_BOOLEAN, 0, 0},
/*
Modified: trunk/patches/src680/xmloff-field-patch.diff
==============================================================================
--- trunk/patches/src680/xmloff-field-patch.diff (original)
+++ trunk/patches/src680/xmloff-field-patch.diff Mon Jan 21 12:42:11 2008
@@ -134,18 +134,18 @@
*** xmloff/inc/xmloff/xmltoken.hxx 3 Aug 2007 12:52:56 -0000 1.7
--- xmloff/inc/xmloff/xmltoken.hxx 21 Jan 2008 08:29:20 -0000
***************
-*** 2951,2956 ****
---- 2951,2963 ----
- XML_RIGHT_ANGLED_AXES,
- XML_SOFT_PAGE_BREAK,
- XML_USE_SOFT_PAGE_BREAKS,
-+
-+ XML_FIELDMARK,
-+ XML_FIELDMARK_START,
-+ XML_FIELDMARK_END,
-+ XML_N_FIELD,
-+ XML_NP_FIELD,
-+
+*** 2994,2999 ****
+--- 2994,3006 ----
+ XML_CHARACTER_SET,
+ XML_APPLICATION_CONNECTION_SETTINGS,
+ XML_TABLE_INCLUDE_FILTER,
++
++ XML_FIELDMARK,
++ XML_FIELDMARK_START,
++ XML_FIELDMARK_END,
++ XML_N_FIELD,
++ XML_NP_FIELD,
++
XML_TOKEN_END
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
