offapi/com/sun/star/accessibility/XMSAAService.idl | 1 -
sw/source/core/doc/docdesc.cxx | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 81253d316851faa33565b212b1257505f6ce2e4b
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Dec 20 11:24:48 2013 +0100
fdo#70232: sw: brown paper-bag fix for header sharing mangling footers
Stupid copy/paste error in SwDoc::CopyMasterFooter() checks
IsHeaderShared().
(regression from e1a9a348a519a69f898c9c1e6d87a5837b8267f9)
Change-Id: I0c0bc16a8c581cd05ed206a0de79c7983204165b
(cherry picked from commit 94c772adc2e8d8af468f3996527c84bf7704103f)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 413a00d..3f1d636 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -258,7 +258,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged,
const SwFmtFooter &rFoot,
// The CntntIdx is _always_ different when called from
// SwDocStyleSheet::SetItemSet, because it deep-copies the
// PageDesc. So check if it was previously shared.
- ((bLeft) ? pDesc->IsHeaderShared() : pDesc->IsFirstShared()))
+ ((bLeft) ? pDesc->IsFooterShared() : pDesc->IsFirstShared()))
{
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? "Left
footer" : "First footer"),
GetDfltFrmFmt() );
commit cb49e62d3a518514dd27e10df6fc6bfd7f509e5f
Author: Michael Stahl <mst...@redhat.com>
Date: Sat Dec 21 00:33:13 2013 +0100
offapi: spurious #endif
Change-Id: I9bfd69ee3edbfdb2e69af72843ef169aae1696e1
diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl
b/offapi/com/sun/star/accessibility/XMSAAService.idl
index d091dec..add11d1 100644
--- a/offapi/com/sun/star/accessibility/XMSAAService.idl
+++ b/offapi/com/sun/star/accessibility/XMSAAService.idl
@@ -23,7 +23,6 @@
#define __com_sun_star_accessibility_XMSAASERVICE_idl__
#include <com/sun/star/lang/XComponent.idl>
-#endif
module com { module sun { module star { module accessibility {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
