INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED

2008/07/30 11:17:25 rt 1.2.6.5: Update license header.
2008/03/28 14:55:41 jcn 1.2.6.4: Workben build fix: do not link to removed libtklayout.
Add error box for missing xml file.
2008/03/28 11:17:42 jcn 1.2.6.3: Move translation and installation of xml files to their svx and sw modules.
2008/03/20 12:59:35 jcn 1.2.6.2: Compile fix for WITH_LANG empty or ALL.
2008/03/20 11:56:31 jcn 1.2.6.1: Update from http://lilypond.org/~janneke/vc/toolkit.git/.git

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

* source/awt/vclxwindow.cxx: Fix compile warning.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

* util/makefile.mk: Revert obsolete VERSION addition.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

* source/controls/dialogcontrol.cxx,
source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx,
util/defs/wntmsci11: Revert weird initial patch.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO: Doc update.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement
MoreButton.  TODO: images.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

* source/vclcompat/wbutton.cxx: Remove redraw cruft, rename
redrawAlready to redraw.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step
towards cleaner redraw.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/layout/helper.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.cxx,
workben/layout/recover.hxx: Extract AdvancedButton implementation
from recover.cxx into new widget.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Update recover dialog, make
advanced/simple switching work.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/zoom.cxx: In test mode, enable everything.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/localize.sdf: Manually add new translatable strings
and translations for de, nl.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor
and View layout alongside each other.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/zoom.cxx, workben/layout/zoom.hxx,
workben/layout/zoom.xml: Merge upstream's zoom.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx:
Nitpick, debugging aid.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement
FixedLine.IsEnabled().

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* util/makefile.mk: Build lib name fix.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Complete VBox/HBox wrappers.  Not use
them in recover, spacing still wrong.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, workben/layout/recover.cxx,
workben/layout/recover.hxx, workben/layout/recover.xml: More
recovery dialog mockuping.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

* source/layout/box-base.cxx: Implement visibility of
elements/containers better.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/layout/import.cxx, source/layout/proplist.cxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx:
Implement FixedImage.  Needed for recovery dialog.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

* source/layout/box-base.hxx, workben/layout/editor.cxx: Give
ChildData virtual distructor.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx,
util/makefile.mk, workben/layout/makefile.mk,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml, workben/layout/test.cxx: Stab at new
recover dialog.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/editor.cxx: Do not clear fresh container.  Disable
debug printing.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for
wordcount.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix
ID for displaying dialogs.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, workben/layout/localize.sdf,
workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings
for all languages.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx,
source/layout/box-base.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/flow.cxx, source/layout/helper.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/root.cxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up
code duplication from layout: new Box_Base class implements
addChild, removeChild, getChildren, getChildProperties for Box,
Table, VCLXSplitter, VCLXTabControl.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, source/layout/root.cxx: Document more fixmes.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, source/layout/proplist.cxx: Remove m237
workaround.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* source/layout/helper.cxx: More comment cleanups.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* source/awt/vclxtabcontrol.cxx, source/layout/box.cxx,
source/layout/container.cxx, source/vclcompat/wrapper.cxx:
Commented-out code cleanups.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, inc/layout/layoutcore.hxx,
source/awt/forward.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx,
source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx,
source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx,
source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx,
source/layout/bin.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/factory.hxx, source/layout/flow.cxx,
source/layout/flow.hxx, source/layout/helper.cxx,
source/layout/helper.hxx, source/layout/import.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/precompiled_xmlscript.hxx,
source/layout/proplist.cxx, source/layout/proplist.hxx,
source/layout/root.cxx, source/layout/root.hxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/layout/timer.hxx,
source/layout/translate.cxx, source/layout/translate.hxx,
source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx,
workben/layout/editor.cxx, workben/layout/editor.hxx,
workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx,
workben/layout/simple-paragraph.hxx, workben/layout/test.cxx,
workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence
headers.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* workben/layout/meekfile.mk: Junk meekfile.mk

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO: Update TODO.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize()
from VCLXWindow's switch to method.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize()
from VCLXWindow's switch to method.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxtopwindow.cxx: Remove code duplication from
VCLXDialog.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

* source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx:
Comment cleanup.

2008-02-21  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, source/layout/helper.hxx,
workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix
remaining SUN warnings.

2008-02-21  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/layout/layout.hxx, source/awt/vclxfixedline.hxx,
source/layout/byteseq.cxx, source/layout/helper.hxx,
source/layout/import.cxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/translate.hxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx,
source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some
sunstudio12 warnings.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

