[ooo-build-commit] .: patches/dev300
Andras Timar
timar at kemper.freedesktop.org
Sat Oct 2 00:26:35 PDT 2010
patches/dev300/apply | 6
patches/dev300/customunittext-percent.diff | 198 -----------------------------
patches/dev300/customunittext-pixel.diff | 66 ---------
3 files changed, 270 deletions(-)
New commits:
commit e6bdf91d42699b168d923afe0a83dcd493352288
Author: Andras Timar <timar at fsf.hu>
Date: Sat Oct 2 09:25:33 2010 +0200
Removed customunittext-*.diff; moved to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index efc2162..10bac0c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -375,12 +375,6 @@ xmlhelp-work-with-symlinks.diff, i#81138, pmladek
localize-pl-cygwin-paths.diff, tml
-# make CustomUnitText "Pixel" localisable
-customunittext-pixel.diff, i#61043, atimar
-
-# make CustomUnitText "%" consistent
-customunittext-percent.diff, i#80784, atimar
-
# make sure that we have mpGraphics
# it might get lost when calling ImplNewFont()
# fixes ReportBuilder crasher
diff --git a/patches/dev300/customunittext-percent.diff b/patches/dev300/customunittext-percent.diff
deleted file mode 100644
index 67a3975..0000000
--- a/patches/dev300/customunittext-percent.diff
+++ /dev/null
@@ -1,198 +0,0 @@
----
- .../source/controller/dialogs/tp_SeriesToAxis.src | 4 ++--
- cui/source/dialogs/grfflt.src | 4 ++--
- cui/source/tabpages/tabline.src | 6 +++---
- svtools/source/dialogs/colrdlg.src | 8 ++++----
- svx/source/dialog/bmpmask.src | 8 ++++----
- svx/source/engine3d/float3d.src | 6 +++---
- 6 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git chart2/source/controller/dialogs/tp_SeriesToAxis.src chart2/source/controller/dialogs/tp_SeriesToAxis.src
-index 134df3e..e30c166 100644
---- chart2/source/controller/dialogs/tp_SeriesToAxis.src
-+++ chart2/source/controller/dialogs/tp_SeriesToAxis.src
-@@ -79,7 +79,7 @@ TabPage TP_OPTIONS
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
-@@ -105,7 +105,7 @@ TabPage TP_OPTIONS
- Maximum = 600 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
-diff --git cui/source/dialogs/grfflt.src cui/source/dialogs/grfflt.src
-index d8cd877..2c49939 100644
---- cui/source/dialogs/grfflt.src
-+++ cui/source/dialogs/grfflt.src
-@@ -179,7 +179,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- Last = 100 ;
- SpinSize = 1 ;
- };
-@@ -258,7 +258,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
-diff --git cui/source/tabpages/tabline.src cui/source/tabpages/tabline.src
-index 435ff95..57d8213 100644
---- cui/source/tabpages/tabline.src
-+++ cui/source/tabpages/tabline.src
-@@ -475,7 +475,7 @@ TabPage RID_SVXPAGE_LINE_DEF
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_LENGTH_2
-@@ -495,7 +495,7 @@ TabPage RID_SVXPAGE_LINE_DEF
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- SpinSize = 10 ;
- };
- FixedText FT_DISTANCE
-@@ -518,7 +518,7 @@ TabPage RID_SVXPAGE_LINE_DEF
- DecimalDigits = 2 ;
- Value = 1 ;
- Unit = FUNIT_MM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- Last = 5000 ;
- SpinSize = 10 ;
- };
-diff --git svtools/source/dialogs/colrdlg.src svtools/source/dialogs/colrdlg.src
-index 801ab83..d7486d2 100644
---- svtools/source/dialogs/colrdlg.src
-+++ svtools/source/dialogs/colrdlg.src
-@@ -102,7 +102,7 @@ ModalDialog DLG_COLOR
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- MetricField NUM_MAGENTA
- {
-@@ -115,7 +115,7 @@ ModalDialog DLG_COLOR
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- MetricField NUM_YELLOW
- {
-@@ -128,7 +128,7 @@ ModalDialog DLG_COLOR
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- MetricField NUM_KEY
- {
-@@ -141,7 +141,7 @@ ModalDialog DLG_COLOR
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- FixedText FT_RED
- {
-diff --git svx/source/dialog/bmpmask.src svx/source/dialog/bmpmask.src
-index d299def..4b93fe9 100644
---- svx/source/dialog/bmpmask.src
-+++ svx/source/dialog/bmpmask.src
-@@ -102,7 +102,7 @@ DockingWindow RID_SVXDLG_BMPMASK
- Last = 99 ;
- SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- ListBox LB_1
- {
-@@ -142,7 +142,7 @@ DockingWindow RID_SVXDLG_BMPMASK
- Last = 99 ;
- SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- ListBox LB_2
- {
-@@ -182,7 +182,7 @@ DockingWindow RID_SVXDLG_BMPMASK
- Last = 99 ;
- SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- ListBox LB_3
- {
-@@ -222,7 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK
- Last = 99 ;
- SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- ListBox LB_4
- {
-diff --git svx/source/engine3d/float3d.src svx/source/engine3d/float3d.src
-index 0fce465..1f77b7f 100644
---- svx/source/engine3d/float3d.src
-+++ svx/source/engine3d/float3d.src
-@@ -242,7 +242,7 @@ DockingWindow RID_SVXFLOAT_3D
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- };
- FixedText FT_BACKSCALE
- {
-@@ -262,7 +262,7 @@ DockingWindow RID_SVXFLOAT_3D
- SpinSize = 5 ;
- Maximum = 10000 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- Last = 10000 ;
- };
- FixedText FT_END_ANGLE
-@@ -1105,7 +1105,7 @@ DockingWindow RID_SVXFLOAT_3D
- Repeat = TRUE ;
- Spin = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " %" ;
-+ CustomUnitText = "%" ;
- Minimum = 1 ;
- First = 1 ;
- Maximum = 100 ;
---
-1.7.0.1
-
diff --git a/patches/dev300/customunittext-pixel.diff b/patches/dev300/customunittext-pixel.diff
deleted file mode 100644
index 640a8af..0000000
--- a/patches/dev300/customunittext-pixel.diff
+++ /dev/null
@@ -1,66 +0,0 @@
----
- cui/source/dialogs/grfflt.src | 4 ++--
- cui/source/tabpages/textanim.src | 2 +-
- sd/source/ui/dlg/vectdlg.src | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git cui/source/dialogs/grfflt.src cui/source/dialogs/grfflt.src
-index f91a667..d8cd877 100644
---- cui/source/dialogs/grfflt.src
-+++ cui/source/dialogs/grfflt.src
-@@ -76,7 +76,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
- Maximum = 999 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " Pixel" ;
-+ CustomUnitText [ en-US ] = " Pixel" ;
- First = 1 ;
- Last = 999 ;
- SpinSize = 1 ;
-@@ -101,7 +101,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
- Maximum = 999 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " Pixel" ;
-+ CustomUnitText [ en-US ] = " Pixel" ;
- First = 1 ;
- Last = 999 ;
- SpinSize = 1 ;
-diff --git cui/source/tabpages/textanim.src cui/source/tabpages/textanim.src
-index c665b2f..346426f 100644
---- cui/source/tabpages/textanim.src
-+++ cui/source/tabpages/textanim.src
-@@ -225,7 +225,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
- Spin = TRUE ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " Pixel" ;
-+ CustomUnitText [ en-US ] = " Pixel" ;
- Minimum = 1 ;
- First = 1 ;
- Maximum = 10000 ;
-diff --git sd/source/ui/dlg/vectdlg.src sd/source/ui/dlg/vectdlg.src
-index 70b5701..9262fa3 100644
---- sd/source/ui/dlg/vectdlg.src
-+++ sd/source/ui/dlg/vectdlg.src
-@@ -128,7 +128,7 @@ ModalDialog DLG_VECTORIZE
- Last = 32 ;
- SpinSize = 1 ;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " Pixel" ;
-+ CustomUnitText [ en-US ] = " Pixel" ;
- };
-
- CheckBox CB_FILLHOLES
-@@ -161,7 +161,7 @@ ModalDialog DLG_VECTORIZE
- Last = 128;
- SpinSize = 1;
- Unit = FUNIT_CUSTOM ;
-- CustomUnitText = " Pixel" ;
-+ CustomUnitText [ en-US ] = " Pixel" ;
- };
-
- FixedText FT_ORIGINAL
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list