incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172121 - in /incubator/ooo/trunk/main/sw/source/filter/ww8: rtfattributeoutput.cxx ww8atr.cxx
Date Sat, 17 Sep 2011 22:41:02 GMT
Author: mst
Date: Sat Sep 17 22:41:02 2011
New Revision: 1172121

URL: http://svn.apache.org/viewvc?rev=1172121&view=rev
Log:
sw34bf06 #i117711# - correct RTF page margin export

# HG changeset patch
# User Oliver-Rainer Wittmann <od@openoffice.org>
# Date 1304667455 -7200
# Node ID a0b88a5ee52f360566d6429d1f5acdd13e05dc27
# Parent  5f7a7d1da1328ca43af2986cea79db76fc6e3e66

Modified:
    incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx   (contents, props
changed)
    incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx   (contents, props changed)

Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx?rev=1172121&r1=1172120&r2=1172121&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx Sat Sep 17 22:41:02
2011
@@ -2650,24 +2650,24 @@ void RtfAttributeOutput::FormatULSpace( 
 
             HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() );
 
+            if( aDistances.dyaTop )
+            {
+                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
+                m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop);
+            }
             if ( aDistances.HasHeader() )
             {
-                if( aDistances.dyaTop )
-                {
-                    m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
-                    m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop);
-                }
                 m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY);
                 m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop);
             }
 
+            if( aDistances.dyaBottom )
+            {
+                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
+                m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom);
+            }
             if( aDistances.HasFooter() )
             {
-                if( aDistances.dyaBottom )
-                {
-                    m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
-                    m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom);
-                }
                 m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY);
                 m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom);
             }

Propchange: incubator/ooo/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx?rev=1172121&r1=1172120&r2=1172121&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx Sat Sep 17 22:41:02 2011
@@ -856,8 +856,10 @@ void MSWordExportBase::OutputFormat( con
             }
         }
         break;
+    case RES_FRMFMT:
+        break;
     default:
-        ASSERT( !this, "Was wird hier ausgegeben ??? " );
+        ASSERT( !this, "Which format is exported here?" );
         break;
     }
 

Propchange: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message