[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                       |    3 -
 patches/dev300/sw-table-frame-uno-fix.diff |   66 -----------------------------
 2 files changed, 69 deletions(-)

New commits:
commit f52058e7847b729e23d791239c494d660eab9b39
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Apr 7 13:06:00 2011 +0200

    Pushed sw-table-frame-uno-fix.diff to the git repos

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b97c756..bb8b293 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1220,9 +1220,6 @@ fix-ppt-linespacing-import-export.diff, n#355302, rodo
 # FIXME 2011-04-05: Does not apply, leaving it to cbosdonnat for now
 # fields-table-formula.diff, n#631912, cbosdo
 
-# Backport from cbosdo06 CWS
-sw-table-frame-uno-fix.diff, i#112564, cbosdo
-
 svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
diff --git a/patches/dev300/sw-table-frame-uno-fix.diff b/patches/dev300/sw-table-frame-uno-fix.diff
deleted file mode 100644
index f9e150b..0000000
--- a/patches/dev300/sw-table-frame-uno-fix.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- sw/inc/doc.hxx
-+++ sw/inc/doc.hxx
-@@ -1096,7 +1096,8 @@ public:
-     // ( Start < Pos < End ) !!!
-     // (Required for Writers.)
-     void GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, const SwPaM* = 0,
--                        sal_Bool bDrawAlso = sal_False ) const;
-+                        sal_Bool bDrawAlso = sal_False, 
-+                        sal_Bool bAsCharAlso = sal_False ) const;
- 
-     // Because swrtf.cxx and define private public here now.
-     SwFlyFrmFmt  *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
---- sw/source/core/doc/doclay.cxx
-+++ sw/source/core/doc/doclay.cxx
-@@ -1088,7 +1088,8 @@ sal_Bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
- }
- 
- void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
--                           const SwPaM* pCmpRange, sal_Bool bDrawAlso ) const
-+                           const SwPaM* pCmpRange, sal_Bool bDrawAlso,
-+                           sal_Bool bAsCharAlso ) const
- {
-     SwPosFlyFrm *pFPos = 0;
-     SwFrmFmt *pFly;
-@@ -1106,7 +1107,8 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
-             if (pAPos &&
-                 ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
-                  (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
--                 (FLY_AT_CHAR == rAnchor.GetAnchorId())))
-+                 (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
-+                 ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && bAsCharAlso)))
-             {
-                 if( pCmpRange &&
-                     !TstFlyRange( pCmpRange, pAPos, rAnchor.GetAnchorId() ))
---- sw/source/core/unocore/unoobj2.cxx
-+++ sw/source/core/unocore/unoobj2.cxx
-@@ -1975,7 +1975,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
-         {
-             SwPosFlyFrms aFlyFrms;
-             //get all frames that are bound at paragraph or at character
--            rPaM.GetDoc()->GetAllFlyFmts(aFlyFrms, m_pImpl->GetCursor());
-+            rPaM.GetDoc()->GetAllFlyFmts(aFlyFrms, m_pImpl->GetCursor(), sal_False, sal_True);
-             for(sal_uInt16 i = 0; i < aFlyFrms.Count(); i++)
-             {
-                 SwPosFlyFrm* pPosFly = aFlyFrms[i];
-@@ -1987,20 +1987,6 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
-                 m_pImpl->m_Frames.push_back(
-                         ::boost::shared_ptr<SwDepend>(pNewDepend) );
-             }
--            //created from any text range
--            if (m_pImpl->GetCursor()->HasMark())
--            {
--                m_pImpl->GetCursor()->Normalize();
--                do
--                {
--                    lcl_FillFrame(*m_pImpl.get(), *m_pImpl->GetCursor(),
--                            m_pImpl->m_Frames);
--                    m_pImpl->GetCursor()->Right(
--                            1, CRSR_SKIP_CHARS, sal_False, sal_False);
--                }
--                while (*m_pImpl->GetCursor()->GetPoint() <
--                        *m_pImpl->GetCursor()->GetMark());
--            }
-         }
-         lcl_FillFrame(*m_pImpl.get(), *m_pImpl->GetCursor(), m_pImpl->m_Frames);
-     }