[Libreoffice-commits] .: 4 commits - sw/inc sw/source

[Lubos Lunak]

 sw/inc/node.hxx                 |    2 +-
 sw/source/core/docnode/node.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit daff51e125d1036895a5d39a7a652b3f5ff0e97e
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Sep 26 16:22:05 2011 +0200

    revert the change of SwCntntNode bases, for now
    
    Smoketest fails because of this, presumably there is some old-style
    C cast that fails to adjust the pointer value in SwModify* -> SwCntntNode*
    casts because of missing the header file *sigh* , but I can't find
    it now.

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 583b8e6..597f02e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -376,7 +376,7 @@ private:
 // --------------------
 // SwCntntNode
 // --------------------
-class SW_DLLPUBLIC SwCntntNode: public SwNode, public SwModify, public SwIndexReg
+class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg
 {
 
 //FEATURE::CONDCOLL
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 0f76a22..b1bb096 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -993,8 +993,8 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
 
 SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
                             SwFmtColl *pColl )
-    : SwNode( rWhere, nNdType ),
-    SwModify( pColl ),     // CrsrsShell, FrameFmt,
+    : SwModify( pColl ),     // CrsrsShell, FrameFmt,
+    SwNode( rWhere, nNdType ),
     pCondColl( 0 ),
     mbSetModifyAtAttr( false )
 {
commit d527a2eaee4ecbcc80ac019f78da9f14ac49060a
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Sep 26 14:37:33 2011 +0200

    remove executable bit

diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
old mode 100755
new mode 100644
commit 76150ea68cb46ca1953f7031f9aca5637ecffe1b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Sep 26 14:27:07 2011 +0200

    remove executable bit

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
old mode 100755
new mode 100644
commit 86eb9e342a7d59bcedb1fab7f51423eac1ebd868
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Sep 26 14:16:53 2011 +0200

    remove executable bit on source files

diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
old mode 100755
new mode 100644
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
old mode 100755
new mode 100644