[ooo-build-commit] 3 commits - patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Sep 30 21:26:56 PDT 2009
patches/dev300/apply | 10
patches/dev300/cjk-character-units-ui-m58.diff | 454 +++++++++++++++++++++++++
patches/dev300/cjk-character-units-ui.diff | 2
patches/dev300/cws-calctabcolor-oox.diff | 2
4 files changed, 464 insertions(+), 4 deletions(-)
New commits:
commit 97e1018e7cd7f80da7c26c87f1c7bbc7557b2c25
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Thu Oct 1 00:25:47 2009 -0400
Fixed build breakage in sfx2.
Cachable = Volatile flag in .sdi file doesn't seem to work
anymore.
* patches/dev300/apply:
* patches/dev300/cjk-character-units-ui-m58.diff:
* patches/dev300/cjk-character-units-ui.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index beb9b81..3d65bc7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -292,7 +292,13 @@ cjk-character-units-imp.diff, Amelia Wang
sw-default-cjk-fontsize.diff i#72010, jianhua
# add a new unit 'character unit'
+[ CJK >= dev300-m60 ]
cjk-character-units-ui.diff, Amelia Wang
+
+[ CJK < dev300-m60 ]
+cjk-character-units-ui-m58.diff, Amelia Wang
+
+[ CJK ]
cjk-character-units-rulers-sync-with-pggrid-fix.diff, Amelia Wang
cjk-character-units-fix.diff, i#356101, Amelia Wang
cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
diff --git a/patches/dev300/cjk-character-units-ui-m58.diff b/patches/dev300/cjk-character-units-ui-m58.diff
new file mode 100644
index 0000000..1d96a19
--- /dev/null
+++ b/patches/dev300/cjk-character-units-ui-m58.diff
@@ -0,0 +1,454 @@
+--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs.old 2009-04-02 11:01:44.000000000 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs 2009-04-06 16:41:41.000000000 +0000
+@@ -1654,6 +1654,18 @@
+ </info>
+ <value>false</value>
+ </prop>
++ <!-- added for apply char unit 2006-12-1 -->
++ <prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
++ <!-- OldPath: Writer/Layout -->
++ <!-- OldLocation: Soffice.cfg -->
++ <!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
++ <info>
++ <author>OS</author>
++ <desc>apply char unit to calculate the paragraph's indent</desc>
++ <label>apply char unit</label>
++ </info>
++ <value>true</value>
++ </prop>
+ </group>
+ </group>
+ <group oor:name="Grid">
+--- rsc/inc/vclrsc.hxx.old 2009-04-02 10:44:31.000000000 +0000
++++ rsc/inc/vclrsc.hxx 2009-04-06 16:41:41.000000000 +0000
+@@ -176,7 +176,7 @@ typedef sal_Int64 WinBits;
+ // from vcl/inc/fldunit.hxx
+ enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
+ FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
+- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
++ FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
+ FUNIT_PERCENT, FUNIT_100TH_MM };
+
+
+--- rsc/source/parser/rscibas.cxx.old 2009-04-02 10:44:31.000000000 +0000
++++ rsc/source/parser/rscibas.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -240,6 +240,9 @@ RscEnum * RscTypCont::InitFieldUnitsType
+ SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT );
+ SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE );
+ SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM );
++ // Amelia : adds two units ,"char" and "line"
++ SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR );
++ SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE );
+ SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
+
+ return pFieldUnits;
+--- sfx2/inc/sfx2/sfxsids.hrc.old 2009-04-02 10:44:03.000000000 +0000
++++ sfx2/inc/sfx2/sfxsids.hrc 2009-04-06 16:41:41.000000000 +0000
+@@ -1028,6 +1028,7 @@
+ #define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74)
+ #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87)
+ #define SID_ATTR_ALLOWFOLDERWEBVIEW (SID_OPTIONS_START + 92)
++#define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88)
+
+
+ // PathTabPage
+--- sfx2/sdi/sfx.sdi.old 2009-04-02 10:43:51.000000000 +0000
++++ sfx2/sdi/sfx.sdi 2009-04-06 16:41:41.000000000 +0000
+@@ -4282,6 +4282,33 @@ SfxUInt16Item MetricUnit SID_ATTR_METRIC
+ ]
+
+ //--------------------------------------------------------------------------
++SfxBoolItem ApplyCharUnit SID_ATTR_APPLYCHARUNIT
++
++[
++ /* flags: */
++ AutoUpdate = TRUE,
++ Cachable = Volatile,
++ FastCall = FALSE,
++ HasCoreId = FALSE,
++ HasDialog = FALSE,
++ ReadOnlyDoc = TRUE,
++ Toggle = FALSE,
++ Container = FALSE,
++ RecordAbsolute = FALSE,
++ RecordPerSet;
++ Synchron;
++
++ Readonly = FALSE,
++
++ /* config: */
++ AccelConfig = FALSE,
++ MenuConfig = FALSE,
++ StatusBarConfig = FALSE,
++ ToolBoxConfig = FALSE,
++ GroupId = GID_VIEW;
++]
++
++//--------------------------------------------------------------------------
+ SfxBoolItem Modified SID_MODIFIED
+
+ [
+--- svtools/inc/svtools/poolitem.hxx.old 2009-04-02 11:06:22.000000000 +0000
++++ svtools/inc/svtools/poolitem.hxx 2009-04-06 16:41:41.000000000 +0000
+@@ -103,7 +103,7 @@ enum SfxFieldUnit
+ {
+ SFX_FUNIT_NONE, SFX_FUNIT_MM, SFX_FUNIT_CM, SFX_FUNIT_M, SFX_FUNIT_KM,
+ SFX_FUNIT_TWIP, SFX_FUNIT_POINT, SFX_FUNIT_PICA,
+- SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CUSTOM
++ SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CHAR, SFX_FUNIT_LINE, SFX_FUNIT_CUSTOM
+ };
+
+ enum SfxMapUnit
+--- svtools/source/control/ruler.cxx.old 2009-04-06 16:41:40.000000000 +0000
++++ svtools/source/control/ruler.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -84,7 +84,9 @@
+ #define RULER_UNIT_MILE 6
+ #define RULER_UNIT_POINT 7
+ #define RULER_UNIT_PICA 8
+-#define RULER_UNIT_COUNT 9
++#define RULER_UNIT_CHAR 9
++#define RULER_UNIT_LINE 10
++#define RULER_UNIT_COUNT 11
+
+ // -----------------
+ // - ImplRulerData -
+@@ -148,7 +150,9 @@ static ImplRulerUnitData aImplRulerUnitT
+ { MAP_100TH_INCH, 1200, 120, 600, 1200, 30480, 3, "'" }, // FOOT
+ { MAP_10TH_INCH, 633600, 63360, 316800, 633600, 1609344, 4, " miles" }, // MILE
+ { MAP_POINT, 1, 12, 12, 36, 353, 2, " pt" }, // POINT
+-{ MAP_100TH_MM, 423, 423, 423, 846, 423, 3, " pi" } // PICA
++{ MAP_100TH_MM, 423, 423, 423, 846, 423, 3, " pi" }, // PICA
++{ MAP_100TH_MM, 371, 371, 371, 743, 371, 3, " ch" }, // CHAR
++{ MAP_100TH_MM, 551, 551, 551, 1102, 551, 3, " li" } // LINE
+ };
+
+ // =======================================================================
+--- svx/source/dialog/ruler.hrc.old 2009-04-02 11:03:28.000000000 +0000
++++ svx/source/dialog/ruler.hrc 2009-04-06 16:41:41.000000000 +0000
+@@ -37,4 +37,5 @@
+ #define ID_MILE 10
+ #define ID_POINT 6
+ #define ID_PICA 7
+-
++#define ID_CHAR 11
++#define ID_LINE 12
+--- svx/source/dialog/ruler.src.old 2009-04-02 11:03:28.000000000 +0000
++++ svx/source/dialog/ruler.src 2009-04-06 16:41:41.000000000 +0000
+@@ -90,6 +90,18 @@ Menu RID_SVXMN_RULER
+ Checkable = TRUE ;
+ Text [ en-US ] = "Pica" ;
+ };
++ MenuItem
++ {
++ Identifier = ID_CHAR ;
++ Checkable = TRUE ;
++ Text[ en-US ] = "Char" ;
++ };
++ MenuItem
++ {
++ Identifier = ID_LINE ;
++ Checkable = TRUE ;
++ Text[ en-US ] = "Line" ;
++ };
+ };
+ };
+ String RID_SVXSTR_RULER_TAB_LEFT
+--- svx/source/dialog/svxruler.cxx.old 2009-04-02 11:03:28.000000000 +0000
++++ svx/source/dialog/svxruler.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -3743,8 +3743,15 @@ void SvxRuler::Command( const CommandEve
+ (nId == FUNIT_M ||
+ nId == FUNIT_KM ||
+ nId == FUNIT_FOOT ||
+- nId == FUNIT_MILE ))
+- aMenu.RemoveItem(i - 1);
++ nId == FUNIT_MILE ||
++ nId == FUNIT_CHAR ||
++ nId == FUNIT_LINE ))
++ if (( nId == FUNIT_CHAR ) && bHorz )
++ ;
++ else if (( nId == FUNIT_LINE ) && !bHorz )
++ ;
++ else
++ aMenu.RemoveItem(i - 1);
+ }
+ aMenu.Execute( this, rCEvt.GetMousePosPixel() );
+ }
+--- svx/source/options/optgenrl.src.old 2009-04-02 11:03:06.000000000 +0000
++++ svx/source/options/optgenrl.src 2009-04-06 16:41:41.000000000 +0000
+@@ -283,6 +283,8 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
+ < "Miles" ; FUNIT_MILE ; > ;
+ < "Pica" ; FUNIT_PICA ; > ;
+ < "Point" ; FUNIT_POINT ; > ;
++ < "Char" ; FUNIT_CHAR ; >;
++ < "Line" ; FUNIT_LINE ; >;
+ };
+ };
+
+--- sw/source/ui/config/optload.cxx.old 2009-04-06 16:41:40.000000000 +0000
++++ sw/source/ui/config/optload.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -80,6 +80,10 @@
+
+ using namespace ::com::sun::star;
+
++#ifndef _SFXENUMITEM_HXX //autogen
++#include <svtools/eitem.hxx>
++#endif
++
+ /* -----------------22.10.98 15:12-------------------
+ *
+ * --------------------------------------------------*/
+@@ -103,6 +107,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pP
+ aTabFT ( this, SW_RES( FT_TAB ) ),
+ aTabMF ( this, SW_RES( MF_TAB ) ),
+ aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ),
++ aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ),
+
+ pWrtShell ( NULL ),
+ bHTMLMode ( FALSE ),
+@@ -125,6 +130,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pP
+ case FUNIT_POINT:
+ case FUNIT_PICA:
+ case FUNIT_INCH:
++ case FUNIT_CHAR:
+ {
+ // nur diese Metriken benutzen
+ USHORT nPos = aMetricLB.InsertEntry( sMetric );
+--- sw/source/ui/config/optload.hrc.old 2009-04-02 10:50:46.000000000 +0000
++++ sw/source/ui/config/optload.hrc 2009-04-06 16:41:41.000000000 +0000
+@@ -44,6 +44,7 @@
+ #define FT_TAB 21
+ #define MF_TAB 22
+ #define CB_USE_SQUARE_PAGE_MODE 23
++#define CB_USE_CHAR_UNIT 24
+
+ // SwCaptionOptPage -----------------------------
+
+--- sw/source/ui/config/optload.src.old 2009-04-02 10:50:46.000000000 +0000
++++ sw/source/ui/config/optload.src 2009-04-06 16:41:41.000000000 +0000
+@@ -142,6 +142,16 @@ TabPage TP_OPTLOAD_PAGE
+ Text [ en-US ] = "Use square page mode for text grid";
+ Text [ zh-CN ] = "使用稿纸模å¼";
+ };
++
++ CheckBox CB_USE_CHAR_UNIT
++ {
++ Pos = MAP_APPFONT ( 12 , 130) ;
++ Size = MAP_APPFONT ( 109 , 10 ) ;
++ Text [ de ] = "appy char unit" ;
++ Text [ en-US ] = "apply char unit";
++ Text [ x-comment ] = " ";
++ };
++
+ };
+ /**************************************************************************/
+ /* */
+@@ -397,6 +407,8 @@ StringArray STR_ARR_METRIC
+ < "Miles" ; FUNIT_MILE ; > ;
+ < "Pica" ; FUNIT_PICA ; > ;
+ < "Point" ; FUNIT_POINT ; > ;
++ < "Char" ; FUNIT_CHAR ; >;
++ < "Line" ; FUNIT_LINE ; >;
+ };
+ };
+
+--- sw/source/ui/config/optpage.cxx.old 2009-04-02 10:50:46.000000000 +0000
++++ sw/source/ui/config/optpage.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -179,14 +179,25 @@ SwContentOptPage::SwContentOptPage( Wind
+ case FUNIT_POINT:
+ case FUNIT_PICA:
+ case FUNIT_INCH:
++ case FUNIT_CHAR: // add two units , 'character' and 'line' , their ticks are not fixed
++ case FUNIT_LINE:
+ {
+ // nur diese Metriken benutzen
+- USHORT nPos = aMetricLB.InsertEntry( sMetric );
+- aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit );
+- aVMetric.InsertEntry( sMetric );
+- aVMetric.SetEntryData( nPos, (void*)(long)eFUnit );
+- aHMetric.InsertEntry( sMetric );
+- aHMetric.SetEntryData( nPos, (void*)(long)eFUnit );
++ // a horizontal ruler has not the 'line' unit
++ // there isn't 'line' unit in HTML format
++ if ( eFUnit != FUNIT_LINE )
++ {
++ USHORT nPos = aMetricLB.InsertEntry( sMetric );
++ aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit );
++ aHMetric.InsertEntry( sMetric );
++ aHMetric.SetEntryData( nPos, (void*)(long)eFUnit );
++ }
++ // a vetical ruler has not the 'character' unit
++ if ( eFUnit != FUNIT_CHAR )
++ {
++ USHORT nPos = aVMetric.InsertEntry( sMetric );
++ aVMetric.SetEntryData( nPos, (void*)(long)eFUnit );
++ }
+ }
+ default:;//prevent warning
+ }
+--- sw/source/ui/inc/optload.hxx.old 2009-04-02 10:50:50.000000000 +0000
++++ sw/source/ui/inc/optload.hxx 2009-04-06 16:41:41.000000000 +0000
+@@ -71,6 +71,7 @@ private:
+ FixedText aTabFT;
+ MetricField aTabMF;
+ CheckBox aUseSquaredPageMode;
++ CheckBox aUseCharUnit;
+
+ SwWrtShell* pWrtShell;
+ sal_Bool bHTMLMode;
+--- sw/source/ui/inc/pggrid.hxx.old 2009-04-06 16:41:40.000000000 +0000
++++ sw/source/ui/inc/pggrid.hxx 2009-04-06 16:41:41.000000000 +0000
+@@ -57,12 +57,14 @@ class SwTextGridPage: public SfxTabPage
+
+ FixedText aLinesPerPageFT;
+ NumericField aLinesPerPageNF;
++ FixedText aLinesRangeFT;
+
+ FixedText aTextSizeFT;
+ MetricField aTextSizeMF;
+
+ FixedText aCharsPerLineFT;
+ NumericField aCharsPerLineNF;
++ FixedText aCharsRangeFT;
+
+ FixedText aCharWidthFT;
+ MetricField aCharWidthMF;
+--- sw/source/ui/misc/pggrid.cxx.old 2009-04-06 16:41:40.000000000 +0000
++++ sw/source/ui/misc/pggrid.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -54,6 +54,7 @@
+ #include <svx/ulspitem.hxx>
+ #include <svx/boxitem.hxx>
+ #include <svx/frmdiritem.hxx>
++#include <svx/ruler.hxx>
+ #include <pggrid.hxx>
+ #include <tgrditem.hxx>
+ #include <pggrid.hrc>
+@@ -77,10 +78,12 @@ SwTextGridPage::SwTextGridPage(Window *p
+ aLayoutFL (this, SW_RES(FL_LAYOUT )),
+ aLinesPerPageFT (this, SW_RES(FT_LINESPERPAGE )),
+ aLinesPerPageNF (this, SW_RES(NF_LINESPERPAGE )),
++ aLinesRangeFT (this, SW_RES(FT_LINERANGE )),
+ aTextSizeFT (this, SW_RES(FT_TEXTSIZE )),
+ aTextSizeMF (this, SW_RES(MF_TEXTSIZE )),
+ aCharsPerLineFT (this, SW_RES(FT_CHARSPERLINE )),
+ aCharsPerLineNF (this, SW_RES(NF_CHARSPERLINE )),
++ aCharsRangeFT (this, SW_RES(FT_CHARRANGE )),
+ aCharWidthFT (this, SW_RES(FT_CHARWIDTH )),
+ aCharWidthMF (this, SW_RES(MF_CHARWIDTH )),
+ aRubySizeFT (this, SW_RES(FT_RUBYSIZE )),
+--- sw/source/ui/misc/pggrid.hrc.old 2009-04-02 10:50:37.000000000 +0000
++++ sw/source/ui/misc/pggrid.hrc 2009-04-06 16:41:41.000000000 +0000
+@@ -53,3 +53,5 @@
+ #define CB_SNAPTOCHARS 23
+ #define FT_CHARWIDTH 24
+ #define MF_CHARWIDTH 25
++#define FT_LINERANGE 26
++#define FT_CHARRANGE 27
+--- sw/source/ui/misc/pggrid.src.old 2009-04-02 10:50:37.000000000 +0000
++++ sw/source/ui/misc/pggrid.src 2009-04-06 16:41:41.000000000 +0000
+@@ -100,6 +100,12 @@ TabPage TP_TEXTGRID_PAGE
+ Last = 154 ;
+ SpinSize = 1 ;
+ };
++ FixedText FT_LINERANGE
++ {
++ Pos = MAP_APPFONT ( 103 , 82 ) ;
++ Size = MAP_APPFONT ( 25 , 8 );
++ Text [ en-US ] = "( 1 - 48 )" ;
++ };
+ FixedText FT_TEXTSIZE
+ {
+ Pos = MAP_APPFONT ( 133 , 82 ) ;
+@@ -169,6 +175,12 @@ TabPage TP_TEXTGRID_PAGE
+ Last = 5600 ;
+ SpinSize = 5 ;
+ };
++ FixedText FT_CHARRANGE
++ {
++ Pos = MAP_APPFONT ( 103 , 96 ) ;
++ Size = MAP_APPFONT ( 25 , 8 ) ;
++ Text [ en-US ] = "( 1 - 45 )" ;
++ };
+ FixedText FT_RUBYSIZE
+ {
+ Pos = MAP_APPFONT ( 133 , 98 ) ;
+--- vcl/inc/vcl/fldunit.hxx.old 2009-04-02 10:44:25.000000000 +0000
++++ vcl/inc/vcl/fldunit.hxx 2009-04-06 16:41:41.000000000 +0000
+@@ -38,7 +38,7 @@
+ // By changes you must also change: rsc/vclrsc.hxx
+ enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
+ FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
+- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
++ FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
+ FUNIT_PERCENT, FUNIT_100TH_MM };
+
+ #endif // _VCL_FLDUNIT_HXX
+--- vcl/source/control/field.cxx.old 2009-04-02 10:44:17.000000000 +0000
++++ vcl/source/control/field.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -1128,6 +1128,10 @@ static FieldUnit ImplStringToMetric( con
+ if ( strAllUnits->GetString( i ).Equals( aStr ) )
+ return (FieldUnit) strAllUnits->GetValue( i );
+
++ // Amelia : about character unit
++ if (aStr.EqualsIgnoreCaseAscii("cm"))
++ return FUNIT_CM;
++
+ return FUNIT_NONE;
+ }
+
+@@ -1143,20 +1147,24 @@ static FieldUnit ImplMetricGetUnit( cons
+ #define M *1000000L
+ #define X *5280L
+
+-static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
++// Amelia : about measurement unit, 'char' and 'line'
++//static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
++static const sal_Int64 aImplFactor[FUNIT_LINE+1][FUNIT_LINE+1] =
+ { /*
+-mm/100 mm cm m km twip point pica inch foot mile */
+-{ 1, 100, 1 K, 100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
+-{ 1, 1, 10, 1 K, 1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
+-{ 1, 1, 1, 100, 100 K, 254, 254, 254, 254, 254*12, 254*12 X },
+-{ 1, 1, 1, 1, 1 K, 254, 254, 254, 254, 254*12, 254*12 X },
+-{ 1, 1, 1, 1, 1, 0, 254, 254, 254, 254*12, 254*12 X },
+-{ 1440,144 K,144 K,14400 K, 0, 1, 20, 240, 1440,1440*12,1440*12 X },
+-{ 72, 7200, 7200, 720 K, 720 M, 1, 1, 12, 72, 72*12, 72*12 X },
+-{ 6, 600, 600, 60 K, 60 M, 1, 1, 1, 6, 6*12, 6*12 X },
+-{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 12, 12 X },
+-{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 X },
+-{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 }
++mm/100 mm cm m km twip point pica inch foot mile char line*/
++{ 1, 100, 1 K, 100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X , 53340, 396240},
++{ 1, 1, 10, 1 K, 1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X , 5334, 396240},
++{ 1, 1, 1, 100, 100 K, 254, 254, 254, 254, 254*12, 254*12 X , 5334, 39624},
++{ 1, 1, 1, 1, 1 K, 254, 254, 254, 254, 254*12, 254*12 X , 533400, 39624},
++{ 1, 1, 1, 1, 1, 0, 254, 254, 254, 254*12, 254*12 X ,533400 K, 39624},
++{ 1440,144 K,144 K,14400 K, 0, 1, 20, 240, 1440,1440*12,1440*12 X , 210, 3120},
++{ 72, 7200, 7200, 720 K, 720 M, 1, 1, 12, 72, 72*12, 72*12 X , 210, 156},
++{ 6, 600, 600, 60 K, 60 M, 1, 1, 1, 6, 6*12, 6*12 X , 210, 10},
++{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 12, 12 X , 210, 45},
++{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 X , 210, 45},
++{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 , 210, 45},
++{ 144, 1440,14400, 14400, 14400, 1, 20, 240, 1440,1440*12, 1440*12 X, 1, 156 },
++{ 720,72000,72000, 7200 K,7200 M, 20, 10, 13, 11, 11*12, 11*12 X, 105, 1 }
+ };
+
+ #undef X
+--- vcl/source/src/units.src.old 2009-04-02 10:44:19.000000000 +0000
++++ vcl/source/src/units.src 2009-04-06 16:41:41.000000000 +0000
+@@ -33,6 +33,7 @@
+ #include <vcl/svids.hrc>
+ #endif
+
++// Amelia : adds two units , 'ch' and 'line'
+ StringArray SV_FUNIT_STRINGS
+ {
+ ItemList [ en-US ] =
+@@ -54,6 +55,8 @@ StringArray SV_FUNIT_STRINGS
+ < "feet" ; FUNIT_FOOT ; > ;
+ < "miles" ; FUNIT_MILE ; > ;
+ < "mile" ; FUNIT_MILE ; > ;
++ < "ch" ; FUNIT_CHAR ; > ;
++ < "line" ; FUNIT_LINE ; > ;
+ < "%" ; FUNIT_PERCENT ; > ;
+ };
+ };
diff --git a/patches/dev300/cjk-character-units-ui.diff b/patches/dev300/cjk-character-units-ui.diff
index 1d96a19..4fa6fc7 100644
--- a/patches/dev300/cjk-character-units-ui.diff
+++ b/patches/dev300/cjk-character-units-ui.diff
@@ -63,7 +63,7 @@
+[
+ /* flags: */
+ AutoUpdate = TRUE,
-+ Cachable = Volatile,
++ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
commit 1d5f00ff47a9abdd0c862ae13ca509bf505125e5
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Thu Oct 1 00:10:11 2009 -0400
Fixed build break in oox.
* patches/dev300/cws-calctabcolor-oox.diff:
diff --git a/patches/dev300/cws-calctabcolor-oox.diff b/patches/dev300/cws-calctabcolor-oox.diff
index 9e37e21..8fd0868 100644
--- a/patches/dev300/cws-calctabcolor-oox.diff
+++ b/patches/dev300/cws-calctabcolor-oox.diff
@@ -53,7 +53,7 @@ index caeacaf..ce8c009 100644
aPropMap[ PROP_IsOutlineSymbolsSet ] <<= xModel->mbShowOutline;
+ if (!xModel->maTabColor.isAuto())
-+ aPropMap[ PROP_TabColor ] <<= static_cast< sal_Int32 >(xModel->maTabColor.getColor(*this));
++ aPropMap[ PROP_TabColor ] <<= static_cast< sal_Int32 >(xModel->maTabColor.getColor(getBaseFilter()));
+
// store sheet view settings in global view settings object
getViewSettings().setSheetViewSettings( getSheetIndex(), xModel, Any( aPropMap.makePropertyValueSequence() ) );
commit 43ff1febd0ee2aeded65cca78134b41d28452f53
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 30 23:40:16 2009 -0400
Added IZ number to calc-general-type-auto-decimal-*.diff.
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c978e5c..beb9b81 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -827,8 +827,8 @@ calc-selection-protected-cells.diff, n#542024, kohei
# When the cell format is 'General', automatically adjust the number of decimals
# to be displayed based on the cell value.
-calc-general-type-auto-decimal-sc.diff, n#541973, kohei
-calc-general-type-auto-decimal-svtools.diff, n#541973, kohei
+calc-general-type-auto-decimal-sc.diff, n#541973, i#46511, kohei
+calc-general-type-auto-decimal-svtools.diff, n#541973, i#46511, kohei
[ CalcFixes >= dev300-m60 ]
More information about the ooo-build-commit
mailing list