Hi Cédric,
I'm doing it task by task. This patches removes all bug id's from Oracle
internal database keeping the indentation, you could apply it, even with the
lines which the content is "//" "- loop prevention" or "- optimization",
i'll fix it in the next patch. ;-)
Under the LGPLv3+ / MPL license.
Regards,
Júlio.
2011/4/15 Júlio Hoffimann <julio.hoffimann@gmail.com>
Ok Cedric, no problem. I will fix these problems.
Thank you for return.
Regards,
Júlio.
2011/4/15 Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Hi Julio,
Many thanks for your patches nice patches. I think we'll manage to
eradicate loads of useless comments this way ;)
I pushed both patches in libs-gui and libs-core after some manual edits,
but it takes too much time to manually adjust the patch for sw. Could
you please adjust your regexps to fix the following problems:
* comments indentation is reduced to 4 spaces in all cases: you should
keep the number of existing leading spaces to avoid breaking the
indentation
* #b[0-9]\+# comments should be purely removed: we don't need them as
they refer to some Oracle internal bug database. Please pay attention
here ase you may have #b...# and #i....# references on the same line
* you often have some comment after the bug number, please keep them.
Some could be removed, but not all.
* While at it, could you remove the lines with comments like '// <--'
as those are the "closing" comments for the other silly SCM-like
comments?
Don't forget to check your patch after running your regexps as you may
have other unexpected cases.
Regards,
On Thu, 2011-04-14 at 19:26 -0300, Júlio Hoffimann wrote:
I forget to mention...
This patch is under the LGPLv3+ / MPL license.
2011/4/14 Júlio Hoffimann <julio.hoffimann@gmail.com>
... and the last and big one. ;-)
https://bugs.freedesktop.org/show_bug.cgi?id=36234
Regards,
Júlio.
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
From 5769a3324c8a1fbe6ecdfbb50a0e16b3c1fe5ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Sat, 16 Apr 2011 16:16:27 -0300
Subject: [PATCH] bug id's from Oracle internal database removed
---
editeng/source/editeng/impedit3.cxx | 2 +-
xmloff/source/transform/TransformerBase.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index f6af728..16738e0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3106,7 +3106,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point
aSta
nTextStart = 0;
nTextLen = aText.Len();
- // #b6668980# crash when accessing 0 pointer in pDXArray
+ // crash when accessing 0 pointer in pDXArray
pTmpDXArray = new sal_Int32[ aText.Len() ];
pDXArray = pTmpDXArray;
Font _aOldFont( GetRefDevice()->GetFont() );
diff --git a/xmloff/source/transform/TransformerBase.cxx
b/xmloff/source/transform/TransformerBase.cxx
index 8e8eb34..81a94f1 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -433,7 +433,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments
for( sal_Int32 nIndex = 0; nIndex < nAnyCount; nIndex++, pAny++ )
{
- // #b6236750# use isAssignableFrom instead of comparing the types to
+ // use isAssignableFrom instead of comparing the types to
// allow XExtendedDocumentHandler instead of XDocumentHandler (used in
// writeOasis2OOoLibraryElement in sfx2).
// The Any shift operator can't be used to query the type because it
--
1.7.0.4
From 1db608d28bb99c5db4f476cbcfe1317c9c310a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Sat, 16 Apr 2011 16:18:45 -0300
Subject: [PATCH] bug id's from Oracle internal database removed
---
l10ntools/source/export.cxx | 2 +-
l10ntools/source/xrmmerge.cxx | 2 +-
vcl/source/gdi/outdev.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 769cf7d..1b1d9d3 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -2261,7 +2261,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
break;
nLIndex ++;
PFormEntrys *oldEntry = pEntrys;
- pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); // <--- game over
+ pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
if( !pEntrys )
pEntrys = oldEntry;
}
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 9dd3399..ae2ac51 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -371,7 +371,7 @@ int XRMResParser::Execute( int nToken, char * pToken )
ByteString sLang = GetAttribute( sCurrentOpenTag, "xml:lang" );
WorkOnText( sCurrentOpenTag, sCurrentText );
Output( sCurrentText );
- EndOfText( sCurrentOpenTag, sCurrentCloseTag );// <---
+ EndOfText( sCurrentOpenTag, sCurrentCloseTag );
bText = sal_False;
rToken = ByteString("");
sCurrentText = ByteString("");
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index da9ddc3..4667398 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -992,7 +992,7 @@ void OutputDevice::ImplInitClipRegion()
&& GetOutDevType() != OUTDEV_PRINTER );
if( bClipDeviceBounds )
{
- // #b6520266# Perform actual rect clip against outdev
+ // Perform actual rect clip against outdev
// dimensions, to generate empty clips whenever one of the
// values is completely off the device.
Rectangle aDeviceBounds( mnOutOffX, mnOutOffY,
--
1.7.0.4
From 44af12e60d2774e610ca007812a52ee0fd6cac6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Sat, 16 Apr 2011 16:19:09 -0300
Subject: [PATCH] bug id's from Oracle internal database removed
---
sw/source/core/layout/calcmove.cxx | 30 +++++++++++++-----------------
sw/source/core/layout/findfrm.cxx | 2 +-
sw/source/core/layout/flowfrm.cxx | 9 ++++-----
sw/source/core/layout/flyincnt.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 6 +++---
sw/source/core/layout/paintfrm.cxx | 26 +++++++++++++-------------
sw/source/core/layout/sectfrm.cxx | 4 ++--
sw/source/core/layout/tabfrm.cxx | 8 ++++----
sw/source/core/layout/wsfrm.cxx | 6 +++---
sw/source/core/text/frmpaint.cxx | 2 +-
sw/source/core/text/inftxt.cxx | 2 +-
sw/source/core/text/itrcrsr.cxx | 29 ++++++++++-------------------
sw/source/core/text/porrst.cxx | 2 +-
sw/source/core/text/portxt.cxx | 2 +-
sw/source/core/txtnode/ndtxt.cxx | 9 ++++-----
sw/source/ui/dochdl/gloshdl.cxx | 2 +-
sw/source/ui/inc/view.hxx | 2 +-
sw/source/ui/misc/outline.cxx | 7 +++----
sw/source/ui/shells/basesh.cxx | 4 ++--
sw/source/ui/shells/textsh.cxx | 3 +--
sw/source/ui/shells/textsh1.cxx | 2 +-
sw/source/ui/uiview/view2.cxx | 2 +-
sw/source/ui/uno/unotxdoc.cxx | 6 +++---
24 files changed, 76 insertions(+), 93 deletions(-)
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 5e41bd8..a357d8b 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -205,7 +205,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
// _WouldFit kann auch gefragt werden, wenn _nur_ fremdverankerte Flys
vorliegen,
// dabei ist sogar die Breite egal, da ein TestFormat in der neuen Umgebung
// vorgenommen wird.
- // --> OD 2007-11-26 #b6614158#
+ //
const sal_uInt8 nBwdMoveNecessaryResult =
BwdMoveNecessary( pNewPage, aRect);
const bool bObjsInNewUpper( nBwdMoveNecessaryResult == 2 ||
@@ -1129,7 +1129,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
|*************************************************************************/
#define STOP_FLY_FORMAT 10
-// --> OD 2006-09-25 #b6448963# - loop prevention
+// - loop prevention
const int cnStopFormat = 15;
// <--
@@ -1165,7 +1165,7 @@ void SwCntntFrm::MakeAll()
LockJoin();
long nFormatCount = 0;
- // --> OD 2006-09-25 #b6448963# - loop prevention
+ // - loop prevention
int nConsequetiveFormatsWithoutChange = 0;
// <--
PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
@@ -1243,7 +1243,7 @@ void SwCntntFrm::MakeAll()
}
}
- // --> OD 2008-08-12 #b6732519#
+ //
if ( GetUpper()->IsSctFrm() &&
HasFollow() &&
GetFollow()->GetFrm() == GetNext() )
@@ -1319,7 +1319,7 @@ void SwCntntFrm::MakeAll()
while ( !bValidPos || !bValidSize || !bValidPrtArea )
{
- // --> OD 2006-09-25 #b6448963# - loop prevention
+ // - loop prevention
SwRect aOldFrm_StopFormat( Frm() );
SwRect aOldPrt_StopFormat( Prt() );
// <--
@@ -1447,7 +1447,7 @@ void SwCntntFrm::MakeAll()
++nFormatCount;
if( nFormatCount > STOP_FLY_FORMAT )
SetFlyLock( sal_True );
- // --> OD 2006-09-25 #b6448963# - loop prevention
+ // - loop prevention
// No format any longer, if <cnStopFormat> consequetive formats
// without change occur.
if ( nConsequetiveFormatsWithoutChange <= cnStopFormat )
@@ -1563,7 +1563,7 @@ void SwCntntFrm::MakeAll()
}
}
- // --> OD 2006-09-25 #b6448963# - loop prevention
+ // - loop prevention
{
if ( aOldFrm_StopFormat == Frm() &&
aOldPrt_StopFormat == Prt() )
@@ -1883,7 +1883,7 @@ sal_Bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
return ( pFrm && pNxt && pFrm->GetNext() == pNxt );
}
-// --> OD 2007-11-26 #b6614158#
+//
sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
SwLayoutFrm *pNewUpper,
sal_Bool bTstMove,
@@ -1912,11 +1912,10 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
pTmpPrev = pTmpPrev->GetNext();
do
{
- // --> FME 2005-03-31 #b6236853# #i46181#
+ // #i46181#
SwTwips nSecondCheck = 0;
SwTwips nOldSpace = nSpace;
sal_Bool bOldSplit = bSplit;
- // <--
if ( bTstMove || IsInFly() || ( IsInSct() &&
( pFrm->GetUpper()->IsColBodyFrm() || ( pFtnFrm &&
@@ -1985,7 +1984,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue();
}
- // --> FME 2005-03-31 #b6236853# #i46181#
+ // #i46181#
nSecondCheck = ( 1 == nSecondCheck &&
pFrm == this &&
IsTxtFrm() &&
@@ -1993,7 +1992,6 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
!static_cast<const SwTxtFrm*>(this)->IsEmpty() ) ?
nUpper :
0;
- // <--
nUpper += bCommonBorder ?
rAttrs.GetBottomLine( *(pFrm) ) :
@@ -2002,9 +2000,8 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
}
else
{
- // --> FME 2005-03-31 #b6236853# #i46181#
+ // #i46181#
nSecondCheck = 0;
- // <--
if( pFrm->IsVertical() )
nUpper = pFrm->Frm().Width() - pFrm->Prt().Width();
@@ -2018,7 +2015,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
{
bRet = sal_False;
- // --> FME 2005-03-31 #b6236853# #i46181#
+ // #i46181#
if ( nSecondCheck > 0 )
{
// The following code is indented to solve a (rare) problem
@@ -2037,7 +2034,6 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
bSplit = sal_True;
}
}
- // <--
}
}
@@ -2075,7 +2071,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
pNxt->FindFtnFrm()->GetAttr() == pFtnFrm->GetAttr() ) ) )
{
// ProbeFormatierung vertraegt keine absatz- oder gar zeichengebundene Objekte
- // --> OD 2007-11-26 #b6614158#
+ //
// current solution for the test formatting doesn't work, if
// objects are present in the remaining area of the new upper
if ( bTstMove &&
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 45a43e8..ad00060 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1715,7 +1715,7 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const
OSL_ENSURE( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" );
const SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper();
- // --> OD 2006-06-28 #b6443897#
+ //
// If most upper row frame is a headline row, the current frame
// can't be in a splitted table row. Thus, add corresponding condition.
if ( pRow->GetNext() ||
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 02ae407..9f40012 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2388,7 +2388,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
//(6677)Wenn allerdings leere Blaetter uebersprungen wurden wird doch gemoved.
if ( pNewUpper && IsFollow() && pNewUpper->Lower() )
{
- // --> OD 2007-09-05 #i79774#, #b6596954#
+ // #i79774#
// neglect empty sections in proposed new upper frame
bool bProposedNewUpperContainsOnlyEmptySections( true );
{
@@ -2424,7 +2424,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
else
pNewUpper = 0;
}
- // <--
}
if ( pNewUpper && !ShouldBwdMoved( pNewUpper, sal_True, rbReformat ) )
{
@@ -2579,7 +2578,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
pNewUpper->Calc();
rThis.Cut();
- // --> OD 2005-02-23 #b6229852#
+ //
// optimization: format section, if its size is invalidated and if it's
// the new parent of moved backward frame.
bool bFormatSect( false );
@@ -2590,7 +2589,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
if( pSect->HasFollow() != bFollow )
{
pSect->InvalidateSize();
- // --> OD 2005-02-23 #b6229852# - optimization
+ // - optimization
if ( pSect == pNewUpper )
bFormatSect = true;
// <--
@@ -2598,7 +2597,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
}
rThis.Paste( pNewUpper );
- // --> OD 2005-02-23 #b6229852# - optimization
+ // - optimization
if ( bFormatSect )
pSect->Calc();
// <--
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index b3a8b6a..6e204f8 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -315,7 +315,7 @@ void SwFlyInCntFrm::MakeAll()
MakeObjPos();
}
- // --> OD 2006-04-13 #b6402800#
+ //
// re-activate clipping of as-character anchored Writer fly frames
// depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames>
if ( bValidPos && bValidSize &&
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 2bbdde1..93426a5 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3414,7 +3414,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod,
sal_uInt1
if( bCalcFrm )
{
- // --> OD 2005-03-04 #b6234250# - format parent Writer
+ // - format parent Writer
// fly frame, if it isn't been formatted yet.
// Note: The Writer fly frame could be the frame itself.
SwFlyFrm* pFlyFrm( pTmpFrm->FindFlyFrm() );
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index dbee2cd..ae83b57 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -61,7 +61,7 @@
#include <flyfrm.hxx>
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-// --> OD 2006-03-22 #b6375613#
+//
#include <pam.hxx>
#include <docsh.hxx>
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
@@ -689,7 +689,7 @@ sal_Bool SwLayHelper::CheckInsertPage()
return sal_False;
}
-// --> OD 2006-03-22 #b6375613#
+//
bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm )
{
bool bHasTextFrmAnchoredObjs( false );
@@ -947,7 +947,7 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
SwPageFrm* pLastPage = rpPage;
if( CheckInsertPage() )
{
- // --> OD 2006-03-21 #b6375613#
+ //
if ( pDoc->ApplyWorkaroundForB6375613() )
{
lcl_ApplyWorkaroundForB6375613( rpFrm );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f1b175b..7a2b060 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4516,7 +4516,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm,
{
if ( _bTop && !_rCellBorderAttrs.GetBox().GetTop() )
{
- // #b4779636#-hack:
+ //-hack
// Cell frame has no top border and no border inside the table, but
// it is at the top border of a table frame, which is a follow.
// Thus, use border attributes of cell frame in first row of complete table.
@@ -4537,7 +4537,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm,
}
else if ( !_bTop && !_rCellBorderAttrs.GetBox().GetBottom() )
{
- // #b4779636#-hack:
+ //-hack
// Cell frame has no bottom border and no border inside the table,
// but it is at the bottom border of a table frame, which has a follow.
// Thus, use border attributes of cell frame in last row of complete table.
@@ -4624,10 +4624,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
const bool bLine = rAttrs.IsLine() ? true : false;
const bool bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE;
- // OD 24.02.2003 #b4779636#, #107692# - flag to control,
- // if #b4779636#-hack has to be used.
+ // - flag to control,
+ //-hack has to be used.
const bool bb4779636HackActive = true;
- // OD 21.02.2003 #b4779636#, #107692#
+ //
const SwFrm* pCellFrmForBottomBorderAttrs = 0;
const SwFrm* pCellFrmForTopBorderAttrs = 0;
bool bFoundCellForTopOrBorderAttrs = false;
@@ -4641,8 +4641,8 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
bFoundCellForTopOrBorderAttrs = true;
}
- // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs>
- // for #b4779636#-hack
+ // - add condition <bFoundCellForTopOrBorderAttrs>
+ //-hack
if ( bLine || bShadow || bFoundCellForTopOrBorderAttrs )
{
//Wenn das Rechteck vollstandig innerhalb der PrtArea liegt,
@@ -4687,8 +4687,8 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
PaintShadow( rRect, aRect, rAttrs );
// OD 27.09.2002 #103636# - suspend drawing of border
// add condition < NOT bDrawOnlyShadowForTransparentFrame > - see above
- // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs>
- // for #b4779636#-hack.
+ // - add condition <bFoundCellForTopOrBorderAttrs>
+ //-hack.
if ( ( bLine || bFoundCellForTopOrBorderAttrs ) &&
!bDrawOnlyShadowForTransparentFrame )
{
@@ -4698,8 +4698,8 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
::lcl_PaintLeftRightLine ( sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect
);
if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) )
{
- // OD 21.02.2003 #b4779636#, #107692# -
- // #b4779636#-hack: If another cell frame for top border
+ // -
+ //-hack
// paint is found, paint its top border.
if ( IsCellFrm() && pCellFrmForTopBorderAttrs != this )
{
@@ -4715,8 +4715,8 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
}
if ( !IsCntntFrm() || rAttrs.GetBottomLine( *(this) ) )
{
- // OD 21.02.2003 #b4779636#, #107692# -
- // #b4779636#-hack: If another cell frame for bottom border
+ // -
+ //-hack
// paint is found, paint its bottom border.
if ( IsCellFrm() && pCellFrmForBottomBorderAttrs != this )
{
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 9868d2c..7cfe5c5 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1135,7 +1135,7 @@ void SwSectionFrm::SimpleFormat()
SWRECTFN( this )
if( GetPrev() || GetUpper() )
{
- // --> OD 2009-09-28 #b6882166#
+ //
// assure notifications on position changes.
const SwLayNotify aNotify( this );
// <--
@@ -2280,7 +2280,7 @@ sal_Bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
SwFrm* SwFrm::_GetIndPrev() const
{
SwFrm *pRet = NULL;
- // --> OD 2007-09-04 #i79774#, #b659654#
+ // #i79774#
// Do not assert, if the frame has a direct previous frame, because it
// could be an empty section frame. The caller has to assure, that the
// frame has no direct previous frame or only empty section frames as
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index aaa73ca..bf33c1d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1750,7 +1750,7 @@ void MA_FASTCALL lcl_RecalcTable( SwTabFrm& rTab,
// GetIndPrev(), which did not work correctly for #i5947#
bool lcl_NoPrev( const SwFrm& rFrm )
{
- // --> OD 2007-09-04 #i79774#, #b6596954#
+ // #i79774#
// skip empty sections on investigation of direct previous frame.
// use information, that at least one empty section is skipped in the following code.
bool bSkippedDirectPrevEmptySection( false );
@@ -1800,7 +1800,7 @@ bool lcl_NoPrev( const SwFrm& rFrm )
#define KEEPTAB ( !GetFollow() && !IsFollow() )
-// --> OD 2005-09-28 #b6329202# - helper method to find next content frame of
+// - helper method to find next content frame of
// a table frame and format it to assure keep attribute.
// method return true, if a next content frame is formatted.
// Precondition: The given table frame hasn't a follow and isn't a follow.
@@ -2121,7 +2121,7 @@ void SwTabFrm::MakeAll()
bLowersFormatted = sal_True;
if ( bKeep && KEEPTAB )
{
- // --> OD 2005-09-28 #b6329202#
+ //
// Consider case that table is inside another table,
// because it has to be avoided, that superior table
// is formatted.
@@ -2293,7 +2293,7 @@ void SwTabFrm::MakeAll()
{
delete pAccess;
- // --> OD 2005-09-28 #b6329202#
+ //
// Consider case that table is inside another table, because
// it has to be avoided, that superior table is formatted.
// Thus, find next content, table or section and, if a section
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index e3de4b9..661b9ac 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -233,7 +233,7 @@ void SwCellFrm::CheckDirection( sal_Bool bVert )
{
const SwFrmFmt* pFmt = GetFmt();
const SfxPoolItem* pItem;
- // --> FME 2006-03-30 #b6402837# Check if the item is set, before actually
+ // Check if the item is set, before actually
// using it. Otherwise the dynamic pool default is used, which may be set
// to LTR in case of OOo 1.0 documents.
// <--
@@ -1040,7 +1040,7 @@ void SwCntntFrm::Cut()
{
if ( pUp->GetUpper() )
{
- // --> OD 2006-09-25 #b6448963#
+ //
// prevent delete of <ColLocked> footnote frame
if ( pUp->IsFtnFrm() && !pUp->IsColLocked())
// <--
@@ -1056,7 +1056,7 @@ void SwCntntFrm::Cut()
}
else
{
- // --> OD 2006-09-25 #b6448963#
+ //
if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
// <--
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 724d21e..aadf621 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -65,7 +65,7 @@
#include <IDocumentStylePoolAccess.hxx>
#include <IDocumentLineNumberAccess.hxx>
-// --> OD 2006-06-27 #b6440955#
+//
// variable moved to class <numfunc:GetDefBulletConfig>
//extern const sal_Char sBulletFntName[];
namespace numfunc
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ee9f9b9..9b882c2 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -100,7 +100,7 @@ using namespace ::com::sun::star::beans;
#define DRAW_SPECIAL_OPTIONS_CENTER 1
#define DRAW_SPECIAL_OPTIONS_ROTATE 2
-// --> OD 2006-06-27 #b6440955#
+//
// variable moved to class <numfunc:GetDefBulletConfig>
//extern const sal_Char sBulletFntName[];
namespace numfunc
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 60a1292..5c02ac7 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -178,8 +178,8 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
const SwTxtNode *pNode = pFrm->GetTxtNode();
const SvxLRSpaceItem &rSpace = pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
- // --> OD 2009-09-08 #i95907#, #b6879723#
- // --> OD 2010-05-05 #i111284#
+ // #i95907#
+ // #i111284#
const bool bListLevelIndentsApplicableAndLabelAlignmentActive(
AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTxtNode()) ) );
// <--
@@ -204,37 +204,31 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo
*pNewInf )
pFrm->Prt().Left() +
nLMWithNum -
pNode->GetLeftMarginWithNum( sal_False ) -
- // --> OD 2009-09-08 #i95907#, #b6879723#
- // --> OD 2010-05-05 #i111284#
+ // #i95907#
+ // #i111284#
// rSpace.GetLeft() +
// rSpace.GetTxtLeft();
( bListLevelIndentsApplicableAndLabelAlignmentActive
? 0
: ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
- // <--
}
else
{
- // --> OD 2009-09-08 #i95907#, #b6879723#
- // --> OD 2010-05-05 #i111284#
-// if (
!pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)
)
+ // #i95907#
+ // #i111284#
if ( bListLevelIndentsApplicableAndLabelAlignmentActive ||
!pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)
)
- // <--
{
// this calculation is identical this the calculation for R2L layout - see above
nLeft = pFrm->Frm().Left() +
pFrm->Prt().Left() +
nLMWithNum -
pNode->GetLeftMarginWithNum( sal_False ) -
- // --> OD 2009-09-08 #i95907#, #b6879723#
- // --> OD 2010-05-05 #i111284#
-// rSpace.GetLeft() +
-// rSpace.GetTxtLeft();
+ // #i95907#
+ // #i111284#
( bListLevelIndentsApplicableAndLabelAlignmentActive
? 0
: ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
- // <--
}
else
{
@@ -318,14 +312,11 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo
*pNewInf )
else
nFirstLineOfs = nFLOfst;
- // --> OD 2009-09-08 #i95907#, #b6879723#
- // --> OD 2010-05-05 #i111284#
-// if ( pFrm->IsRightToLeft() ||
-//
!pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)
)
+ // #i95907#
+ // #i111284#
if ( pFrm->IsRightToLeft() ||
bListLevelIndentsApplicableAndLabelAlignmentActive ||
!pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)
)
- // <--
{
nFirst = nLeft + nFirstLineOfs;
}
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 375aa2e..ec76d17 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -177,7 +177,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
static sal_Char const sDoubleSpace[] = " ";
XubString aTxtDouble( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
- // --> FME 2006-07-12 #b6439097#
+ //
SwRect aClipRect;
rInf.CalcRect( *this, &aClipRect, 0 );
SwSaveClip aClip( (OutputDevice*)rInf.GetOut() );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index b3334ec..f5114b0 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -394,7 +394,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
// (work around different definition of tab stop character - breaking or
// non breaking character - in compatibility mode)
else if ( ( IsFtnPortion() && rInf.IsFakeLineStart() &&
- // --> OD 2010-01-29 #b6921213#
+ //
rInf.IsOtherThanFtnInside() ) ||
// <--
( rInf.GetLast() &&
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index cd2f170..0b3de9e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2656,7 +2656,7 @@ XubString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
cons
SvxNumberType const& rNumberType(
pRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) ) );
if (rNumberType.IsTxtFmt() ||
- // #b6432095#
+ //
(style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType()))
{
return pRule->MakeNumString( GetNum()->GetNumberVector(),
@@ -2715,11 +2715,10 @@ long SwTxtNode::GetLeftMarginWithNum( sal_Bool bTxtLeft ) const
sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
{
sal_Bool bRet( sal_False );
- // --> OD 2009-09-08 #i95907#, #b6879723#
+ // #i95907#
rFLOffset = 0;
- // <--
- // --> OD 2005-11-02 #i51089 - TUNING#
+ // #i51089#
const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
if ( pRule )
{
@@ -2760,7 +2759,7 @@ sal_Bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
return bRet;
}
-// --> OD 2010-01-05 #b6884103#
+//
SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const
{
SwTwips nAdditionalIndent = 0;
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index ba831d3..8289840 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -440,7 +440,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
String aShortName( rShortName );
sal_Bool bCancel = sal_False;
// search for text block
- //#b6633427# - don't prefer current group depending on configuration setting
+ // - don't prefer current group depending on configuration setting
const SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
sal_uInt16 nFound = !pCfg->IsSearchInAllCategories() ? pGlossary->GetIndex( aShortName ) : -1;
// if not found then search in all groups
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 57ca1c9..05108ed 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -285,7 +285,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
bInMailMerge : 1,
bInDtor : 1, //detect destructor to prevent creating of sub shells while
closing
bOldShellWasPagePreView : 1,
- bMakeSelectionVisible : 1 // #b6330459# transport the bookmark selection
+ bMakeSelectionVisible : 1 // transport the bookmark selection
;
// Methoden fuers Suchen
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index b69393b..aaabce9 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -409,7 +409,7 @@ short SwOutlineTabDialog::Ok()
SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline );
if( !pColl )
{
- if(aCollNames[i] != sHeadline)//->added by zhaojianwei
+ if(aCollNames[i] != sHeadline)
{
SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i) );
@@ -427,15 +427,14 @@ short SwOutlineTabDialog::Ok()
pTxtColl->SetFmtAttr(aItem);
}
}
- }//<--end,zhaojianwei
+ }
}
}
rWrtSh.SetOutlineNumRule( *pNumRule);
- // --> OD 2006-12-11 #130443#
+ // #i30443#
rWrtSh.EndAction();
- // <--
return RET_OK;
}
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 3056cb3..3c23e02 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1849,9 +1849,9 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
break;
case FN_WRAP_ANCHOR_ONLY:
aWrap.SetAnchorOnly(!aWrap.IsAnchorOnly());
- // --> OD 2006-06-02 #b6432130#
+ //
// keep previous wrapping
- // --> OD 2006-09-21 #138144# - adjust fix #b6432130#
+ //
// switch to wrap SURROUND_PARALLEL, if previous wrap is SURROUND_NONE
if ( nOldSurround != SURROUND_NONE )
{
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index de64856..a6c12fe 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -751,11 +751,10 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
rSh.Push();
const sal_Bool bCrsrInHidden = rSh.SelectHiddenRange();
- // --> OD 2009-08-05 #i103839#, #b6855246#
+ // #i103839#
// Do not call method <SwCrsrShell::Pop(..)> with 1st parameter = <sal_False>
// in order to avoid that the view jumps to the visible cursor.
rSh.Pop();
- // <--
while ( nWhich )
{
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 12ed911..68cfc2e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1013,7 +1013,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
//if it's set to something different than USHRT_MAX
sal_Bool bStart = ((SfxBoolItem&)pSet->Get(FN_NUMBER_NEWSTART)).GetValue();
- // --> OD 2007-06-11 #b6560525#
+ //
// Default value for restart value has to be USHRT_MAX
// in order to indicate that the restart value of the list
// style has to be used on restart.
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index e733a98..2aa0514 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1863,7 +1863,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark )
else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) ))
bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
- // #b6330459# make selection visible later
+ // make selection visible later
if ( aVisArea.IsEmpty() )
bMakeSelectionVisible = sal_True;
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 6892867..4c65bac 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1684,7 +1684,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString&
rServic
if (rServiceName.lastIndexOf( C2U(".OLE2Shape") ) == rServiceName.getLength() - 10)
throw ServiceNotRegisteredException(); // declare service to be not
registered with this factory
- // --> OD 2006-02-22 #b6382898#
+ //
// the XML import is allowed to create instances of com.sun.star.drawing.OLE2Shape.
// Thus, a temporary service name is introduced to make this possible.
OUString aTmpServiceName( rServiceName );
@@ -1974,7 +1974,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
case WID_DOC_BUILDID:
aValue >>= maBuildId;
break;
- // --> OD 2006-03-21 #b6375613#
+ //
case WID_APPLY_WORKAROUND_FOR_B6375613:
{
bool bApplyWorkaroundForB6375613( false );
@@ -2139,7 +2139,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
case WID_DOC_HAS_VALID_SIGNATURES:
aAny <<= hasValidSignatures();
break;
- // --> OD 2006-03-21 #b6375613#
+ //
case WID_APPLY_WORKAROUND_FOR_B6375613:
{
aAny <<= pDocShell->GetDoc()->ApplyWorkaroundForB6375613();
--
1.7.0.4
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.