* doc/layout/TODO, source/awt/makefile.mk,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx,
source/layout/helper.cxx: Junk VCLXProxy.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

* inc/toolkit/awt/vclxwindows.hxx,
inc/toolkit/helper/listenermultiplexer.hxx,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label
and images.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

* .gitignore, source/awt/forward.hxx, source/awt/makefile.mk,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx,
source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx,
source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/makefile.mk, workben/layout/localize-de.sdf,
workben/layout/localize-nl.sdf: Cleanup of includes, namespace in
headers in awt.

1 files changed, 55 insertions, 27 deletions

diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
index aa1f31dcd369..8612992303d8 100644
--- a/toolkit/workben/layout/makefile.mk
+++ b/toolkit/workben/layout/makefile.mk
@@ -1,3 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.3 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
 PRJ=../..
 PRJNAME=toolkit
 TARGET=test
@@ -24,12 +55,14 @@ CFLAGS+=-Wall -Wno-non-virtual-dtor
 
 CXXFILES=\
     editor.cxx \
+    recover.cxx \
     wordcountdialog.cxx \
     test.cxx \
     zoom.cxx
 
 OBJFILES=\
     $(OBJ)$/editor.obj \
+    $(OBJ)$/recover.obj \
     $(OBJ)$/test.obj \
     $(OBJ)$/wordcountdialog.obj \
     $(OBJ)$/zoom.obj
@@ -44,41 +77,36 @@ APP1STDLIBS= \
         $(CPPUHELPERLIB)		\
         $(SALLIB)			\
         $(XMLSCRIPTLIB)			\
-        $(LAYOUTLIB)\
         $(TKLIB)
 
-all: svtools ALLTAR
+svtools = $(INCCOM)/svtools
+all: $(svtools) ALLTAR
 
 .INCLUDE :  target.mk
 
-# FIXME: move this rule and .xml files into sw/svx trees,
-#        install into xml directory instead of lib.
-ALLTAR: \
-    $(DLLDEST)$/wordcount.xml\
-    $(DLLDEST)$/zoom.xml\
-    $(DLLDEST)$/de/wordcount.xml\
-    $(DLLDEST)$/de/zoom.xml\
-    $(DLLDEST)$/nl/wordcount.xml\
-    $(DLLDEST)$/nl/zoom.xml
+XML_FILES=\
+    recover.xml\
+    wordcount.xml\
+    zoom.xml\
 
 TRALAY=tralay
-$(WITH_LANG:f:t"/%.xml ")/%.xml: %.xml
-    $(TRALAY) -m localize.sdf -o . -l $(WITH_LANG:f:t" -l ") $<
-    rm -rf en-US
+XML_LANGS=$(alllangiso)
 
-$(DLLDEST)$/%.xml: %.xml
-# modes, INSTALL?
-    -$(MKDIR) $(@:d)
-    $(COPY) $< $@
+#ALL_XMLS=$(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $i/$j))
+ALLTAR: $(foreach,i,$(XML_FILES) en-US/$i)
+
+$(XML_LANGS:f:t"/%.xml ")/%.xml: %.xml
+    $(TRALAY) -m localize.sdf -o . -l $(XML_LANGS:f:t" -l ") $<
+    rm -rf en-US
 
-svtools:
-    # FIXME: there's a bug in svtools layout or usage
-    # Include files are in svtools/inc, but are referenced as <svtools/..>
-    # They probably should be in svtools/inc/svtools
-    # This means that include files can only be included after svtools
-    # is built, which would mean a circular dependency,
-    # because svtools depends on toolkit.
-    ln -sf ../$(PRJ)/svtools/inc svtools
+$(svtools):
+# FIXME: there's a bug in svtools layout or usage
+# Include files are in svtools/inc, but are referenced as <svtools/..>
+# They probably should be in svtools/inc/svtools
+# This means that include files can only be included after svtools
+# is built, which would mean a circular dependency,
+# because svtools depends on toolkit.
+    ln -sf ..$/$(PRJ)$/svtools$/inc $(INCCOM)$/svtools
 
 dist .PHONY :
     $(SHELL) ./un-test.sh zoom.cxx > ../$(PRJ)/svx/source/dialog/zoom.cxx
@@ -87,7 +115,7 @@ dist .PHONY :
     $(SHELL) ./un-test.sh wordcountdialog.cxx > ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.cxx
     $(SHELL) ./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
     touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
-    # FIXME: broken setup
+# FIXME: broken setup
     ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
 
 .ELSE # ENABLE_LAYOUT != TRUE