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

List:       kde-commits
Subject:    koffice/filters/kspread/excel
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2010-06-15 12:30:59
Message-ID: 20100615123059.A2575AC8D3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1138228 by mkruisselbrink:

add support for horizontal justify alignment to the xls import filter


 M  +9 -3      import/excelimport.cc  
 M  +1 -1      sidewinder/format.cpp  
 M  +1 -1      sidewinder/format.h  
 M  +7 -1      sidewinder/globalssubstreamhandler.cpp  


--- trunk/koffice/filters/kspread/excel/import/excelimport.cc #1138227:1138228
@@ -1855,9 +1855,15 @@
 
     if (!align.isNull()) {
         switch (align.alignX()) {
-        case Format::Left: style.addProperty("fo:text-align", "start", \
                KoGenStyle::ParagraphType); break;
-        case Format::Center: style.addProperty("fo:text-align", "center", \
                KoGenStyle::ParagraphType); break;
-        case Format::Right: style.addProperty("fo:text-align", "end", \
KoGenStyle::ParagraphType); break; +        case Format::Left:
+            style.addProperty("fo:text-align", "start", KoGenStyle::ParagraphType); \
break; +        case Format::Center:
+            style.addProperty("fo:text-align", "center", KoGenStyle::ParagraphType); \
break; +        case Format::Right:
+            style.addProperty("fo:text-align", "end", KoGenStyle::ParagraphType); \
break; +        case Format::Justify:
+        case Format::Distributed:
+            style.addProperty("fo:text-align", "justify", \
KoGenStyle::ParagraphType); break;  }
 
         if (align.indentLevel() != 0)
--- trunk/koffice/filters/kspread/excel/sidewinder/format.cpp #1138227:1138228
@@ -309,7 +309,7 @@
 
 bool FormatAlignment::wrap() const
 {
-    return d->wrap || d->alignY == Format::VJustify || d->alignY == \
Format::VDistributed; +    return d->wrap || d->alignY == Format::VJustify || \
d->alignY == Format::VDistributed || d->alignX == Format::Justify || d->alignX == \
Format::Distributed;  }
 
 void FormatAlignment::setWrap(bool w)
--- trunk/koffice/filters/kspread/excel/sidewinder/format.h #1138227:1138228
@@ -766,7 +766,7 @@
      */
     void setValueFormat(const UString& valueFormat);
 
-    enum { Standard = -1, Left, Center, Right };
+    enum { Standard = -1, Left, Center, Right, Justify, Distributed };
 
     enum { Top, Middle, Bottom, VJustify, VDistributed };
 
--- trunk/koffice/filters/kspread/excel/sidewinder/globalssubstreamhandler.cpp \
#1138227:1138228 @@ -474,8 +474,14 @@
         alignment.setAlignX(Format::Right); break;
     case XFRecord::Centered:
         alignment.setAlignX(Format::Center); break;
+    case XFRecord::Justified:
+        alignment.setAlignX(Format::Justify); break;
+    case XFRecord::Distributed:
+        alignment.setAlignX(Format::Distributed); break;
+    case XFRecord::Filled:
+    case XFRecord::CenteredSelection:
     default: break;
-        // FIXME still unsupported: Repeat, Justified, Filled, Distributed
+        // FIXME still unsupported: CenteredSelection, Filled
     }
 
     switch (xf.verticalAlignment()) {


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