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

List:       kde-commits
Subject:    koffice
From:       Laurent Montel <montel () kde ! org>
Date:       2004-11-10 18:43:50
Message-ID: 20041110184350.B9C9C16C7E () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Move enum style for date/time variable.
We must define date/time style here (use also by kspread)


  M +1 -1      kspread/kspread_doc.h   1.160
  M +3 -3      kspread/kspread_style.cc   1.33
  M +3 -1      lib/kofficecore/koGenStyles.h   1.22


--- koffice/kspread/kspread_doc.h  #1.159:1.160
@@ -129,5 +129,5 @@ public:
   ~KSpreadDoc();
 
-    enum { STYLE_PAGE = 20, STYLE_COLUMN, STYLE_ROW, STYLE_CELL, STYLE_PAGEMASTER, \
STYLE_USERSTYLE, STYLE_DEFAULTSTYLE, STYLE_NUMERIC_DATE, STYLE_NUMERIC_TIME, \
STYLE_NUMERIC_PERCENTAGE, STYLE_NUMERIC_CURRENCY, STYLE_NUMERIC_FRACTION, \
STYLE_NUMERIC_SCIENTIFIC,  STYLE_NUMERIC_NUMBER}; +    enum { STYLE_PAGE = 20, \
STYLE_COLUMN, STYLE_ROW, STYLE_CELL, STYLE_PAGEMASTER, STYLE_USERSTYLE, \
STYLE_DEFAULTSTYLE,  STYLE_NUMERIC_PERCENTAGE, STYLE_NUMERIC_CURRENCY, \
STYLE_NUMERIC_FRACTION, STYLE_NUMERIC_SCIENTIFIC,  STYLE_NUMERIC_NUMBER};  
 

--- koffice/kspread/kspread_style.cc  #1.32:1.33
@@ -630,5 +630,5 @@ QString KSpreadStyle::saveOasisStyleNume
 QString KSpreadStyle::saveOasisStyleNumericDate( KoGenStyles&mainStyles )
 {
-    KoGenStyle currentCellStyle( KSpreadDoc::STYLE_NUMERIC_DATE );
+    KoGenStyle currentCellStyle( KoGenStyle::STYLE_NUMERIC_DATE );
     switch( m_formatType )
     {
@@ -684,5 +684,5 @@ QString KSpreadStyle::saveOasisStyleNume
     //<number:am-pm/>
     //</number:date-style>
-    KoGenStyle currentCellStyle( KSpreadDoc::STYLE_NUMERIC_DATE );
+    KoGenStyle currentCellStyle( KoGenStyle::STYLE_NUMERIC_DATE );
     QBuffer buffer;
     buffer.open( IO_WriteOnly );
@@ -706,5 +706,5 @@ QString KSpreadStyle::saveOasisStyleNume
     //</number:time-style>
 
-    KoGenStyle currentCellStyle( KSpreadDoc::STYLE_NUMERIC_TIME );
+    KoGenStyle currentCellStyle( KoGenStyle::STYLE_NUMERIC_TIME );
     QBuffer buffer;
     buffer.open( IO_WriteOnly );

--- koffice/lib/kofficecore/koGenStyles.h  #1.21:1.22
@@ -137,5 +137,7 @@ public:
            STYLE_AUTO = 2,
            STYLE_MASTER = 3,
-           STYLE_LIST = 4 };
+           STYLE_LIST = 4,
+           STYLE_NUMERIC_DATE = 5,
+           STYLE_NUMERIC_TIME = 6 };
     /**
      * Start the definition of a new style. Its name will be set later by \
KoGenStyles::lookup(),


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