[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Sep 14 07:43:37 PDT 2010
patches/dev300/apply | 6 --
patches/dev300/sw-changes-format-fix.diff | 39 -------------------
patches/dev300/sw-ww8-import-list-fix.diff | 41 --------------------
patches/dev300/sw-ww8-textframe-background-fix.diff | 30 --------------
4 files changed, 116 deletions(-)
New commits:
commit 60edf16bbe285e9290e77c52ceb087b7a888def8
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:43:10 2010 +0200
sw-changes-format-fix.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2e1fece..dd55dd6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2905,8 +2905,6 @@ system-lpsolve-rpath.diff, rengelha
system-lpsolve-rpath.diff, rengelha
[ Fixes ]
-# show insertion change first
-sw-changes-format-fix.diff, Fong, n#545815
ww8-image-position.diff
sw-ww8-ruby-export-fix.diff, i#79246, cbosdo
diff --git a/patches/dev300/sw-changes-format-fix.diff b/patches/dev300/sw-changes-format-fix.diff
deleted file mode 100644
index 6736de3..0000000
--- a/patches/dev300/sw-changes-format-fix.diff
+++ /dev/null
@@ -1,39 +0,0 @@
----
- sw/source/core/doc/docredln.cxx | 21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
-
-diff --git sw/source/core/doc/docredln.cxx sw/source/core/doc/docredln.cxx
-index 9615aa6..d0324d6 100644
---- sw/source/core/doc/docredln.cxx
-+++ sw/source/core/doc/docredln.cxx
-@@ -1574,6 +1574,27 @@ const SwRedline* SwDoc::GetRedline( const SwPosition& rPos,
- --nM;
- pRedl = (*pRedlineTbl)[ nM ];
- }
-+ // if there are format and insert changes in the same position
-+ // show insert change first.
-+ // since the redlines are sorted by position, only check the redline
-+ // before and after the current redline
-+ if( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
-+ {
-+ if( nM && rPos >= *(*pRedlineTbl)[ nM - 1 ]->Start() &&
-+ rPos <= *(*pRedlineTbl)[ nM - 1 ]->End() &&
-+ ( nsRedlineType_t::REDLINE_INSERT == (*pRedlineTbl)[ nM - 1 ]->GetType() ) )
-+ {
-+ --nM;
-+ pRedl = (*pRedlineTbl)[ nM ];
-+ }
-+ else if( ( nM + 1 ) <= nO && rPos >= *(*pRedlineTbl)[ nM + 1 ]->Start() &&
-+ rPos <= *(*pRedlineTbl)[ nM + 1 ]->End() &&
-+ ( nsRedlineType_t::REDLINE_INSERT == (*pRedlineTbl)[ nM + 1 ]->GetType() ) )
-+ {
-+ ++nM;
-+ pRedl = (*pRedlineTbl)[ nM ];
-+ }
-+ }
-
- if( pFndPos )
- *pFndPos = nM;
---
-1.7.0.1
-
commit 5abf6937a0d1316d3a9051cdd2a6ae60d0b2508f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:40:29 2010 +0200
sw-ww8-import-list-fix.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b437e4c..2e1fece 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2905,8 +2905,6 @@ system-lpsolve-rpath.diff, rengelha
system-lpsolve-rpath.diff, rengelha
[ Fixes ]
-# fix the bullet indent issue
-sw-ww8-import-list-fix.diff, Fong, n#547308
# show insertion change first
sw-changes-format-fix.diff, Fong, n#545815
ww8-image-position.diff
diff --git a/patches/dev300/sw-ww8-import-list-fix.diff b/patches/dev300/sw-ww8-import-list-fix.diff
deleted file mode 100644
index 84fc403..0000000
--- a/patches/dev300/sw-ww8-import-list-fix.diff
+++ /dev/null
@@ -1,41 +0,0 @@
----
- sw/source/filter/ww8/ww8par6.cxx | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
-index cdc0959..65b63bd 100644
---- sw/source/filter/ww8/ww8par6.cxx
-+++ sw/source/filter/ww8/ww8par6.cxx
-@@ -3949,6 +3949,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
---
-1.7.0.1
-
commit 0cd66ddeafc95a16503bf58517a295ce3ec55027
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:37:42 2010 +0200
sw-ww8-textframe-background-fix.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f859c4d..b437e4c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2905,8 +2905,6 @@ system-lpsolve-rpath.diff, rengelha
system-lpsolve-rpath.diff, rengelha
[ 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
# show insertion change first
diff --git a/patches/dev300/sw-ww8-textframe-background-fix.diff b/patches/dev300/sw-ww8-textframe-background-fix.diff
deleted file mode 100644
index d41594b..0000000
--- a/patches/dev300/sw-ww8-textframe-background-fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
----
- sw/source/filter/ww8/ww8graf.cxx | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8graf.cxx sw/source/filter/ww8/ww8graf.cxx
-index 59154a5..6a70ac1 100644
---- sw/source/filter/ww8/ww8graf.cxx
-+++ sw/source/filter/ww8/ww8graf.cxx
-@@ -1901,6 +1901,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();
-@@ -1912,8 +1913,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
- bBrushItemOk = true;
- }
- break;
-- case XFILL_GRADIENT:
-- break;
-+ //case XFILL_GRADIENT:
-+ //break;
- case XFILL_HATCH:
- break;
- case XFILL_BITMAP:
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list