[Libreoffice-commits] .: sw/source

[Thorsten Behrens]

 sw/source/core/layout/flycnt.cxx                |    2 --
 sw/source/core/layout/objectformattertxtfrm.cxx |    6 +-----
 sw/source/core/layout/objectformattertxtfrm.hxx |    2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 9e3a4754ae05c764c178b410689968a18c1c1df6
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Mon Feb 14 14:00:29 2011 +0100

    Elided internal Sun bugtracker IDs.

diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 6753aa0..f2ae960 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -479,7 +479,6 @@ void SwFlyAtCntFrm::MakeAll()
                 {
                     bOsz = aOszCntrl.ChkOsz();
 
-                    // #b6403541#
                     // special loop prevention for dedicated document:
                     if ( bOsz &&
                          HasFixSize() && IsClipped() &&
@@ -551,7 +550,6 @@ void SwFlyAtCntFrm::MakeAll()
             {
                 SetTmpConsiderWrapInfluence( true );
                 SetRestartLayoutProcess( true );
-                // #b6449874#
                 SetTmpConsiderWrapInfluenceOfOtherObjs( true );
             }
             bSetCompletePaintOnInvalidate = FALSE;
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 1b150a4..c1c5247 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -180,7 +180,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
         // wrapping style influence is temporarly considered.
         // #i40147# - consider also anchored objects, for
         // whose the check of a moved forward anchor frame is requested.
-        // #b6449874# - revise decision made for i3317:
+        // revise decision made for i3317:
         // anchored objects, whose wrapping style influence is temporarly considered,
         // have to be considered in method <SwObjectFormatterTxtFrm::DoFormatObjs()>
         if ( bSuccess &&
@@ -359,7 +359,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
         bSuccess = _FormatObjsAtFrm();
     }
 
-    // #b449874#
     // consider anchored objects, whose wrapping style influence are temporarly
     // considered.
     if ( bSuccess &&
@@ -596,7 +595,6 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
         if ( nPageNum > _nFromPageNum )
         {
             _noToPageNum = nPageNum;
-            // #b6443897#
             // Handling of special case:
             // If anchor frame is move forward into a follow flow row,
             // <_noToPageNum> is set to <_nFromPageNum + 1>, because it is
@@ -795,8 +793,6 @@ void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()
 
 /** method to determine if at least one anchored object has state
     <temporarly consider wrapping style influence> set.
-
-    #b6449874#
 */
 bool SwObjectFormatterTxtFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence()
 {
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index a5caa9f..3504461 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -122,8 +122,6 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
 
         /** method to determine if at least one anchored object has state
             <temporarly consider wrapping style influence> set.
-
-            #b6449874#
         */
         bool _AtLeastOneObjIsTmpConsiderWrapInfluence();