[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Sep 14 07:24:12 PDT 2010
patches/dev300/apply | 5
patches/dev300/sw-import-html-controls.diff | 217 ----------
patches/dev300/sw-insert-pagebreak-in-numbered-paragraph.diff | 95 ----
patches/dev300/sw-outline-numbering-broken-fix.diff | 20
4 files changed, 337 deletions(-)
New commits:
commit 505388817d5dbed760190dcb3348204778fc1d3d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:23:53 2010 +0200
sw-insert-pagebreak-in-numbered-paragraph.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 70e6036..b52d51e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2648,8 +2648,6 @@ mingw-cpp-increase-include-limit.diff, i#95193, jholesov
mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
[ Fixes ]
-# one of pagebreak enhancements
-sw-insert-pagebreak-in-numbered-paragraph.diff, n#396648, Amelia Wang
# Experimental support for Interix
# FIXME dev300-m83 win32-interix.diff, tml
diff --git a/patches/dev300/sw-insert-pagebreak-in-numbered-paragraph.diff b/patches/dev300/sw-insert-pagebreak-in-numbered-paragraph.diff
deleted file mode 100644
index 80e6643..0000000
--- a/patches/dev300/sw-insert-pagebreak-in-numbered-paragraph.diff
+++ /dev/null
@@ -1,95 +0,0 @@
----
- sw/inc/doc.hxx | 1 +
- sw/source/core/docnode/ndtbl.cxx | 43 ++++++++++++++++++++++++++++++++++++++
- sw/source/ui/wrtsh/wrtsh1.cxx | 2 +
- 3 files changed, 46 insertions(+), 0 deletions(-)
-
-diff --git sw/inc/doc.hxx sw/inc/doc.hxx
-index 09a3862..d31dc4b 100644
---- sw/inc/doc.hxx
-+++ sw/inc/doc.hxx
-@@ -1746,6 +1746,7 @@ public:
- void ChkBoxNumFmt( SwTableBox& rAktBox, sal_Bool bCallUpdate );
- void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
- void ClearBoxNumAttrs( const SwNodeIndex& rNode );
-+ void ClearLineNumAttrs( SwPosition & rPos );
-
- sal_Bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
- const SwTable* pCpyTbl = 0, sal_Bool bCpyName = sal_False,
-diff --git sw/source/core/docnode/ndtbl.cxx sw/source/core/docnode/ndtbl.cxx
-index 77d98ab..7029de9 100644
---- sw/source/core/docnode/ndtbl.cxx
-+++ sw/source/core/docnode/ndtbl.cxx
-@@ -39,6 +39,7 @@
- #include <editeng/brkitem.hxx>
- #include <editeng/protitem.hxx>
- #include <editeng/boxitem.hxx>
-+#include <svl/stritem.hxx>
- // OD 06.08.2003 #i17174#
- #include <editeng/shaditem.hxx>
- #include <fmtfsize.hxx>
-@@ -4267,6 +4268,48 @@ void SwDoc::SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet )
- SetModified();
- }
-
-+void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
-+{
-+ SwPaM aPam(rPos);
-+ aPam.Move(fnMoveBackward);
-+ SwCntntNode *pNode = aPam.GetCntntNode();
-+ if ( 0 == pNode )
-+ return ;
-+ if( pNode->IsTxtNode() )
-+ {
-+ SwTxtNode * pTxtNode = pNode->GetTxtNode();
-+ if ( pTxtNode && pTxtNode->IsNumbered() && pTxtNode->GetTxt().Len()==0 )
-+ {
-+ const SfxPoolItem* pFmtItem = 0;
-+ SfxItemSet rSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
-+ RES_PARATR_BEGIN, RES_PARATR_END - 1,
-+ 0);
-+ pTxtNode->SwCntntNode::GetAttr( rSet );
-+ if ( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE , FALSE , &pFmtItem ) )
-+ {
-+ SwUndoDelNum * pUndo;
-+ if( DoesUndo() )
-+ {
-+ ClearRedo();
-+ AppendUndo( pUndo = new SwUndoDelNum( aPam ) );
-+ }
-+ else
-+ pUndo = 0;
-+ SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
-+ aRegH.RegisterInModify( pTxtNode , *pTxtNode );
-+ if ( pUndo )
-+ pUndo->AddNode( *pTxtNode , FALSE );
-+ String aStyle = String::CreateFromAscii("");
-+ SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone();
-+ pNewItem->SetValue( aStyle );
-+ rSet.Put( *pNewItem );
-+ pTxtNode->SetAttr( rSet );
-+ delete pNewItem;
-+ }
-+ }
-+ }
-+}
-+
- void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
- {
- SwStartNode* pSttNd;
-diff --git sw/source/ui/wrtsh/wrtsh1.cxx sw/source/ui/wrtsh/wrtsh1.cxx
-index b3087f7..9f0b753 100644
---- sw/source/ui/wrtsh/wrtsh1.cxx
-+++ sw/source/ui/wrtsh/wrtsh1.cxx
-@@ -928,6 +928,8 @@ void SwWrtShell::InsertPageBreak(const String *pPageDesc, USHORT nPgNum )
- if(HasSelection())
- DelRight();
- SwFEShell::SplitNode();
-+ // delete the numbered attribute of the last line if the last line is empty
-+ GetDoc()->ClearLineNumAttrs( *GetCrsr()->GetPoint() );
- }
-
- const SwPageDesc *pDesc = pPageDesc
---
-1.7.0.1
-
commit c91645f17db524565fb16a272398a26a31c9e0a9
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:21:23 2010 +0200
sw-outline-numbering-broken-fix.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8aa5b16..70e6036 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2648,8 +2648,6 @@ mingw-cpp-increase-include-limit.diff, i#95193, jholesov
mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
[ Fixes ]
-# fix problem with outline numbering broken in master document
-sw-outline-numbering-broken-fix.diff, i#96092, n#445536, Amelia Wang
# one of pagebreak enhancements
sw-insert-pagebreak-in-numbered-paragraph.diff, n#396648, Amelia Wang
diff --git a/patches/dev300/sw-outline-numbering-broken-fix.diff b/patches/dev300/sw-outline-numbering-broken-fix.diff
deleted file mode 100644
index dfc3edc..0000000
--- a/patches/dev300/sw-outline-numbering-broken-fix.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sw/source/core/docnode/ndcopy.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/ndcopy.cxx
-index ef65d7d..6217ae6 100644
---- sw/source/core/docnode/ndcopy.cxx
-+++ sw/source/core/docnode/ndcopy.cxx
-@@ -258,7 +258,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
- // kopiere Attribute/Text
- if( !pCpyAttrNd->HasSwAttrSet() )
- // wurde ein AttrSet fuer die Numerierung angelegt, so loesche diesen!
-- pTxtNd->ResetAllAttr();
-+ pCpyAttrNd->ResetAllAttr();
-
- // if Copy-Textnode unequal to Copy-Attrnode, then copy first
- // the attributes into the new Node.
---
-1.7.0.1
-
commit f883c0a78e909340e30bf91d665a30dc86821d38
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:13:44 2010 +0200
sw-import-html-controls.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index da8c17b..8aa5b16 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2539,7 +2539,6 @@ win32-restore-associations.diff, n#530872, tml
[ Fixes ]
fix-ppt-linespacing-import-export.diff, n#355302, rodo
-sw-import-html-controls.diff, n#485609, freuter
svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
sd-slideshow-slideshowview-transformation-fix.diff, rodo
diff --git a/patches/dev300/sw-import-html-controls.diff b/patches/dev300/sw-import-html-controls.diff
deleted file mode 100644
index 867872f..0000000
--- a/patches/dev300/sw-import-html-controls.diff
+++ /dev/null
@@ -1,217 +0,0 @@
----
- filter/inc/filter/msfilter/msocximex.hxx | 34 ++++++++++
- filter/source/msfilter/msocximex.cxx | 100 +++++++++++++++++++++++++++++-
- sw/source/filter/ww8/ww8par.hxx | 2 +
- sw/source/filter/ww8/ww8par3.cxx | 8 +++
- sw/source/filter/ww8/ww8par5.cxx | 2 +-
- 5 files changed, 144 insertions(+), 2 deletions(-)
-
-diff --git filter/inc/filter/msfilter/msocximex.hxx filter/inc/filter/msfilter/msocximex.hxx
-index b8733b1..c50c5a4 100644
---- filter/inc/filter/msfilter/msocximex.hxx
-+++ filter/inc/filter/msfilter/msocximex.hxx
-@@ -1417,4 +1417,38 @@ public:
- const com::sun::star::awt::Size& rSize );
- };
-
-+
-+class HTML_TextBox : public OCX_ModernControl
-+{
-+public:
-+ HTML_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
-+ msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField");
-+ msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel");
-+ mnBackColor = 0x80000005L;
-+ mnForeColor = 0x80000008L;
-+ nBorderColor = 0x80000006L;
-+ aFontData.SetHasAlign(TRUE);
-+ }
-+
-+ using OCX_ModernControl::Import; // to not hide the other two import methods
-+ virtual sal_Bool Import(com::sun::star::uno::Reference<
-+ com::sun::star::beans::XPropertySet> &rPropSet);
-+ /*
-+ sal_Bool Export(SotStorageRef &rObj,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::beans::XPropertySet> &rPropSet,
-+ const com::sun::star::awt::Size& rSize);
-+ sal_Bool WriteContents(SotStorageStreamRef &rObj,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::beans::XPropertySet> &rPropSet,
-+ const com::sun::star::awt::Size& rSize);
-+ */
-+ static OCX_Control *Create() { return new HTML_TextBox;}
-+
-+ virtual sal_Bool Read(SotStorageStream *pS);
-+ virtual sal_Bool ReadFontData(SotStorageStream *pS);
-+};
-+
-+
-+
- #endif
-diff --git filter/source/msfilter/msocximex.cxx filter/source/msfilter/msocximex.cxx
-index 0391c5c..174781a 100644
---- filter/source/msfilter/msocximex.cxx
-+++ filter/source/msfilter/msocximex.cxx
-@@ -4444,7 +4444,8 @@ OCX_map aOCXTab[] =
- {&OCX_GroupBox::Create,"",
- form::FormComponentType::GROUPBOX,""},
- {&OCX_ProgressBar::Create,"",
-- form::FormComponentType::CONTROL,""}
-+ form::FormComponentType::CONTROL,""},
-+ {&HTML_TextBox::Create,"5512D124-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"},
- };
-
- const int NO_OCX = sizeof( aOCXTab ) / sizeof( *aOCXTab );
-@@ -5142,6 +5143,103 @@ sal_Bool OCX_FontData::Export(SvStorageStreamRef &rContent,
- return sal_True;
- }
-
-+
-+sal_Bool HTML_TextBox::Import(com::sun::star::uno::Reference<
-+ com::sun::star::beans::XPropertySet> &rPropSet)
-+{
-+ uno::Any aTmp(&sName,getCppuType((OUString *)0));
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("Name"), aTmp );
-+
-+ aTmp = bool2any( fEnabled != 0 );
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("Enabled"), aTmp);
-+
-+ aTmp = bool2any( fLocked != 0 );
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("ReadOnly"), aTmp);
-+
-+ aTmp = bool2any( fHideSelection != 0 );
-+ rPropSet->setPropertyValue( WW8_ASCII2STR( "HideInactiveSelection" ), aTmp);
-+
-+ aTmp <<= ImportColor(mnForeColor);
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("TextColor"), aTmp);
-+
-+ aTmp <<= ImportColor(mnBackColor);
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
-+
-+ aTmp <<= ImportBorder(nSpecialEffect,nBorderStyle);
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp);
-+
-+ aTmp <<= ImportColor( nBorderColor );
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp);
-+
-+ aTmp = bool2any( fMultiLine != 0 );
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("MultiLine"), aTmp);
-+
-+ sal_uInt16 nTmp = static_cast<sal_uInt16>(nMaxLength);
-+ aTmp <<= nTmp;
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
-+
-+
-+ sal_Bool bTemp1,bTemp2;
-+ uno::Any aBarsH,aBarsV;
-+ switch(nScrollBars)
-+ {
-+ case 1:
-+ bTemp1 = sal_True;
-+ bTemp2 = sal_False;
-+ break;
-+ case 2:
-+ bTemp1 = sal_False;
-+ bTemp2 = sal_True;
-+ break;
-+ case 3:
-+ bTemp1 = sal_True;
-+ bTemp2 = sal_True;
-+ break;
-+ case 0:
-+ default:
-+ bTemp1 = sal_False;
-+ bTemp2 = sal_False;
-+ break;
-+ }
-+
-+ aBarsH = bool2any(bTemp1);
-+ aBarsV = bool2any(bTemp2);
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("HScroll"), aBarsH);
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("VScroll"), aBarsV);
-+
-+ nTmp = nPasswordChar;
-+ aTmp <<= nTmp;
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("EchoChar"), aTmp);
-+
-+ if (pValue)
-+ {
-+ aTmp <<= lclCreateOUString( pValue, nValueLen );
-+ // DefaultText seems to no longer be in UnoEditControlModel
-+ if ( bSetInDialog )
-+ {
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("Text"), aTmp);
-+ }
-+ else
-+ {
-+ rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultText"), aTmp);
-+ }
-+ }
-+
-+ // aFontData.Import(rPropSet);
-+ return sal_True;
-+}
-+
-+sal_Bool HTML_TextBox::Read(SotStorageStream *pS)
-+{
-+ return sal_True;
-+}
-+
-+sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
-+{
-+ return sal_True;
-+}
-+
-+
- // Doesn't really read anything but just skips the
- // record.
- sal_Bool OCX_TabStrip::Read(SotStorageStream *pS)
-diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
-index 8af5c62..7d0c454 100644
---- sw/source/filter/ww8/ww8par.hxx
-+++ sw/source/filter/ww8/ww8par.hxx
-@@ -1580,6 +1580,8 @@ public: // eigentlich private, geht aber leider nur public
- eF_ResT Read_F_OCX(WW8FieldDesc*, String&);
- eF_ResT Read_F_Hyperlink(WW8FieldDesc*, String& rStr);
- eF_ResT Read_F_Shape(WW8FieldDesc* pF, String& rStr);
-+ eF_ResT Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr);
-+
-
- void DeleteFormImpl();
-
-diff --git sw/source/filter/ww8/ww8par3.cxx sw/source/filter/ww8/ww8par3.cxx
-index fb565ea..88683c8 100644
---- sw/source/filter/ww8/ww8par3.cxx
-+++ sw/source/filter/ww8/ww8par3.cxx
-@@ -321,6 +321,14 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
- }
- }
-
-+eF_ResT SwWW8ImplReader::Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr)
-+{
-+ if( bObj && nPicLocFc )
-+ nObjLocFc = nPicLocFc;
-+ bEmbeddObj = true;
-+ return FLD_TEXT;
-+}
-+
- void SwWW8ImplReader::DeleteFormImpl()
- {
- delete pFormImpl, pFormImpl = 0;
-diff --git sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par5.cxx
-index 1fe4e37..57dfd8a 100644
---- sw/source/filter/ww8/ww8par5.cxx
-+++ sw/source/filter/ww8/ww8par5.cxx
-@@ -908,7 +908,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
- &SwWW8ImplReader::Read_F_Hyperlink, // 88
- 0, // 89
- 0, // 90
-- 0, // 91
-+ &SwWW8ImplReader::Read_F_HTMLControl, // 91
- 0, // 92
- 0, // 93
- 0, // 94
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list