MPL/LGPL3+ relicensing

[Gil Forcada]

Hi all,

Seems that I tried to help on this amazing project that I can only
follow and not contribute anymore due to other duties, but see below my
blanket statement about the relicensing  and the bits I helped on:

All of my past  future contributions to LibreOffice may be
 licensed under the MPL/LGPLv3+ dual license

Cheers and thanks for this amazing office suite!!!
-- 
Gil Forcada

[ca] guifi.net - una xarxa lliure que no para de créixer
[en] guifi.net - a non-stopping free network
bloc: http://gil.badall.net
planet: http://planet.guifi.net

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH]Remove death code and comments

[Gil Forcada]

Hi,

See attached a small patch that removes death code and comments on
writer/sw/source

Cheers,

-- 
gil forcada

[ca] guifi.net - una xarxa lliure que no para de créixer
[en] guifi.net - a non-stopping free network
bloc: http://gil.badall.net
planet: http://planet.guifi.net
From 026e9fbabf85be410a38488600705dcf40761c2b Mon Sep 17 00:00:00 2001
From: Gil Forcada gforc...@gnome.org
Date: Thu, 14 Oct 2010 02:07:25 +0200
Subject: [PATCH] Removed death code and comments

---
 sw/source/core/text/porlay.cxx|1 -
 sw/source/core/txtnode/ndtxt.cxx  |  229 -
 sw/source/filter/html/svxcss1.cxx |2 -
 sw/source/filter/ww8/wrtww8.cxx   |   52 -
 sw/source/ui/index/cntex.cxx  |   22 
 sw/source/ui/ribbar/workctrl.src  |   28 -
 6 files changed, 20 insertions(+), 314 deletions(-)

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 34dbba9..93d461f 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -71,7 +71,6 @@
 using namespace ::com::sun::star;
 using namespace i18n::ScriptType;
 
-//#ifdef BIDI
 #include unicode/ubidi.h
 #include i18nutil/unicode.hxx  //unicode::getUnicodeScriptType
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4046cbc..56bce35 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -34,9 +34,7 @@
 #include editeng/brkitem.hxx
 #include editeng/escpitem.hxx
 #include editeng/lrspitem.hxx
-// -- OD 2008-01-17 #newlistlevelattrs#
 #include editeng/tstpitem.hxx
-// --
 #include svl/urihelper.hxx
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_ULONGS
@@ -88,16 +86,12 @@
 #include SwStyleNameMapper.hxx
 #include numrule.hxx
 
-//-- #outlinelevel added by zhaojianwei
 #include svl/intitem.hxx
-//--end
 #include swtable.hxx
 #include docsh.hxx
 #include SwNodeNum.hxx
-// -- OD 2008-02-25 #refactorlists#
 #include svl/intitem.hxx
 #include list.hxx
-// --
 
 SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 )
 
@@ -126,24 +120,14 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex  rWhere,
 
 SwNodeIndex aIdx( *pNode );
 
-// -- OD 2005-11-03 #125329#
+// #125329#
 // call method UpdateOutlineNode(..) only for the document nodes array
 if ( IsDocNodes() )
 {
-//if ( pColl  NO_NUMBERING != pColl-GetOutlineLevel() )	//#outline level,removed by zhaojianwei
-//{
-//	UpdateOutlineNode( *pNode, NO_NUMBERING, pColl-GetOutlineLevel() );
-//}
-//if ( pColl  0 != pColl-GetAttrOutlineLevel() )//#outline level,added by zhaojianwei
-//{
-//UpdateOutlineNode( *pNode, 0, pColl-GetAttrOutlineLevel() );
-//}//--end
-//else
 {
 UpdateOutlineNode(*pNode);
 }
 }
-// --
 
 //Wenn es noch kein Layout gibt oder in einer versteckten Section
 // stehen, brauchen wir uns um das MakeFrms nicht bemuehen.
@@ -231,13 +215,10 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
   mpNodeNum( 0 ),
   m_bLastOutlineState( false ),
   m_bNotifiable( false ),
-  // -- OD 2008-11-19 #i70748#
+  // #i70748#
   mbEmptyListStyleSetDueToSetOutlineLevelAttr( false ),
-  // --
-  // -- OD 2008-05-06 #refactorlists#
   mbInSetOrResetAttr( false ),
   mpList( 0 )
-  // --
 {
 InitSwParaStatistics( true );
 
@@ -245,11 +226,10 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
 if( pAutoAttr )
 SetAttr( *pAutoAttr );
 
-// -- OD 2008-03-13 #refactorlists# - no longed needed
 //SyncNumberAndNumRule();
 if ( !IsInList()  GetNumRule()  GetListId().Len()  0 )
 {
-// -- OD 2009-08-27 #i101516#
+// #i101516#
 // apply paragraph style's assigned outline style list level as
 // list level of the paragraph, if it has none set already.
 if ( !HasAttrListLevel() 
@@ -257,10 +237,8 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
 {
 SetAttrListLevel( pTxtColl-GetAssignedOutlineStyleLevel() );
 }
-// --
 AddToList();
 }
-// --
 GetNodes().UpdateOutlineNode(*this);
 
 m_bNotifiable = true;
@@ -287,15 +265,7 @@ SwTxtNode::~SwTxtNode()
 delete pTmpHints;
 }
 
-// -- OD 2008-03-13 #refactorlists#
-//if ( mpNodeNum )
-//{
-//mpNodeNum-RemoveMe();
-//delete mpNodeNum;
-//mpNodeNum = 0L;
-//}
 RemoveFromList();
-// --
 
 InitSwParaStatistics( false );
 }
@@ -360,7 +330,7 @@ void lcl_ChangeFtnRef( SwTxtNode rNode )
 {
 while( pFtn-GetMaster() )
 pFtn = pFtn-GetMaster();
-// OD 07.11.2002 #104840# - remember footnote frame
+// #104840# - remember footnote frame
 pFirstFtnOfNode = pFtn;
 while ( pFtn