[ooo-build-commit] .: 4 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Sep 13 08:32:06 PDT 2010
patches/dev300/apply | 11
patches/dev300/svx-text-rotation-fix.diff | 41 -
patches/dev300/sw-preserve-char-style-on-reset-format.diff | 20
patches/dev300/sw-rtf-num-fix.diff | 229 ----------
patches/dev300/sw-show-Remove-Hyperlink-even-with-selection.diff | 40 -
5 files changed, 341 deletions(-)
New commits:
commit 59a12a55992211d543cd651b9edb88c5ca0e9137
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Sep 13 17:31:41 2010 +0200
sw-preserve-char-style-on-reset-format.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index de05764..0e91ba7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -575,11 +575,6 @@ sw-ww8-field-fix.diff, i#61075, i#89667, i#11684 cbosdo
# Upstreamed in cbosdo06
sw-ww8-styles-import-fix.diff, i#21939, cbosdo
-# Added by Octavio Alvarez <alvarezp at alvarezp.ods.org>
-# The first patch is to prevent losing functionality because
-# of the second patch.
-sw-preserve-char-style-on-reset-format.diff, i#47893, alvarezp2000
-
# Refresh the cell formatting after pasting in it
sw-paste-table.diff, n#564789, cbosdo
diff --git a/patches/dev300/sw-preserve-char-style-on-reset-format.diff b/patches/dev300/sw-preserve-char-style-on-reset-format.diff
deleted file mode 100644
index d6f5b70..0000000
--- a/patches/dev300/sw-preserve-char-style-on-reset-format.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sw/source/ui/shells/textsh1.cxx | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
-index 6ce6c6f..f41d28c 100644
---- sw/source/ui/shells/textsh1.cxx
-+++ sw/source/ui/shells/textsh1.cxx
-@@ -508,8 +508,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
- RES_CHRATR_CJK_LANGUAGE + 1, RES_CHRATR_CTL_LANGUAGE - 1,
- RES_CHRATR_CTL_LANGUAGE + 1, RES_CHRATR_END-1,
- RES_PARATR_BEGIN, RES_PARATR_END-1,
-- RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
-- RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
- RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
- RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
- RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
---
-1.7.0.1
-
commit 1543b44de8cb9f65e096158b4de97e1aed501b21
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Sep 13 17:27:19 2010 +0200
sw-show-Remove-Hyperlink-even-with-selection.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 014826c..de05764 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -578,7 +578,6 @@ sw-ww8-styles-import-fix.diff, i#21939, cbosdo
# Added by Octavio Alvarez <alvarezp at alvarezp.ods.org>
# The first patch is to prevent losing functionality because
# of the second patch.
-sw-show-Remove-Hyperlink-even-with-selection.diff, alvarezp2000
sw-preserve-char-style-on-reset-format.diff, i#47893, alvarezp2000
# Refresh the cell formatting after pasting in it
diff --git a/patches/dev300/sw-show-Remove-Hyperlink-even-with-selection.diff b/patches/dev300/sw-show-Remove-Hyperlink-even-with-selection.diff
deleted file mode 100644
index 971b3ed..0000000
--- a/patches/dev300/sw-show-Remove-Hyperlink-even-with-selection.diff
+++ /dev/null
@@ -1,40 +0,0 @@
----
- sw/source/ui/shells/textsh1.cxx | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
-index 1e3b6ff..6ce6c6f 100644
---- sw/source/ui/shells/textsh1.cxx
-+++ sw/source/ui/shells/textsh1.cxx
-@@ -1596,7 +1596,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
- GetViewFrame()->GetChildWindow( nWhich ) ));
- break;
- case FN_EDIT_HYPERLINK:
-- case FN_REMOVE_HYPERLINK:
- case FN_COPY_HYPERLINK_LOCATION:
- {
- SfxItemSet aSet(GetPool(),
-@@ -1609,6 +1608,20 @@ void SwTextShell::GetState( SfxItemSet &rSet )
- }
- }
- break;
-+ case FN_REMOVE_HYPERLINK:
-+ {
-+ SfxItemSet aSet(GetPool(),
-+ RES_TXTATR_INETFMT,
-+ RES_TXTATR_INETFMT);
-+ rSh.GetCurAttr(aSet);
-+
-+ // If a hyperlink is selected, either alone or along with other text...
-+ if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, TRUE )) == 0) || rSh.HasReadonlySel())
-+ {
-+ rSet.DisableItem(nWhich);
-+ }
-+ }
-+ break;
- case SID_TRANSLITERATE_HALFWIDTH:
- case SID_TRANSLITERATE_FULLWIDTH:
- case SID_TRANSLITERATE_HIRAGANA:
---
-1.7.0.1
-
commit 8486d2e695a65cf29e025a4916cf7d8edfb885ec
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Sep 13 17:16:25 2010 +0200
sw-rtf-num-fix.diff: moved to the git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index cb8feff..014826c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -572,8 +572,6 @@ sfx2-qstartfixes.diff, i#108846, caolan
# Upstreamed in cbosdo06
sw-ww8-field-fix.diff, i#61075, i#89667, i#11684 cbosdo
-sw-rtf-num-fix.diff, n#569266, cbosdo
-
# Upstreamed in cbosdo06
sw-ww8-styles-import-fix.diff, i#21939, cbosdo
diff --git a/patches/dev300/sw-rtf-num-fix.diff b/patches/dev300/sw-rtf-num-fix.diff
deleted file mode 100644
index 7f8c950..0000000
--- a/patches/dev300/sw-rtf-num-fix.diff
+++ /dev/null
@@ -1,229 +0,0 @@
----
- sw/source/filter/rtf/rtfatr.cxx | 12 +++---
- sw/source/filter/rtf/rtfnum.cxx | 78 ++++++++++++--------------------------
- 2 files changed, 31 insertions(+), 59 deletions(-)
-
-diff --git sw/source/filter/rtf/rtfatr.cxx sw/source/filter/rtf/rtfatr.cxx
-index a2fd2dd..367e5e6 100644
---- sw/source/filter/rtf/rtfatr.cxx
-+++ sw/source/filter/rtf/rtfatr.cxx
-@@ -438,15 +438,15 @@ bool SwFmtToSet(SwRTFWriter& rWrt, const SwFmt& rFmt, SfxItemSet &rSet)
- }
-
- const SwNumFmt* pNFmt = &rWrt.pDoc->GetOutlineNumRule()->Get( static_cast<USHORT>(nLvl) );
-- if( pNFmt->GetAbsLSpace() )
-+ if( pNFmt->GetIndentAt() )
- {
- SfxItemSet aSet( *rFmt.GetAttrSet().GetPool(),
- rFmt.GetAttrSet().GetRanges() );
- aSet.SetParent( &rFmt.GetAttrSet() );
- SvxLRSpaceItem aLR( (SvxLRSpaceItem&)aSet.Get( RES_LR_SPACE ) );
-
-- aLR.SetTxtLeft( aLR.GetTxtLeft() + pNFmt->GetAbsLSpace() );
-- aLR.SetTxtFirstLineOfst( pNFmt->GetFirstLineOffset() );
-+ aLR.SetTxtLeft( aLR.GetTxtLeft() + pNFmt->GetIndentAt() );
-+ aLR.SetTxtFirstLineOfst( pNFmt->GetFirstLineIndent() );
-
- aSet.Put(aLR);
- rSet.Put(aSet);
-@@ -1210,7 +1210,7 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
- }
-
- // gibt es harte Attributierung ?
-- if( bNewFmts && pNd->HasSwAttrSet())
-+ if( pNd->HasSwAttrSet() )
- {
- rRTFWrt.pFlyFmt = 0;
-
-@@ -1233,9 +1233,9 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
- SfxItemSet aSet( rNdSet );
- SvxLRSpaceItem aLR( (SvxLRSpaceItem&)rNdSet.Get( RES_LR_SPACE ) );
-
-- aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetAbsLSpace() );
-+ aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetIndentAt() );
- if( MAXLEVEL > pNd->GetActualListLevel() )
-- aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineOffset() );
-+ aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineIndent() );
- else
- aSet.ClearItem( RES_PARATR_NUMRULE );
- aSet.Put( aLR );
-diff --git sw/source/filter/rtf/rtfnum.cxx sw/source/filter/rtf/rtfnum.cxx
-index 3d77f13..c8aa398 100644
---- sw/source/filter/rtf/rtfnum.cxx
-+++ sw/source/filter/rtf/rtfnum.cxx
-@@ -1,29 +1,3 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * Copyright 2000, 2010 Oracle and/or its affiliates.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU Lesser General Public License version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org. If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
-@@ -43,6 +17,7 @@
- #include <editeng/colritem.hxx>
- #include <editeng/udlnitem.hxx>
- #include <editeng/wrlmitem.hxx>
-+#include <editeng/numitem.hxx>
- #include <shellio.hxx>
- #include <fltini.hxx>
- #include <swtypes.hxx>
-@@ -72,7 +47,7 @@ void lcl_ExpandNumFmts( SwNumRule& rRule )
- if( !rRule.GetNumFmt( n ) )
- {
- SwNumFmt aNumFmt( rRule.Get( 0 ));
-- aNumFmt.SetAbsLSpace( aNumFmt.GetAbsLSpace() * ( n + 1 ) );
-+ aNumFmt.SetIndentAt( aNumFmt.GetIndentAt() * ( n + 1 ) );
- rRule.Set( n, aNumFmt );
- }
- }
-@@ -99,13 +74,13 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
- int nLvlTxtLevel = 0, nLvlNumberLevel = 0;
- String sLvlText, sLvlNumber;
- SwNumFmt* pCurNumFmt;
-- String aStringFollow = aEmptyStr;
-+ SvxNumberFormat::SvxNumLabelFollowedBy eFollowedBy = SvxNumberFormat::NOTHING;
-
- if( MAXLEVEL >= nNumLvl )
- {
- pCurNumFmt = (SwNumFmt*)rRule.GetNumFmt( nNumLvl );
-- pCurNumFmt->SetAbsLSpace( 0 );
-- pCurNumFmt->SetFirstLineOffset( 0 );
-+ pCurNumFmt->SetIndentAt( 0 );
-+ pCurNumFmt->SetFirstLineIndent( 0 );
- }
- else
- pCurNumFmt = 0;
-@@ -210,17 +185,16 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
- break;
-
- case RTF_LEVELFOLLOW:
-- /* removed; waiting for swnum02 to be integrated!
-+ /* removed; waiting for swnum02 to be integrated! */
- switch (nTokenValue)
- {
- case 0:
-- aStringFollow=String('\t');
-+ eFollowedBy = SvxNumberFormat::LISTTAB;
- break;
- case 1:
-- aStringFollow=String(' ');
-+ eFollowedBy = SvxNumberFormat::SPACE;
- break;
- }
-- */
- break;
-
- case RTF_LEVELOLD:
-@@ -244,8 +218,8 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
- // and put the current "LRSpace" into the set
- {
- SvxLRSpaceItem aLR( RES_LR_SPACE );
-- aLR.SetTxtLeft( pCurNumFmt->GetAbsLSpace() );
-- aLR.SetTxtFirstLineOfst(pCurNumFmt->GetFirstLineOffset());
-+ aLR.SetTxtLeft( pCurNumFmt->GetIndentAt() );
-+ aLR.SetTxtFirstLineOfst(pCurNumFmt->GetFirstLineIndent());
- aSet.Put( aLR );
- }
-
-@@ -264,8 +238,9 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
- FALSE, &pItem ))
- {
- const SvxLRSpaceItem& rLR = *(SvxLRSpaceItem*)pItem;
-- pCurNumFmt->SetAbsLSpace( static_cast< short >(rLR.GetTxtLeft()) );
-- pCurNumFmt->SetFirstLineOffset( rLR.GetTxtFirstLineOfst());
-+ pCurNumFmt->SetListtabPos( rLR.GetTxtLeft( ) );
-+ pCurNumFmt->SetIndentAt( rLR.GetTxtLeft() );
-+ pCurNumFmt->SetFirstLineIndent( rLR.GetTxtFirstLineOfst());
- }
-
- // dann aus der Vorlage den Font holen
-@@ -306,16 +281,13 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
- pCurNumFmt->SetSuffix( sLvlText );
- }
-
-- String newSuffix=pCurNumFmt->GetSuffix();
-- newSuffix+=aStringFollow;
-- pCurNumFmt->SetSuffix(newSuffix);
-- /* removed; waiting for swnum02 to be integrated!
-- if (aStringFollow.GetChar(0)=='\t' && !pCurNumFmt->IsItemize())
-+ /* removed; waiting for swnum02 to be integrated!*/
-+ pCurNumFmt->SetLabelFollowedBy( eFollowedBy );
-+ if (eFollowedBy == SvxNumberFormat::LISTTAB && !pCurNumFmt->IsItemize())
- {
-- pCurNumFmt->SetAbsLSpace(0);
-- pCurNumFmt->SetFirstLineOffset(0);
-+ pCurNumFmt->SetIndentAt(0);
-+ pCurNumFmt->SetFirstLineIndent(0);
- }
-- */
- }
-
- SkipToken( -1 );
-@@ -380,7 +352,7 @@ void SwRTFParser::ReadListTable()
-
- String sTmp( String::CreateFromAscii(
- RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
-- aEntry.nListDocPos = pDoc->MakeNumRule( sTmp );
-+ aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, FALSE, SvxNumberFormat::LABEL_ALIGNMENT );
- pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
- // --> OD 2008-07-08 #i91400#
- pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ),
-@@ -1011,8 +983,8 @@ NUMATTR_SETUNDERLINE:
- case RTF_PNINDENT:
- if( 0 > short( nTokenValue ) )
- nTokenValue = - (short)nTokenValue;
-- pCurNumFmt->SetFirstLineOffset( - short( nTokenValue ));
-- pCurNumFmt->SetAbsLSpace( (nLevel + 1 ) * USHORT( nTokenValue ));
-+ pCurNumFmt->SetFirstLineIndent( - nTokenValue );
-+ pCurNumFmt->SetIndentAt( (nLevel + 1 ) * nTokenValue );
- break;
- case RTF_PNSP:
- pCurNumFmt->SetCharTextDistance( USHORT( nTokenValue ));
-@@ -1288,8 +1260,8 @@ void SwRTFWriter::OutRTFListTab()
- }
-
- Strm() << OOO_STRING_SVTOOLS_RTF_FI;
-- OutLong( rFmt.GetFirstLineOffset() ) << OOO_STRING_SVTOOLS_RTF_LI;
-- OutLong( rFmt.GetAbsLSpace() );
-+ OutLong( rFmt.GetFirstLineIndent() ) << OOO_STRING_SVTOOLS_RTF_LI;
-+ OutLong( rFmt.GetIndentAt() );
-
- Strm() << '}';
-
-@@ -1401,9 +1373,9 @@ BOOL SwRTFWriter::OutListNum( const SwTxtNode& rNd )
- SfxItemSet aSet( *rNdSet.GetPool(), rNdSet.GetRanges() );
- aSet.SetParent( &rNdSet );
- SvxLRSpaceItem aLR( (SvxLRSpaceItem&)rNdSet.Get( RES_LR_SPACE ) );
-- aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetAbsLSpace() );
-+ aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetIndentAt() );
-
-- aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineOffset() );
-+ aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineIndent() );
- if ( bExportNumRule )
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTTEXT << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << ' ';
-
---
-1.7.0.1
-
commit 1ce8757266f792c0b12386f17255d4e5ce9aa8dd
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Sep 13 17:05:06 2010 +0200
svx-text-rotation-fix.diff: moved the git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 137c020..cb8feff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -434,9 +434,6 @@ tools-urlobj-smb-scheme-patch.diff, n#261623, flr
samba-hyperlinks-sc-sd.diff, n#382718, jholesov
tools-qa-urlobj-unittest.diff, n#261623, flr
-# writer doc margin text rotates when opened in word
-svx-text-rotation-fix.diff, n#404221, flr
-
# check real help path defined in registry instead of the $(instpath)/help
sfx-check-real-help-path.diff, i#81139, pmladek
diff --git a/patches/dev300/svx-text-rotation-fix.diff b/patches/dev300/svx-text-rotation-fix.diff
deleted file mode 100644
index d966bf0..0000000
--- a/patches/dev300/svx-text-rotation-fix.diff
+++ /dev/null
@@ -1,41 +0,0 @@
----
- filter/source/msfilter/escherex.cxx | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git filter/source/msfilter/escherex.cxx filter/source/msfilter/escherex.cxx
-index 546df9c..44cb5c6 100644
---- filter/source/msfilter/escherex.cxx
-+++ filter/source/msfilter/escherex.cxx
-@@ -720,6 +720,29 @@ void EscherPropertyContainer::CreateTextProperties(
-
- if ( nTextId )
- AddOpt( ESCHER_Prop_lTxid, nTextId );
-+
-+ // n#404221: In case of rotation we need to write the txtflTextFlow
-+ // attribute too.
-+ if (bIsTextFrame) {
-+ sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
-+ aAny,
-+ rXPropSet,
-+ String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ),
-+ sal_True )
-+ ? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0;
-+ if (nAngle==900) {
-+ AddOpt( ESCHER_Prop_txflTextFlow, 1 );
-+ bSuppressRotation=true;
-+ }
-+ if (nAngle==1800) {
-+ AddOpt( ESCHER_Prop_txflTextFlow, 2 );
-+ bSuppressRotation=true;
-+ }
-+ if (nAngle==2700) {
-+ AddOpt( ESCHER_Prop_txflTextFlow, 3 );
-+ bSuppressRotation=true;
-+ }
-+ }
- }
-
- sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list