[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Sep 23 06:53:45 PDT 2010
patches/dev300/maths_baseline_fix.diff | 117 ++++++++++++++++-----------------
1 file changed, 57 insertions(+), 60 deletions(-)
New commits:
commit ac827d6cf50c2dc14caa58c659b6f3ad032ec802
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 23 15:43:55 2010 +0200
maths_baseline_fix.diff: Make apply
diff --git a/patches/dev300/maths_baseline_fix.diff b/patches/dev300/maths_baseline_fix.diff
index 98db0c9..9a58736 100644
--- a/patches/dev300/maths_baseline_fix.diff
+++ b/patches/dev300/maths_baseline_fix.diff
@@ -1,7 +1,7 @@
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 141de70..2471323 100644
---- a/sfx2/inc/sfx2/ipclient.hxx
-+++ b/sfx2/inc/sfx2/ipclient.hxx
+--- sfx2/inc/sfx2/ipclient.hxx
++++ sfx2/inc/sfx2/ipclient.hxx
@@ -101,6 +101,7 @@ public:
// used in Writer
// Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const;
@@ -12,8 +12,8 @@ index 141de70..2471323 100644
#endif
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index a0cd213..a486bc0 100644
---- a/sfx2/source/view/ipclient.cxx
-+++ b/sfx2/source/view/ipclient.cxx
+--- sfx2/source/view/ipclient.cxx
++++ sfx2/source/view/ipclient.cxx
@@ -214,6 +214,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a
if ( m_pClient && aEvent.EventName.equalsAscii("OnVisAreaChanged") && m_nAspect != embed::Aspects::MSOLE_ICON )
@@ -36,8 +36,8 @@ index a0cd213..a486bc0 100644
if ( GetObject().is() )
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index dabb503..cfa8b2b 100644
---- a/starmath/inc/node.hxx
-+++ b/starmath/inc/node.hxx
+--- starmath/inc/node.hxx
++++ starmath/inc/node.hxx
@@ -180,6 +180,9 @@ public:
const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
@@ -68,9 +68,9 @@ index dabb503..cfa8b2b 100644
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index b243ced..415a8c0 100644
---- a/starmath/source/node.cxx
-+++ b/starmath/source/node.cxx
-@@ -760,7 +760,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
+--- starmath/source/node.cxx
++++ starmath/source/node.cxx
+@@ -758,7 +758,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
}
Point aPos;
@@ -79,7 +79,7 @@ index b243ced..415a8c0 100644
for (i = 0; i < nSize; i++)
{ if (NULL != (pNode = GetSubNode(i)))
{ const SmRect &rNodeRect = pNode->GetRect();
-@@ -776,6 +776,22 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
+@@ -774,6 +774,22 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
ExtendBy(rNodeRect, nSize > 1 ? RCP_NONE : RCP_ARG);
}
}
@@ -89,7 +89,7 @@ index b243ced..415a8c0 100644
+ else
+ {
+ SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE);
-+ aTmpDev.SetFont(GetFont());
++ aTmpDev.SetFont(GetFont());
+
+ SmRect aRect = (SmRect(aTmpDev, &rFormat, C2S("a"),
+ GetFont().GetBorderWidth()));
@@ -102,7 +102,7 @@ index b243ced..415a8c0 100644
}
-@@ -815,27 +831,33 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
+@@ -813,20 +831,21 @@
SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE);
aTmpDev.SetFont(GetFont());
@@ -133,11 +133,11 @@ index b243ced..415a8c0 100644
+ SetItalicSpaces(0, 0);
return;
+ }
-+
// make distance depend on font size
- long nDist = +(rFormat.GetDistance(DIS_HORIZONTAL)
- * GetFont().GetSize().Height()) / 100L;
+ long nDist = (rFormat.GetDistance(DIS_HORIZONTAL) * GetFont().GetSize().Height()) / 100L;
+@@ -834,7 +836,11 @@
+ nDist = 0;
Point aPos;
- for (i = 0; i < nSize; i++)
@@ -151,8 +151,8 @@ index b243ced..415a8c0 100644
aPos = pNode->AlignTo(*this, RP_RIGHT, RHA_CENTER, RVA_BASELINE);
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index ea2bcb4..6e49687 100644
---- a/starmath/source/unomodel.cxx
-+++ b/starmath/source/unomodel.cxx
+--- starmath/source/unomodel.cxx
++++ starmath/source/unomodel.cxx
@@ -146,7 +146,8 @@ enum SmModelPropertyHandles
// --> PB 2004-08-25 #i33095# Security Options
HANDLE_LOAD_READONLY,
@@ -197,8 +197,8 @@ index ea2bcb4..6e49687 100644
}
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c352cc7..29542a6 100644
---- a/sw/inc/editsh.hxx
-+++ b/sw/inc/editsh.hxx
+--- sw/inc/editsh.hxx
++++ sw/inc/editsh.hxx
@@ -933,6 +933,9 @@ public:
// character attribut dialog.
USHORT GetScalingOfSelectedText() const;
@@ -211,8 +211,8 @@ index c352cc7..29542a6 100644
// verkleideter Copy-Constructor
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 0318f99..7fafbca 100644
---- a/sw/inc/fesh.hxx
-+++ b/sw/inc/fesh.hxx
+--- sw/inc/fesh.hxx
++++ sw/inc/fesh.hxx
@@ -543,6 +543,18 @@ public:
BOOL ReplaceSdrObj( const String& rGrfName, const String& rFltName,
@@ -234,8 +234,8 @@ index 0318f99..7fafbca 100644
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index e3074e4..9ff19de 100644
---- a/sw/inc/ndole.hxx
-+++ b/sw/inc/ndole.hxx
+--- sw/inc/ndole.hxx
++++ sw/inc/ndole.hxx
@@ -149,7 +149,8 @@ public:
// --> OD 2009-03-05 #i99665#
bool IsChart() const;
@@ -248,8 +248,8 @@ index e3074e4..9ff19de 100644
void SetChartTblName( const String& rNm ) { sChartTblName = rNm; }
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 3227b89..4e71ccb 100644
---- a/sw/inc/pam.hxx
-+++ b/sw/inc/pam.hxx
+--- sw/inc/pam.hxx
++++ sw/inc/pam.hxx
@@ -259,7 +259,7 @@ public:
// etwas geschuetztes.
BOOL HasReadonlySel( bool bFormView ) const;
@@ -261,8 +261,8 @@ index 3227b89..4e71ccb 100644
static BOOL Overlap(const SwPaM & a, const SwPaM & b);
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index d4fe338..23fa501 100644
---- a/sw/inc/swcli.hxx
-+++ b/sw/inc/swcli.hxx
+--- sw/inc/swcli.hxx
++++ sw/inc/swcli.hxx
@@ -53,6 +53,8 @@ public:
void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; }
@@ -274,12 +274,12 @@ index d4fe338..23fa501 100644
#endif
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 5c85192..8032913 100644
---- a/sw/source/core/doc/poolfmt.cxx
-+++ b/sw/source/core/doc/poolfmt.cxx
+--- sw/source/core/doc/poolfmt.cxx
++++ sw/source/core/doc/poolfmt.cxx
@@ -1336,7 +1336,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
case RES_POOLFRM_FORMEL:
{
- aSet.Put( SwFmtAnchor( FLY_IN_CNTNT ) );
+ aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
+ aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
@@ -287,8 +287,8 @@ index 5c85192..8032913 100644
break;
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index ce48d9f..3d3db79 100644
---- a/sw/source/core/edit/edatmisc.cxx
-+++ b/sw/source/core/edit/edatmisc.cxx
+--- sw/source/core/edit/edatmisc.cxx
++++ sw/source/core/edit/edatmisc.cxx
@@ -36,7 +36,12 @@
#include <swundo.hxx> // fuer die UndoIds
#include <ndtxt.hxx> // fuer Get-/ChgFmt Set-/GetAttrXXX
@@ -371,8 +371,8 @@ index ce48d9f..3d3db79 100644
diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk
index 07904b7..828b1d1 100644
---- a/sw/source/core/edit/makefile.mk
-+++ b/sw/source/core/edit/makefile.mk
+--- sw/source/core/edit/makefile.mk
++++ sw/source/core/edit/makefile.mk
@@ -44,13 +44,13 @@ EXCEPTIONSFILES=\
$(SLO)$/eddel.obj \
$(SLO)$/edlingu.obj \
@@ -390,15 +390,12 @@ index 07904b7..828b1d1 100644
$(SLO)$/edfld.obj \
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 1458463..ed859cf 100644
---- a/sw/source/core/frmedt/fefly1.cxx
-+++ b/sw/source/core/frmedt/fefly1.cxx
-@@ -72,9 +72,10 @@
- // --> OD 2006-03-06 #125892#
- #include <HandleAnchorNodeChg.hxx>
+--- sw/source/core/frmedt/fefly1.cxx
++++ sw/source/core/frmedt/fefly1.cxx
+@@ -72,6 +72,9 @@
+ #include <fmtsrnd.hxx>
+ #include <editeng/opaqitem.hxx>
// <--
--
- #include <frmatr.hxx>
--
+// --> #i972#
+#include <ndole.hxx>
+// <--
@@ -555,8 +552,8 @@ index 1458463..ed859cf 100644
+
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index f698ff4..0402344 100644
---- a/sw/source/core/inc/flyfrm.hxx
-+++ b/sw/source/core/inc/flyfrm.hxx
+--- sw/source/core/inc/flyfrm.hxx
++++ sw/source/core/inc/flyfrm.hxx
@@ -77,6 +77,9 @@ protected:
// OD 2004-05-27 #i26791# - moved to <SwAnchoredObject>
@@ -579,8 +576,8 @@ index f698ff4..0402344 100644
#endif
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 10791a4..6c3d18f 100644
---- a/sw/source/core/inc/flyfrms.hxx
-+++ b/sw/source/core/inc/flyfrms.hxx
+--- sw/source/core/inc/flyfrms.hxx
++++ sw/source/core/inc/flyfrms.hxx
@@ -188,6 +188,7 @@ class SwFlyInCntFrm : public SwFlyFrm
BOOL bInvalidLayout :1;
@@ -600,8 +597,8 @@ index 10791a4..6c3d18f 100644
inline void SwFlyInCntFrm::InvalidateLayout() const
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 127bc24..ac192d1 100644
---- a/sw/source/core/layout/fly.cxx
-+++ b/sw/source/core/layout/fly.cxx
+--- sw/source/core/layout/fly.cxx
++++ sw/source/core/layout/fly.cxx
@@ -121,6 +121,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
// aRelPos(),
pPrevLink( 0 ),
@@ -612,8 +609,8 @@ index 127bc24..ac192d1 100644
bLayout( FALSE ),
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index c724779..26a4252 100644
---- a/sw/source/core/layout/flyincnt.cxx
-+++ b/sw/source/core/layout/flyincnt.cxx
+--- sw/source/core/layout/flyincnt.cxx
++++ sw/source/core/layout/flyincnt.cxx
@@ -56,6 +56,7 @@ SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
SwFlyFrm( pFmt, pAnch )
{
@@ -636,8 +633,8 @@ index c724779..26a4252 100644
//Und ggf. noch die aktuellen Werte im Format updaten, dabei darf
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index 835ff3b..1ae7981 100644
---- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
-+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+--- sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
++++ sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -328,7 +328,11 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
{
// set new anchor position and relative position
@@ -652,8 +649,8 @@ index 835ff3b..1ae7981 100644
// recalculate object bound rectangle, if object width has changed.
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ccb2d9e..64961db 100644
---- a/sw/source/core/ole/ndole.cxx
-+++ b/sw/source/core/ole/ndole.cxx
+--- sw/source/core/ole/ndole.cxx
++++ sw/source/core/ole/ndole.cxx
@@ -71,6 +71,7 @@
#ifndef _COMCORE_HRC
#include <comcore.hrc>
@@ -689,8 +686,8 @@ index ccb2d9e..64961db 100644
pListener( 0 ),
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index f6415e4..b6890fd 100644
---- a/sw/source/ui/uiview/swcli.cxx
-+++ b/sw/source/ui/uiview/swcli.cxx
+--- sw/source/ui/uiview/swcli.cxx
++++ sw/source/ui/uiview/swcli.cxx
@@ -169,3 +169,17 @@ void SwOleClient::MakeVisible()
const SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
rSh.MakeObjVisible( GetObject() );
@@ -711,8 +708,8 @@ index f6415e4..b6890fd 100644
+}
diff --git a/sw/source/ui/wrtsh/makefile.mk b/sw/source/ui/wrtsh/makefile.mk
index 66de5cb..7a79ed2 100644
---- a/sw/source/ui/wrtsh/makefile.mk
-+++ b/sw/source/ui/wrtsh/makefile.mk
+--- sw/source/ui/wrtsh/makefile.mk
++++ sw/source/ui/wrtsh/makefile.mk
@@ -36,6 +36,8 @@ TARGET=wrtsh
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/inc$/sw.mk
@@ -724,8 +721,8 @@ index 66de5cb..7a79ed2 100644
SRS1NAME=$(TARGET)
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index a7cd77a..d1f8514 100644
---- a/sw/source/ui/wrtsh/wrtsh1.cxx
-+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
+--- sw/source/ui/wrtsh/wrtsh1.cxx
++++ sw/source/ui/wrtsh/wrtsh1.cxx
@@ -124,6 +124,10 @@
#include "PostItMgr.hxx"
More information about the ooo-build-commit
mailing list