[ooo-build-commit] .: 2 commits - git-hooks/pre-commit patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Sep 2 03:54:04 PDT 2010
git-hooks/pre-commit | 7
patches/dev300/apply | 2
patches/dev300/toolbar-decorations-svx.diff | 214 +++++++++++++++-------------
3 files changed, 123 insertions(+), 100 deletions(-)
New commits:
commit dd4d753a312e8bef9ba2cdcf027cccbde49f488b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Sep 2 12:52:47 2010 +0200
Partially update toolbar-decorations-svx.diff for 3.3.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 62b8177..e11335a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3483,7 +3483,7 @@ SectionOwner => jholesov
# Improved toolbar popups
toolbar-decorations-rsc.diff
toolbar-decorations-vcl.diff
-# FIXME dev300-m83 toolbar-decorations-svx.diff
+toolbar-decorations-svx.diff
# 'New table' toolbar widget rework, and a small update of the 'Colums' widget
toolbar-decorations-svx-tables-columns.diff
diff --git a/patches/dev300/toolbar-decorations-svx.diff b/patches/dev300/toolbar-decorations-svx.diff
index 6efb80f..4fb57a6 100644
--- a/patches/dev300/toolbar-decorations-svx.diff
+++ b/patches/dev300/toolbar-decorations-svx.diff
@@ -10,104 +10,122 @@ Subject: [PATCH 759/768] toolbar-decorations-svx.diff
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
4 files changed, 11 insertions(+), 41 deletions(-)
-diff --git svx/source/tbxctrls/extrusioncontrols.src svx/source/tbxctrls/extrusioncontrols.src
-index 37447b3..ba4f92d 100644
---- svx/source/tbxctrls/extrusioncontrols.src
-+++ svx/source/tbxctrls/extrusioncontrols.src
-@@ -32,13 +32,8 @@
-
- FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Extrusion Direction" ;
-
-@@ -202,13 +197,8 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
-
- FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Extrusion Depth" ;
-
-@@ -291,13 +281,8 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
-
- FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Extrusion Lighting" ;
-
-@@ -607,13 +592,8 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
-
- FloatingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Extrusion Surface" ;
-
-diff --git svx/source/tbxctrls/fontworkgallery.src svx/source/tbxctrls/fontworkgallery.src
-index 7d5b20e..8bc9c94 100644
---- svx/source/tbxctrls/fontworkgallery.src
-+++ svx/source/tbxctrls/fontworkgallery.src
-@@ -94,13 +94,8 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
-
- FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Fontwork Alignment" ;
-
-@@ -229,13 +224,8 @@ FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
-
- FloatingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
- {
-- Border = TRUE ;
-+ StdPopup = TRUE ;
- Hide = TRUE ;
-- SVLook = TRUE ;
-- Sizeable = FALSE ;
-- Moveable = TRUE ;
-- Closeable = TRUE ;
-- Zoomable = TRUE ;
-
- Text [ en-US ] = "Fontwork Character Spacing" ;
-
+#diff --git svx/source/tbxctrls/extrusioncontrols.src svx/source/tbxctrls/extrusioncontrols.src
+#index 37447b3..ba4f92d 100644
+#--- svx/source/tbxctrls/extrusioncontrols.src
+#+++ svx/source/tbxctrls/extrusioncontrols.src
+#@@ -32,15 +32,10 @@
+#
+# #define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
+#
+#-DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
+#+FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Extrusion Direction" ;
+#
+#@@ -202,15 +197,10 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
+# };
+# };
+#
+#-DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
+#+FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Extrusion Depth" ;
+#
+#@@ -291,15 +281,10 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
+# };
+#
+#
+#-DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
+#+FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Extrusion Lighting" ;
+#
+#@@ -607,15 +592,10 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
+# };
+# };
+#
+#-DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
+#+FloatingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Extrusion Surface" ;
+#
+#diff --git svx/source/tbxctrls/fontworkgallery.src svx/source/tbxctrls/fontworkgallery.src
+#index 7d5b20e..8bc9c94 100644
+#--- svx/source/tbxctrls/fontworkgallery.src
+#+++ svx/source/tbxctrls/fontworkgallery.src
+#@@ -94,15 +94,10 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
+# };
+# };
+#
+#-DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
+#+FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Fontwork Alignment" ;
+#
+#@@ -229,15 +224,10 @@ FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
+# };
+# };
+#
+#-DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
+#+FloatingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
+# {
+#- Border = FALSE ;
+#+ StdPopup = TRUE ;
+# Hide = TRUE ;
+#- SVLook = TRUE ;
+#- Sizeable = FALSE ;
+#- Moveable = TRUE ;
+#- Closeable = TRUE ;
+#- Zoomable = TRUE ;
+#
+# Text [ en-US ] = "Fontwork Character Spacing" ;
+#
diff --git svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/linectrl.cxx
index f3a21c1..bd88600 100644
--- svx/source/tbxctrls/linectrl.cxx
commit 516d349c1fb01d02ecf1e332c3a77931ecfa973b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Sep 2 12:50:45 2010 +0200
Don't test the patches for whitespace.
This leads to lots of false positives.
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index 19cebd8..2153c0b 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -83,6 +83,11 @@ if test -n "$ERRORS" ; then
fi
# git way of checking whitespace
-exec git diff-index --check --cached $against --
+FILTER_PATCHES=`git diff-index --check --cached $against -- | sed '/\.\(diff\|patch\):/,/.*/d'`
+if [ -n "$FILTER_PATCHES" ] ; then
+ echo "$FILTER_PATCHES"
+ exit 1
+fi
+exit 0
# vi:set shiftwidth=4 expandtab:
More information about the ooo-build-commit
mailing list