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

[Tor Lillqvist]

 patches/dev300/apply                       |    3 ++-
 patches/dev300/sw-table-frame-uno-fix.diff |   10 ++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit ca4d28c0f4996765592fb246996b65f402f5fc71
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:34:48 2011 +0300

    Make sw-table-frame-uno-fix.diff apply again

diff --git a/patches/dev300/sw-table-frame-uno-fix.diff b/patches/dev300/sw-table-frame-uno-fix.diff
index 1723528..694f4b8 100644
--- a/patches/dev300/sw-table-frame-uno-fix.diff
+++ b/patches/dev300/sw-table-frame-uno-fix.diff
@@ -1,5 +1,3 @@
-diff --git sw/inc/doc.hxx sw/inc/doc.hxx
-index baaeef6..0344486 100644
 --- sw/inc/doc.hxx
 +++ sw/inc/doc.hxx
 @@ -1096,7 +1096,8 @@ public:
@@ -12,8 +10,6 @@ index baaeef6..0344486 100644
  
      // wegen swrtf.cxx und define private public, jetzt hier
      SwFlyFrmFmt  *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
-diff --git sw/source/core/doc/doclay.cxx sw/source/core/doc/doclay.cxx
-index 021bb55..3f8eb9d 100644
 --- 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,
@@ -36,8 +32,6 @@ index 021bb55..3f8eb9d 100644
              {
                  if( pCmpRange &&
                      !TstFlyRange( pCmpRange, pAPos, rAnchor.GetAnchorId() ))
-diff --git sw/source/core/unocore/unoobj2.cxx sw/source/core/unocore/unoobj2.cxx
-index 1b3ed92..66dabf1 100644
 --- sw/source/core/unocore/unoobj2.cxx
 +++ sw/source/core/unocore/unoobj2.cxx
 @@ -1975,7 +1975,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
@@ -46,7 +40,7 @@ index 1b3ed92..66dabf1 100644
              //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(USHORT i = 0; i < aFlyFrms.Count(); i++)
+             for(sal_uInt16 i = 0; i < aFlyFrms.Count(); i++)
              {
                  SwPosFlyFrm* pPosFly = aFlyFrms[i];
 @@ -1987,20 +1987,6 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
@@ -62,7 +56,7 @@ index 1b3ed92..66dabf1 100644
 -                    lcl_FillFrame(*m_pImpl.get(), *m_pImpl->GetCursor(),
 -                            m_pImpl->m_Frames);
 -                    m_pImpl->GetCursor()->Right(
--                            1, CRSR_SKIP_CHARS, FALSE, FALSE);
+-                            1, CRSR_SKIP_CHARS, sal_False, sal_False);
 -                }
 -                while (*m_pImpl->GetCursor()->GetPoint() <
 -                        *m_pImpl->GetCursor()->GetMark());
commit 4a016e4114043abccd52c62f9204881e6044bbea
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:34:08 2011 +0300

    Bypass fields-table-formula.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8c9693b..f899ed6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1330,7 +1330,8 @@ win32-restore-associations.diff, n#530872, tml
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 
-fields-table-formula.diff, n#631912, cbosdo
+# 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