[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/zoom-combobox.diff |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit e2e0403d6010531e33cc6c7d149927776e986cd4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 12:43:10 2009 +0300

    Update zoom-combobox.diff to dev300-m57

diff --git a/patches/dev300/zoom-combobox.diff b/patches/dev300/zoom-combobox.diff
index 2229312..179ce50 100644
--- a/patches/dev300/zoom-combobox.diff
+++ b/patches/dev300/zoom-combobox.diff
@@ -256,20 +256,18 @@ index d76d23d..71d507e 100644
  ..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
  ..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
  ..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-diff --git svx/source/tbxctrls/makefile.mk svx/source/tbxctrls/makefile.mk
-index 5e7acbb..9de74b6 100644
 --- svx/source/tbxctrls/makefile.mk
 +++ svx/source/tbxctrls/makefile.mk
 @@ -61,7 +61,8 @@ SLOFILES=	\
- 		$(SLO)$/subtoolboxcontrol.obj \
+         $(SLO)$/verttexttbxctrl.obj \
+         $(SLO)$/subtoolboxcontrol.obj \
          $(SLO)$/tbxcolor.obj \
-         $(SLO)$/tbxcolorupdate.obj \
 -        $(SLO)$/tbunocontroller.obj
 +        $(SLO)$/tbunocontroller.obj \
 +        $(SLO)$/zoomtbxctrl.obj	
  
- SRS1NAME=$(TARGET)
- SRC1FILES = \
+ SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+ 
 diff --git svx/source/tbxctrls/tbcontrl.src svx/source/tbxctrls/tbcontrl.src
 index b061e0e..e5910ad 100644
 --- svx/source/tbxctrls/tbcontrl.src