[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 5 02:37:23 PDT 2011
patches/dev300/sw-table-frame-uno-fix.diff | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7780f3005e530fbc6bbab024d2ef8559dc1a5906
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 12:37:00 2011 +0300
Missed one thing
diff --git a/patches/dev300/sw-table-frame-uno-fix.diff b/patches/dev300/sw-table-frame-uno-fix.diff
index 694f4b8..f9e150b 100644
--- a/patches/dev300/sw-table-frame-uno-fix.diff
+++ b/patches/dev300/sw-table-frame-uno-fix.diff
@@ -2,13 +2,13 @@
+++ sw/inc/doc.hxx
@@ -1096,7 +1096,8 @@ public:
// ( Start < Pos < End ) !!!
- // (wird fuer die Writer benoetigt)
+ // (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;
- // wegen swrtf.cxx und define private public, jetzt hier
+ // 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
More information about the Libreoffice-commits
mailing list