[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Sep 14 06:30:05 PDT 2010
patches/dev300/apply | 4
patches/dev300/filled-tab-editeng.diff | 344 --------------------
patches/dev300/svtools-svrtf-token-ignore-case.diff | 27 -
patches/dev300/sw-table-join-fix-i99267.diff | 23 -
4 files changed, 398 deletions(-)
New commits:
commit b14aad38ea499c003460215b99935f4fddd395fa
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 15:29:25 2010 +0200
filled-tab-editeng.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9672e42..5de0886 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3275,7 +3275,6 @@ svtools-wmf-clipperf.diff, n#535304, thorsten
sw-caption-separator.diff, i#110287, timar
# Fix name order for Hungarian on the UI
svx-hu-name-order.diff, i#105342, timar
-filled-tab-editeng.diff, n#564454, cbosdo
metric-field-limits.diff, cbosdo
# In some cases when exporting a PDF from a presentation, we are asked
diff --git a/patches/dev300/filled-tab-editeng.diff b/patches/dev300/filled-tab-editeng.diff
deleted file mode 100644
index 2f1a13f..0000000
--- a/patches/dev300/filled-tab-editeng.diff
+++ /dev/null
@@ -1,344 +0,0 @@
----
- .../drawinglayer/primitive2d/textprimitive2d.hxx | 8 +++-
- .../source/primitive2d/textprimitive2d.cxx | 12 ++++-
- drawinglayer/source/processor2d/vclprocessor2d.cxx | 41 ++++++++++++++++---
- editeng/inc/editeng/editeng.hxx | 8 ++++
- editeng/inc/editeng/outliner.hxx | 15 +++++++
- editeng/source/editeng/editeng.cxx | 8 ++++
- editeng/source/editeng/impedit3.cxx | 19 +++++++++
- editeng/source/outliner/outleeng.cxx | 9 ++++
- editeng/source/outliner/outleeng.hxx | 8 ++++
- editeng/source/outliner/outliner.cxx | 15 +++++++-
- svx/source/svdraw/svdotextdecomposition.cxx | 4 +-
- 11 files changed, 134 insertions(+), 13 deletions(-)
-
-diff --git drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
-index 3d630d8..d60e68c 100644
---- drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
-+++ drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
-@@ -129,6 +129,8 @@ namespace drawinglayer
-
- /// #i96669# internal: add simple range buffering for this primitive
- basegfx::B2DRange maB2DRange;
-+ bool mbFilled; // Whether to fill a given width with the text
-+ long mnWidthToFill; // the width to fill
-
- protected:
- /// local decomposition.
-@@ -144,7 +146,9 @@ namespace drawinglayer
- const ::std::vector< double >& rDXArray,
- const attribute::FontAttribute& rFontAttribute,
- const ::com::sun::star::lang::Locale& rLocale,
-- const basegfx::BColor& rFontColor);
-+ const basegfx::BColor& rFontColor,
-+ bool bFilled = false,
-+ long nWidthToFill = 0);
-
- /// helpers
- /** get text outlines as polygons and their according ObjectTransformation. Handles all
-@@ -161,6 +165,8 @@ namespace drawinglayer
- const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; }
- const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; }
- const basegfx::BColor& getFontColor() const { return maFontColor; }
-+ bool isFilled() const { return mbFilled; }
-+ long getWidthToFill() const { return mnWidthToFill; }
-
- /// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
-diff --git drawinglayer/source/primitive2d/textprimitive2d.cxx drawinglayer/source/primitive2d/textprimitive2d.cxx
-index 992d4dc..d97883d 100644
---- drawinglayer/source/primitive2d/textprimitive2d.cxx
-+++ drawinglayer/source/primitive2d/textprimitive2d.cxx
-@@ -237,7 +237,9 @@ namespace drawinglayer
- const ::std::vector< double >& rDXArray,
- const attribute::FontAttribute& rFontAttribute,
- const ::com::sun::star::lang::Locale& rLocale,
-- const basegfx::BColor& rFontColor)
-+ const basegfx::BColor& rFontColor,
-+ bool bFilled,
-+ long nWidthToFill)
- : BufferedDecompositionPrimitive2D(),
- maTextTransform(rNewTransform),
- maText(rText),
-@@ -247,7 +249,9 @@ namespace drawinglayer
- maFontAttribute(rFontAttribute),
- maLocale(rLocale),
- maFontColor(rFontColor),
-- maB2DRange()
-+ maB2DRange(),
-+ mbFilled(bFilled),
-+ mnWidthToFill(nWidthToFill)
- {
- #ifdef DBG_UTIL
- const xub_StrLen aStringLength(getText().Len());
-@@ -276,7 +280,9 @@ namespace drawinglayer
- && getDXArray() == rCompare.getDXArray()
- && getFontAttribute() == rCompare.getFontAttribute()
- && LocalesAreEqual(getLocale(), rCompare.getLocale())
-- && getFontColor() == rCompare.getFontColor());
-+ && getFontColor() == rCompare.getFontColor()
-+ && mbFilled == rCompare.mbFilled
-+ && mnWidthToFill == rCompare.mnWidthToFill);
- }
-
- return false;
-diff --git drawinglayer/source/processor2d/vclprocessor2d.cxx drawinglayer/source/processor2d/vclprocessor2d.cxx
-index 71bb587..678bbf4 100644
---- drawinglayer/source/processor2d/vclprocessor2d.cxx
-+++ drawinglayer/source/processor2d/vclprocessor2d.cxx
-@@ -250,22 +250,49 @@ namespace drawinglayer
- mpOutputDevice->SetFont(aFont);
- mpOutputDevice->SetTextColor(Color(aRGBFontColor));
-
-+ String aText( rTextCandidate.getText() );
-+ xub_StrLen nPos = rTextCandidate.getTextPosition();
-+ xub_StrLen nLen = rTextCandidate.getTextLength();
-+
-+ sal_Int32* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : NULL ;
-+
-+ if ( rTextCandidate.isFilled() )
-+ {
-+ basegfx::B2DVector aOldFontScaling, aOldTranslate;
-+ double fOldRotate, fOldShearX;
-+ rTextCandidate.getTextTransform().decompose(aOldFontScaling, aOldTranslate, fOldRotate, fOldShearX);
-+
-+ long nWidthToFill = rTextCandidate.getWidthToFill( ) * aFontScaling.getX() / aOldFontScaling.getX();
-+
-+ long nWidth = mpOutputDevice->GetTextArray(
-+ rTextCandidate.getText(), pDXArray, 0, 1 );
-+ long nChars = 2;
-+ if ( nWidth )
-+ nChars = nWidthToFill / nWidth;
-+
-+ String aFilled;
-+ aFilled.Fill( (USHORT)nChars, aText.GetChar( 0 ) );
-+ aText = aFilled;
-+ nPos = 0;
-+ nLen = nChars;
-+ }
-+
- if(aTransformedDXArray.size())
- {
- mpOutputDevice->DrawTextArray(
- aStartPoint,
-- rTextCandidate.getText(),
-- &(aTransformedDXArray[0]),
-- rTextCandidate.getTextPosition(),
-- rTextCandidate.getTextLength());
-+ aText,
-+ pDXArray,
-+ nPos,
-+ nLen);
- }
- else
- {
- mpOutputDevice->DrawText(
- aStartPoint,
-- rTextCandidate.getText(),
-- rTextCandidate.getTextPosition(),
-- rTextCandidate.getTextLength());
-+ aText,
-+ nPos,
-+ nLen);
- }
-
- if(rTextCandidate.getFontAttribute().getRTL())
-diff --git editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editeng.hxx
-index efe2d42..7bf5df6 100755
---- editeng/inc/editeng/editeng.hxx
-+++ editeng/inc/editeng/editeng.hxx
-@@ -444,6 +444,14 @@ public:
- const Color& rOverlineColor,
- const Color& rTextLineColor);
-
-+ virtual void DrawingTab(
-+ const Point& rStartPos, long nWidth, const String& rChar,
-+ const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-+ bool bEndOfLine,
-+ bool bEndOfParagraph,
-+ const Color& rOverlineColor,
-+ const Color& rTextLineColor);
-+
- virtual String GetUndoComment( USHORT nUndoId ) const;
- virtual BOOL FormattingParagraph( USHORT nPara );
- virtual BOOL SpellNextDocument();
-diff --git editeng/inc/editeng/outliner.hxx editeng/inc/editeng/outliner.hxx
-index 10664cd..1134188 100644
---- editeng/inc/editeng/outliner.hxx
-+++ editeng/inc/editeng/outliner.hxx
-@@ -422,6 +422,9 @@ public:
- // #101498# BiDi level needs to be transported, too.
- BYTE mnBiDiLevel;
-
-+ bool mbFilled;
-+ long mnWidthToFill;
-+
- // bitfield
- unsigned mbEndOfLine : 1;
- unsigned mbEndOfParagraph : 1;
-@@ -445,6 +448,8 @@ public:
- const Color& rOverlineColor,
- const Color& rTextLineColor,
- BYTE nBiDiLevel,
-+ bool bFilled,
-+ long nWidthToFill,
- bool bEndOfLine,
- bool bEndOfParagraph,
- bool bEndOfBullet)
-@@ -462,6 +467,8 @@ public:
- maOverlineColor(rOverlineColor),
- maTextLineColor(rTextLineColor),
- mnBiDiLevel(nBiDiLevel),
-+ mbFilled( bFilled ),
-+ mnWidthToFill( nWidthToFill ),
- mbEndOfLine(bEndOfLine),
- mbEndOfParagraph(bEndOfParagraph),
- mbEndOfBullet(bEndOfBullet)
-@@ -895,6 +902,14 @@ public:
- const Color& rOverlineColor,
- const Color& rTextLineColor);
-
-+ virtual void DrawingTab(
-+ const Point& rStartPos, long nWidth, const String& rChar,
-+ const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-+ bool bEndOfLine,
-+ bool bEndOfParagraph,
-+ const Color& rOverlineColor,
-+ const Color& rTextLineColor);
-+
- Size CalcTextSize();
-
- Point GetDocPos( Paragraph* pPara );
-diff --git editeng/source/editeng/editeng.cxx editeng/source/editeng/editeng.cxx
-index 0f9523d..35cdcc1 100644
---- editeng/source/editeng/editeng.cxx
-+++ editeng/source/editeng/editeng.cxx
-@@ -2482,6 +2482,14 @@ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT, U
- DBG_CHKTHIS( EditEngine, 0 );
- }
-
-+void __EXPORT EditEngine::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar,
-+ const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-+ bool bEndOfLine, bool bEndOfParagraph,
-+ const Color& rOverlineColor, const Color& rTextLineColor)
-+{
-+ DBG_CHKTHIS( EditEngine, 0 );
-+}
-+
- void __EXPORT EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
- {
- DBG_CHKTHIS( EditEngine, 0 );
-diff --git editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit3.cxx
-index eb0613d..7a57d46 100644
---- editeng/source/editeng/impedit3.cxx
-+++ editeng/source/editeng/impedit3.cxx
-@@ -3561,7 +3561,26 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
-
- String aText;
- aText.Fill( (USHORT)nChars, pTextPortion->GetExtraValue() );
-+ aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.Len(), NULL );
- pOutDev->DrawStretchText( aTmpPos, pTextPortion->GetSize().Width(), aText );
-+
-+ if ( bStripOnly )
-+ {
-+ // create EOL and EOP bools
-+ const bool bEndOfLine(y == pLine->GetEndPortion());
-+ const bool bEndOfParagraph(bEndOfLine && nLine + 1 == nLines);
-+
-+ const Color aOverlineColor(pOutDev->GetOverlineColor());
-+ const Color aTextLineColor(pOutDev->GetTextLineColor());
-+
-+ // StripPortions() data callback
-+ GetEditEnginePtr()->DrawingTab( aTmpPos,
-+ pTextPortion->GetSize().Width(),
-+ pTextPortion->GetExtraValue(),
-+ aTmpFont, n, nIndex, pTextPortion->GetRightToLeft(),
-+ bEndOfLine, bEndOfParagraph,
-+ aOverlineColor, aTextLineColor);
-+ }
- }
- }
- break;
-diff --git editeng/source/outliner/outleeng.cxx editeng/source/outliner/outleeng.cxx
-index f8d4b9a..820492f 100644
---- editeng/source/outliner/outleeng.cxx
-+++ editeng/source/outliner/outleeng.cxx
-@@ -204,6 +204,15 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rTex
- pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor);
- }
-
-+void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar,
-+ const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-+ bool bEndOfLine, bool bEndOfParagraph,
-+ const Color& rOverlineColor, const Color& rTextLineColor)
-+{
-+ pOwner->DrawingTab(rStartPos, nWidth, rChar, rFont, nPara, nIndex, nRightToLeft,
-+ bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor );
-+}
-+
- void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
- {
- EditEngine::FieldClicked( rField, nPara, nPos ); // Falls URL
-diff --git editeng/source/outliner/outleeng.hxx editeng/source/outliner/outleeng.hxx
-index 96cafc8..536af8b 100644
---- editeng/source/outliner/outleeng.hxx
-+++ editeng/source/outliner/outleeng.hxx
-@@ -68,6 +68,14 @@ public:
- const Color& rOverlineColor,
- const Color& rTextLineColor);
-
-+ virtual void DrawingTab(
-+ const Point& rStartPos, long nWidth, const String& rChar,
-+ const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-+ bool bEndOfLine,
-+ bool bEndOfParagraph,
-+ const Color& rOverlineColor,
-+ const Color& rTextLineColor);
-+
- virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
- virtual void ParaAttribsChanged( USHORT nPara );
- virtual BOOL SpellNextDocument();
-diff --git editeng/source/outliner/outliner.cxx editeng/source/outliner/outliner.cxx
-index e0a89aa..e8aa629 100644
---- editeng/source/outliner/outliner.cxx
-+++ editeng/source/outliner/outliner.cxx
-@@ -1790,7 +1790,20 @@ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHO
- {
- // #101498#
- DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
-- pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, bEndOfLine, bEndOfParagraph, bEndOfBullet);
-+ pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
-+
-+ aDrawPortionHdl.Call( &aInfo );
-+ }
-+}
-+
-+void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, const SvxFont& rFont,
-+ USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
-+ const Color& rOverlineColor, const Color& rTextLineColor)
-+{
-+ if(aDrawPortionHdl.IsSet())
-+ {
-+ DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.Len(), rFont, nPara, nIndex, NULL, NULL,
-+ NULL, NULL, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false);
-
- aDrawPortionHdl.Call( &aInfo );
- }
-diff --git svx/source/svdraw/svdotextdecomposition.cxx svx/source/svdraw/svdotextdecomposition.cxx
-index 760287a..1bb2001 100644
---- svx/source/svdraw/svdotextdecomposition.cxx
-+++ svx/source/svdraw/svdotextdecomposition.cxx
-@@ -370,7 +370,9 @@ namespace
- aDXArray,
- aFontAttribute,
- rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale(),
-- aBFontColor);
-+ aBFontColor,
-+ rInfo.mbFilled,
-+ rInfo.mnWidthToFill);
- }
-
- if(rInfo.mbEndOfBullet)
---
-1.7.0.1
-
commit f857611b10c22cf999717d4d4587e61d4d5bd5d6
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 15:03:43 2010 +0200
svtools-svrtf-token-ignore-case.diff: moved to git repo
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6948a27..9672e42 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2639,8 +2639,6 @@ solenv-installer-unopkg-call.diff, thorsten
svx-debug-sdrolestreams.diff, thorsten
sal-disable-backtrace.diff, thorsten
-svtools-svrtf-token-ignore-case.diff, n#417818, flr
-
# fix wrong en-US accelerators in Impress
fix-sd-accelerators.diff, n#463733, i#97088, jholesov
diff --git a/patches/dev300/svtools-svrtf-token-ignore-case.diff b/patches/dev300/svtools-svrtf-token-ignore-case.diff
deleted file mode 100644
index 5f7d385..0000000
--- a/patches/dev300/svtools-svrtf-token-ignore-case.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- svtools/source/svrtf/rtfkeywd.cxx | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git svtools/source/svrtf/rtfkeywd.cxx svtools/source/svrtf/rtfkeywd.cxx
-index cc74a4a..1c6f93c 100644
---- svtools/source/svrtf/rtfkeywd.cxx
-+++ svtools/source/svrtf/rtfkeywd.cxx
-@@ -1201,13 +1201,13 @@ _Optlink
- nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareTo(
- *((RTF_TokenEntry*)pSecond)->pUToken );
- else
-- nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareToAscii(
-+ nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareIgnoreCaseToAscii(
- ((RTF_TokenEntry*)pSecond)->sToken );
- }
- else
- {
- if( -1 == ((RTF_TokenEntry*)pSecond)->nToken )
-- nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareToAscii(
-+ nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareIgnoreCaseToAscii(
- ((RTF_TokenEntry*)pFirst)->sToken );
- else
- nRet = strcmp( ((RTF_TokenEntry*)pFirst)->sToken,
---
-1.7.0.1
-
commit 754c8f88319fdb4aed4295a3782bde015383bc7c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 15:01:29 2010 +0200
sw-table-join-fix-i99267.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 48d80a6..6948a27 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2639,7 +2639,6 @@ solenv-installer-unopkg-call.diff, thorsten
svx-debug-sdrolestreams.diff, thorsten
sal-disable-backtrace.diff, thorsten
-sw-table-join-fix-i99267.diff, n#417814, flr
svtools-svrtf-token-ignore-case.diff, n#417818, flr
# fix wrong en-US accelerators in Impress
diff --git a/patches/dev300/sw-table-join-fix-i99267.diff b/patches/dev300/sw-table-join-fix-i99267.diff
deleted file mode 100644
index 0aea13f..0000000
--- a/patches/dev300/sw-table-join-fix-i99267.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- sw/source/core/layout/tabfrm.cxx | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git sw/source/core/layout/tabfrm.cxx sw/source/core/layout/tabfrm.cxx
-index 90a7c61..50cc422 100644
---- sw/source/core/layout/tabfrm.cxx
-+++ sw/source/core/layout/tabfrm.cxx
-@@ -2074,6 +2074,11 @@ void SwTabFrm::MakeAll()
- pPre->GetAttrSet()->GetKeep().GetValue()) )
- {
- bCalcLowers = TRUE;
-+ // --> OD 2009-03-06 #i99267#
-+ // reset <bSplit> after forward move to assure that follows
-+ // can be joined, if further space is available.
-+ bSplit = FALSE;
-+ // <--
- }
- }
-
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list