[ooo-build-commit] patches/dev300
Pei Feng Lin
pflin at kemper.freedesktop.org
Tue Nov 3 23:14:23 PST 2009
patches/dev300/apply | 6 +++
patches/dev300/sw-ww8-import-list-fix.diff | 34 ++++++++++++++++++++
patches/dev300/sw-ww8-textframe-background-fix.diff | 23 +++++++++++++
3 files changed, 63 insertions(+)
New commits:
commit a1192dd36ba7d029e98bd6c4833d48b159b156d3
Author: Fong Lin <pflin at novell.com>
Date: Wed Nov 4 15:13:25 2009 +0800
Fix the background color of text frame and bullet indent issue. n#547308
* patches/dev300/apply:
* patches/dev300/sw-ww8-import-list-fix.diff:
* patches/dev300/sw-ww8-textframe-background-fix.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e633b91..a4ed988 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3369,6 +3369,12 @@ configure-fix-lpsolve-depends.diff, janneke
configure-fix-use-c++-for-mythes.diff, janneke
build-fix-xulrunner-npapi-inc.diff, janneke
+[ Fixes ]
+# fix incorrect background color of text frame
+sw-ww8-textframe-background-fix.diff, Fong, n#547308
+# fix the bullet indent issue
+sw-ww8-import-list-fix.diff, Fong, n#547308
+
[ NLPSolverBits ]
# build NLPSolver extension when enabled (fate#304653)
postprocess-nlpsolver.diff, pmladek
diff --git a/patches/dev300/sw-ww8-import-list-fix.diff b/patches/dev300/sw-ww8-import-list-fix.diff
new file mode 100644
index 0000000..e9e8edd
--- /dev/null
+++ b/patches/dev300/sw-ww8-import-list-fix.diff
@@ -0,0 +1,34 @@
+diff --git sw/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
+index c15042a..c75935f 100644
+--- sw/source/filter/ww8/ww8par6.cxx
++++ sw/source/filter/ww8/ww8par6.cxx
+@@ -3898,6 +3898,29 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
+ if( pLR )
+ aLR = *(const SvxLRSpaceItem*)pLR;
+
++ // Fix the regression issue: #i99822#: Discussion?
++ // Since the list lever formatting doesn't apply into paragraph style
++ // for list levels of mode LABEL_ALIGNMENT.(see ww8par3.cxx
++ // W8ImplReader::RegisterNumFmtOnTxtNode).
++ // Need to apply the list format to the paragraph here.
++ SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode();
++ if( pTxtNode && pTxtNode->AreListLevelIndentsApplicable() )
++ {
++ SwNumRule * pNumRule = pTxtNode->GetNumRule();
++ if( pNumRule )
++ {
++ BYTE nLvl = static_cast< BYTE >(pTxtNode->GetActualListLevel());
++ const SwNumFmt* pFmt = pNumRule->GetNumFmt( nLvl );
++ if ( pFmt && pFmt->GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
++ {
++ aLR.SetTxtLeft( pFmt->GetIndentAt() );
++ aLR.SetTxtFirstLineOfst( static_cast<short>(pFmt->GetFirstLineIndent()) );
++ // make paragraph have hard-set indent attributes
++ pTxtNode->SetAttr( aLR );
++ }
++ }
++ }
++
+ /*
+ The older word sprms mean left/right, while the new ones mean before/after.
+ Writer now also works with before after, so when we see old left/right and
diff --git a/patches/dev300/sw-ww8-textframe-background-fix.diff b/patches/dev300/sw-ww8-textframe-background-fix.diff
new file mode 100644
index 0000000..b4ada97
--- /dev/null
+++ b/patches/dev300/sw-ww8-textframe-background-fix.diff
@@ -0,0 +1,23 @@
+diff --git sw/source/filter/ww8/ww8graf.cxx sw/source/filter/ww8/ww8graf.cxx
+index 2853bcc..add9cd2 100644
+--- sw/source/filter/ww8/ww8graf.cxx
++++ sw/source/filter/ww8/ww8graf.cxx
+@@ -1906,6 +1906,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
+ }
+ break;
+ case XFILL_SOLID:
++ case XFILL_GRADIENT:
+ {
+ const Color aColor = static_cast< XFillColorItem const & >(
+ rOldSet.Get(XATTR_FILLCOLOR)).GetColorValue();
+@@ -1917,8 +1918,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
+ bBrushItemOk = true;
+ }
+ break;
+- case XFILL_GRADIENT:
+- break;
++ //case XFILL_GRADIENT:
++ //break;
+ case XFILL_HATCH:
+ break;
+ case XFILL_BITMAP:
More information about the ooo-build-commit
mailing list