[Libreoffice-commits] core.git: 3 commits - Makefile.in sw/source vcl/source vcl/win

[Oliver-Rainer Wittmann]

 Makefile.in                           |    2 ++
 sw/source/filter/ww8/rtfexport.cxx    |   15 ++++++++++++++-
 vcl/source/gdi/textlayout.cxx         |    2 +-
 vcl/source/glyphs/graphite_layout.cxx |    2 +-
 vcl/source/window/winproc.cxx         |   11 -----------
 vcl/win/source/window/salframe.cxx    |    4 ----
 6 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit b7f2129c1186e1c5b2dd19ebb79ff82b213c0870
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Wed Jun 19 14:18:36 2013 +0000

    Resolves: #i120023# RTF export certain special copy-and-paste scenarios
    
    (cherry picked from commit d70e1e8ea81a942875f91fdef75d3e39fba42eff)
    
    Conflicts:
    	sw/source/filter/ww8/rtfexport.cxx
    
    Change-Id: I845f3f2bebe411969483a53c45ef9413f7f1b903

diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index a766e348..0787f37 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -391,8 +391,21 @@ void RtfExport::WriteStyles()
 void RtfExport::WriteMainText()
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
-    pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
+
+    SwTableNode* pTableNode = pCurPam->GetNode()->FindTableNode();
+    if ( m_pWriter && m_pWriter->bWriteOnlyFirstTable
+         && pTableNode != 0 )
+    {
+        pCurPam->GetPoint()->nNode = *pTableNode;
+        pCurPam->GetMark()->nNode = *(pTableNode->EndOfSectionNode());
+    }
+    else
+    {
+        pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
+    }
+
     WriteText();
+
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
 }
 
commit 4f3287c8b8e72dcad9539c95b8d14ac7bebd35d7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 19 20:05:18 2013 +0100

    bodge callcatcher some more
    
    Change-Id: Ie2e126700540cbec2a94f40250b2a114d1ea9306

diff --git a/Makefile.in b/Makefile.in
index 01d8d5c..b5681c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -384,6 +384,8 @@ findunusedcode:
 	@cp config_host/* callcatcher/config_host
 	@cp config_host.mk* callcatcher
 	@sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/callcatcher/config_host.mk
+	@sed -i -e s,g++,"callcatcher g++",g $(SRCDIR)/callcatcher/config_host.mk
+	@sed -i -e s,gcc,"callcatcher gcc",g $(SRCDIR)/callcatcher/config_host.mk
 	@echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
 	@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
 	@echo unexport CXXFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
commit bbabdfd84135bf2b8db09a4c1fb1d6f390ea5dba
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 19 17:51:18 2013 +0100

    WaE: for higher debugging levels
    
    Change-Id: Ibcf081c0c64381e8c188764f036687a8bfc0ea0e

diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index ebac541..7be750d 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -188,7 +188,7 @@ namespace vcl
             aTrace.append( " ): " );
             aTrace.append( nTextWidth );
             aTrace.append( " = ( " );
-            for ( size_t i=0; i<_nLength; )
+            for ( sal_Int32 i=0; i<_nLength; )
             {
                 aTrace.append( _pDXAry[i] );
                 if ( ++i < _nLength )
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 034842a..afd8411 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -603,7 +603,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
         if (pSegment != NULL)
         {
 #ifdef GRLAYOUT_DEBUG
-            fprintf(grLog(),"Gr::LayoutText %d-%d, context %d, len %d, numchars %" SAL_PRI_SIZET "u, rtl %d scaling %f:", rArgs.mnMinCharPos,
+            fprintf(grLog(),"Gr::LayoutText %d-%d, context %d, len %d, numchars %d, rtl %d scaling %f:", rArgs.mnMinCharPos,
                rArgs.mnEndCharPos, limit, rArgs.mnLength, numchars, bRtl, mfScaling);
             for (int i = mnSegCharOffset; i < limit; ++i)
                 fprintf(grLog(), " %04X", rArgs.mpStr[i]);
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 73e5a7a..8485971 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -51,17 +51,6 @@
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
-#if OSL_DEBUG_LEVEL > 1
-char dbgbuffer[1024];
-#ifndef WNT
-#include <stdio.h>
-#define MyOutputDebugString(s) (fprintf(stderr, s ))
-#else
-extern void MyOutputDebugString( char *s);
-#endif
-#endif
-
-
 // =======================================================================
 
 #define IMPL_MIN_NEEDSYSWIN         49
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 05f1f35..2571b99 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -106,10 +106,6 @@ using namespace ::com::sun::star::beans;
 # define WM_MOUSEHWHEEL 0x020E
 #endif
 
-#if OSL_DEBUG_LEVEL > 1
-void MyOutputDebugString( char *s) { OutputDebugString( s ); }
-#endif
-
 // =======================================================================
 
 const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED");