[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    KOFFICE_1_3_BRANCH: koffice/filters/kword/libexport
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-02-05 21:09:09
Message-ID: 20040205210909.A0B23909C () office ! kde ! org
[Download RAW message or body]

CVS commit by goutte: 

- Add support for "fixed" line spacing
- Fix check about old/new syntax of <LINESPACING>
(Backport)
CCMAIL:koffice-devel@kde.org


  M +2 -2      KWEFStructures.h   1.46.2.1
  M +5 -5      ProcessDocument.cc   1.47.2.1


--- koffice/filters/kword/libexport/KWEFStructures.h  #1.46:1.46.2.1
@@ -397,5 +397,5 @@ public:
 
     enum { LS_CUSTOM = 0, LS_SINGLE = 10, LS_ONEANDHALF = 15, LS_DOUBLE = 20,
-      LS_ATLEAST = 30, LS_MULTIPLE = 40 };
+      LS_ATLEAST = 30, LS_MULTIPLE = 40, LS_FIXED = 50 };
 
     QString     styleName;

--- koffice/filters/kword/libexport/ProcessDocument.cc  #1.47:1.47.2.1
@@ -1,7 +1,7 @@
-// $Header$
+//
 
 /*
    This file is part of the KDE project
-   Copyright (C) 2001, 2002 Nicolas GOUTTE <goutte@kde.org>
+   Copyright (C) 2001, 2002, 2004 Nicolas GOUTTE <goutte@kde.org>
    Copyright (c) 2001 IABG mbH. All rights reserved.
                       Contact: Wolf-Michael Bolle <Bolle@IABG.de>
@@ -734,8 +734,8 @@ static void ProcessLinespacingTag (QDomN
     ProcessAttributes (myNode, attrProcessingList);
 
-    // KWord pre-1.2 uses "value" attribute (stored in oldValue)
-    // while 1.2 uses "type" and "spacingvalue"
+    // KWord pre-1.2 uses only the "value" attribute (stored in oldValue)
+    // while 1.2 uses mainly "type" and "spacingvalue", while keeping "value" for compatibility
 
-    if( !oldValue.isEmpty() )
+    if ( spacingType.isEmpty() )
     {
         // for old format


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]