ooo-build r13449 - in trunk: . patches/dev300
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13449 - in trunk: . patches/dev300
- Date: Thu, 31 Jul 2008 10:32:58 +0000 (UTC)
Author: jannieuw
Date: Thu Jul 31 10:32:58 2008
New Revision: 13449
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13449&view=rev
Log:
2008-07-31 Jan Nieuwenhuizen <janneke gnu org>
* patches/dev300/cws-layoutdialogs-offapi.diff:
* patches/dev300/cws-layoutdialogs-scp2.diff:
* patches/dev300/cws-layoutdialogs-svx-m25.diff:
* patches/dev300/cws-layoutdialogs-svx.diff:
* patches/dev300/cws-layoutdialogs-sw.diff:
* patches/dev300/cws-layoutdialogs-toolkit.diff:
* patches/dev300/cws-layoutdialogs-transex3.diff: Update with final changes
from cws.
* patches/dev300/layout-plugin-toolkit.diff: Update for cws-layoutdialogs
changes.
* patches/dev300/layout-simple-dialogs-offapi.diff:
* patches/dev300/layout-simple-dialogs-sc-localize.diff:
* patches/dev300/layout-simple-dialogs-sc.diff:
* patches/dev300/layout-simple-dialogs-toolkit.diff:
* patches/dev300/layout-tab-toolkit.diff: Update for cws-layoutdialogs
changes and add converted Move/Copy Sheet dialog.
Modified:
trunk/ChangeLog
trunk/patches/dev300/cws-layoutdialogs-offapi.diff
trunk/patches/dev300/cws-layoutdialogs-scp2.diff
trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff
trunk/patches/dev300/cws-layoutdialogs-svx.diff
trunk/patches/dev300/cws-layoutdialogs-sw.diff
trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
trunk/patches/dev300/cws-layoutdialogs-transex3.diff
trunk/patches/dev300/layout-plugin-toolkit.diff
trunk/patches/dev300/layout-simple-dialogs-offapi.diff
trunk/patches/dev300/layout-simple-dialogs-sc-localize.diff
trunk/patches/dev300/layout-simple-dialogs-sc.diff
trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
trunk/patches/dev300/layout-tab-toolkit.diff
Modified: trunk/patches/dev300/cws-layoutdialogs-offapi.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-offapi.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-offapi.diff Thu Jul 31 10:32:58 2008
@@ -1,20 +1,233 @@
-cvs diff: Diffing offapi
-cvs diff: Diffing offapi/com
-cvs diff: Diffing offapi/com/sun
-cvs diff: Diffing offapi/com/sun/star
-cvs diff: Diffing offapi/com/sun/star/accessibility
-cvs diff: Diffing offapi/com/sun/star/animations
-cvs diff: Diffing offapi/com/sun/star/auth
-cvs diff: Diffing offapi/com/sun/star/awt
+Index: offapi/com/sun/star/awt/MaxChildrenException.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/MaxChildrenException.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/MaxChildrenException.idl 6 Mar 2008 12:41:08 -0000 1.2
++++ offapi/com/sun/star/awt/MaxChildrenException.idl 7 Apr 2008 19:41:46 -0000 1.2.26.1
+@@ -15,8 +15,10 @@ module com { module sun { module star
+
+ @see XLayoutContainer
+ @see com::sun::star::awt::XLayoutContainer::addChild
++
++ @since OOo 3.0
+ */
+-published exception MaxChildrenException: com::sun::star::uno::Exception
++exception MaxChildrenException: com::sun::star::uno::Exception
+ {
+ };
+
+Index: offapi/com/sun/star/awt/XDialog2.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XDialog2.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XDialog2.idl 6 Mar 2008 12:41:21 -0000 1.2
++++ offapi/com/sun/star/awt/XDialog2.idl 7 Apr 2008 19:41:46 -0000 1.2.26.1
+@@ -13,9 +13,14 @@ module com { module sun { module star
+ //=============================================================================
+
+ /** Makes it possible to end a dialog.
++
++ @since OOo 3.0
+ */
+-published interface XDialog2: com::sun::star::awt::XDialog
++interface XDialog2: com::sun::star::awt::XDialog
+ {
++ /** hides the dialog and then causes <member>XDialog::execute</member>
++ to return with the given result value.
++ */
+ void endDialog ( [in] long Result );
+ };
+
+Index: offapi/com/sun/star/awt/XLayoutContainer.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XLayoutContainer.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XLayoutContainer.idl 6 Mar 2008 12:41:33 -0000 1.2
++++ offapi/com/sun/star/awt/XLayoutContainer.idl 7 Apr 2008 19:41:46 -0000 1.2.26.1
+@@ -26,45 +26,59 @@ module com { module sun { module star
+
+ //=============================================================================
+
+-published interface XLayoutUnit;
++interface XLayoutUnit;
+
+ /** specifies the layout constraints for a surrounding container.
++
++ @since OOo 3.0
+ */
+-published interface XLayoutContainer: com::sun::star::container::XChild
++interface XLayoutContainer: com::sun::star::container::XChild
+ {
+- /* Add/remove a child. Some containers provide an interface for
++ /** Adds a child. Some containers provide an interface for
+ adding children which you should use. */
+ void addChild( [in] com::sun::star::awt::XLayoutConstrains Child )
+ raises( com::sun::star::awt::MaxChildrenException );
++
++ /** Remove a child. Some containers provide an interface for
++ adding children which you should use.
++ */
+ void removeChild( [in] com::sun::star::awt::XLayoutConstrains Child );
++
++ /** Returns a sequence of the children of this container. */
+ sequence< com::sun::star::awt::XLayoutConstrains > getChildren();
+
+- /* Read/modify some child layout properties. XPropertySet provides a
++ /** Read/modify some child layout properties. XPropertySet provides a
+ rich API that allows, e.g., for introspection.
+ Should rarely be a need to use; containers shall provide an interface
+ for setting properties more confortably. */
+ com::sun::star::beans::XPropertySet getChildProperties(
+ [in] com::sun::star::awt::XLayoutConstrains Child );
+
+- /* Set at initilization, this object should be notified when a containers state
++ /** Set at initilization, this object should be notified when a containers state
+ changes, that may affect its size, to queue a layout re-calculation. */
+ void setLayoutUnit( [in] com::sun::star::awt::XLayoutUnit Unit );
+
+ // TEMP: no need for this...
+ com::sun::star::awt::XLayoutUnit getLayoutUnit();
+
+- /* To be used by the parent for the purpose of layout management.
++ /** To be used by the parent for the purpose of layout management.
+ For widgets, use XWindow::setPosSize() */
+ void allocateArea( [in] com::sun::star::awt::Rectangle NewArea );
+
+- /* Used by the layouting unit to evaluate size damage, and force a
++ /** Used by the layouting unit to evaluate size damage, and force a
+ re-allocation. */
+ com::sun::star::awt::Size getRequestedSize();
++
++ /** Used by the layouting unit to evaluate size damage, and force a
++ re-allocation. */
+ com::sun::star::awt::Rectangle getAllocatedArea();
+
+- /* For flow layouting (e.g. wrap-able labels). TODO: We might want to
++ /** For flow layouting (e.g. wrap-able labels). TODO: We might want to
+ re-design this approach -- check XLayoutConstrains::calcAdjustedSize(). */
+ long getHeightForWidth( [in] long Width );
++
++ /** For flow layouting (e.g. wrap-able labels). TODO: We might want to
++ re-design this approach -- check XLayoutConstrains::calcAdjustedSize(). */
+ boolean hasHeightForWidth();
+ };
+
+Index: offapi/com/sun/star/awt/XLayoutFlow.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XLayoutFlow.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XLayoutFlow.idl 6 Mar 2008 12:41:45 -0000 1.2
++++ offapi/com/sun/star/awt/XLayoutFlow.idl 7 Apr 2008 19:41:47 -0000 1.2.26.1
+@@ -10,15 +10,18 @@ module com { module sun { module star
+ //=============================================================================
+
+ /** Enables height-for-width layout negociations, which allows for label wrapping
+- * and flow containers. Can be implemented by either a container or an ordinary widget;
+- * whether its parent will honor it is another story, so keep implementing
+- * getMinimumSize().
++ and flow containers. Can be implemented by either a container or an ordinary widget;
++ whether its parent will honor it is another story, so keep implementing
++ getMinimumSize().
++
++ @since OOo 3.0
+ */
+-published interface XLayoutFlow
++interface XLayoutFlow
+ {
++ /** returns the prefered high this layout element would need for the given width. */
+ long getHeightForWidth( [in] long Width );
+
+- /* Allow the container/widget to toggle the functionality. */
++ /** Allow the container/widget to toggle the functionality. */
+ boolean hasHeightForWidth();
+ };
+
+Index: offapi/com/sun/star/awt/XLayoutFlowContainer.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XLayoutFlowContainer.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XLayoutFlowContainer.idl 6 Mar 2008 12:41:59 -0000 1.2
++++ offapi/com/sun/star/awt/XLayoutFlowContainer.idl 7 Apr 2008 19:41:47 -0000 1.2.26.1
+@@ -11,9 +11,11 @@ module com { module sun { module star
+
+ /** Responsible to evaluate size damages and force a re-calculation. Containers
+ should let it know of state changes that may affects their size.
+- * All children of a top-level window should share the same object.
++ All children of a top-level window should share the same object.
++
++ @since OOo 3.0
+ */
+-published interface XLayoutContainer
++interface XLayoutContainer
+ {
+ void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
+ };
+Index: offapi/com/sun/star/awt/XLayoutRoot.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XLayoutRoot.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XLayoutRoot.idl 6 Mar 2008 12:42:13 -0000 1.2
++++ offapi/com/sun/star/awt/XLayoutRoot.idl 7 Apr 2008 19:41:47 -0000 1.2.26.1
+@@ -18,8 +18,10 @@ module com { module sun { module star
+ //=============================================================================
+
+ /** specifies an interface for a top-level layoutable widget
++
++ @since OOo 3.0
+ */
+-published interface XLayoutRoot: com::sun::star::container::XNameAccess
++interface XLayoutRoot: com::sun::star::container::XNameAccess
+ {
+ com::sun::star::awt::XLayoutContainer getLayoutContainer();
+ };
+Index: offapi/com/sun/star/awt/XLayoutUnit.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/awt/XLayoutUnit.idl,v
+retrieving revision 1.2
+retrieving revision 1.2.26.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.26.1
+--- offapi/com/sun/star/awt/XLayoutUnit.idl 6 Mar 2008 12:42:24 -0000 1.2
++++ offapi/com/sun/star/awt/XLayoutUnit.idl 7 Apr 2008 19:41:47 -0000 1.2.26.1
+@@ -11,13 +11,15 @@ module com { module sun { module star
+
+ //=============================================================================
+
+-published interface XLayoutContainer;
++interface XLayoutContainer;
+
+ /** Responsible to evaluate size damages and force a re-calculation. Containers
+ should let it know of state changes that may affects their size.
+- * All children of a top-level window should share the same object.
++ All children of a top-level window should share the same object.
++
++ @since OOo 3.0
+ */
+-published interface XLayoutUnit
++interface XLayoutUnit
+ {
+ void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
+ };
Index: offapi/com/sun/star/awt/makefile.mk
===================================================================
RCS file: /cvs/api/offapi/com/sun/star/awt/makefile.mk,v
-retrieving revision 1.47
-retrieving revision 1.47.20.1
-diff -p -u -u -p -b -w -B -r1.47 -r1.47.20.1
---- offapi/com/sun/star/awt/makefile.mk 12 Mar 2008 09:17:33 -0000 1.47
-+++ offapi/com/sun/star/awt/makefile.mk 28 Mar 2008 10:15:31 -0000 1.47.20.1
-@@ -320,10 +320,7 @@ IDLFILES=\
+retrieving revision 1.49
+retrieving revision 1.47.20.2
+diff -p -u -u -p -b -w -B -r1.49 -r1.47.20.2
+--- offapi/com/sun/star/awt/makefile.mk 25 Jun 2008 14:50:06 -0000 1.49
++++ offapi/com/sun/star/awt/makefile.mk 30 Jul 2008 12:45:52 -0000 1.47.20.2
+@@ -317,10 +317,7 @@ IDLFILES=\
XWindowListener.idl\
XWindowListener2.idl\
XWindowPeer.idl\
@@ -26,7 +239,7 @@
MaxChildrenException.idl\
XDialog2.idl\
XLayoutContainer.idl\
-@@ -331,7 +328,6 @@ IDLFILES+=\
+@@ -328,7 +325,6 @@ IDLFILES+=\
XLayoutFlowContainer.idl\
XLayoutRoot.idl\
XLayoutUnit.idl
@@ -34,106 +247,3 @@
# ------------------------------------------------------------------
-cvs diff: Diffing offapi/com/sun/star/awt/tree
-cvs diff: Diffing offapi/com/sun/star/chart
-cvs diff: Diffing offapi/com/sun/star/chart2
-cvs diff: Diffing offapi/com/sun/star/chart2/data
-cvs diff: Diffing offapi/com/sun/star/configuration
-cvs diff: Diffing offapi/com/sun/star/configuration/backend
-cvs diff: Diffing offapi/com/sun/star/configuration/backend/xml
-cvs diff: Diffing offapi/com/sun/star/configuration/bootstrap
-cvs diff: Diffing offapi/com/sun/star/datatransfer
-cvs diff: Diffing offapi/com/sun/star/datatransfer/clipboard
-cvs diff: Diffing offapi/com/sun/star/datatransfer/dnd
-cvs diff: Diffing offapi/com/sun/star/deployment
-cvs diff: Diffing offapi/com/sun/star/deployment/test
-cvs diff: Diffing offapi/com/sun/star/deployment/ui
-cvs diff: Diffing offapi/com/sun/star/document
-cvs diff: Diffing offapi/com/sun/star/drawing
-cvs diff: Diffing offapi/com/sun/star/drawing/framework
-cvs diff: Diffing offapi/com/sun/star/embed
-cvs diff: Diffing offapi/com/sun/star/form
-cvs diff: Diffing offapi/com/sun/star/form/binding
-cvs diff: Diffing offapi/com/sun/star/form/component
-cvs diff: Diffing offapi/com/sun/star/form/control
-cvs diff: Diffing offapi/com/sun/star/form/inspection
-cvs diff: Diffing offapi/com/sun/star/form/runtime
-cvs diff: Diffing offapi/com/sun/star/form/submission
-cvs diff: Diffing offapi/com/sun/star/form/validation
-cvs diff: Diffing offapi/com/sun/star/formula
-cvs diff: Diffing offapi/com/sun/star/frame
-cvs diff: Diffing offapi/com/sun/star/frame/status
-cvs diff: Diffing offapi/com/sun/star/gallery
-cvs diff: Diffing offapi/com/sun/star/geometry
-cvs diff: Diffing offapi/com/sun/star/graphic
-cvs diff: Diffing offapi/com/sun/star/i18n
-cvs diff: Diffing offapi/com/sun/star/image
-cvs diff: Diffing offapi/com/sun/star/inspection
-cvs diff: Diffing offapi/com/sun/star/installation
-cvs diff: Diffing offapi/com/sun/star/ldap
-cvs diff: Diffing offapi/com/sun/star/linguistic2
-cvs diff: Diffing offapi/com/sun/star/logging
-cvs diff: Diffing offapi/com/sun/star/mail
-cvs diff: Diffing offapi/com/sun/star/media
-cvs diff: Diffing offapi/com/sun/star/mozilla
-cvs diff: Diffing offapi/com/sun/star/packages
-cvs diff: Diffing offapi/com/sun/star/packages/manifest
-cvs diff: Diffing offapi/com/sun/star/packages/zip
-cvs diff: Diffing offapi/com/sun/star/plugin
-cvs diff: Diffing offapi/com/sun/star/presentation
-cvs diff: Diffing offapi/com/sun/star/presentation/textfield
-cvs diff: Diffing offapi/com/sun/star/rendering
-cvs diff: Diffing offapi/com/sun/star/report
-cvs diff: Diffing offapi/com/sun/star/report/inspection
-cvs diff: Diffing offapi/com/sun/star/resource
-cvs diff: Diffing offapi/com/sun/star/scanner
-cvs diff: Diffing offapi/com/sun/star/script
-cvs diff: Diffing offapi/com/sun/star/script/browse
-cvs diff: Diffing offapi/com/sun/star/script/provider
-cvs diff: Diffing offapi/com/sun/star/sdb
-cvs diff: Diffing offapi/com/sun/star/sdb/application
-cvs diff: Diffing offapi/com/sun/star/sdb/tools
-cvs diff: Diffing offapi/com/sun/star/sdbc
-cvs diff: Diffing offapi/com/sun/star/sdbcx
-cvs diff: Diffing offapi/com/sun/star/security
-cvs diff: Diffing offapi/com/sun/star/setup
-cvs diff: Diffing offapi/com/sun/star/sheet
-cvs diff: Diffing offapi/com/sun/star/smarttags
-cvs diff: Diffing offapi/com/sun/star/style
-cvs diff: Diffing offapi/com/sun/star/svg
-cvs diff: Diffing offapi/com/sun/star/sync
-cvs diff: Diffing offapi/com/sun/star/sync2
-cvs diff: Diffing offapi/com/sun/star/system
-cvs diff: Diffing offapi/com/sun/star/table
-cvs diff: Diffing offapi/com/sun/star/task
-cvs diff: Diffing offapi/com/sun/star/text
-cvs diff: Diffing offapi/com/sun/star/text/fieldmaster
-cvs diff: Diffing offapi/com/sun/star/text/textfield
-cvs diff: Diffing offapi/com/sun/star/text/textfield/docinfo
-cvs diff: Diffing offapi/com/sun/star/ucb
-cvs diff: Diffing offapi/com/sun/star/ucb/smart
-cvs diff: Diffing offapi/com/sun/star/ui
-cvs diff: Diffing offapi/com/sun/star/ui/dialogs
-cvs diff: Diffing offapi/com/sun/star/util
-cvs diff: Diffing offapi/com/sun/star/view
-cvs diff: Diffing offapi/com/sun/star/xforms
-cvs diff: Diffing offapi/com/sun/star/xml
-cvs diff: Diffing offapi/com/sun/star/xml/crypto
-cvs diff: Diffing offapi/com/sun/star/xml/crypto/sax
-cvs diff: Diffing offapi/com/sun/star/xml/csax
-cvs diff: Diffing offapi/com/sun/star/xml/dom
-cvs diff: Diffing offapi/com/sun/star/xml/dom/events
-cvs diff: Diffing offapi/com/sun/star/xml/dom/views
-cvs diff: Diffing offapi/com/sun/star/xml/input
-cvs diff: Diffing offapi/com/sun/star/xml/sax
-cvs diff: Diffing offapi/com/sun/star/xml/wrapper
-cvs diff: Diffing offapi/com/sun/star/xml/xpath
-cvs diff: Diffing offapi/com/sun/star/xsd
-cvs diff: Diffing offapi/drafts
-cvs diff: Diffing offapi/drafts/com
-cvs diff: Diffing offapi/drafts/com/sun
-cvs diff: Diffing offapi/drafts/com/sun/star
-cvs diff: Diffing offapi/drafts/com/sun/star/form
-cvs diff: Diffing offapi/prj
-cvs diff: Diffing offapi/type_reference
-cvs diff: Diffing offapi/util
Modified: trunk/patches/dev300/cws-layoutdialogs-scp2.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-scp2.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-scp2.diff Thu Jul 31 10:32:58 2008
@@ -1,29 +1,12 @@
-cvs diff: Diffing scp2
-cvs diff: Diffing scp2/inc
-cvs diff: Diffing scp2/macros
-cvs diff: Diffing scp2/prj
-cvs diff: Diffing scp2/source
-cvs diff: Diffing scp2/source/activex
-cvs diff: Diffing scp2/source/base
-cvs diff: Diffing scp2/source/calc
-cvs diff: Diffing scp2/source/canvas
-cvs diff: Diffing scp2/source/crashrep
-cvs diff: Diffing scp2/source/draw
-cvs diff: Diffing scp2/source/gnome
-cvs diff: Diffing scp2/source/graphicfilter
-cvs diff: Diffing scp2/source/impress
-cvs diff: Diffing scp2/source/javafilter
-cvs diff: Diffing scp2/source/kde
-cvs diff: Diffing scp2/source/layout
Index: scp2/source/layout/layout.scp
===================================================================
RCS file: /cvs/installation/scp2/source/layout/layout.scp,v
-retrieving revision 1.2
-retrieving revision 1.2.20.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.20.3
---- scp2/source/layout/layout.scp 6 Mar 2008 12:47:00 -0000 1.2
-+++ scp2/source/layout/layout.scp 31 Mar 2008 14:53:28 -0000 1.2.20.3
-@@ -35,83 +35,21 @@
+retrieving revision 1.3
+retrieving revision 1.2.20.4
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.20.4
+--- scp2/source/layout/layout.scp 10 Apr 2008 09:27:03 -0000 1.3
++++ scp2/source/layout/layout.scp 30 Jul 2008 12:58:07 -0000 1.2.20.4
+@@ -30,83 +30,21 @@
#include "macros.inc"
@@ -115,18 +98,3 @@
-// Default = YES;
-// Styles = ();
-// End
-cvs diff: Diffing scp2/source/lingu
-cvs diff: Diffing scp2/source/math
-cvs diff: Diffing scp2/source/onlineupdate
-cvs diff: Diffing scp2/source/ooo
-cvs diff: Diffing scp2/source/ooo_wo_ure
-cvs diff: Diffing scp2/source/python
-cvs diff: Diffing scp2/source/quickstart
-cvs diff: Diffing scp2/source/sdkoo
-cvs diff: Diffing scp2/source/templates
-cvs diff: Diffing scp2/source/testtool
-cvs diff: Diffing scp2/source/ure
-cvs diff: Diffing scp2/source/winexplorerext
-cvs diff: Diffing scp2/source/writer
-cvs diff: Diffing scp2/source/xsltfilter
-cvs diff: Diffing scp2/util
Modified: trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff Thu Jul 31 10:32:58 2008
@@ -1,18 +1,3 @@
-cvs diff: Diffing svx
-cvs diff: Diffing svx/doc
-cvs diff: Diffing svx/doc/UML
-cvs diff: Diffing svx/inc
-cvs diff: Diffing svx/inc/pch
-cvs diff: Diffing svx/inc/svx
-cvs diff: Diffing svx/inc/svx/sdr
-cvs diff: Diffing svx/inc/svx/sdr/animation
-cvs diff: Diffing svx/inc/svx/sdr/contact
-cvs diff: Diffing svx/inc/svx/sdr/event
-cvs diff: Diffing svx/inc/svx/sdr/mixer
-cvs diff: Diffing svx/inc/svx/sdr/overlay
-cvs diff: Diffing svx/inc/svx/sdr/properties
-cvs diff: Diffing svx/inc/svx/sdr/table
-cvs diff: Diffing svx/prj
Index: svx/prj/build.lst
===================================================================
RCS file: /cvs/graphics/svx/prj/build.lst,v
@@ -32,68 +17,16 @@
Index: svx/prj/d.lst
===================================================================
RCS file: /cvs/graphics/svx/prj/d.lst,v
-retrieving revision 1.136
-retrieving revision 1.136.18.2
-diff -p -u -u -p -b -w -B -r1.136 -r1.136.18.2
---- svx/prj/d.lst 12 Mar 2008 09:35:06 -0000 1.136
-+++ svx/prj/d.lst 31 Mar 2008 14:52:10 -0000 1.136.18.2
-@@ -656,3 +656,5 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
- ..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
+retrieving revision 1.138
+retrieving revision 1.136.18.3
+diff -p -u -u -p -b -w -B -r1.138 -r1.136.18.3
+--- svx/prj/d.lst 22 Jul 2008 16:44:35 -0000 1.138
++++ svx/prj/d.lst 30 Jul 2008 12:52:27 -0000 1.136.18.3
+@@ -658,3 +658,4 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-+
+
+..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-cvs diff: Diffing svx/qa
-cvs diff: Diffing svx/qa/unoapi
-cvs diff: Diffing svx/qa/unoapi/testdocuments
-cvs diff: Diffing svx/sdi
-cvs diff: Diffing svx/source
-cvs diff: Diffing svx/source/accessibility
-cvs diff: Diffing svx/source/customshapes
-cvs diff: Diffing svx/source/dialog
-cvs diff: Diffing svx/source/editeng
-cvs diff: Diffing svx/source/engine3d
-cvs diff: Diffing svx/source/fmcomp
-cvs diff: Diffing svx/source/form
-cvs diff: Diffing svx/source/gallery2
-cvs diff: Diffing svx/source/gengal
-cvs diff: Diffing svx/source/inc
-cvs diff: Diffing svx/source/init
-cvs diff: Diffing svx/source/intro
-cvs diff: Diffing svx/source/items
-cvs diff: Diffing svx/source/mnuctrls
-cvs diff: Diffing svx/source/msfilter
-cvs diff: Diffing svx/source/options
-cvs diff: Diffing svx/source/outliner
-cvs diff: Diffing svx/source/sdr
-cvs diff: Diffing svx/source/sdr/animation
-cvs diff: Diffing svx/source/sdr/contact
-cvs diff: Diffing svx/source/sdr/event
-cvs diff: Diffing svx/source/sdr/mixer
-cvs diff: Diffing svx/source/sdr/overlay
-cvs diff: Diffing svx/source/sdr/properties
-cvs diff: Diffing svx/source/smarttags
-cvs diff: Diffing svx/source/src
-cvs diff: Diffing svx/source/stbctrls
-cvs diff: Diffing svx/source/svdraw
-cvs diff: Diffing svx/source/svrtf
-cvs diff: Diffing svx/source/svxlink
-cvs diff: Diffing svx/source/table
-cvs diff: Diffing svx/source/tbxctrls
-cvs diff: Diffing svx/source/toolbars
-cvs diff: Diffing svx/source/unodialogs
-cvs diff: Diffing svx/source/unodialogs/inc
-cvs diff: Diffing svx/source/unodialogs/textconversiondlgs
-cvs diff: Diffing svx/source/unodraw
-cvs diff: Diffing svx/source/unoedit
-cvs diff: Diffing svx/source/unogallery
-cvs diff: Diffing svx/source/xml
-cvs diff: Diffing svx/source/xoutdev
-cvs diff: Diffing svx/uiconfig
-cvs diff: Diffing svx/uiconfig/accelerator
-cvs diff: Diffing svx/uiconfig/accelerator/en-US
-cvs diff: Diffing svx/uiconfig/accelerator/es
-cvs diff: Diffing svx/uiconfig/layout
Index: svx/uiconfig/layout/delzip
===================================================================
RCS file: svx/uiconfig/layout/delzip
@@ -648,40 +581,36 @@
RCS file: svx/uiconfig/layout/makefile.mk
diff -N svx/uiconfig/layout/makefile.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/makefile.mk 3 Apr 2008 16:47:47 -0000 1.1.2.4
-@@ -0,0 +1,54 @@
++++ svx/uiconfig/layout/makefile.mk 30 Jul 2008 11:30:47 -0000 1.1.2.5
+@@ -0,0 +1,50 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# last change: $Author$ $Date$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $RCSfile$
+#
++# $Revision$
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# This file is part of OpenOffice.org.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
++# 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.
+#
-+# This library 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 for more details.
++# 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 along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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.
+#
+#*************************************************************************
+
@@ -770,16 +699,15 @@
+ </dialogbuttonhbox>
+ </vbox>
+</modaldialog>
-cvs diff: Diffing svx/util
Index: svx/util/makefile.mk
===================================================================
RCS file: /cvs/graphics/svx/util/makefile.mk,v
-retrieving revision 1.56
-retrieving revision 1.56.18.2
-diff -p -u -u -p -b -w -B -r1.56 -r1.56.18.2
---- svx/util/makefile.mk 12 Mar 2008 10:14:26 -0000 1.56
-+++ svx/util/makefile.mk 28 Mar 2008 10:17:48 -0000 1.56.18.2
-@@ -188,11 +188,6 @@ SHL2STDLIBS+= \
+retrieving revision 1.59
+retrieving revision 1.56.18.3
+diff -p -u -u -p -b -w -B -r1.59 -r1.56.18.3
+--- svx/util/makefile.mk 11 Apr 2008 04:20:55 -0000 1.59
++++ svx/util/makefile.mk 30 Jul 2008 12:52:20 -0000 1.56.18.3
+@@ -185,11 +185,6 @@ SHL2STDLIBS+= \
$(ADVAPI32LIB)
.ENDIF # WNT
@@ -791,7 +719,3 @@
# ------------------------------------------------------------------------------
# Resource files
-cvs diff: Diffing svx/util/defs
-cvs diff: Diffing svx/workben
-cvs diff: Diffing svx/workben/msview
-cvs diff: Diffing svx/xml
Modified: trunk/patches/dev300/cws-layoutdialogs-svx.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-svx.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-svx.diff Thu Jul 31 10:32:58 2008
@@ -1,18 +1,3 @@
-cvs diff: Diffing svx
-cvs diff: Diffing svx/doc
-cvs diff: Diffing svx/doc/UML
-cvs diff: Diffing svx/inc
-cvs diff: Diffing svx/inc/pch
-cvs diff: Diffing svx/inc/svx
-cvs diff: Diffing svx/inc/svx/sdr
-cvs diff: Diffing svx/inc/svx/sdr/animation
-cvs diff: Diffing svx/inc/svx/sdr/contact
-cvs diff: Diffing svx/inc/svx/sdr/event
-cvs diff: Diffing svx/inc/svx/sdr/mixer
-cvs diff: Diffing svx/inc/svx/sdr/overlay
-cvs diff: Diffing svx/inc/svx/sdr/properties
-cvs diff: Diffing svx/inc/svx/sdr/table
-cvs diff: Diffing svx/prj
Index: svx/prj/build.lst
===================================================================
RCS file: /cvs/graphics/svx/prj/build.lst,v
@@ -32,68 +17,16 @@
Index: svx/prj/d.lst
===================================================================
RCS file: /cvs/graphics/svx/prj/d.lst,v
-retrieving revision 1.136
-retrieving revision 1.136.18.2
-diff -p -u -u -p -b -w -B -r1.136 -r1.136.18.2
---- svx/prj/d.lst 12 Mar 2008 09:35:06 -0000 1.136
-+++ svx/prj/d.lst 31 Mar 2008 14:52:10 -0000 1.136.18.2
-@@ -656,3 +656,5 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
+retrieving revision 1.138
+retrieving revision 1.136.18.3
+diff -p -u -u -p -b -w -B -r1.138 -r1.136.18.3
+--- svx/prj/d.lst 22 Jul 2008 16:44:35 -0000 1.138
++++ svx/prj/d.lst 30 Jul 2008 12:52:27 -0000 1.136.18.3
+@@ -658,3 +658,4 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
-+
+..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-cvs diff: Diffing svx/qa
-cvs diff: Diffing svx/qa/unoapi
-cvs diff: Diffing svx/qa/unoapi/testdocuments
-cvs diff: Diffing svx/sdi
-cvs diff: Diffing svx/source
-cvs diff: Diffing svx/source/accessibility
-cvs diff: Diffing svx/source/customshapes
-cvs diff: Diffing svx/source/dialog
-cvs diff: Diffing svx/source/editeng
-cvs diff: Diffing svx/source/engine3d
-cvs diff: Diffing svx/source/fmcomp
-cvs diff: Diffing svx/source/form
-cvs diff: Diffing svx/source/gallery2
-cvs diff: Diffing svx/source/gengal
-cvs diff: Diffing svx/source/inc
-cvs diff: Diffing svx/source/init
-cvs diff: Diffing svx/source/intro
-cvs diff: Diffing svx/source/items
-cvs diff: Diffing svx/source/mnuctrls
-cvs diff: Diffing svx/source/msfilter
-cvs diff: Diffing svx/source/options
-cvs diff: Diffing svx/source/outliner
-cvs diff: Diffing svx/source/sdr
-cvs diff: Diffing svx/source/sdr/animation
-cvs diff: Diffing svx/source/sdr/contact
-cvs diff: Diffing svx/source/sdr/event
-cvs diff: Diffing svx/source/sdr/mixer
-cvs diff: Diffing svx/source/sdr/overlay
-cvs diff: Diffing svx/source/sdr/properties
-cvs diff: Diffing svx/source/smarttags
-cvs diff: Diffing svx/source/src
-cvs diff: Diffing svx/source/stbctrls
-cvs diff: Diffing svx/source/svdraw
-cvs diff: Diffing svx/source/svrtf
-cvs diff: Diffing svx/source/svxlink
-cvs diff: Diffing svx/source/table
-cvs diff: Diffing svx/source/tbxctrls
-cvs diff: Diffing svx/source/toolbars
-cvs diff: Diffing svx/source/unodialogs
-cvs diff: Diffing svx/source/unodialogs/inc
-cvs diff: Diffing svx/source/unodialogs/textconversiondlgs
-cvs diff: Diffing svx/source/unodraw
-cvs diff: Diffing svx/source/unoedit
-cvs diff: Diffing svx/source/unogallery
-cvs diff: Diffing svx/source/xml
-cvs diff: Diffing svx/source/xoutdev
-cvs diff: Diffing svx/uiconfig
-cvs diff: Diffing svx/uiconfig/accelerator
-cvs diff: Diffing svx/uiconfig/accelerator/en-US
-cvs diff: Diffing svx/uiconfig/accelerator/es
-cvs diff: Diffing svx/uiconfig/layout
Index: svx/uiconfig/layout/delzip
===================================================================
RCS file: svx/uiconfig/layout/delzip
@@ -648,40 +581,36 @@
RCS file: svx/uiconfig/layout/makefile.mk
diff -N svx/uiconfig/layout/makefile.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ svx/uiconfig/layout/makefile.mk 3 Apr 2008 16:47:47 -0000 1.1.2.4
-@@ -0,0 +1,54 @@
++++ svx/uiconfig/layout/makefile.mk 30 Jul 2008 11:30:47 -0000 1.1.2.5
+@@ -0,0 +1,50 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# last change: $Author$ $Date$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $RCSfile$
+#
++# $Revision$
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# This file is part of OpenOffice.org.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
++# 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.
+#
-+# This library 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 for more details.
++# 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 along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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.
+#
+#*************************************************************************
+
@@ -770,16 +699,15 @@
+ </dialogbuttonhbox>
+ </vbox>
+</modaldialog>
-cvs diff: Diffing svx/util
Index: svx/util/makefile.mk
===================================================================
RCS file: /cvs/graphics/svx/util/makefile.mk,v
-retrieving revision 1.56
-retrieving revision 1.56.18.2
-diff -p -u -u -p -b -w -B -r1.56 -r1.56.18.2
---- svx/util/makefile.mk 12 Mar 2008 10:14:26 -0000 1.56
-+++ svx/util/makefile.mk 28 Mar 2008 10:17:48 -0000 1.56.18.2
-@@ -188,11 +188,6 @@ SHL2STDLIBS+= \
+retrieving revision 1.59
+retrieving revision 1.56.18.3
+diff -p -u -u -p -b -w -B -r1.59 -r1.56.18.3
+--- svx/util/makefile.mk 11 Apr 2008 04:20:55 -0000 1.59
++++ svx/util/makefile.mk 30 Jul 2008 12:52:20 -0000 1.56.18.3
+@@ -185,11 +185,6 @@ SHL2STDLIBS+= \
$(ADVAPI32LIB)
.ENDIF # WNT
@@ -791,7 +719,3 @@
# ------------------------------------------------------------------------------
# Resource files
-cvs diff: Diffing svx/util/defs
-cvs diff: Diffing svx/workben
-cvs diff: Diffing svx/workben/msview
-cvs diff: Diffing svx/xml
Modified: trunk/patches/dev300/cws-layoutdialogs-sw.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-sw.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-sw.diff Thu Jul 31 10:32:58 2008
@@ -1,7 +1,3 @@
-cvs diff: Diffing sw
-cvs diff: Diffing sw/inc
-cvs diff: Diffing sw/inc/pch
-cvs diff: Diffing sw/prj
Index: sw/prj/build.lst
===================================================================
RCS file: /cvs/sw/sw/prj/build.lst,v
@@ -32,86 +28,6 @@
..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml
+
+..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-cvs diff: Diffing sw/qa
-cvs diff: Diffing sw/qa/complex
-cvs diff: Diffing sw/qa/complex/accessibility
-cvs diff: Diffing sw/qa/complex/checkColor
-cvs diff: Diffing sw/qa/complex/indeterminateState
-cvs diff: Diffing sw/qa/complex/writer
-cvs diff: Diffing sw/qa/complex/writer/testdocuments
-cvs diff: Diffing sw/qa/core
-cvs diff: Diffing sw/qa/unoapi
-cvs diff: Diffing sw/qa/unoapi/testdocuments
-cvs diff: Diffing sw/sdi
-cvs diff: Diffing sw/source
-cvs diff: Diffing sw/source/core
-cvs diff: Diffing sw/source/core/SwNumberTree
-cvs diff: Diffing sw/source/core/access
-cvs diff: Diffing sw/source/core/attr
-cvs diff: Diffing sw/source/core/bastyp
-cvs diff: Diffing sw/source/core/crsr
-cvs diff: Diffing sw/source/core/doc
-cvs diff: Diffing sw/source/core/docnode
-cvs diff: Diffing sw/source/core/draw
-cvs diff: Diffing sw/source/core/edit
-cvs diff: Diffing sw/source/core/except
-cvs diff: Diffing sw/source/core/fields
-cvs diff: Diffing sw/source/core/frmedt
-cvs diff: Diffing sw/source/core/graphic
-cvs diff: Diffing sw/source/core/inc
-cvs diff: Diffing sw/source/core/layout
-cvs diff: Diffing sw/source/core/objectpositioning
-cvs diff: Diffing sw/source/core/ole
-cvs diff: Diffing sw/source/core/para
-cvs diff: Diffing sw/source/core/sw3io
-cvs diff: Diffing sw/source/core/swg
-cvs diff: Diffing sw/source/core/table
-cvs diff: Diffing sw/source/core/text
-cvs diff: Diffing sw/source/core/tox
-cvs diff: Diffing sw/source/core/txtnode
-cvs diff: Diffing sw/source/core/undo
-cvs diff: Diffing sw/source/core/unocore
-cvs diff: Diffing sw/source/core/view
-cvs diff: Diffing sw/source/filter
-cvs diff: Diffing sw/source/filter/ascii
-cvs diff: Diffing sw/source/filter/basflt
-cvs diff: Diffing sw/source/filter/html
-cvs diff: Diffing sw/source/filter/inc
-cvs diff: Diffing sw/source/filter/rtf
-cvs diff: Diffing sw/source/filter/writer
-cvs diff: Diffing sw/source/filter/ww1
-cvs diff: Diffing sw/source/filter/ww8
-cvs diff: Diffing sw/source/filter/ww8/dump
-cvs diff: Diffing sw/source/filter/xml
-cvs diff: Diffing sw/source/ui
-cvs diff: Diffing sw/source/ui/app
-cvs diff: Diffing sw/source/ui/cctrl
-cvs diff: Diffing sw/source/ui/chrdlg
-cvs diff: Diffing sw/source/ui/config
-cvs diff: Diffing sw/source/ui/dbui
-cvs diff: Diffing sw/source/ui/dialog
-cvs diff: Diffing sw/source/ui/dochdl
-cvs diff: Diffing sw/source/ui/docvw
-cvs diff: Diffing sw/source/ui/envelp
-cvs diff: Diffing sw/source/ui/fldui
-cvs diff: Diffing sw/source/ui/fmtui
-cvs diff: Diffing sw/source/ui/frmdlg
-cvs diff: Diffing sw/source/ui/globdoc
-cvs diff: Diffing sw/source/ui/inc
-cvs diff: Diffing sw/source/ui/index
-cvs diff: Diffing sw/source/ui/lingu
-cvs diff: Diffing sw/source/ui/misc
-cvs diff: Diffing sw/source/ui/ribbar
-cvs diff: Diffing sw/source/ui/shells
-cvs diff: Diffing sw/source/ui/smartmenu
-cvs diff: Diffing sw/source/ui/table
-cvs diff: Diffing sw/source/ui/uiview
-cvs diff: Diffing sw/source/ui/uno
-cvs diff: Diffing sw/source/ui/utlui
-cvs diff: Diffing sw/source/ui/web
-cvs diff: Diffing sw/source/ui/wrtsh
-cvs diff: Diffing sw/uiconfig
-cvs diff: Diffing sw/uiconfig/layout
Index: sw/uiconfig/layout/delzip
===================================================================
RCS file: sw/uiconfig/layout/delzip
@@ -732,40 +648,36 @@
RCS file: sw/uiconfig/layout/makefile.mk
diff -N sw/uiconfig/layout/makefile.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ sw/uiconfig/layout/makefile.mk 31 Mar 2008 15:01:30 -0000 1.1.2.4
-@@ -0,0 +1,54 @@
++++ sw/uiconfig/layout/makefile.mk 30 Jul 2008 11:27:51 -0000 1.1.2.5
+@@ -0,0 +1,50 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# last change: $Author$ $Date$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $RCSfile$
+#
++# $Revision$
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# This file is part of OpenOffice.org.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
++# 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.
+#
-+# This library 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 for more details.
++# 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 along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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.
+#
+#*************************************************************************
+
@@ -845,75 +757,15 @@
+ </dialogbuttonhbox>
+ </vbox>
+</modaldialog>
-cvs diff: Diffing sw/uiconfig/sglobal
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator/de
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator/en-GB
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator/es
-cvs diff: Diffing sw/uiconfig/sglobal/accelerator/fr
-cvs diff: Diffing sw/uiconfig/sglobal/menubar
-cvs diff: Diffing sw/uiconfig/sglobal/statusbar
-cvs diff: Diffing sw/uiconfig/sglobal/toolbar
-cvs diff: Diffing sw/uiconfig/sweb
-cvs diff: Diffing sw/uiconfig/sweb/accelerator
-cvs diff: Diffing sw/uiconfig/sweb/accelerator/de
-cvs diff: Diffing sw/uiconfig/sweb/accelerator/en-GB
-cvs diff: Diffing sw/uiconfig/sweb/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/sweb/accelerator/es
-cvs diff: Diffing sw/uiconfig/sweb/accelerator/fr
-cvs diff: Diffing sw/uiconfig/sweb/menubar
-cvs diff: Diffing sw/uiconfig/sweb/statusbar
-cvs diff: Diffing sw/uiconfig/sweb/toolbar
-cvs diff: Diffing sw/uiconfig/swform
-cvs diff: Diffing sw/uiconfig/swform/accelerator
-cvs diff: Diffing sw/uiconfig/swform/accelerator/de
-cvs diff: Diffing sw/uiconfig/swform/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/swform/accelerator/es
-cvs diff: Diffing sw/uiconfig/swform/accelerator/fr
-cvs diff: Diffing sw/uiconfig/swform/menubar
-cvs diff: Diffing sw/uiconfig/swform/statusbar
-cvs diff: Diffing sw/uiconfig/swform/toolbar
-cvs diff: Diffing sw/uiconfig/swreport
-cvs diff: Diffing sw/uiconfig/swreport/accelerator
-cvs diff: Diffing sw/uiconfig/swreport/accelerator/de
-cvs diff: Diffing sw/uiconfig/swreport/accelerator/en-GB
-cvs diff: Diffing sw/uiconfig/swreport/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/swreport/accelerator/es
-cvs diff: Diffing sw/uiconfig/swreport/accelerator/fr
-cvs diff: Diffing sw/uiconfig/swreport/menubar
-cvs diff: Diffing sw/uiconfig/swreport/statusbar
-cvs diff: Diffing sw/uiconfig/swreport/toolbar
-cvs diff: Diffing sw/uiconfig/swriter
-cvs diff: Diffing sw/uiconfig/swriter/accelerator
-cvs diff: Diffing sw/uiconfig/swriter/accelerator/de
-cvs diff: Diffing sw/uiconfig/swriter/accelerator/en-GB
-cvs diff: Diffing sw/uiconfig/swriter/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/swriter/accelerator/es
-cvs diff: Diffing sw/uiconfig/swriter/accelerator/fr
-cvs diff: Diffing sw/uiconfig/swriter/menubar
-cvs diff: Diffing sw/uiconfig/swriter/statusbar
-cvs diff: Diffing sw/uiconfig/swriter/toolbar
-cvs diff: Diffing sw/uiconfig/swxform
-cvs diff: Diffing sw/uiconfig/swxform/accelerator
-cvs diff: Diffing sw/uiconfig/swxform/accelerator/de
-cvs diff: Diffing sw/uiconfig/swxform/accelerator/en-GB
-cvs diff: Diffing sw/uiconfig/swxform/accelerator/en-US
-cvs diff: Diffing sw/uiconfig/swxform/accelerator/es
-cvs diff: Diffing sw/uiconfig/swxform/accelerator/fr
-cvs diff: Diffing sw/uiconfig/swxform/menubar
-cvs diff: Diffing sw/uiconfig/swxform/statusbar
-cvs diff: Diffing sw/uiconfig/swxform/toolbar
-cvs diff: Diffing sw/util
Index: sw/util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
-retrieving revision 1.66
-retrieving revision 1.66.18.2
-diff -p -u -u -p -b -w -B -r1.66 -r1.66.18.2
---- sw/util/makefile.mk 12 Mar 2008 13:00:47 -0000 1.66
-+++ sw/util/makefile.mk 28 Mar 2008 10:18:04 -0000 1.66.18.2
-@@ -199,11 +199,6 @@ SHL3STDLIBS= \
+retrieving revision 1.72
+retrieving revision 1.66.18.3
+diff -p -u -u -p -b -w -B -r1.72 -r1.66.18.3
+--- sw/util/makefile.mk 30 Jun 2008 13:31:06 -0000 1.72
++++ sw/util/makefile.mk 30 Jul 2008 12:37:27 -0000 1.66.18.3
+@@ -195,11 +195,6 @@ SHL3STDLIBS= \
$(SALLIB) \
$(SOTLIB)
@@ -925,5 +777,3 @@
SHL3LIBS= $(SLB)$/swui.lib
LIB3TARGET = $(SLB)$/swui.lib
-cvs diff: Diffing sw/util/defs
-cvs diff: Diffing sw/xml
Modified: trunk/patches/dev300/cws-layoutdialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-toolkit.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-toolkit.diff Thu Jul 31 10:32:58 2008
@@ -1,6 +1,3 @@
-cvs diff: Diffing toolkit
-cvs diff: Diffing toolkit/doc
-cvs diff: Diffing toolkit/doc/layout
Index: toolkit/doc/layout/ChangeLog
===================================================================
RCS file: /cvs/gsl/toolkit/doc/layout/ChangeLog,v
@@ -447,49 +444,43 @@
it can be improved I think :-)
* improve Kohei's converter (poke him on IRC (afternoons) about this)
-cvs diff: Diffing toolkit/inc
-cvs diff: Diffing toolkit/inc/layout
Index: toolkit/inc/layout/layout-post.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/inc/layout/layout-post.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/inc/layout/layout-post.hxx 6 Mar 2008 11:37:06 -0000 1.2
-+++ toolkit/inc/layout/layout-post.hxx 20 Mar 2008 11:56:24 -0000 1.2.6.1
-@@ -1,18 +1,65 @@
++++ toolkit/inc/layout/layout-post.hxx 30 Jul 2008 11:12:10 -0000 1.2.6.2
+@@ -1,18 +1,61 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -527,50 +518,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/inc/layout/layout-pre.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/inc/layout/layout-pre.hxx 6 Mar 2008 11:37:18 -0000 1.2
-+++ toolkit/inc/layout/layout-pre.hxx 20 Mar 2008 11:56:25 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/inc/layout/layout-pre.hxx 30 Jul 2008 11:11:39 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef _LAYOUT_PRE_HXX
#define _LAYOUT_PRE_HXX
-@@ -13,16 +48,28 @@
+@@ -13,16 +44,28 @@
//typedef layout::Dialog SfxModalDialog;
//typedef layout::FixedLine FixedLine;
@@ -599,7 +586,7 @@
/* FIXME: why are we defaulting to layout::Window?
/home/janneke/vc/ooo-build/build/hack/sw/source/ui/dialog/wordcountdialog.cxx:87: error: no matching function for call to 'layout::Dialog::Dialog(Window*&, const char [14], const char [7])'
-@@ -41,20 +88,29 @@
+@@ -41,20 +84,29 @@
* but is not scalable. */
#ifdef _LAYOUT_POST_HXX
@@ -638,43 +625,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/inc/layout/layout.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/inc/layout/layout.hxx 6 Mar 2008 11:37:31 -0000 1.2
-+++ toolkit/inc/layout/layout.hxx 28 Mar 2008 09:51:22 -0000 1.2.6.2
-@@ -1,10 +1,44 @@
++++ toolkit/inc/layout/layout.hxx 30 Jul 2008 11:12:22 -0000 1.2.6.3
+@@ -1,10 +1,40 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -689,7 +672,7 @@
#include <tools/link.hxx>
#include <tools/string.hxx>
-@@ -16,6 +50,7 @@
+@@ -16,6 +46,7 @@
#include <toolkit/dllapi.h>
class Window;
@@ -697,7 +680,7 @@
namespace layout
{
-@@ -28,32 +63,22 @@ class TOOLKIT_DLLPUBLIC Context
+@@ -28,32 +59,22 @@ class TOOLKIT_DLLPUBLIC Context
{
ContextImpl *pImpl;
public:
@@ -734,7 +717,7 @@
t( Window *pParent, WinBits nStyle = defaultWinBit )
#define DECL_GET_IMPL(t) \
inline t##Impl &getImpl() const
-@@ -61,12 +86,12 @@ public:
+@@ -61,12 +82,12 @@ public:
// follows the VCL inheritance hierarchy ...
class WindowImpl;
@@ -749,7 +732,7 @@
public:
PeerHandle GetPeer();
Context *getContext();
-@@ -91,7 +116,7 @@ class TOOLKIT_DLLPUBLIC Control : public
+@@ -91,7 +112,7 @@ class TOOLKIT_DLLPUBLIC Control : public
DECL_GET_IMPL( Control );
DECL_CONSTRUCTORS( Control, Window, 0 );
public:
@@ -758,7 +741,7 @@
};
class FixedLineImpl;
-@@ -100,6 +125,8 @@ class TOOLKIT_DLLPUBLIC FixedLine : publ
+@@ -100,6 +121,8 @@ class TOOLKIT_DLLPUBLIC FixedLine : publ
friend class FixedLineImpl;
DECL_GET_IMPL( FixedLine );
DECL_CONSTRUCTORS( FixedLine, Control, WB_HORZ );
@@ -767,7 +750,7 @@
};
class FixedTextImpl;
-@@ -109,7 +136,17 @@ class TOOLKIT_DLLPUBLIC FixedText : publ
+@@ -109,7 +132,17 @@ class TOOLKIT_DLLPUBLIC FixedText : publ
DECL_GET_IMPL( FixedText );
DECL_CONSTRUCTORS( FixedText, Control, 0 );
public:
@@ -786,7 +769,7 @@
};
class FixedInfoImpl;
-@@ -120,6 +157,16 @@ class TOOLKIT_DLLPUBLIC FixedInfo : publ
+@@ -120,6 +153,16 @@ class TOOLKIT_DLLPUBLIC FixedInfo : publ
DECL_CONSTRUCTORS( FixedInfo, FixedText, 0 );
};
@@ -803,7 +786,7 @@
class ButtonImpl;
class TOOLKIT_DLLPUBLIC Button : public Control
{
-@@ -127,11 +174,11 @@ class TOOLKIT_DLLPUBLIC Button : public
+@@ -127,11 +170,11 @@ class TOOLKIT_DLLPUBLIC Button : public
DECL_GET_IMPL( Button );
DECL_CONSTRUCTORS( Button, Control, 0 );
public:
@@ -817,7 +800,7 @@
virtual void Click() /* pure virtual? */;
};
-@@ -145,7 +192,7 @@ public:
+@@ -145,7 +188,7 @@ public:
BOOL IsChecked() const;
void Toggle();
@@ -826,7 +809,7 @@
};
class TOOLKIT_DLLPUBLIC OKButton : public PushButton
-@@ -185,6 +232,27 @@ class TOOLKIT_DLLPUBLIC HelpButton : pub
+@@ -185,6 +228,27 @@ class TOOLKIT_DLLPUBLIC HelpButton : pub
DECL_CONSTRUCTORS( HelpButton, PushButton, 0 );
};
@@ -854,7 +837,7 @@
class RadioButtonImpl;
class TOOLKIT_DLLPUBLIC RadioButton : public Button
{
-@@ -195,11 +263,11 @@ public:
+@@ -195,11 +259,11 @@ public:
BOOL IsChecked() const;
void Toggle();
@@ -868,7 +851,7 @@
{
DECL_GET_IMPL( CheckBox );
DECL_CONSTRUCTORS( CheckBox, Button, 0 );
-@@ -208,7 +276,7 @@ public:
+@@ -208,7 +272,7 @@ public:
BOOL IsChecked() const;
void Toggle();
@@ -877,7 +860,7 @@
};
class EditImpl;
-@@ -217,9 +285,9 @@ class TOOLKIT_DLLPUBLIC Edit : public Co
+@@ -217,9 +281,9 @@ class TOOLKIT_DLLPUBLIC Edit : public Co
DECL_GET_IMPL( Edit );
DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
public:
@@ -889,7 +872,7 @@
};
class MultiLineEditImpl;
-@@ -267,7 +335,7 @@ class TOOLKIT_DLLPUBLIC NumericField : p
+@@ -267,7 +331,7 @@ class TOOLKIT_DLLPUBLIC NumericField : p
{
DECL_GET_IMPL( NumericField );
public:
@@ -898,7 +881,7 @@
NumericField( Window *pParent, WinBits nStyle );
};
-@@ -294,7 +362,7 @@ class TOOLKIT_DLLPUBLIC MetricField : pu
+@@ -294,7 +358,7 @@ class TOOLKIT_DLLPUBLIC MetricField : pu
{
DECL_GET_IMPL( MetricField );
public:
@@ -907,7 +890,7 @@
MetricField( Window *pParent, WinBits nStyle );
};
-@@ -307,17 +375,17 @@ class TOOLKIT_DLLPUBLIC ComboBox : publi
+@@ -307,17 +371,17 @@ class TOOLKIT_DLLPUBLIC ComboBox : publi
DECL_CONSTRUCTORS( ComboBox, Edit, 0 );
public:
@@ -930,7 +913,7 @@
};
#define LISTBOX_APPEND ((USHORT)0xFFFF)
-@@ -328,25 +396,25 @@ class TOOLKIT_DLLPUBLIC ListBox : public
+@@ -328,25 +392,25 @@ class TOOLKIT_DLLPUBLIC ListBox : public
DECL_GET_IMPL( ListBox );
DECL_CONSTRUCTORS( ListBox, Control, WB_BORDER );
public:
@@ -962,7 +945,7 @@
};
class DialogImpl;
-@@ -356,11 +424,24 @@ class TOOLKIT_DLLPUBLIC Dialog : public
+@@ -356,11 +420,24 @@ class TOOLKIT_DLLPUBLIC Dialog : public
void SetParent( Window *pParent );
void SetParent( ::Window *pParent );
public:
@@ -990,7 +973,7 @@
};
// -----------------------------------------------------------------
-@@ -371,9 +452,9 @@ class TOOLKIT_DLLPUBLIC Container
+@@ -371,9 +448,9 @@ class TOOLKIT_DLLPUBLIC Container
{
protected:
css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
@@ -1002,7 +985,7 @@
void Add( Window *pWindow );
void Add( Container *pContainer );
-@@ -385,6 +466,8 @@ public:
+@@ -385,6 +462,8 @@ public:
// besides we would need to keep track of children, uh
void ShowAll( bool bVisible );
@@ -1011,7 +994,7 @@
css::uno::Reference< css::awt::XLayoutContainer > getImpl()
{ return mxContainer; }
-@@ -395,8 +478,7 @@ class TOOLKIT_DLLPUBLIC Table : public C
+@@ -395,8 +474,7 @@ class TOOLKIT_DLLPUBLIC Table : public C
protected:
Table( sal_Int32 nBorder, sal_Int32 nColumns );
public:
@@ -1021,7 +1004,7 @@
void Add( Window *pWindow, bool bXExpand, bool bYExpand,
sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
void Add( Container *pContainer, bool bXExpand, bool bYExpand,
-@@ -410,10 +492,9 @@ private:
+@@ -410,10 +488,9 @@ private:
class TOOLKIT_DLLPUBLIC Box : public Container
{
protected:
@@ -1034,7 +1017,7 @@
void Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding);
void Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding);
-@@ -425,18 +506,16 @@ private:
+@@ -425,18 +502,16 @@ private:
class TOOLKIT_DLLPUBLIC HBox : public Box
{
public:
@@ -1061,50 +1044,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/inc/layout/layoutcore.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/inc/layout/layoutcore.hxx 6 Mar 2008 11:37:48 -0000 1.2
-+++ toolkit/inc/layout/layoutcore.hxx 26 Mar 2008 13:11:40 -0000 1.2.6.2
-@@ -1,3 +1,38 @@
++++ toolkit/inc/layout/layoutcore.hxx 30 Jul 2008 11:12:27 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef _LAYOUT_CORE_HXX_
#define _LAYOUT_CORE_HXX_
-@@ -33,15 +68,15 @@ css::uno::Reference< css::graphic::XGrap
+@@ -33,15 +64,15 @@ css::uno::Reference< css::graphic::XGrap
namespace prophlp
{
// can we set properties on this handle ?
@@ -1124,20 +1103,17 @@
const rtl::OUString &rName );
} // namespace prophlp
} // namespace layoutimpl
-cvs diff: Diffing toolkit/inc/pch
-cvs diff: Diffing toolkit/inc/toolkit
-cvs diff: Diffing toolkit/inc/toolkit/awt
Index: toolkit/inc/toolkit/awt/vclxtopwindow.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/inc/toolkit/awt/vclxtopwindow.hxx,v
-retrieving revision 1.5
-retrieving revision 1.5.30.4
-diff -p -u -u -p -b -w -B -r1.5 -r1.5.30.4
---- toolkit/inc/toolkit/awt/vclxtopwindow.hxx 14 Jan 2008 12:55:06 -0000 1.5
-+++ toolkit/inc/toolkit/awt/vclxtopwindow.hxx 28 Mar 2008 13:04:27 -0000 1.5.30.4
-@@ -54,26 +54,56 @@
+retrieving revision 1.6
+retrieving revision 1.5.30.5
+diff -p -u -u -p -b -w -B -r1.6 -r1.5.30.5
+--- toolkit/inc/toolkit/awt/vclxtopwindow.hxx 11 Apr 2008 08:49:02 -0000 1.6
++++ toolkit/inc/toolkit/awt/vclxtopwindow.hxx 30 Jul 2008 12:36:45 -0000 1.5.30.5
+@@ -37,26 +37,56 @@
+ #include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
- #endif
+#include <cppuhelper/implbase2.hxx>
+
@@ -1198,7 +1174,7 @@
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
-@@ -83,13 +113,6 @@ public:
+@@ -66,13 +96,6 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
@@ -1215,12 +1191,12 @@
Index: toolkit/inc/toolkit/awt/vclxwindows.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/inc/toolkit/awt/vclxwindows.hxx,v
-retrieving revision 1.39
-retrieving revision 1.39.26.2
-diff -p -u -u -p -b -w -B -r1.39 -r1.39.26.2
---- toolkit/inc/toolkit/awt/vclxwindows.hxx 29 Jan 2008 15:03:47 -0000 1.39
-+++ toolkit/inc/toolkit/awt/vclxwindows.hxx 28 Mar 2008 14:54:34 -0000 1.39.26.2
-@@ -491,6 +491,9 @@ public:
+retrieving revision 1.40
+retrieving revision 1.39.26.3
+diff -p -u -u -p -b -w -B -r1.40 -r1.39.26.3
+--- toolkit/inc/toolkit/awt/vclxwindows.hxx 11 Apr 2008 08:50:53 -0000 1.40
++++ toolkit/inc/toolkit/awt/vclxwindows.hxx 30 Jul 2008 12:36:39 -0000 1.39.26.3
+@@ -375,6 +375,9 @@ public:
::rtl::OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException);
sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException);
@@ -1230,7 +1206,7 @@
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
};
-@@ -710,6 +713,10 @@ public:
+@@ -594,6 +597,10 @@ public:
void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
@@ -1241,9 +1217,6 @@
static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
};
-cvs diff: Diffing toolkit/inc/toolkit/controls
-cvs diff: Diffing toolkit/inc/toolkit/helper
-cvs diff: Diffing toolkit/prj
Index: toolkit/prj/build.lst
===================================================================
RCS file: /cvs/gsl/toolkit/prj/build.lst,v
@@ -1280,55 +1253,43 @@
-..\%__SRC%\lib\nl\*.xml %_DEST%\lib%_EXT%\nl\*.xml
..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
-cvs diff: Diffing toolkit/qa
-cvs diff: Diffing toolkit/qa/complex
-cvs diff: Diffing toolkit/qa/complex/toolkit
-cvs diff: Diffing toolkit/qa/complex/toolkit/interface_tests
-cvs diff: Diffing toolkit/qa/unoapi
-cvs diff: Diffing toolkit/qa/unoapi/testdocuments
-cvs diff: Diffing toolkit/source
-cvs diff: Diffing toolkit/source/awt
Index: toolkit/source/awt/forward.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/forward.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
---- toolkit/source/awt/forward.hxx 6 Mar 2008 11:38:52 -0000 1.2
-+++ toolkit/source/awt/forward.hxx 20 Mar 2008 11:56:25 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.2
+--- toolkit/source/awt/forward.hxx 11 Apr 2008 09:13:52 -0000 1.3
++++ toolkit/source/awt/forward.hxx 30 Jul 2008 11:12:32 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -1338,12 +1299,12 @@
Index: toolkit/source/awt/makefile.mk
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/makefile.mk,v
-retrieving revision 1.33
-retrieving revision 1.33.6.2
-diff -p -u -u -p -b -w -B -r1.33 -r1.33.6.2
---- toolkit/source/awt/makefile.mk 6 Mar 2008 11:39:07 -0000 1.33
-+++ toolkit/source/awt/makefile.mk 28 Mar 2008 09:40:05 -0000 1.33.6.2
-@@ -47,6 +47,9 @@ ENABLE_EXCEPTIONS=TRUE
+retrieving revision 1.34
+retrieving revision 1.33.6.3
+diff -p -u -u -p -b -w -B -r1.34 -r1.33.6.3
+--- toolkit/source/awt/makefile.mk 11 Apr 2008 09:14:30 -0000 1.34
++++ toolkit/source/awt/makefile.mk 30 Jul 2008 12:29:06 -0000 1.33.6.3
+@@ -43,6 +43,9 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
@@ -1353,7 +1314,7 @@
.IF "$(GUIBASE)"=="aqua"
OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
CFLAGSCXX+=$(OBJCXXFLAGS)
-@@ -72,25 +75,17 @@ SLOFILES= \
+@@ -68,25 +71,17 @@ SLOFILES= \
$(SLO)$/vclxspinbutton.obj \
$(SLO)$/xsimpleanimation.obj \
$(SLO)$/xthrobber.obj \
@@ -1387,43 +1348,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxbutton.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/awt/vclxbutton.cxx 6 Mar 2008 11:39:31 -0000 1.2
-+++ toolkit/source/awt/vclxbutton.cxx 28 Mar 2008 09:40:05 -0000 1.2.6.2
-@@ -1,15 +1,56 @@
++++ toolkit/source/awt/vclxbutton.cxx 30 Jul 2008 11:12:38 -0000 1.2.6.3
+@@ -1,15 +1,52 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -1452,7 +1409,7 @@
setLabel( aDefaultLabel );
setProperty( rtl::OUString::createFromAscii( "Graphic" ),
css::uno::Any( layoutimpl::loadGraphic( pGraphName ) ) );
-@@ -21,110 +62,73 @@ IconButton::IconButton( css::uno::Refere
+@@ -21,110 +58,73 @@ IconButton::IconButton( css::uno::Refere
// FIXME: l10n/i18n of Reset & Apply
@@ -1598,43 +1555,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxbutton.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/awt/vclxbutton.hxx 6 Mar 2008 11:39:43 -0000 1.2
-+++ toolkit/source/awt/vclxbutton.hxx 26 Mar 2008 13:32:17 -0000 1.2.6.2
-@@ -1,69 +1,122 @@
++++ toolkit/source/awt/vclxbutton.hxx 30 Jul 2008 11:12:44 -0000 1.2.6.3
+@@ -1,69 +1,118 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -1751,48 +1704,44 @@
Index: toolkit/source/awt/vclxdialog.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxdialog.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.5
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
---- toolkit/source/awt/vclxdialog.cxx 6 Mar 2008 11:39:55 -0000 1.2
-+++ toolkit/source/awt/vclxdialog.cxx 28 Mar 2008 13:45:13 -0000 1.2.6.5
-@@ -1,54 +1,81 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.6
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.6
+--- toolkit/source/awt/vclxdialog.cxx 11 Apr 2008 09:16:59 -0000 1.3
++++ toolkit/source/awt/vclxdialog.cxx 30 Jul 2008 11:12:50 -0000 1.2.6.6
+@@ -1,54 +1,77 @@
-#include "vclxdialog.hxx"
-#include "toolkit/helper/property.hxx"
-#include <com/sun/star/awt/ScrollBarOrientation.hpp>
-
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
@@ -1825,14 +1774,14 @@
+#include <windows.h>
+#include <tools/postwin.h>
+#endif
-+
+
+-#include <com/sun/star/awt/PosSize.hpp>
+#ifdef QUARTZ
+#include "premac.h"
+#include <Cocoa/Cocoa.h>
+#include "postmac.h"
+#endif
-
--#include <com/sun/star/awt/PosSize.hpp>
++
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
@@ -1870,7 +1819,7 @@
{
DBG_CTOR( VCLXDialog, NULL );
-@@ -66,25 +83,36 @@ VCLXDialog::VCLXDialog()
+@@ -56,25 +79,36 @@ VCLXDialog::VCLXDialog()
assert(mxLayoutUnit.is());*/
}
@@ -1886,25 +1835,25 @@
+{
+ return VCLXWindow::GetMutex();
+}
-
--//--------------------------------------------------------------------
--IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base )
++
+Window* VCLXDialog::GetWindowImpl()
+{
+ return VCLXWindow::GetWindow();
+}
-
--//--------------------------------------------------------------------
--void SAL_CALL VCLXDialog::dispose( ) throw(RuntimeException)
++
+TopWindowListenerMultiplexer& VCLXDialog::GetTopWindowListenersImpl()
+{
+ return VCLXWindow::GetTopWindowListeners();
+}
+
+IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXDialog, VCLXWindow, Bin, VCLXDialog_Base );
-+
+
+-//--------------------------------------------------------------------
+-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base );
-+
+
+-//--------------------------------------------------------------------
+-void SAL_CALL VCLXDialog::dispose( ) throw(RuntimeException)
+void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException)
{
{
@@ -1915,7 +1864,7 @@
aDisposeEvent.Source = *this;
// maTabListeners.disposeAndClear( aDisposeEvent );
}
-@@ -100,32 +128,31 @@ void VCLXDialog::resizedCb()
+@@ -90,32 +124,31 @@ void VCLXDialog::resizedCb()
void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea )
throw (css::uno::RuntimeException)
{
@@ -1954,7 +1903,7 @@
void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
::vos::OClearableGuard aGuard( GetMutex() );
-@@ -141,143 +168,42 @@ void VCLXDialog::ProcessWindowEvent( con
+@@ -131,143 +164,42 @@ void VCLXDialog::ProcessWindowEvent( con
}
}
@@ -2109,7 +2058,7 @@
}
void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException)
-@@ -350,6 +276,4 @@ void VCLXDialog::endExecute() throw(::co
+@@ -340,6 +272,4 @@ void VCLXDialog::endExecute() throw(::co
endDialog( 0 );
}
@@ -2120,44 +2069,40 @@
Index: toolkit/source/awt/vclxdialog.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxdialog.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
---- toolkit/source/awt/vclxdialog.hxx 6 Mar 2008 11:40:06 -0000 1.2
-+++ toolkit/source/awt/vclxdialog.hxx 28 Mar 2008 13:19:45 -0000 1.2.6.3
-@@ -1,51 +1,70 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.4
+--- toolkit/source/awt/vclxdialog.hxx 11 Apr 2008 09:17:22 -0000 1.3
++++ toolkit/source/awt/vclxdialog.hxx 30 Jul 2008 11:12:56 -0000 1.2.6.4
+@@ -1,51 +1,66 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -2227,7 +2172,7 @@
~VCLXDialog( );
// XInterface
-@@ -72,16 +83,6 @@ protected:
+@@ -64,16 +79,6 @@ protected:
// VCLXWindow
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
@@ -2244,7 +2189,7 @@
// ::com::sun::star::awt::XDialog
void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException);
::rtl::OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException);
-@@ -99,16 +100,15 @@ protected:
+@@ -91,16 +96,15 @@ protected:
}
virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
@@ -2270,56 +2215,53 @@
Index: toolkit/source/awt/vclxfixedline.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxfixedline.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
---- toolkit/source/awt/vclxfixedline.cxx 6 Mar 2008 11:40:27 -0000 1.2
-+++ toolkit/source/awt/vclxfixedline.cxx 28 Mar 2008 13:45:13 -0000 1.2.6.4
-@@ -1,16 +1,48 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.5
+--- toolkit/source/awt/vclxfixedline.cxx 11 Apr 2008 09:17:36 -0000 1.3
++++ toolkit/source/awt/vclxfixedline.cxx 30 Jul 2008 11:13:02 -0000 1.2.6.5
+@@ -1,16 +1,46 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "vclxfixedline.hxx"
-#include "toolkit/helper/property.hxx"
++
+#include <com/sun/star/awt/PosSize.hpp>
+#include <toolkit/helper/property.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <vcl/fixed.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
--
+
-#include <com/sun/star/awt/PosSize.hpp>
+#include "forward.hxx"
@@ -2331,7 +2273,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
-@@ -26,30 +52,21 @@ using namespace ::com::sun::star::lang;
+@@ -18,30 +48,21 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
@@ -2364,7 +2306,7 @@
void SAL_CALL VCLXFixedLine::dispose( ) throw(RuntimeException)
{
{
-@@ -62,44 +79,45 @@ void SAL_CALL VCLXFixedLine::dispose( )
+@@ -54,44 +75,45 @@ void SAL_CALL VCLXFixedLine::dispose( )
VCLXWindow::dispose();
}
@@ -2416,7 +2358,7 @@
Any SAL_CALL VCLXFixedLine::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
::vos::OGuard aGuard( GetMutex() );
-@@ -107,16 +125,16 @@ Any SAL_CALL VCLXFixedLine::getProperty(
+@@ -99,16 +121,16 @@ Any SAL_CALL VCLXFixedLine::getProperty(
Any aReturn;
if ( GetWindow() )
{
@@ -2440,44 +2382,40 @@
Index: toolkit/source/awt/vclxfixedline.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxfixedline.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
---- toolkit/source/awt/vclxfixedline.hxx 6 Mar 2008 11:40:39 -0000 1.2
-+++ toolkit/source/awt/vclxfixedline.hxx 28 Mar 2008 13:14:17 -0000 1.2.6.2
-@@ -1,28 +1,50 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.3
+--- toolkit/source/awt/vclxfixedline.hxx 11 Apr 2008 09:17:50 -0000 1.3
++++ toolkit/source/awt/vclxfixedline.hxx 30 Jul 2008 11:13:07 -0000 1.2.6.3
+@@ -1,28 +1,46 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -2510,7 +2448,7 @@
class VCLXFixedLine :public VCLXWindow
{
-@@ -64,8 +78,6 @@ private:
+@@ -56,8 +74,6 @@ private:
VCLXFixedLine& operator=( const VCLXFixedLine& ); // never implemented
};
@@ -3189,53 +3127,49 @@
Index: toolkit/source/awt/vclxscroller.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxscroller.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
---- toolkit/source/awt/vclxscroller.cxx 6 Mar 2008 11:41:15 -0000 1.2
-+++ toolkit/source/awt/vclxscroller.cxx 28 Mar 2008 13:45:13 -0000 1.2.6.4
-@@ -1,22 +1,51 @@
--#include "vclxscroller.hxx"
--#include "toolkit/helper/property.hxx"
--#include <com/sun/star/awt/ScrollBarOrientation.hpp>
--#include <tools/debug.hxx>
--#include <vcl/scrbar.hxx>
+retrieving revision 1.3
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.5
+--- toolkit/source/awt/vclxscroller.cxx 11 Apr 2008 09:19:31 -0000 1.3
++++ toolkit/source/awt/vclxscroller.cxx 30 Jul 2008 11:13:13 -0000 1.2.6.5
+@@ -1,22 +1,48 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
++
+ #include "vclxscroller.hxx"
+-#include "toolkit/helper/property.hxx"
+-#include <com/sun/star/awt/ScrollBarOrientation.hpp>
+-#include <tools/debug.hxx>
+-#include <vcl/scrbar.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-+#include "vclxscroller.hxx"
+#include <assert.h>
#include <com/sun/star/awt/PosSize.hpp>
@@ -3258,7 +3192,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
-@@ -34,11 +54,8 @@ using namespace ::com::sun::star::lang;
+@@ -24,11 +50,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
@@ -3271,7 +3205,7 @@
VCLXScroller::VCLXScroller( )
: VCLXWindow()
, Bin()
-@@ -47,19 +64,15 @@ VCLXScroller::VCLXScroller( )
+@@ -37,19 +60,15 @@ VCLXScroller::VCLXScroller( )
mpHorScrollBar = mpVerScrollBar = 0;
}
@@ -3293,7 +3227,7 @@
void SAL_CALL VCLXScroller::dispose( ) throw(RuntimeException)
{
{
-@@ -73,7 +86,6 @@ void SAL_CALL VCLXScroller::dispose( ) t
+@@ -63,7 +82,6 @@ void SAL_CALL VCLXScroller::dispose( ) t
VCLXWindow::dispose();
}
@@ -3301,7 +3235,7 @@
void VCLXScroller::ensureScrollBars()
{
-@@ -96,7 +108,6 @@ void VCLXScroller::ensureScrollBars()
+@@ -86,7 +104,6 @@ void VCLXScroller::ensureScrollBars()
}
@@ -3309,7 +3243,7 @@
void SAL_CALL VCLXScroller::allocateArea(
const ::com::sun::star::awt::Rectangle &rArea )
throw (::com::sun::star::uno::RuntimeException)
-@@ -128,7 +139,6 @@ void SAL_CALL VCLXScroller::allocateArea
+@@ -118,7 +135,6 @@ void SAL_CALL VCLXScroller::allocateArea
allocateChildAt( mxChild, childRect );
}
@@ -3317,7 +3251,7 @@
#define MAX_CHILD_REQ 40
::com::sun::star::awt::Size SAL_CALL VCLXScroller::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
-@@ -144,37 +154,42 @@ void SAL_CALL VCLXScroller::allocateArea
+@@ -134,37 +150,42 @@ void SAL_CALL VCLXScroller::allocateArea
return maRequisition;
}
@@ -3363,7 +3297,7 @@
Any SAL_CALL VCLXScroller::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
::vos::OGuard aGuard( GetMutex() );
-@@ -182,12 +197,15 @@ Any SAL_CALL VCLXScroller::getProperty(
+@@ -172,12 +193,15 @@ Any SAL_CALL VCLXScroller::getProperty(
Any aReturn;
if ( GetWindow() )
{
@@ -3380,7 +3314,7 @@
}
return aReturn;
}
-@@ -199,6 +217,4 @@ IMPL_LINK( VCLXScroller, ScrollHdl, Scro
+@@ -189,6 +213,4 @@ IMPL_LINK( VCLXScroller, ScrollHdl, Scro
return 0;
}
@@ -3391,44 +3325,40 @@
Index: toolkit/source/awt/vclxscroller.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxscroller.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
---- toolkit/source/awt/vclxscroller.hxx 6 Mar 2008 11:41:26 -0000 1.2
-+++ toolkit/source/awt/vclxscroller.hxx 28 Mar 2008 13:14:18 -0000 1.2.6.2
-@@ -1,29 +1,50 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.3
+--- toolkit/source/awt/vclxscroller.hxx 11 Apr 2008 09:19:47 -0000 1.3
++++ toolkit/source/awt/vclxscroller.hxx 30 Jul 2008 11:13:18 -0000 1.2.6.3
+@@ -1,29 +1,46 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -3463,7 +3393,7 @@
class VCLXScroller :public VCLXWindow
,public Bin
-@@ -77,8 +90,6 @@ private:
+@@ -69,8 +86,6 @@ private:
DECL_LINK( ScrollHdl, ScrollBar* );
};
@@ -3476,12 +3406,12 @@
Index: toolkit/source/awt/vclxsplitter.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxsplitter.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
---- toolkit/source/awt/vclxsplitter.cxx 6 Mar 2008 11:41:41 -0000 1.2
-+++ toolkit/source/awt/vclxsplitter.cxx 27 Mar 2008 13:08:18 -0000 1.2.6.3
-@@ -1,19 +1,51 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.4
+--- toolkit/source/awt/vclxsplitter.cxx 11 Apr 2008 09:20:21 -0000 1.3
++++ toolkit/source/awt/vclxsplitter.cxx 30 Jul 2008 11:13:24 -0000 1.2.6.4
+@@ -1,19 +1,47 @@
-#include "vclxsplitter.hxx"
-#include "toolkit/helper/property.hxx"
-#include <tools/debug.hxx>
@@ -3489,36 +3419,32 @@
-#include <toolkit/helper/vclunohelper.hxx>
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
@@ -3542,7 +3468,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
-@@ -29,26 +53,37 @@ using namespace ::com::sun::star::lang;
+@@ -21,26 +49,37 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
@@ -3568,12 +3494,6 @@
+VCLXSplitter::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
+{
+ return new ChildData( xChild );
-+}
-+
-+VCLXSplitter::ChildProps*
-+VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
-+{
-+ return new ChildProps( static_cast<VCLXSplitter::ChildData*> ( pData ) );
}
- PROPHELPER_SET_INFO
-};
@@ -3583,6 +3503,12 @@
-//====================================================================
-DBG_NAME( VCLXSplitter )
-//--------------------------------------------------------------------
++VCLXSplitter::ChildProps*
++VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
++{
++ return new ChildProps( static_cast<VCLXSplitter::ChildData*> ( pData ) );
++}
++
+
+DBG_NAME( VCLXSplitter );
+
@@ -3593,7 +3519,7 @@
{
DBG_CTOR( VCLXSplitter, NULL );
mnHandleRatio = 0.5;
-@@ -57,19 +92,25 @@ VCLXSplitter::VCLXSplitter( bool bHorizo
+@@ -49,19 +88,25 @@ VCLXSplitter::VCLXSplitter( bool bHorizo
mpSplitter = NULL;
}
@@ -3625,7 +3551,7 @@
void SAL_CALL VCLXSplitter::dispose( ) throw(RuntimeException)
{
{
-@@ -83,7 +124,6 @@ void SAL_CALL VCLXSplitter::dispose( ) t
+@@ -75,7 +120,6 @@ void SAL_CALL VCLXSplitter::dispose( ) t
VCLXWindow::dispose();
}
@@ -3633,7 +3559,7 @@
void VCLXSplitter::ensureSplitter()
{
if ( !mpSplitter )
-@@ -94,86 +134,15 @@ void VCLXSplitter::ensureSplitter()
+@@ -86,86 +130,15 @@ void VCLXSplitter::ensureSplitter()
}
}
@@ -3657,9 +3583,8 @@
- setChildParent( xChild );
- queueResize();
- }
-+ Box_Base::addChild( xChild );
- }
-
+-}
+-
-//--------------------------------------------------------------------
-void SAL_CALL VCLXSplitter::removeChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > &xChild )
- throw (::com::sun::star::uno::RuntimeException)
@@ -3692,8 +3617,9 @@
- if ( maChildren[ 1 ].xChild.is() )
- childrenSeq[ i++ ] = maChildren[ 1 ].xChild;
- return childrenSeq;
--}
--
++ Box_Base::addChild( xChild );
+ }
+
-//--------------------------------------------------------------------
-uno::Reference< beans::XPropertySet > SAL_CALL
-VCLXSplitter::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& xChild )
@@ -3722,7 +3648,7 @@
void SAL_CALL VCLXSplitter::allocateArea(
const ::com::sun::star::awt::Rectangle &rArea )
throw (::com::sun::star::uno::RuntimeException)
-@@ -203,7 +172,7 @@ void SAL_CALL VCLXSplitter::allocateArea
+@@ -195,7 +168,7 @@ void SAL_CALL VCLXSplitter::allocateArea
int leftWidth = splitPos;
int rightWidth = width - splitPos;
@@ -3731,7 +3657,7 @@
{
awt::Rectangle childRect( 0, 0, rArea.Width, rArea.Height );
-@@ -211,9 +180,9 @@ void SAL_CALL VCLXSplitter::allocateArea
+@@ -203,9 +176,9 @@ void SAL_CALL VCLXSplitter::allocateArea
childRect.Width = leftWidth - 2;
else
childRect.Height = leftWidth - 2;
@@ -3743,7 +3669,7 @@
{
awt::Rectangle childRect( 0, 0, rArea.Width, rArea.Height );
-@@ -227,11 +196,10 @@ void SAL_CALL VCLXSplitter::allocateArea
+@@ -219,11 +192,10 @@ void SAL_CALL VCLXSplitter::allocateArea
childRect.Y += leftWidth + splitLen + 2;
childRect.Height = rightWidth;
}
@@ -3756,7 +3682,7 @@
::com::sun::star::awt::Size SAL_CALL VCLXSplitter::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
{
-@@ -240,9 +208,9 @@ void SAL_CALL VCLXSplitter::allocateArea
+@@ -232,9 +204,9 @@ void SAL_CALL VCLXSplitter::allocateArea
awt::Size size( mbHorizontal ? 2 : 0, mbHorizontal ? 0 : 2 );
for( unsigned int i = 0; i < 2; i++ )
{
@@ -3768,7 +3694,7 @@
if ( mbHorizontal )
{
size.Width += childSize.Width;
-@@ -260,51 +228,19 @@ void SAL_CALL VCLXSplitter::allocateArea
+@@ -252,51 +224,19 @@ void SAL_CALL VCLXSplitter::allocateArea
return size;
}
@@ -3821,7 +3747,7 @@
}
IMPL_LINK( VCLXSplitter, HandleMovedHdl, Splitter *, pSplitter )
-@@ -314,6 +250,4 @@ IMPL_LINK( VCLXSplitter, HandleMovedHdl,
+@@ -306,6 +246,4 @@ IMPL_LINK( VCLXSplitter, HandleMovedHdl,
return 0;
}
@@ -3832,44 +3758,40 @@
Index: toolkit/source/awt/vclxsplitter.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxsplitter.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
---- toolkit/source/awt/vclxsplitter.hxx 6 Mar 2008 11:41:52 -0000 1.2
-+++ toolkit/source/awt/vclxsplitter.hxx 28 Mar 2008 13:45:13 -0000 1.2.6.4
-@@ -1,32 +1,59 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.5
+--- toolkit/source/awt/vclxsplitter.hxx 11 Apr 2008 09:20:37 -0000 1.3
++++ toolkit/source/awt/vclxsplitter.hxx 30 Jul 2008 11:13:29 -0000 1.2.6.5
+@@ -1,32 +1,55 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -3913,7 +3835,7 @@
public:
VCLXSplitter( bool bHorizontal );
-@@ -54,12 +73,6 @@ protected:
+@@ -46,12 +69,6 @@ protected:
virtual void SAL_CALL addChild(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains >& Child )
throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::awt::MaxChildrenException);
@@ -3926,7 +3848,7 @@
virtual void SAL_CALL allocateArea( const ::com::sun::star::awt::Rectangle &rArea )
throw (::com::sun::star::uno::RuntimeException);
-@@ -67,10 +80,6 @@ protected:
+@@ -59,10 +76,6 @@ protected:
virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize()
throw(::com::sun::star::uno::RuntimeException);
@@ -3937,7 +3859,7 @@
// unimplemented:
virtual sal_Bool SAL_CALL hasHeightForWidth()
throw(css::uno::RuntimeException)
-@@ -86,21 +95,25 @@ protected:
+@@ -78,21 +91,25 @@ protected:
// VCLXWindow
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
@@ -3974,7 +3896,7 @@
float mnHandleRatio;
bool mbHandlePressed;
-@@ -111,8 +124,6 @@ private:
+@@ -103,8 +120,6 @@ private:
void ensureSplitter();
};
@@ -3987,48 +3909,44 @@
Index: toolkit/source/awt/vclxtabcontrol.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxtabcontrol.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
---- toolkit/source/awt/vclxtabcontrol.cxx 6 Mar 2008 11:42:06 -0000 1.2
-+++ toolkit/source/awt/vclxtabcontrol.cxx 27 Mar 2008 13:08:18 -0000 1.2.6.3
-@@ -1,21 +1,51 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.4
+--- toolkit/source/awt/vclxtabcontrol.cxx 11 Apr 2008 09:21:14 -0000 1.3
++++ toolkit/source/awt/vclxtabcontrol.cxx 30 Jul 2008 11:13:35 -0000 1.2.6.4
+@@ -1,21 +1,47 @@
-#include "vclxtabcontrol.hxx"
-#include "toolkit/helper/property.hxx"
-#include <com/sun/star/awt/ScrollBarOrientation.hpp>
-
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
@@ -4055,7 +3973,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
-@@ -35,46 +53,51 @@ using namespace ::com::sun::star::lang;
+@@ -23,46 +49,51 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
@@ -4069,15 +3987,8 @@
::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
- &(pData->aTitle) );
+ &(pData->maTitle) );
- }
-- PROPHELPER_SET_INFO
--};
-
--//====================================================================
--//= VCLXTabControl
--//====================================================================
--DBG_NAME( VCLXTabControl )
--//--------------------------------------------------------------------
++}
++
+VCLXTabControl::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
+ : Box_Base::ChildData( xChild )
+ , maTitle()
@@ -4088,8 +3999,15 @@
+VCLXTabControl::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
+{
+ return new ChildData( xChild );
-+}
-+
+ }
+- PROPHELPER_SET_INFO
+-};
+
+-//====================================================================
+-//= VCLXTabControl
+-//====================================================================
+-DBG_NAME( VCLXTabControl )
+-//--------------------------------------------------------------------
+VCLXTabControl::ChildProps*
+VCLXTabControl::createChildProps( Box_Base::ChildData *pData )
+{
@@ -4128,7 +4046,7 @@
void SAL_CALL VCLXTabControl::dispose( ) throw(RuntimeException)
{
{
-@@ -87,23 +110,21 @@ void SAL_CALL VCLXTabControl::dispose( )
+@@ -75,23 +106,21 @@ void SAL_CALL VCLXTabControl::dispose( )
VCLXWindow::dispose();
}
@@ -4155,7 +4073,7 @@
TabControl *VCLXTabControl::getTabControl() const throw (RuntimeException)
{
TabControl *pTabControl = static_cast< TabControl* >( GetWindow() );
-@@ -112,48 +133,42 @@ TabControl *VCLXTabControl::getTabContro
+@@ -100,48 +129,42 @@ TabControl *VCLXTabControl::getTabContro
throw RuntimeException();
}
@@ -4212,7 +4130,7 @@
{
if ( *it == xListener )
// already added
-@@ -162,12 +177,11 @@ void SAL_CALL VCLXTabControl::addTabList
+@@ -150,12 +173,11 @@ void SAL_CALL VCLXTabControl::addTabList
mxTabListeners.push_back( xListener );
}
@@ -4228,7 +4146,7 @@
{
if ( *it == xListener )
{
-@@ -177,11 +191,10 @@ void SAL_CALL VCLXTabControl::removeTabL
+@@ -165,11 +187,10 @@ void SAL_CALL VCLXTabControl::removeTabL
}
}
@@ -4241,7 +4159,7 @@
throw IndexOutOfBoundsException();
for( int i = 0; i < Properties.getLength(); i++ )
-@@ -192,17 +205,16 @@ void SAL_CALL VCLXTabControl::setTabProp
+@@ -180,17 +201,16 @@ void SAL_CALL VCLXTabControl::setTabProp
if ( name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) )
{
rtl::OUString title = value.get<rtl::OUString>();
@@ -4261,7 +4179,7 @@
throw IndexOutOfBoundsException();
#define ADD_PROP( seq, i, name, val ) { \
-@@ -213,21 +225,19 @@ Sequence< NamedValue > SAL_CALL VCLXTabC
+@@ -201,21 +221,19 @@ Sequence< NamedValue > SAL_CALL VCLXTabC
}
Sequence< NamedValue > props( 2 );
@@ -4286,7 +4204,7 @@
if ( pTabPage )
{
::Point aPos( nX, nY );
-@@ -243,93 +253,28 @@ void SAL_CALL VCLXTabControl::draw( sal_
+@@ -231,93 +249,28 @@ void SAL_CALL VCLXTabControl::draw( sal_
VCLXWindow::draw( nX, nY );
}
@@ -4385,7 +4303,7 @@
}
uno::Reference < awt::XLayoutContainer > xCont( xChild, uno::UNO_QUERY );
-@@ -343,7 +288,6 @@ static void setChildrenVisible( uno::Ref
+@@ -331,7 +284,6 @@ static void setChildrenVisible( uno::Ref
}
}
@@ -4393,7 +4311,7 @@
void SAL_CALL VCLXTabControl::allocateArea(
const ::com::sun::star::awt::Rectangle &rArea )
throw (::com::sun::star::uno::RuntimeException)
-@@ -362,12 +306,13 @@ void SAL_CALL VCLXTabControl::allocateAr
+@@ -350,12 +302,13 @@ void SAL_CALL VCLXTabControl::allocateAr
// FIXME: we can save cycles by setting visibility more sensibly. Having
// it here does makes it easier when changing tabs (just needs a recalc())
@@ -4411,7 +4329,7 @@
if ( xChild.is() )
{
uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY );
-@@ -384,8 +329,8 @@ void SAL_CALL VCLXTabControl::allocateAr
+@@ -372,8 +325,8 @@ void SAL_CALL VCLXTabControl::allocateAr
if ( active )
{
@@ -4422,7 +4340,7 @@
awt::Rectangle childRect;
childRect.X = page_rect.Left();
-@@ -399,7 +344,6 @@ void SAL_CALL VCLXTabControl::allocateAr
+@@ -387,7 +340,6 @@ void SAL_CALL VCLXTabControl::allocateAr
}
}
@@ -4430,7 +4348,7 @@
::com::sun::star::awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
{
-@@ -411,15 +355,17 @@ void SAL_CALL VCLXTabControl::allocateAr
+@@ -399,15 +351,17 @@ void SAL_CALL VCLXTabControl::allocateAr
return size;
// calculate size to accomodate all children
@@ -4453,7 +4371,7 @@
childrenSize.Width = SAL_MAX( childSize.Width, childrenSize.Width );
childrenSize.Height = SAL_MAX( childSize.Height, childrenSize.Height );
}
-@@ -431,7 +377,6 @@ void SAL_CALL VCLXTabControl::allocateAr
+@@ -419,7 +373,6 @@ void SAL_CALL VCLXTabControl::allocateAr
return size;
}
@@ -4461,7 +4379,7 @@
void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
::vos::OClearableGuard aGuard( GetMutex() );
-@@ -450,9 +395,9 @@ void VCLXTabControl::ProcessWindowEvent(
+@@ -438,9 +391,9 @@ void VCLXTabControl::ProcessWindowEvent(
case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
{
ULONG page = (ULONG) _rVclWindowEvent.GetData();
@@ -4474,7 +4392,7 @@
{
::com::sun::star::uno::Reference
< ::com::sun::star::awt::XTabListener > listener = *it;
-@@ -475,7 +420,7 @@ void VCLXTabControl::ProcessWindowEvent(
+@@ -463,7 +416,7 @@ void VCLXTabControl::ProcessWindowEvent(
case VCLEVENT_TABPAGE_REMOVEDALL:
for( int i = 1; i < mnNextTabId; i++)
{
@@ -4483,7 +4401,7 @@
listener->removed( i );
}
break;
-@@ -493,40 +438,14 @@ void VCLXTabControl::ProcessWindowEvent(
+@@ -481,40 +434,14 @@ void VCLXTabControl::ProcessWindowEvent(
}
}
@@ -4529,44 +4447,40 @@
Index: toolkit/source/awt/vclxtabcontrol.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxtabcontrol.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.5
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
---- toolkit/source/awt/vclxtabcontrol.hxx 6 Mar 2008 11:42:19 -0000 1.2
-+++ toolkit/source/awt/vclxtabcontrol.hxx 28 Mar 2008 13:45:13 -0000 1.2.6.5
-@@ -1,36 +1,58 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.6
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.6
+--- toolkit/source/awt/vclxtabcontrol.hxx 11 Apr 2008 09:21:32 -0000 1.3
++++ toolkit/source/awt/vclxtabcontrol.hxx 30 Jul 2008 11:13:41 -0000 1.2.6.6
+@@ -1,36 +1,54 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -4611,7 +4525,7 @@
{
public:
VCLXTabControl();
-@@ -57,7 +69,7 @@ protected:
+@@ -47,7 +65,7 @@ protected:
// XComponent
void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
@@ -4620,7 +4534,7 @@
// XSimpleTabController
virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException);
-@@ -79,20 +91,12 @@ protected:
+@@ -69,20 +87,12 @@ protected:
virtual void SAL_CALL removeChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains >& Child )
throw (::com::sun::star::uno::RuntimeException);
@@ -4641,7 +4555,7 @@
// unimplemented:
virtual sal_Bool SAL_CALL hasHeightForWidth()
throw(css::uno::RuntimeException)
-@@ -108,35 +112,40 @@ protected:
+@@ -98,35 +108,40 @@ protected:
// VCLXWindow
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
@@ -4700,12 +4614,12 @@
Index: toolkit/source/awt/vclxtopwindow.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxtopwindow.cxx,v
-retrieving revision 1.12
-retrieving revision 1.12.30.3
-diff -p -u -u -p -b -w -B -r1.12 -r1.12.30.3
---- toolkit/source/awt/vclxtopwindow.cxx 14 Jan 2008 12:57:00 -0000 1.12
-+++ toolkit/source/awt/vclxtopwindow.cxx 28 Mar 2008 13:04:07 -0000 1.12.30.3
-@@ -69,6 +69,106 @@
+retrieving revision 1.13
+retrieving revision 1.12.30.4
+diff -p -u -u -p -b -w -B -r1.13 -r1.12.30.4
+--- toolkit/source/awt/vclxtopwindow.cxx 11 Apr 2008 09:22:05 -0000 1.13
++++ toolkit/source/awt/vclxtopwindow.cxx 30 Jul 2008 12:29:07 -0000 1.12.30.4
+@@ -59,6 +59,106 @@
#include <tools/debug.hxx>
@@ -4812,7 +4726,7 @@
// ----------------------------------------------------
// class VCLXTopWindow
// ----------------------------------------------------
-@@ -87,6 +187,21 @@ VCLXTopWindow::~VCLXTopWindow()
+@@ -77,6 +177,21 @@ VCLXTopWindow::~VCLXTopWindow()
{
}
@@ -4834,7 +4748,7 @@
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXTopWindow::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
{
-@@ -177,104 +292,3 @@ VCLXTopWindow::~VCLXTopWindow()
+@@ -167,104 +282,3 @@ VCLXTopWindow::~VCLXTopWindow()
return (*pCollection).getTypes();
}
}
@@ -4942,20 +4856,30 @@
Index: toolkit/source/awt/vclxwindow.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxwindow.cxx,v
-retrieving revision 1.85
-retrieving revision 1.85.26.1
-diff -p -u -u -p -b -w -B -r1.85 -r1.85.26.1
---- toolkit/source/awt/vclxwindow.cxx 29 Jan 2008 15:05:41 -0000 1.85
-+++ toolkit/source/awt/vclxwindow.cxx 20 Mar 2008 11:56:26 -0000 1.85.26.1
-@@ -82,6 +82,7 @@
- #include <com/sun/star/awt/XWindowListener2.hpp>
+retrieving revision 1.89
+retrieving revision 1.85.26.2
+diff -p -u -u -p -b -w -B -r1.89 -r1.85.26.2
+--- toolkit/source/awt/vclxwindow.cxx 17 Jul 2008 11:08:13 -0000 1.89
++++ toolkit/source/awt/vclxwindow.cxx 30 Jul 2008 12:29:07 -0000 1.85.26.2
+@@ -45,6 +45,7 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <toolkit/awt/vclxwindow.hxx>
-+#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/awt/vclxpointer.hxx>
++#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/helper/macros.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-@@ -2330,14 +2333,6 @@ void VCLXWindow::setProperty( const ::rt
+ #include <toolkit/helper/convert.hxx>
+@@ -458,7 +459,8 @@ void VCLXWindowImpl::processEvent( const
+ break;
+ }
+ }
+- else {
++ else
++ {
+ DBG_ERROR( "VCLXWindowImpl::processEvent: what kind of event *is* this (3)?" );
+ }
+ }
+@@ -2258,14 +2260,6 @@ void VCLXWindow::setProperty( const ::rt
WindowType nWinType = GetWindow()->GetType();
switch ( nWinType )
{
@@ -4970,7 +4894,7 @@
case WINDOW_CONTROL:
aSz.Width() = GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*12;
aSz.Height() = GetWindow()->GetTextHeight()+2*6;
-@@ -2354,12 +2349,7 @@ void VCLXWindow::setProperty( const ::rt
+@@ -2282,12 +2276,7 @@ void VCLXWindow::setProperty( const ::rt
aSz.Height() = GetWindow()->GetTextHeight()+2*2;
break;
case WINDOW_SCROLLBARBOX:
@@ -4987,12 +4911,12 @@
Index: toolkit/source/awt/vclxwindows.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/awt/vclxwindows.cxx,v
-retrieving revision 1.67
-retrieving revision 1.67.26.1
-diff -p -u -u -p -b -w -B -r1.67 -r1.67.26.1
---- toolkit/source/awt/vclxwindows.cxx 29 Jan 2008 15:05:57 -0000 1.67
-+++ toolkit/source/awt/vclxwindows.cxx 20 Mar 2008 11:56:27 -0000 1.67.26.1
-@@ -2188,7 +2188,11 @@ sal_Int16 VCLXMessageBox::execute() thro
+retrieving revision 1.68
+retrieving revision 1.67.26.2
+diff -p -u -u -p -b -w -B -r1.68 -r1.67.26.2
+--- toolkit/source/awt/vclxwindows.cxx 11 Apr 2008 09:22:58 -0000 1.68
++++ toolkit/source/awt/vclxwindows.cxx 30 Jul 2008 12:29:07 -0000 1.67.26.2
+@@ -2127,7 +2127,11 @@ sal_Int16 VCLXMessageBox::execute() thro
return pBox ? pBox->Execute() : 0;
}
@@ -5005,7 +4929,7 @@
// ----------------------------------------------------
// class VCLXDialog
-@@ -3337,6 +3341,19 @@ void VCLXScrollBar::ProcessWindowEvent(
+@@ -3276,6 +3280,19 @@ void VCLXScrollBar::ProcessWindowEvent(
}
}
@@ -5025,18 +4949,15 @@
// ----------------------------------------------------
// class VCLXEdit
// ----------------------------------------------------
-cvs diff: Diffing toolkit/source/controls
-cvs diff: Diffing toolkit/source/controls/tree
-cvs diff: Diffing toolkit/source/helper
Index: toolkit/source/helper/registerservices.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/helper/registerservices.cxx,v
-retrieving revision 1.18
-retrieving revision 1.18.26.1
-diff -p -u -u -p -b -w -B -r1.18 -r1.18.26.1
---- toolkit/source/helper/registerservices.cxx 29 Jan 2008 15:07:36 -0000 1.18
-+++ toolkit/source/helper/registerservices.cxx 28 Mar 2008 09:40:51 -0000 1.18.26.1
-@@ -267,6 +267,8 @@ extern ::com::sun::star::uno::Reference<
+retrieving revision 1.19
+retrieving revision 1.18.26.2
+diff -p -u -u -p -b -w -B -r1.19 -r1.18.26.2
+--- toolkit/source/helper/registerservices.cxx 11 Apr 2008 09:37:15 -0000 1.19
++++ toolkit/source/helper/registerservices.cxx 30 Jul 2008 12:36:13 -0000 1.18.26.2
+@@ -205,6 +205,8 @@ extern ::com::sun::star::uno::Reference<
extern sal_Bool SAL_CALL comp_AsyncCallback_component_writeInfo( void * serviceManager, void * registryKey );
extern void * SAL_CALL comp_AsyncCallback_component_getFactory( const char * implName, void * serviceManager, void * registryKey );
@@ -5045,7 +4966,7 @@
extern "C"
{
-@@ -347,7 +349,9 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL comp
+@@ -285,7 +287,9 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL comp
registerServices( xRegistryKey, "UnoThrobberControl", szServiceName_UnoThrobberControl );
registerServices( xRegistryKey, "UnoFixedHyperlinkControl", szServiceName_UnoControlFixedHyperlink );
registerServices( xRegistryKey, "UnoControlFixedHyperlinkModel", szServiceName_UnoControlFixedHyperlinkModel );
@@ -5055,7 +4976,7 @@
return sal_True;
}
-@@ -430,6 +434,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL compone
+@@ -368,6 +372,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL compone
if ( rtl_str_compare( sImplementationName, "com.sun.star.awt.comp.AsyncCallback" ) == 0 )
return comp_AsyncCallback_component_getFactory( sImplementationName, _pServiceManager, _pRegistryKey );
@@ -5066,48 +4987,43 @@
}
return pRet;
}
-cvs diff: Diffing toolkit/source/layout
Index: toolkit/source/layout/bin.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/bin.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/bin.cxx 6 Mar 2008 11:42:48 -0000 1.2
-+++ toolkit/source/layout/bin.cxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/bin.cxx 30 Jul 2008 11:13:46 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -5118,43 +5034,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/bin.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/bin.hxx 6 Mar 2008 11:43:00 -0000 1.2
-+++ toolkit/source/layout/bin.hxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/bin.hxx 30 Jul 2008 11:13:51 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -5166,40 +5078,36 @@
RCS file: toolkit/source/layout/box-base.cxx
diff -N toolkit/source/layout/box-base.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/layout/box-base.cxx 21 Mar 2008 07:47:07 -0000 1.1.2.1
-@@ -0,0 +1,174 @@
++++ toolkit/source/layout/box-base.cxx 30 Jul 2008 11:13:57 -0000 1.1.2.2
+@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -5347,40 +5255,36 @@
RCS file: toolkit/source/layout/box-base.hxx
diff -N toolkit/source/layout/box-base.hxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/layout/box-base.hxx 28 Mar 2008 13:44:29 -0000 1.1.2.2
-@@ -0,0 +1,94 @@
++++ toolkit/source/layout/box-base.hxx 30 Jul 2008 11:14:02 -0000 1.1.2.3
+@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -5447,50 +5351,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/box.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/box.cxx 6 Mar 2008 11:43:11 -0000 1.2
-+++ toolkit/source/layout/box.cxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/box.cxx 30 Jul 2008 11:14:08 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "box.hxx"
#include <tools/debug.hxx>
-@@ -11,36 +46,41 @@ namespace layoutimpl
+@@ -11,36 +42,41 @@ namespace layoutimpl
using namespace css;
@@ -5547,7 +5447,7 @@
, mnSpacing( 0 )
, mbHomogeneous( false )
, mbHorizontal( horizontal )
-@@ -54,119 +94,28 @@ Box::Box( bool horizontal )
+@@ -54,119 +90,28 @@ Box::Box( bool horizontal )
mbHasFlowChildren = false;
}
@@ -5674,7 +5574,7 @@
if ( !mbHorizontal /*vertical*/ && bFlow )
{
-@@ -176,7 +125,7 @@ Box::calculateSize( long nWidth )
+@@ -176,7 +121,7 @@ Box::calculateSize( long nWidth )
}
else
{
@@ -5683,7 +5583,7 @@
if ( mbHomogeneous )
nPrimSize = SAL_MAX( nPrimSize, size );
else
-@@ -198,13 +147,14 @@ Box::calculateSize( long nWidth )
+@@ -198,13 +143,14 @@ Box::calculateSize( long nWidth )
{
if ( nWidth == 0 )
nWidth = nSecSize ? nSecSize : nFlowMinWidth;
@@ -5701,7 +5601,7 @@
bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
if ( bFlow )
-@@ -248,14 +198,14 @@ Box::allocateArea( const awt::Rectangle
+@@ -248,14 +194,14 @@ Box::allocateArea( const awt::Rectangle
maAllocation = newArea;
int nVisibleChildren = 0, nExpandChildren = 0;
@@ -5720,7 +5620,7 @@
nExpandChildren++;
}
}
-@@ -285,9 +235,10 @@ Box::allocateArea( const awt::Rectangle
+@@ -285,9 +231,10 @@ Box::allocateArea( const awt::Rectangle
int nStartPoint = primDim( newPoint ) + mnBorderWidth;
int nBoxSecSize = SAL_MAX( 1, secDim( newSize ) - mnBorderWidth * 2 );
@@ -5733,7 +5633,7 @@
if ( !child->isVisible() )
continue;
-@@ -298,26 +249,26 @@ Box::allocateArea( const awt::Rectangle
+@@ -298,26 +245,26 @@ Box::allocateArea( const awt::Rectangle
nBoxPrimSize = nExtraSpace;
else
{
@@ -5768,7 +5668,7 @@
nChildPrimPoint += (nBoxPrimSize - nChildPrimSize) / 2;
nChildSecPoint += (nBoxSecSize - nChildSecSize) / 2;
-@@ -329,9 +280,9 @@ Box::allocateArea( const awt::Rectangle
+@@ -329,9 +276,9 @@ Box::allocateArea( const awt::Rectangle
area.Width = mbHorizontal ? nChildPrimSize : nChildSecSize;
area.Height = mbHorizontal ? nChildSecSize : nChildPrimSize;
@@ -5784,43 +5684,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/box.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/box.hxx 6 Mar 2008 11:43:24 -0000 1.2
-+++ toolkit/source/layout/box.hxx 28 Mar 2008 13:44:29 -0000 1.2.6.2
-@@ -1,57 +1,78 @@
++++ toolkit/source/layout/box.hxx 30 Jul 2008 11:14:15 -0000 1.2.6.3
+@@ -1,57 +1,74 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -5902,12 +5798,12 @@
Index: toolkit/source/layout/byteseq.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/byteseq.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
---- toolkit/source/layout/byteseq.cxx 6 Mar 2008 11:43:43 -0000 1.2
-+++ toolkit/source/layout/byteseq.cxx 28 Mar 2008 09:46:07 -0000 1.2.6.4
-@@ -33,43 +33,50 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.6
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.6
+--- toolkit/source/layout/byteseq.cxx 11 Apr 2008 09:39:39 -0000 1.3
++++ toolkit/source/layout/byteseq.cxx 30 Jul 2008 12:36:16 -0000 1.2.6.6
+@@ -28,43 +28,52 @@
*
************************************************************************/
@@ -5942,7 +5838,9 @@
- FILE *f = ::fopen( fname, "rb" );
- if (f)
+ rtl::OUString sFileURL;
-+ FileBase::getFileURLFromSystemPath( rName, sFileURL );
++ if( FileBase::E_None != FileBase::getFileURLFromSystemPath( rName, sFileURL ) )
++ sFileURL = rName; // maybe it already was a file url
++
+ File * blobFile = new File(sFileURL);
+ File::RC errorCode = blobFile->open(OpenFlag_Read);
+
@@ -5989,100 +5887,98 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/container.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/container.cxx 6 Mar 2008 11:43:57 -0000 1.2
-+++ toolkit/source/layout/container.cxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/container.cxx 30 Jul 2008 11:14:20 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "container.hxx"
#include <com/sun/star/awt/XWindow.hpp>
-@@ -131,9 +166,6 @@ void Container::propertiesChanged()
- DBG_ERROR( "Properties listener: error container doesn't have parent" );
- }
+@@ -126,13 +157,8 @@ Container::getLabel() // debug label
+ void Container::propertiesChanged()
+ {
+- if ( !mxParent.is() )
+- {
+- DBG_ERROR( "Properties listener: error container doesn't have parent" );
+- }
+-
- // ask parent to be re-calculated
-// FIXME: thats wrongg actually. We just need to do a "queueResize();"
--
++ // cl: why this assertion? This is also called to set properties at the top level widget which has no parent!?
++ // DBG_ASSERT( mxParent.is(), "Properties listener: error container doesn't have parent" );
+
if ( mxLayoutUnit.is() && mxParent.is() )
mxLayoutUnit->queueResize( mxParent );
- }
Index: toolkit/source/layout/container.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/container.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/container.hxx 6 Mar 2008 11:44:10 -0000 1.2
-+++ toolkit/source/layout/container.hxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/container.hxx 30 Jul 2008 11:14:26 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -6093,44 +5989,40 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/dialogbuttonhbox.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/dialogbuttonhbox.cxx 6 Mar 2008 11:44:23 -0000 1.2
-+++ toolkit/source/layout/dialogbuttonhbox.cxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,11 +1,45 @@
++++ toolkit/source/layout/dialogbuttonhbox.cxx 30 Jul 2008 11:14:31 -0000 1.2.6.3
+@@ -1,11 +1,41 @@
-#include "dialogbuttonhbox.hxx"
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
@@ -6145,7 +6037,16 @@
#include "proplist.hxx"
#if TEST_LAYOUT && !defined( DBG_UTIL )
-@@ -129,23 +163,23 @@ DialogButtonHBox::removeChild( uno::Refe
+@@ -26,7 +56,7 @@ using namespace css;
+ //FIXME: how to set platform-dependant variables?
+ DialogButtonHBox::Ordering const DialogButtonHBox::DEFAULT_ORDERING =
+ #if defined( MACOSX )
+- DialogButtonHBox::MacOS;
++ DialogButtonHBox::MACOS;
+ #elif defined( SAL_W32 )
+ DialogButtonHBox::WINDOWS;
+ #elif defined( ENABLE_KDE )
+@@ -129,23 +159,23 @@ DialogButtonHBox::removeChild( uno::Refe
if ( !xChild.is ())
return;
@@ -6178,7 +6079,7 @@
p = mpHelp;
else
p = removeChildData( maOther, xChild );
-@@ -166,7 +200,7 @@ DialogButtonHBox::removeChild( uno::Refe
+@@ -166,7 +196,7 @@ DialogButtonHBox::removeChild( uno::Refe
void
DialogButtonHBox::gnomeOrdering()
{
@@ -6187,7 +6088,7 @@
if ( mpHelp )
ordered.push_back( mpHelp );
if ( mpReset )
-@@ -190,7 +224,7 @@ DialogButtonHBox::gnomeOrdering()
+@@ -190,7 +220,7 @@ DialogButtonHBox::gnomeOrdering()
void
DialogButtonHBox::kdeOrdering()
{
@@ -6196,7 +6097,7 @@
if ( mpHelp )
ordered.push_back( mpHelp );
if ( mpReset )
-@@ -214,7 +248,7 @@ DialogButtonHBox::kdeOrdering()
+@@ -214,7 +244,7 @@ DialogButtonHBox::kdeOrdering()
void
DialogButtonHBox::macosOrdering()
{
@@ -6205,7 +6106,7 @@
if ( mpHelp )
ordered.push_back( mpHelp );
if ( mpReset )
-@@ -240,7 +274,7 @@ DialogButtonHBox::macosOrdering()
+@@ -240,7 +270,7 @@ DialogButtonHBox::macosOrdering()
void
DialogButtonHBox::windowsOrdering()
{
@@ -6218,50 +6119,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/dialogbuttonhbox.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/dialogbuttonhbox.hxx 6 Mar 2008 11:44:34 -0000 1.2
-+++ toolkit/source/layout/dialogbuttonhbox.hxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/dialogbuttonhbox.hxx 30 Jul 2008 11:14:36 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef CORE_DIALOGBUTTONHBOX_HXX
#define CORE_DIALOGBUTTONHBOX_HXX
-@@ -38,7 +73,7 @@ private:
+@@ -38,7 +69,7 @@ private:
ChildData *mpHelp;
ChildData *mpReset;
@@ -6274,50 +6171,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/factory.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/factory.cxx 6 Mar 2008 11:44:46 -0000 1.2
-+++ toolkit/source/layout/factory.cxx 28 Mar 2008 09:48:25 -0000 1.2.6.2
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/factory.cxx 30 Jul 2008 11:14:42 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "factory.hxx"
#include <com/sun/star/registry/XRegistryKey.hpp>
-@@ -9,17 +44,7 @@
+@@ -9,17 +40,7 @@
using namespace ::com::sun::star;
using namespace layoutimpl;
@@ -6336,7 +6229,7 @@
{
void * pRet = 0;
-@@ -40,8 +65,7 @@ extern "C"
+@@ -40,8 +61,7 @@ extern "C"
return pRet;
}
@@ -6346,7 +6239,7 @@
{
if ( pRegistryKey )
{
-@@ -61,13 +85,13 @@ extern "C"
+@@ -61,13 +81,13 @@ extern "C"
return sal_True;
}
catch (registry::InvalidRegistryException &)
@@ -6367,43 +6260,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/factory.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/factory.hxx 6 Mar 2008 11:44:57 -0000 1.2
-+++ toolkit/source/layout/factory.hxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/factory.hxx 30 Jul 2008 11:14:47 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -6414,43 +6303,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/flow.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/flow.cxx 6 Mar 2008 11:45:11 -0000 1.2
-+++ toolkit/source/layout/flow.cxx 20 Mar 2008 11:56:27 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/flow.cxx 30 Jul 2008 11:14:53 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -6461,50 +6346,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/flow.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/flow.hxx 6 Mar 2008 11:45:24 -0000 1.2
-+++ toolkit/source/layout/flow.hxx 28 Mar 2008 13:44:29 -0000 1.2.6.2
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/flow.hxx 30 Jul 2008 11:14:58 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef CORE_FLOW_HXX
#define CORE_FLOW_HXX
-@@ -15,6 +50,7 @@ protected:
+@@ -15,6 +46,7 @@ protected:
sal_Int32 mnSpacing;
sal_Bool mbHomogeneous;
@@ -6512,7 +6393,7 @@
// Children properties
struct ChildData
{
-@@ -23,6 +59,8 @@ protected:
+@@ -23,6 +55,8 @@ protected:
css::uno::Reference< css::beans::XPropertySet > xProps;
bool isVisible();
};
@@ -6525,50 +6406,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/helper.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
--- toolkit/source/layout/helper.cxx 6 Mar 2008 11:45:38 -0000 1.2
-+++ toolkit/source/layout/helper.cxx 28 Mar 2008 09:49:53 -0000 1.2.6.3
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/helper.cxx 30 Jul 2008 11:15:04 -0000 1.2.6.5
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "helper.hxx"
#include <assert.h>
-@@ -8,7 +43,7 @@
+@@ -8,7 +39,7 @@
#include <tools/debug.hxx>
#include "proplist.hxx"
@@ -6577,15 +6454,15 @@
#if TEST_LAYOUT && !defined( DBG_UTIL )
#include <stdio.h>
-@@ -143,6 +178,7 @@ createToolkitWidget( uno::Reference< awt
+@@ -143,6 +174,7 @@ createToolkitWidget( uno::Reference< awt
uno::Reference< awt::XWindowPeer > xWinPeer;
try
{
-+ DBG_ERROR1("Asking toolkit: %s\n", OUSTRING_CSTR( desc.WindowServiceName ) );
++// DBG_ERROR1("Asking toolkit: %s\n", OUSTRING_CSTR( desc.WindowServiceName ) );
xWinPeer = xToolkit->createWindow( desc );
if ( !xWinPeer.is() )
throw uno::RuntimeException(
-@@ -150,9 +186,9 @@ createToolkitWidget( uno::Reference< awt
+@@ -150,9 +182,9 @@ createToolkitWidget( uno::Reference< awt
uno::Reference< uno::XInterface >() );
xPeer = uno::Reference< awt::XLayoutConstrains >( xWinPeer, uno::UNO_QUERY );
}
@@ -6597,7 +6474,7 @@
return uno::Reference< awt::XLayoutConstrains >();
}
-@@ -182,10 +218,6 @@ createWidget( uno::Reference< awt::XTool
+@@ -182,10 +214,6 @@ createWidget( uno::Reference< awt::XTool
if ( xPeer.is() )
return xPeer;
@@ -6608,7 +6485,7 @@
#if FIXED_INFO
OUString tName = rName;
// FIXME
-@@ -314,19 +346,23 @@ PropHelper::queryInterface( const ::com:
+@@ -314,19 +342,23 @@ PropHelper::queryInterface( const ::com:
} // namespace layoutimpl
@@ -6638,7 +6515,7 @@
namespace layoutimpl
{
-@@ -346,10 +382,7 @@ uno::Reference< awt::XLayoutConstrains >
+@@ -346,10 +378,7 @@ uno::Reference< awt::XLayoutConstrains >
if ( aName.equalsAscii( "dialog" ) )
{
if ( pParent == NULL )
@@ -6650,7 +6527,7 @@
pNewWindow = new Dialog( pParent,
ImplGetWinBits( WindowAttributes, 0 ) );
pNewComp = new layoutimpl::VCLXDialog();
-@@ -394,6 +427,61 @@ uno::Reference< awt::XLayoutConstrains >
+@@ -394,6 +423,61 @@ uno::Reference< awt::XLayoutConstrains >
pNewWindow = new FixedLine( pParent, nStyle );
pNewComp = new layoutimpl::VCLXFixedLine();
}
@@ -6716,50 +6593,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/helper.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
--- toolkit/source/layout/helper.hxx 6 Mar 2008 11:45:51 -0000 1.2
-+++ toolkit/source/layout/helper.hxx 27 Mar 2008 13:07:56 -0000 1.2.6.3
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/helper.hxx 30 Jul 2008 11:15:10 -0000 1.2.6.4
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef HELPER_HXX
#define HELPER_HXX
-@@ -62,6 +97,7 @@ public:
+@@ -62,6 +93,7 @@ public:
throw(css::lang::IllegalArgumentException);
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
const css::uno::Any& rValue ) throw (css::uno::Exception);
@@ -6771,43 +6644,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/import.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/import.cxx 6 Mar 2008 11:46:13 -0000 1.2
-+++ toolkit/source/layout/import.cxx 28 Mar 2008 09:49:53 -0000 1.2.6.2
-@@ -1,13 +1,52 @@
++++ toolkit/source/layout/import.cxx 30 Jul 2008 11:15:17 -0000 1.2.6.3
+@@ -1,13 +1,48 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -6828,7 +6697,7 @@
#define XMLNS_LAYOUT_URI "http://openoffice.org/2007/layout";
#define XMLNS_CONTAINER_URI "http://openoffice.org/2007/layout/container";
-@@ -71,14 +110,21 @@ SAL_THROW (())
+@@ -71,14 +106,21 @@ SAL_THROW (())
DBG_ERROR( "Fatal error: top node isn't a dialog" );
}
@@ -6855,7 +6724,7 @@
#ifdef IMPORT_RADIOGROUP
bool bSetRadioGroup, bSetTitle;
-@@ -201,7 +247,6 @@ uno::Reference< xml::input::XElement > I
+@@ -201,7 +243,6 @@ uno::Reference< xml::input::XElement > I
throw xml::sax::SAXException(
OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid namespace!" ) ),
uno::Reference< uno::XInterface >(), uno::Any() );
@@ -6867,50 +6736,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/import.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/import.hxx 6 Mar 2008 11:46:38 -0000 1.2
-+++ toolkit/source/layout/import.hxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/import.hxx 30 Jul 2008 11:15:22 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef IMPORT_HXX
#define IMPORT_HXX
-@@ -87,7 +122,8 @@ private:
+@@ -87,7 +118,8 @@ private:
{
mxSelectedRadio->setState( false );
// the only radio button selected would be the one that fired the event
@@ -6924,43 +6789,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/makefile.mk,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/makefile.mk 6 Mar 2008 11:46:52 -0000 1.2
-+++ toolkit/source/layout/makefile.mk 28 Mar 2008 09:49:53 -0000 1.2.6.2
-@@ -1,39 +1,56 @@
++++ toolkit/source/layout/makefile.mk 30 Jul 2008 11:15:28 -0000 1.2.6.3
+@@ -1,39 +1,52 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# $RCSfile$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# $Revision$
++# $RCSfile$
+#
-+# last change: $Author$ $Date$
++# $Revision$
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# 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.
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# 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).
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
-+#
-+# This library 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 for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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.
+#
+#*************************************************************************
+
@@ -7009,7 +6870,7 @@
$(SLO)$/box.obj \
$(SLO)$/byteseq.obj \
$(SLO)$/container.obj \
-@@ -48,6 +65,6 @@ SLOFILES= \
+@@ -48,6 +61,6 @@ SLOFILES= \
$(SLO)$/timer.obj \
$(SLO)$/translate.obj
@@ -7021,43 +6882,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/precompiled_xmlscript.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/precompiled_xmlscript.hxx 6 Mar 2008 11:47:03 -0000 1.2
-+++ toolkit/source/layout/precompiled_xmlscript.hxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/precompiled_xmlscript.hxx 30 Jul 2008 11:15:34 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -7068,50 +6925,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/proplist.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
--- toolkit/source/layout/proplist.cxx 6 Mar 2008 11:47:20 -0000 1.2
-+++ toolkit/source/layout/proplist.cxx 28 Mar 2008 09:49:54 -0000 1.2.6.3
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/proplist.cxx 30 Jul 2008 11:15:40 -0000 1.2.6.4
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "proplist.hxx"
#include <rtl/ustrbuf.hxx>
-@@ -8,6 +43,8 @@
+@@ -8,6 +39,8 @@
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
#include <tools/debug.hxx>
@@ -7120,7 +6973,7 @@
#if TEST_LAYOUT && !defined( DBG_UTIL )
#include <stdio.h>
#undef DBG_ERROR
-@@ -85,8 +122,14 @@ getProperty( const uno::Reference< uno::
+@@ -85,8 +118,14 @@ getProperty( const uno::Reference< uno::
/* Given a string and a type, it converts the string to the type, and returns
it encapsulated in Any. */
@@ -7136,7 +6989,7 @@
switch ( type.getTypeClass() )
{
case uno::TypeClass_CHAR:
-@@ -98,21 +141,21 @@ uno::Any anyFromString( const OUString &
+@@ -98,21 +137,21 @@ uno::Any anyFromString( const OUString &
return uno::makeAny( false );
break; // ends switch, throws exception
case uno::TypeClass_BYTE:
@@ -7166,7 +7019,7 @@
case uno::TypeClass_FLOAT:
return uno::makeAny( value.toFloat() );
case uno::TypeClass_DOUBLE:
-@@ -120,9 +163,9 @@ uno::Any anyFromString( const OUString &
+@@ -120,9 +159,9 @@ uno::Any anyFromString( const OUString &
case uno::TypeClass_STRING:
return uno::makeAny( value );
case uno::TypeClass_CONSTANT:
@@ -7179,7 +7032,7 @@
case uno::TypeClass_SEQUENCE:
{
sal_Int32 i = 0;
-@@ -163,10 +206,9 @@ uno::Any anyFromString( const OUString &
+@@ -163,10 +202,9 @@ uno::Any anyFromString( const OUString &
return uno::makeAny( seq );
}
@@ -7191,7 +7044,7 @@
break;
}
throw uno::RuntimeException();
-@@ -212,7 +254,7 @@ setProperties( uno::Reference< uno::XInt
+@@ -212,7 +250,7 @@ setProperties( uno::Reference< uno::XInt
{
if ( !prophlp::canHandleProps( xPeer ) )
{
@@ -7200,7 +7053,7 @@
PropList::const_iterator cur;
for( cur = rProps.begin(); cur != rProps.end(); cur++ )
{
-@@ -233,6 +275,7 @@ setProperty( uno::Reference< uno::XInter
+@@ -233,6 +271,7 @@ setProperty( uno::Reference< uno::XInter
{
OUString unoAttr = toUnoNaming( attr );
@@ -7208,7 +7061,7 @@
// get a Property object
beans::Property prop;
try
-@@ -241,15 +284,15 @@ setProperty( uno::Reference< uno::XInter
+@@ -241,15 +280,15 @@ setProperty( uno::Reference< uno::XInter
= prophlp::queryPropertyInfo( xPeer );
prop = xInfo->getPropertyByName( unoAttr );
}
@@ -7227,7 +7080,7 @@
return;
}
-@@ -259,9 +302,9 @@ setProperty( uno::Reference< uno::XInter
+@@ -259,9 +298,9 @@ setProperty( uno::Reference< uno::XInter
{
any = anyFromString( value, prop.Type );
}
@@ -7239,7 +7092,7 @@
return;
}
-@@ -272,7 +315,7 @@ setProperty( uno::Reference< uno::XInter
+@@ -272,7 +311,7 @@ setProperty( uno::Reference< uno::XInter
}
catch( ... )
{
@@ -7248,7 +7101,7 @@
}
}
-@@ -301,8 +344,7 @@ static const AttributesMap attribsMap[]
+@@ -301,8 +340,7 @@ static const AttributesMap attribsMap[]
{ "left", awt::VclWindowPeerAttribute::LEFT, false },
{ "moveable", awt::WindowAttribute::MOVEABLE, true },
{ "noborder", awt::VclWindowPeerAttribute::NOBORDER, false },
@@ -7262,43 +7115,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/proplist.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/proplist.hxx 6 Mar 2008 11:47:31 -0000 1.2
-+++ toolkit/source/layout/proplist.hxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/proplist.hxx 30 Jul 2008 11:15:46 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -7309,43 +7158,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/root.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.7
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.7
+retrieving revision 1.2.6.8
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.8
--- toolkit/source/layout/root.cxx 6 Mar 2008 11:47:44 -0000 1.2
-+++ toolkit/source/layout/root.cxx 3 Apr 2008 08:03:18 -0000 1.2.6.7
-@@ -1,6 +1,49 @@
++++ toolkit/source/layout/root.cxx 30 Jul 2008 11:15:53 -0000 1.2.6.8
+@@ -1,6 +1,45 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -7363,7 +7208,7 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include "helper.hxx"
-@@ -42,6 +86,37 @@ LayoutRoot::~LayoutRoot()
+@@ -42,6 +82,37 @@ LayoutRoot::~LayoutRoot()
}
}
@@ -7401,7 +7246,7 @@
// XInitialization
void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
throw ( uno::Exception,
-@@ -66,36 +141,36 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -66,36 +137,36 @@ void SAL_CALL LayoutRoot::initialize( co
uno::Reference< xml::sax::XParser > xParser
( mxFactory->createInstance(
@@ -7449,7 +7294,7 @@
ImportContext *pCtx = new ImportContext( *this );
uno::Reference< xml::input::XRoot > xRoot( pCtx );
-@@ -103,17 +178,31 @@ void SAL_CALL LayoutRoot::initialize( co
+@@ -103,17 +174,31 @@ void SAL_CALL LayoutRoot::initialize( co
aArgs[0] <<= xRoot;
uno::Reference< xml::sax::XDocumentHandler > xDocHandler
(mxFactory->createInstanceWithArguments
@@ -7483,7 +7328,7 @@
// XLayoutContainer
uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (uno::RuntimeException)
-@@ -249,7 +338,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -249,7 +334,7 @@ LayoutWidget *LayoutRoot::create( OUStri
return pWidget;
}
@@ -7492,7 +7337,7 @@
uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
{
if ( mpToplevel )
-@@ -265,7 +354,7 @@ LayoutWidget *LayoutRoot::create( OUStri
+@@ -265,7 +350,7 @@ LayoutWidget *LayoutRoot::create( OUStri
rRef = i->second;
return rRef;
}
@@ -7505,50 +7350,54 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/root.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
--- toolkit/source/layout/root.hxx 6 Mar 2008 11:47:56 -0000 1.2
-+++ toolkit/source/layout/root.hxx 28 Mar 2008 14:55:40 -0000 1.2.6.3
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/root.hxx 30 Jul 2008 11:15:59 -0000 1.2.6.5
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef CORE_ROOT_HXX
#define CORE_ROOT_HXX
-@@ -19,9 +54,7 @@ namespace layoutimpl
+@@ -11,6 +42,7 @@
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <cppuhelper/implbase3.hxx>
+ #include <cppuhelper/interfacecontainer.h>
++#include <toolkit/dllapi.h>
+
+ #include "proplist.hxx"
+
+@@ -19,9 +51,7 @@ namespace layoutimpl
namespace css = ::com::sun::star;
@@ -7559,7 +7408,16 @@
/* Interface generation code -- to hook to a parser. */
-@@ -61,6 +94,8 @@ protected:
+@@ -37,7 +67,7 @@ getFileAsStream( const css::uno::Referen
+
+ class LayoutWidget;
+
+-class LayoutRoot : public ::cppu::WeakImplHelper3<
++class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3<
+ css::awt::XLayoutRoot,
+ css::lang::XInitialization,
+ css::lang::XComponent>
+@@ -61,6 +91,8 @@ protected:
LayoutWidget *mpToplevel;
css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
@@ -7568,7 +7426,7 @@
public:
LayoutRoot( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
virtual ~LayoutRoot();
-@@ -74,7 +109,7 @@ public:
+@@ -74,7 +106,7 @@ public:
}
// get XLayoutContainer
@@ -7577,54 +7435,59 @@
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException);
+@@ -95,7 +127,7 @@ public:
+ virtual LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs, css::uno::Reference< css::awt::XLayoutContainer > xParent );
+ };
+
+-class LayoutWidget
++class TOOLKIT_DLLPUBLIC LayoutWidget
+ {
+ friend class LayoutRoot;
+
Index: toolkit/source/layout/table.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/table.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/table.cxx 6 Mar 2008 11:48:10 -0000 1.2
-+++ toolkit/source/layout/table.cxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/table.cxx 30 Jul 2008 11:16:05 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include <table.hxx>
#include <sal/macros.h>
-@@ -15,117 +50,73 @@ namespace layoutimpl
+@@ -15,117 +46,73 @@ namespace layoutimpl
using namespace com::sun::star;
@@ -7775,7 +7638,7 @@
}
awt::Size SAL_CALL
-@@ -138,15 +129,16 @@ Table::getMinimumSize() throw( uno::Runt
+@@ -138,15 +125,16 @@ Table::getMinimumSize() throw( uno::Runt
// temporary 1D representation of the table
std::vector< ChildData *> aTable;
@@ -7797,7 +7660,7 @@
{
col = 0;
row++;
-@@ -159,21 +151,21 @@ Table::getMinimumSize() throw( uno::Runt
+@@ -159,21 +147,21 @@ Table::getMinimumSize() throw( uno::Runt
row = i / mnColsLen;
}
@@ -7827,7 +7690,7 @@
}
}
-@@ -186,51 +178,52 @@ Table::getMinimumSize() throw( uno::Runt
+@@ -186,51 +174,52 @@ Table::getMinimumSize() throw( uno::Runt
aGroup.resize( g == 0 ? mnColsLen : nRowsLen );
// 2.1 base sizes on one-column/row children
@@ -7901,7 +7764,7 @@
int extra = child_size - size;
if ( extra > 0 )
{
-@@ -240,8 +233,8 @@ Table::getMinimumSize() throw( uno::Runt
+@@ -240,8 +229,8 @@ Table::getMinimumSize() throw( uno::Runt
extra /= nLastAttach - nFirstAttach;
for( int i = nFirstAttach; i < nLastAttach; i++ )
@@ -7912,7 +7775,7 @@
}
}
}
-@@ -253,15 +246,15 @@ Table::getMinimumSize() throw( uno::Runt
+@@ -253,15 +242,15 @@ Table::getMinimumSize() throw( uno::Runt
for( std::vector<GroupData>::iterator it = maCols.begin();
it != maCols.end(); it++ )
{
@@ -7932,7 +7795,7 @@
mnRowExpandables++;
}
-@@ -282,10 +275,10 @@ Table::allocateArea( const awt::Rectangl
+@@ -282,10 +271,10 @@ Table::allocateArea( const awt::Rectangl
nExtraSize[ 0 ] /= mnColExpandables ? mnColExpandables : mnColsLen;
nExtraSize[ 1 ] /= mnRowExpandables ? mnRowExpandables : maRows.size();
@@ -7946,7 +7809,7 @@
if ( !child->isVisible() )
continue;
-@@ -294,13 +287,13 @@ Table::allocateArea( const awt::Rectangl
+@@ -294,13 +283,13 @@ Table::allocateArea( const awt::Rectangl
for( int g = 0; g < 2; g++ )
{
std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
@@ -7964,7 +7827,7 @@
gSize += nExtraSize[ g ];
if ( g == 0 )
rChildArea.X += gSize;
-@@ -309,8 +302,8 @@ Table::allocateArea( const awt::Rectangl
+@@ -309,8 +298,8 @@ Table::allocateArea( const awt::Rectangl
}
for( int i = nFirstAttach; i < nLastAttach; i++ )
{
@@ -7975,7 +7838,7 @@
gSize += nExtraSize[ g ];
if ( g == 0 )
rChildArea.Width += gSize;
-@@ -319,7 +312,7 @@ Table::allocateArea( const awt::Rectangl
+@@ -319,7 +308,7 @@ Table::allocateArea( const awt::Rectangl
}
}
@@ -7988,43 +7851,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/table.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/layout/table.hxx 6 Mar 2008 11:48:23 -0000 1.2
-+++ toolkit/source/layout/table.hxx 28 Mar 2008 13:44:29 -0000 1.2.6.2
-@@ -1,61 +1,94 @@
++++ toolkit/source/layout/table.hxx 30 Jul 2008 11:16:10 -0000 1.2.6.3
+@@ -1,61 +1,90 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8123,43 +7982,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/timer.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/timer.cxx 6 Mar 2008 11:48:36 -0000 1.2
-+++ toolkit/source/layout/timer.cxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/timer.cxx 30 Jul 2008 11:16:16 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8170,43 +8025,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/timer.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/timer.hxx 6 Mar 2008 11:48:47 -0000 1.2
-+++ toolkit/source/layout/timer.hxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/layout/timer.hxx 30 Jul 2008 11:16:22 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8216,44 +8067,40 @@
Index: toolkit/source/layout/translate.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/translate.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
---- toolkit/source/layout/translate.cxx 6 Mar 2008 11:48:59 -0000 1.2
-+++ toolkit/source/layout/translate.cxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.3
+--- toolkit/source/layout/translate.cxx 9 Jun 2008 12:22:15 -0000 1.3
++++ toolkit/source/layout/translate.cxx 30 Jul 2008 12:36:19 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8264,43 +8111,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/layout/translate.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/layout/translate.hxx 6 Mar 2008 11:49:12 -0000 1.2
-+++ toolkit/source/layout/translate.hxx 20 Mar 2008 11:56:28 -0000 1.2.6.1
-@@ -1,12 +1,48 @@
++++ toolkit/source/layout/translate.hxx 30 Jul 2008 11:16:33 -0000 1.2.6.2
+@@ -1,12 +1,44 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8319,48 +8162,43 @@
+} // namespace layoutimpl
#endif /* CORE_TRANSLATE_HXX */
-cvs diff: Diffing toolkit/source/vclcompat
Index: toolkit/source/vclcompat/makefile.mk
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/makefile.mk,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/vclcompat/makefile.mk 6 Mar 2008 11:49:25 -0000 1.2
-+++ toolkit/source/vclcompat/makefile.mk 28 Mar 2008 09:50:42 -0000 1.2.6.2
-@@ -1,25 +1,52 @@
++++ toolkit/source/vclcompat/makefile.mk 30 Jul 2008 11:16:38 -0000 1.2.6.3
+@@ -1,25 +1,48 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# $Revision$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# last change: $Author$ $Date$
++# $RCSfile$
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $Revision$
+#
++# This file is part of OpenOffice.org.
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# 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.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, 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).
+#
-+# This library 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 for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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.
+#
+#*************************************************************************
+
@@ -8394,7 +8232,7 @@
SLOFILES= \
$(SLO)$/wrapper.obj \
-@@ -27,6 +54,6 @@ SLOFILES= \
+@@ -27,6 +50,6 @@ SLOFILES= \
$(SLO)$/wcontainer.obj \
$(SLO)$/wfield.obj
@@ -8406,43 +8244,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/wbutton.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
--- toolkit/source/vclcompat/wbutton.cxx 6 Mar 2008 11:49:41 -0000 1.2
-+++ toolkit/source/vclcompat/wbutton.cxx 28 Mar 2008 09:50:42 -0000 1.2.6.3
-@@ -1,11 +1,50 @@
++++ toolkit/source/vclcompat/wbutton.cxx 30 Jul 2008 11:16:45 -0000 1.2.6.4
+@@ -1,11 +1,46 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8461,7 +8295,7 @@
#include <vcl/event.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-@@ -13,18 +52,40 @@
+@@ -13,18 +48,40 @@
#include <list>
@@ -8508,7 +8342,7 @@
{
Link maClickHdl;
protected:
-@@ -107,10 +168,9 @@ void Button::Click()
+@@ -107,10 +164,9 @@ void Button::Click()
{
}
@@ -8520,7 +8354,7 @@
class PushButtonImpl : public ButtonImpl
{
public:
-@@ -163,13 +223,12 @@ void PushButton::SetToggleHdl( const Lin
+@@ -163,13 +219,12 @@ void PushButton::SetToggleHdl( const Lin
getImpl().SetToggleHdl( rLink );
}
@@ -8535,7 +8369,7 @@
class RadioButtonImpl : public ButtonImpl
{
public:
-@@ -210,19 +269,11 @@ public:
+@@ -210,19 +265,11 @@ public:
static void unsetOthersGroup( RadioButtonImpl* current )
{
// set all others to false
@@ -8559,7 +8393,7 @@
}
}
-@@ -269,10 +320,22 @@ void RadioButton::SetToggleHdl( const Li
+@@ -269,10 +316,22 @@ void RadioButton::SetToggleHdl( const Li
getImpl().SetToggleHdl( rLink );
}
@@ -8584,7 +8418,7 @@
class CheckBoxImpl : public ButtonImpl
{
public:
-@@ -302,7 +365,7 @@ BOOL CheckBox::IsChecked() const
+@@ -302,7 +361,7 @@ BOOL CheckBox::IsChecked() const
{
if ( !getImpl().mxCheckBox.is() )
return FALSE;
@@ -8593,7 +8427,7 @@
}
void CheckBox::SetToggleHdl( const Link& rLink )
-@@ -310,10 +373,9 @@ void CheckBox::SetToggleHdl( const Link&
+@@ -310,10 +369,9 @@ void CheckBox::SetToggleHdl( const Link&
getImpl().SetToggleHdl( rLink );
}
@@ -8605,7 +8439,7 @@
#define BUTTON_IMPL(t, parent, response) \
class t##Impl : public parent##Impl \
{ \
-@@ -358,25 +420,167 @@ DECL_CONSTRUCTOR_IMPLS( ResetButton, Pus
+@@ -358,25 +416,167 @@ DECL_CONSTRUCTOR_IMPLS( ResetButton, Pus
DECL_CONSTRUCTOR_IMPLS( ApplyButton, PushButton, "applybutton" ); /* Deprecated? */
DECL_CONSTRUCTOR_IMPLS( HelpButton, PushButton, "helpbutton" );
@@ -8786,43 +8620,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/wcontainer.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/source/vclcompat/wcontainer.cxx 6 Mar 2008 11:49:54 -0000 1.2
-+++ toolkit/source/vclcompat/wcontainer.cxx 28 Mar 2008 09:50:42 -0000 1.2.6.2
-@@ -1,6 +1,41 @@
++++ toolkit/source/vclcompat/wcontainer.cxx 30 Jul 2008 11:16:51 -0000 1.2.6.3
+@@ -1,6 +1,37 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -8833,7 +8663,7 @@
#include <com/sun/star/awt/XLayoutRoot.hpp>
#include <com/sun/star/awt/XLayoutContainer.hpp>
-@@ -13,8 +48,7 @@ using namespace ::com::sun::star;
+@@ -13,8 +44,7 @@ using namespace ::com::sun::star;
namespace layout
{
@@ -8843,7 +8673,7 @@
: mxContainer( pCtx->GetPeerHandle( pId ), uno::UNO_QUERY )
{
if ( !mxContainer.is() )
-@@ -23,7 +57,7 @@ Container::Container( const Context *pCt
+@@ -23,7 +53,7 @@ Container::Container( const Context *pCt
}
}
@@ -8852,7 +8682,7 @@
{
mxContainer = layoutimpl::createContainer( rName );
-@@ -106,7 +140,16 @@ void Container::ShowAll( bool bShow )
+@@ -106,7 +136,16 @@ void Container::ShowAll( bool bShow )
inner::setChildrenVisible( mxContainer, bShow );
}
@@ -8870,7 +8700,7 @@
Table::Table( sal_Int32 nBorder, sal_Int32 nColumns )
: Container( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ), nBorder )
{
-@@ -153,8 +196,7 @@ void Table::setProps( uno::Reference< aw
+@@ -153,8 +192,7 @@ void Table::setProps( uno::Reference< aw
uno::Any( nYSpan ) );
}
@@ -8880,7 +8710,7 @@
: Container( rName, nBorder )
{
uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
-@@ -199,4 +241,36 @@ void Box::setProps( uno::Reference< awt:
+@@ -199,4 +237,36 @@ void Box::setProps( uno::Reference< awt:
uno::Any( nPadding ) );
}
@@ -8922,50 +8752,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/wfield.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
--- toolkit/source/vclcompat/wfield.cxx 6 Mar 2008 11:50:09 -0000 1.2
-+++ toolkit/source/vclcompat/wfield.cxx 27 Mar 2008 13:08:19 -0000 1.2.6.3
-@@ -1,3 +1,38 @@
++++ toolkit/source/vclcompat/wfield.cxx 30 Jul 2008 11:16:57 -0000 1.2.6.4
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "wrapper.hxx"
#include <comphelper/processfactory.hxx>
-@@ -72,7 +107,7 @@ void Edit::SetModifyHdl( const Link& rLi
+@@ -72,7 +103,7 @@ void Edit::SetModifyHdl( const Link& rLi
}
DECL_CONSTRUCTOR_IMPLS( Edit, Control, "edit" );
@@ -8974,7 +8800,7 @@
// Window/Control/Edit/MultiLineEdit
class MultiLineEditImpl : public EditImpl
-@@ -85,14 +120,16 @@ public:
+@@ -85,14 +116,16 @@ public:
};
DECL_CONSTRUCTOR_IMPLS( MultiLineEdit, Edit, "multilineedit" );
@@ -8993,7 +8819,7 @@
};
DECL_CONSTRUCTOR_IMPLS( SpinField, Edit, "spinfield" );
-@@ -102,7 +139,9 @@ class NumericFieldImpl : public SpinFiel
+@@ -102,7 +135,9 @@ class NumericFieldImpl : public SpinFiel
{
public:
NumericFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
@@ -9004,7 +8830,7 @@
};
// Window/Control/Edit/SpinField/MetricField
-@@ -110,12 +149,14 @@ class MetricFieldImpl : public SpinField
+@@ -110,12 +145,14 @@ class MetricFieldImpl : public SpinField
{
public:
MetricFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
@@ -9023,7 +8849,7 @@
// FormatterBase
class FormatterBaseImpl
-@@ -124,7 +165,9 @@ class FormatterBaseImpl
+@@ -124,7 +161,9 @@ class FormatterBaseImpl
PeerHandle mxPeer;
public:
explicit FormatterBaseImpl( const PeerHandle &xPeer )
@@ -9034,7 +8860,7 @@
};
class NumericFormatterImpl : public FormatterBaseImpl
-@@ -133,13 +176,15 @@ class NumericFormatterImpl : public Form
+@@ -133,13 +172,15 @@ class NumericFormatterImpl : public Form
uno::Reference< awt::XCurrencyField > mxField;
explicit NumericFormatterImpl( const PeerHandle &xPeer )
: FormatterBaseImpl( xPeer )
@@ -9052,7 +8878,7 @@
for ( sal_uInt16 d = 0; d < nDigits; d++ )
n /= 10;
return n;
-@@ -160,7 +205,9 @@ class MetricFormatterImpl : public Forma
+@@ -160,7 +201,9 @@ class MetricFormatterImpl : public Forma
uno::Reference< awt::XMetricField > mxField;
explicit MetricFormatterImpl( const PeerHandle &xPeer )
: FormatterBaseImpl( xPeer )
@@ -9063,7 +8889,7 @@
};
// NumericFormatter
-@@ -204,7 +251,9 @@ DECL_CONSTRUCTOR_IMPLS_2( NumericField,
+@@ -204,7 +247,9 @@ DECL_CONSTRUCTOR_IMPLS_2( NumericField,
// MetricFormatter
MetricFormatter::MetricFormatter( FormatterBaseImpl *pImpl )
@@ -9074,7 +8900,7 @@
MetricFormatterImpl& MetricFormatter::getFormatImpl() const
{ return *( static_cast<MetricFormatterImpl *>( mpFormatImpl ) ); }
-@@ -276,7 +325,7 @@ public:
+@@ -276,7 +321,7 @@ public:
for( unsigned int i = 0; aItems.getLength(); i++ )
{
if ( aItems[ i ] == rKey )
@@ -9083,7 +8909,7 @@
}
return COMBOBOX_ENTRY_NOTFOUND;
}
-@@ -382,7 +431,7 @@ void ComboBox::SetSelectHdl( const Link&
+@@ -382,7 +427,7 @@ void ComboBox::SetSelectHdl( const Link&
}
DECL_CONSTRUCTOR_IMPLS( ComboBox, Edit, "combobox" );
@@ -9092,7 +8918,7 @@
// Window/Control/ListBox
class ListBoxImpl : public ControlImpl,
-@@ -426,7 +475,7 @@ public:
+@@ -426,7 +471,7 @@ public:
for( unsigned int i = 0; aItems.getLength(); i++ )
{
if ( aItems[ i ] == rKey )
@@ -9101,7 +8927,7 @@
}
return LISTBOX_ENTRY_NOTFOUND;
}
-@@ -448,7 +497,7 @@ public:
+@@ -448,7 +493,7 @@ public:
USHORT GetSelectEntryCount() const
{
@@ -9110,7 +8936,7 @@
}
USHORT GetSelectEntryPos( USHORT nSelIndex ) const
-@@ -577,6 +626,6 @@ void ListBox::SetClickHdl( const Link& r
+@@ -577,6 +622,6 @@ void ListBox::SetClickHdl( const Link& r
}
DECL_CONSTRUCTOR_IMPLS( ListBox, Control, "listbox" );
@@ -9123,43 +8949,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/wrapper.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
--- toolkit/source/vclcompat/wrapper.cxx 6 Mar 2008 11:50:23 -0000 1.2
-+++ toolkit/source/vclcompat/wrapper.cxx 28 Mar 2008 09:50:42 -0000 1.2.6.3
-@@ -1,16 +1,55 @@
++++ toolkit/source/vclcompat/wrapper.cxx 30 Jul 2008 11:17:03 -0000 1.2.6.4
+@@ -1,16 +1,50 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -9182,11 +9004,10 @@
+#include <layout/factory.hxx>
+#include <layout/root.hxx>
+#include <vcl/image.hxx>
-+#include <stdio.h>
using namespace ::com::sun::star;
-@@ -239,10 +277,10 @@ WinBits Window::GetStyle()
+@@ -239,10 +273,10 @@ WinBits Window::GetStyle()
{
if ( toolkitVclPropsMap[ i ].propName )
{
@@ -9199,7 +9020,7 @@
mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= bValue;
nValue = bValue ? 1 : 0;
}
-@@ -284,55 +322,6 @@ PeerHandle Window::CreatePeer( Window *p
+@@ -284,55 +318,6 @@ PeerHandle Window::CreatePeer( Window *p
return layoutimpl::createWidget( getToolkit(), pParent->GetPeer(),
rtl::OUString::createFromAscii( pName ), nWinAttrbs );
@@ -9255,7 +9076,7 @@
}
void Window::Enable( bool bEnable )
-@@ -419,6 +408,12 @@ public:
+@@ -419,6 +404,12 @@ public:
DECL_CONSTRUCTOR_IMPLS( FixedLine, Control, "hfixedline" );
DECL_GET_IMPL_IMPL( FixedLine )
@@ -9268,7 +9089,7 @@
class FixedTextImpl : public ControlImpl
{
public:
-@@ -456,6 +451,123 @@ public:
+@@ -456,6 +447,123 @@ public:
};
DECL_CONSTRUCTOR_IMPLS( FixedInfo, FixedText, "fixedinfo" );
@@ -9398,50 +9219,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/source/vclcompat/wrapper.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/source/vclcompat/wrapper.hxx 6 Mar 2008 11:50:35 -0000 1.2
-+++ toolkit/source/vclcompat/wrapper.hxx 20 Mar 2008 11:56:29 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/source/vclcompat/wrapper.hxx 30 Jul 2008 11:17:08 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef WRAPPER_HXX
#define WRAPPER_HXX
-@@ -5,7 +40,6 @@
+@@ -5,7 +36,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
@@ -9449,7 +9266,7 @@
#include <cstring>
-@@ -13,7 +47,7 @@ namespace css = com::sun::star;
+@@ -13,7 +43,7 @@ namespace css = com::sun::star;
namespace layout
{
@@ -9458,7 +9275,7 @@
class WindowImpl
{
public:
-@@ -63,7 +97,6 @@ class WindowImpl
+@@ -63,7 +93,6 @@ class WindowImpl
}
};
@@ -9466,7 +9283,7 @@
class ControlImpl : public WindowImpl
{
public:
-@@ -71,14 +104,6 @@ class ControlImpl : public WindowImpl
+@@ -71,14 +100,6 @@ class ControlImpl : public WindowImpl
: WindowImpl( pCtx, xPeer, pWindow ) {}
};
@@ -9481,7 +9298,7 @@
inline WindowImpl &Window::getImpl() const
{ return *(static_cast< WindowImpl * >( mpImpl )); }
-@@ -110,6 +135,6 @@ inline WindowImpl &Window::getImpl() con
+@@ -110,6 +131,6 @@ inline WindowImpl &Window::getImpl() con
{ \
}
@@ -9489,8 +9306,6 @@
+} // namespace layout
#endif // WRAPPER_HXX
-cvs diff: Diffing toolkit/src2xml
-cvs diff: Diffing toolkit/src2xml/source
Index: toolkit/src2xml/source/src2xml.py
===================================================================
RCS file: /cvs/gsl/toolkit/src2xml/source/src2xml.py,v
@@ -9512,20 +9327,15 @@
def do_one_file (file_name, options):
str = XML_HEADER
-cvs diff: Diffing toolkit/test
-cvs diff: Diffing toolkit/test/accessibility
-cvs diff: Diffing toolkit/test/accessibility/ov
-cvs diff: Diffing toolkit/test/accessibility/tools
-cvs diff: Diffing toolkit/util
Index: toolkit/util/makefile.mk
===================================================================
RCS file: /cvs/gsl/toolkit/util/makefile.mk,v
-retrieving revision 1.23
-retrieving revision 1.23.6.3
-diff -p -u -u -p -b -w -B -r1.23 -r1.23.6.3
---- toolkit/util/makefile.mk 6 Mar 2008 11:55:35 -0000 1.23
-+++ toolkit/util/makefile.mk 28 Mar 2008 09:39:07 -0000 1.23.6.3
-@@ -57,7 +57,10 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib
+retrieving revision 1.25
+retrieving revision 1.23.6.4
+diff -p -u -u -p -b -w -B -r1.25 -r1.23.6.4
+--- toolkit/util/makefile.mk 11 Apr 2008 09:39:56 -0000 1.25
++++ toolkit/util/makefile.mk 30 Jul 2008 12:36:02 -0000 1.23.6.4
+@@ -53,7 +53,10 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1FILES= $(SLB)$/awt.lib \
$(SLB)$/tree.lib \
$(SLB)$/controls.lib \
@@ -9536,8 +9346,8 @@
+
SHL1TARGET= tk$(DLLPOSTFIX)
SHL1IMPLIB= itk
- SHL1USE_EXPORTS=ordinal
-@@ -103,31 +106,5 @@ RES1FILELIST=$(SRS)$/awt.srs
+ SHL1USE_EXPORTS=name
+@@ -99,31 +102,5 @@ RES1FILELIST=$(SRS)$/awt.srs
RESLIB1NAME=$(TARGET)
RESLIB1SRSFILES=$(RES1FILELIST)
@@ -9572,71 +9382,65 @@
Index: toolkit/util/makefile.pmk
===================================================================
RCS file: /cvs/gsl/toolkit/util/makefile.pmk,v
-retrieving revision 1.4
-retrieving revision 1.4.6.2
-diff -p -u -u -p -b -w -B -r1.4 -r1.4.6.2
---- toolkit/util/makefile.pmk 6 Mar 2008 11:55:48 -0000 1.4
-+++ toolkit/util/makefile.pmk 28 Mar 2008 09:39:07 -0000 1.4.6.2
-@@ -43,7 +43,7 @@ CFLAGS += -xldscope=hidden
+retrieving revision 1.6
+retrieving revision 1.4.6.3
+diff -p -u -u -p -b -w -B -r1.6 -r1.4.6.3
+--- toolkit/util/makefile.pmk 11 Apr 2008 09:40:17 -0000 1.6
++++ toolkit/util/makefile.pmk 30 Jul 2008 12:35:59 -0000 1.4.6.3
+@@ -39,8 +39,8 @@ CFLAGS += -xldscope=hidden
# FIXME: sprinkle some TOOLKIT_DLLPUBLIC
-+CFLAGS+=-I$(PRJ)/inc/layout
- .IF "$(ENABLE_LAYOUT)" == "TRUE"
--CFLAGS+=-I$(PRJ)/inc/layout
+-.IF "$(ENABLE_LAYOUT)" == "TRUE"
+ CFLAGS+=-I$(PRJ)/inc/layout
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
CFLAGS+=-DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
.ELSE
-cvs diff: Diffing toolkit/util/defs
-cvs diff: Diffing toolkit/workben
-cvs diff: Diffing toolkit/workben/layout
+ CFLAGS+=-DENABLE_LAYOUT=0
Index: toolkit/workben/layout/editor.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/editor.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
--- toolkit/workben/layout/editor.cxx 6 Mar 2008 11:58:21 -0000 1.2
-+++ toolkit/workben/layout/editor.cxx 28 Mar 2008 09:53:22 -0000 1.2.6.4
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/editor.cxx 30 Jul 2008 11:17:14 -0000 1.2.6.5
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "editor.hxx"
#undef NDEBUG
-@@ -29,7 +64,7 @@ using rtl::OUString;
+@@ -29,7 +60,7 @@ using rtl::OUString;
//#define FILEDLG
// somewhat of a hack unfortunately ...
@@ -9645,7 +9449,7 @@
#include "root.hxx"
#include "helper.hxx"
-@@ -73,7 +108,7 @@ namespace layoutimpl {
+@@ -73,7 +104,7 @@ namespace layoutimpl {
const rtl::OUString &rName, long nProps, bool bToplevel );
uno::Any anyFromString (const rtl::OUString &value, const uno::Type &type);
@@ -9654,7 +9458,7 @@
using namespace layout;
using namespace layoutimpl;
-@@ -117,7 +152,7 @@ static rtl::OUString anyToString (uno::A
+@@ -117,7 +148,7 @@ static rtl::OUString anyToString (uno::A
}
static inline long anyToNatural (uno::Any value)
@@ -9663,7 +9467,7 @@
static inline double anyToDecimal (uno::Any value)
{ return anyToString( value ).toDouble(); }
-@@ -211,7 +246,9 @@ public:
+@@ -211,7 +242,9 @@ public:
beans::Property prop = it.next();
rtl::OUString name( prop.Name );
rtl::OUString value( getProperty( name, WINDOW_PROPERTY ) );
@@ -9673,7 +9477,7 @@
std::pair< rtl::OUString, rtl::OUString > pair( name, value );
maOriProps.push_back( pair );
}
-@@ -439,7 +476,9 @@ fprintf(stderr, "original property: %s =
+@@ -439,7 +472,9 @@ fprintf(stderr, "original property: %s =
for ( PropList::const_iterator it = props.begin(); it != props.end(); it++ )
if ( it->first.equalsIgnoreAsciiCase( propName ) )
return it->second;
@@ -9683,7 +9487,7 @@
return rtl::OUString();
}
-@@ -486,10 +525,14 @@ fprintf(stderr, "Serious error: property
+@@ -486,10 +521,14 @@ fprintf(stderr, "Serious error: property
rtl::OUString oriValue = getOriginalProperty( propName, rKind );
rtl::OUString newValue = getProperty( propName, rKind );
bool isTouched = oriValue != newValue;
@@ -9698,7 +9502,7 @@
void setProperty( rtl::OUString rPropName, PropertyKind rKind, uno::Any rValue )
{
switch ( rKind ) {
-@@ -717,7 +760,7 @@ namespace FlatLayout
+@@ -717,7 +756,7 @@ namespace FlatLayout
nRet++;
return nRet;
}
@@ -9707,7 +9511,7 @@
//** PropertiesList widget
-@@ -743,7 +786,9 @@ class PropertiesList : public layout::Ta
+@@ -743,7 +782,9 @@ class PropertiesList : public layout::Ta
virtual ~AnyWidget()
{
@@ -9717,7 +9521,7 @@
}
void save( uno::Any aValue )
-@@ -756,7 +801,7 @@ void checkProperty()
+@@ -756,7 +797,7 @@ void checkProperty()
{
bool flag = mpWidget->isPropertyTouched( maPropName, maPropKind );
@@ -9726,7 +9530,7 @@
{
CheckFlag( flag, true );
}
-@@ -950,7 +995,9 @@ printf("Remove mpEdit and expand\n");
+@@ -950,7 +991,9 @@ printf("Remove mpEdit and expand\n");
virtual void store()
{
@@ -9736,7 +9540,7 @@
save( uno::makeAny( rtl::OUString( GetText() ).toInt64() ) );
}
};
-@@ -982,7 +1029,9 @@ fprintf(stderr, "store number: %ld\n", r
+@@ -982,7 +1025,9 @@ fprintf(stderr, "store number: %ld\n", r
virtual ~AnyCheckBox()
{
@@ -9746,7 +9550,7 @@
}
virtual layout::Window *getWindow()
-@@ -990,8 +1039,10 @@ fprintf(stderr, "store number: %ld\n", r
+@@ -990,8 +1035,10 @@ fprintf(stderr, "store number: %ld\n", r
virtual void load()
{
@@ -9758,7 +9562,7 @@
setLabel();
checkProperty();
}
-@@ -1022,7 +1073,7 @@ fprintf(stderr, "loading boolean value\n
+@@ -1022,7 +1069,7 @@ fprintf(stderr, "loading boolean value\n
virtual void load()
{
@@ -9767,7 +9571,7 @@
checkProperty();
}
-@@ -1108,7 +1159,9 @@ fprintf(stderr, "loading boolean value\n
+@@ -1108,7 +1155,9 @@ fprintf(stderr, "loading boolean value\n
~PropertyEntry()
{
@@ -9777,7 +9581,7 @@
delete mpLabel;
delete mpFlag;
delete mpValue;
-@@ -1224,7 +1277,7 @@ private:
+@@ -1224,7 +1273,7 @@ private:
rtl::OUString name( prop.Name );
if ( toIgnore( name ) )
continue;
@@ -9786,7 +9590,7 @@
PropertyEntry *propEntry = PropertyEntry::construct(
pWidget, name, rKind, type, mpParentWindow );
-@@ -1262,6 +1317,7 @@ public:
+@@ -1262,6 +1313,7 @@ public:
void clear()
{
@@ -9794,7 +9598,7 @@
Container::Clear();
for ( std::list< PropertyEntry* >::iterator it = maPropertiesList.begin();
-@@ -1283,26 +1339,34 @@ IMPL_LINK( PropertiesList::PropertyEntry
+@@ -1283,26 +1335,34 @@ IMPL_LINK( PropertiesList::PropertyEntry
IMPL_LINK( PropertiesList::PropertyEntry::AnyWidget, FlagToggledHdl, layout::CheckBox *, pCheck )
{
@@ -9829,7 +9633,7 @@
return 0;
}
-@@ -1392,14 +1456,16 @@ public:
+@@ -1392,14 +1452,16 @@ public:
itemSelected( LISTBOX_ENTRY_NOTFOUND );
}
@@ -9848,7 +9652,7 @@
IMPL_LINK( SortListBox, UpPressedHdl, layout::Button *, pBtn )
{
-@@ -1463,10 +1529,7 @@ public:
+@@ -1463,10 +1525,7 @@ public:
mpRootWidget = new Widget( xWidget, "root" );
}
@@ -9860,7 +9664,7 @@
Widget *getWidget( int nPos )
{
-@@ -1489,7 +1552,7 @@ public:
+@@ -1489,7 +1548,7 @@ public:
if ( pos == -1 )
// if asked to select hidden root, select visible root
pos = 0;
@@ -9869,7 +9673,7 @@
}
void rebuild()
-@@ -1622,6 +1685,11 @@ protected:
+@@ -1622,6 +1681,11 @@ protected:
}
};
@@ -9881,7 +9685,7 @@
//** EditorImpl
class EditorImpl : public LayoutTree::Listener
-@@ -1656,7 +1724,7 @@ public:
+@@ -1656,7 +1720,7 @@ public:
EditorImpl( layout::Dialog *dialog,
// we should probable open this channel (or whatever its called) ourselves
uno::Reference< lang::XMultiServiceFactory > xMSF );
@@ -9890,7 +9694,7 @@
void loadFile( const rtl::OUString &aTestFile );
};
-@@ -1669,7 +1737,9 @@ EditorImpl::EditorImpl( layout::Dialog *
+@@ -1669,7 +1733,9 @@ EditorImpl::EditorImpl( layout::Dialog *
//dialog->getContext()->getRoot(), uno::UNO_QUERY )
// dialog->GetPeer(), uno::UNO_QUERY )
{
@@ -9900,7 +9704,7 @@
// framework
mxToolkit = uno::Reference< awt::XToolkit >(
mxFactory->createInstance(
-@@ -1678,7 +1748,9 @@ fprintf (stderr, "EditorImpl()\n");
+@@ -1678,7 +1744,9 @@ fprintf (stderr, "EditorImpl()\n");
assert( mxToolkit.is() );
// custom widgets
@@ -9910,7 +9714,7 @@
mpPropertiesList = new PropertiesList( dialog );
mpLayoutTree = new LayoutTree( dialog );
-@@ -1755,7 +1827,10 @@ mxMSF->createInstance
+@@ -1755,7 +1823,10 @@ mxMSF->createInstance
uno::Reference< uno::XInterface >() );
}
@@ -9921,7 +9725,7 @@
uno::Reference< lang::XInitialization > xInit( xRoot, uno::UNO_QUERY );
if ( !xInit.is() )
{
-@@ -1764,12 +1839,18 @@ fprintf( stderr, "TEST: initing root\n"
+@@ -1764,12 +1835,18 @@ fprintf( stderr, "TEST: initing root\n"
uno::Reference< uno::XInterface >() );
}
@@ -9940,7 +9744,7 @@
mpLayoutTree->rebuild();
}
-@@ -1829,7 +1910,9 @@ IMPL_LINK( EditorImpl, CreateWidgetHdl,
+@@ -1829,7 +1906,9 @@ IMPL_LINK( EditorImpl, CreateWidgetHdl,
IMPL_LINK( EditorImpl, ImportButtonHdl, layout::PushButton *, pBtn )
{
(void) pBtn;
@@ -9950,7 +9754,7 @@
#ifdef FILEDLG
pImportDialog->Execute();
#endif
-@@ -1840,10 +1923,12 @@ fprintf(stderr, "IMPORT!\n");
+@@ -1840,10 +1919,12 @@ fprintf(stderr, "IMPORT!\n");
#ifdef FILEDLG
IMPL_LINK( EditorImpl, ImportDialogHdl, FileDialog *, pDialog )
{
@@ -9968,43 +9772,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/editor.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/workben/layout/editor.hxx 6 Mar 2008 11:58:33 -0000 1.2
-+++ toolkit/workben/layout/editor.hxx 20 Mar 2008 11:56:31 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/editor.hxx 30 Jul 2008 11:17:20 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -10015,50 +9815,46 @@
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/makefile.mk,v
retrieving revision 1.2
-retrieving revision 1.2.6.4
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.4
+retrieving revision 1.2.6.5
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.5
--- toolkit/workben/layout/makefile.mk 6 Mar 2008 12:00:06 -0000 1.2
-+++ toolkit/workben/layout/makefile.mk 28 Mar 2008 14:55:41 -0000 1.2.6.4
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/makefile.mk 30 Jul 2008 11:17:25 -0000 1.2.6.5
+@@ -1,3 +1,34 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# $Revision$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# last change: $Author$ $Date$
++# $RCSfile$
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $Revision$
+#
++# This file is part of OpenOffice.org.
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# 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.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, 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).
+#
-+# This library 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 for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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 +59,14 @@ CFLAGS+=-Wall -Wno-non-virtual-dtor
+@@ -24,12 +55,14 @@ CFLAGS+=-Wall -Wno-non-virtual-dtor
CXXFILES=\
editor.cxx \
@@ -10073,7 +9869,7 @@
$(OBJ)$/test.obj \
$(OBJ)$/wordcountdialog.obj \
$(OBJ)$/zoom.obj
-@@ -44,41 +81,36 @@ APP1STDLIBS= \
+@@ -44,41 +77,36 @@ APP1STDLIBS= \
$(CPPUHELPERLIB) \
$(SALLIB) \
$(XMLSCRIPTLIB) \
@@ -10161,40 +9957,36 @@
RCS file: toolkit/workben/layout/recover.cxx
diff -N toolkit/workben/layout/recover.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/recover.cxx 20 Mar 2008 11:56:31 -0000 1.1.2.1
-@@ -0,0 +1,111 @@
++++ toolkit/workben/layout/recover.cxx 30 Jul 2008 11:17:31 -0000 1.1.2.2
+@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -10279,40 +10071,36 @@
RCS file: toolkit/workben/layout/recover.hxx
diff -N toolkit/workben/layout/recover.hxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/recover.hxx 20 Mar 2008 11:56:32 -0000 1.1.2.1
-@@ -0,0 +1,87 @@
++++ toolkit/workben/layout/recover.hxx 30 Jul 2008 11:17:36 -0000 1.1.2.2
+@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * 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.
+ *
+ ************************************************************************/
+#ifndef _SVX_RECOVER_HXX
@@ -10445,44 +10233,40 @@
Index: toolkit/workben/layout/simple-paragraph.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/simple-paragraph.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
---- toolkit/workben/layout/simple-paragraph.cxx 6 Mar 2008 12:04:37 -0000 1.2
-+++ toolkit/workben/layout/simple-paragraph.cxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
+retrieving revision 1.3
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.3
+--- toolkit/workben/layout/simple-paragraph.cxx 11 Apr 2008 09:42:58 -0000 1.3
++++ toolkit/workben/layout/simple-paragraph.cxx 30 Jul 2008 12:36:28 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -10493,97 +10277,106 @@
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/simple-paragraph.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/workben/layout/simple-paragraph.hxx 6 Mar 2008 12:04:48 -0000 1.2
-+++ toolkit/workben/layout/simple-paragraph.hxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/simple-paragraph.hxx 30 Jul 2008 11:17:47 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $RCSfile$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * $Revision$
++ * $RCSfile$
+ *
-+ * last change: $Author$ $Date$
++ * $Revision$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * 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.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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).
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef _SVX_SIMPLE_PARAGRAPH_HXX
#define _SVX_SIMPLE_PARAGRAPH_HXX
+Index: toolkit/workben/layout/tabcontrol.xml
+===================================================================
+RCS file: /cvs/gsl/toolkit/workben/layout/tabcontrol.xml,v
+retrieving revision 1.2
+retrieving revision 1.2.6.1
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+--- toolkit/workben/layout/tabcontrol.xml 6 Mar 2008 12:05:35 -0000 1.2
++++ toolkit/workben/layout/tabcontrol.xml 14 Apr 2008 13:01:03 -0000 1.2.6.1
+@@ -6,7 +6,7 @@
+ has_border="true" sizeable="true" moveable="true">
+ <vbox>
+ <tabcontrol>
+-- <pushbutton label="Child 1" cnt:title="Page 1" />
++ <pushbutton label="Child 1" cnt:title="Page 1" />
+ <edit has_border="true" text="Child 2" cnt:title="Page 2" />
+ <vbox cnt:title="Page 3">
+ <pushbutton label="Child 3"/>
Index: toolkit/workben/layout/test.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/test.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
+retrieving revision 1.2.6.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
--- toolkit/workben/layout/test.cxx 6 Mar 2008 12:06:00 -0000 1.2
-+++ toolkit/workben/layout/test.cxx 26 Mar 2008 13:46:01 -0000 1.2.6.2
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/test.cxx 30 Jul 2008 11:17:52 -0000 1.2.6.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include <vcl/svapp.hxx>
//#include <transex3/vosapp.hxx>
-@@ -25,6 +61,9 @@
+@@ -25,6 +57,9 @@
#include "zoom.hxx"
#undef _LAYOUT_POST_HXX
@@ -10593,7 +10386,7 @@
//#undef SW_WORDCOUNTDIALOG_HXX
#include <layout/layout-pre.hxx>
-@@ -161,7 +200,7 @@ void LayoutTest::IInit()
+@@ -161,7 +196,7 @@ void LayoutTest::IInit()
void LayoutTest::ParseCommandLine()
{
@@ -10602,7 +10395,7 @@
{
OUString aParam = OUString( GetCommandLineParam( i ) );
if ( aParam.equalsAscii( "-h" ) || aParam.equalsAscii( "--help" ) )
-@@ -220,6 +259,11 @@ void TestDialog( OUString const& name )
+@@ -220,6 +255,11 @@ void TestDialog( OUString const& name )
SwWordCountDialog words ( 0 );
RunDialog( words );
}
@@ -10618,43 +10411,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/uno.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/workben/layout/uno.hxx 6 Mar 2008 12:06:47 -0000 1.2
-+++ toolkit/workben/layout/uno.hxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/uno.hxx 30 Jul 2008 11:17:58 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * $Revision$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * last change: $Author$ $Date$
++ * $RCSfile$
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $Revision$
+ *
++ * This file is part of OpenOffice.org.
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * 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.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, 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).
+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -10686,12 +10475,12 @@
Index: toolkit/workben/layout/wordcountdialog.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/wordcountdialog.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.3
---- toolkit/workben/layout/wordcountdialog.cxx 6 Mar 2008 12:07:32 -0000 1.2
-+++ toolkit/workben/layout/wordcountdialog.cxx 27 Mar 2008 13:08:19 -0000 1.2.6.3
-@@ -96,7 +96,15 @@ SwWordCountDialog::~SwWordCountDialog()
+retrieving revision 1.3
+retrieving revision 1.2.6.4
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.4
+--- toolkit/workben/layout/wordcountdialog.cxx 11 Apr 2008 09:43:15 -0000 1.3
++++ toolkit/workben/layout/wordcountdialog.cxx 30 Jul 2008 12:36:25 -0000 1.2.6.4
+@@ -84,7 +84,15 @@ SwWordCountDialog::~SwWordCountDialog()
/*-- 06.04.2004 16:05:57---------------------------------------------------
-----------------------------------------------------------------------*/
@@ -10711,12 +10500,12 @@
Index: toolkit/workben/layout/zoom.cxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/zoom.cxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
---- toolkit/workben/layout/zoom.cxx 6 Mar 2008 12:09:02 -0000 1.2
-+++ toolkit/workben/layout/zoom.cxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -87,8 +87,42 @@ struct SvxZoomItem
+retrieving revision 1.3
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.2
+--- toolkit/workben/layout/zoom.cxx 11 Apr 2008 09:43:47 -0000 1.3
++++ toolkit/workben/layout/zoom.cxx 30 Jul 2008 12:36:22 -0000 1.2.6.2
+@@ -72,8 +72,42 @@ struct SvxZoomItem
fprintf( stderr, "Zoom factor: %d\n", int( n ) );
}
};
@@ -10758,8 +10547,8 @@
+#include <svx/viewlayoutitem.hxx>
#include <svx/dialmgr.hxx>
#endif /* !TEST_LAYOUT */
-
-@@ -113,16 +147,8 @@ static USHORT pRanges[] =
+ #include "zoom_def.hxx"
+@@ -95,16 +129,8 @@ static USHORT pRanges[] =
USHORT SvxZoomDialog::GetFactor() const
{
@@ -10776,7 +10565,7 @@
if ( aUserBtn.IsChecked() )
return (USHORT)aUserEdit.GetValue();
else
-@@ -140,31 +166,11 @@ void SvxZoomDialog::SetFactor( USHORT nN
+@@ -122,31 +148,11 @@ void SvxZoomDialog::SetFactor( USHORT nN
if ( !nBtnId )
{
@@ -10809,7 +10598,7 @@
else
{
aUserBtn.Check();
-@@ -270,16 +276,21 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
+@@ -252,16 +258,21 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_ZOOM ) ),
aZoomFl ( this, SVX_RES( FL_ZOOM ) ),
@@ -10836,7 +10625,7 @@
aOKBtn ( this, SVX_RES( BTN_ZOOM_OK ) ),
aCancelBtn ( this, SVX_RES( BTN_ZOOM_CANCEL ) ),
aHelpBtn ( this, SVX_RES( BTN_ZOOM_HELP ) ),
-@@ -292,15 +303,23 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
+@@ -274,15 +285,23 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
{
Link aLink = LINK( this, SvxZoomDialog, UserHdl );
@@ -10864,7 +10653,7 @@
aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
-@@ -341,9 +360,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
+@@ -323,9 +342,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
if ( rItem.ISA(SvxZoomItem) )
{
const SvxZoomItem& rZoomItem = (const SvxZoomItem&)rItem;
@@ -10877,7 +10666,7 @@
USHORT nBtnId = 0;
switch ( eType )
-@@ -363,17 +382,8 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
+@@ -345,17 +364,8 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
break;
}
@@ -10895,7 +10684,7 @@
if ( !(SVX_ZOOM_ENABLE_OPTIMAL & nValSet) )
aOptimalBtn.Disable();
if ( !(SVX_ZOOM_ENABLE_PAGEWIDTH & nValSet) )
-@@ -384,9 +394,56 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
+@@ -366,9 +376,56 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
}
else
{
@@ -10953,7 +10742,7 @@
#endif /* !TEST_LAYOUT */
FreeResource();
-@@ -438,17 +495,82 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, Metri
+@@ -420,17 +477,82 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, Metri
// -----------------------------------------------------------------------
@@ -11040,7 +10829,7 @@
if ( &aOKBtn == pBtn )
{
USHORT nFactor = GetFactor();
-@@ -456,14 +578,30 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button
+@@ -438,14 +560,30 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button
if ( SPECIAL_FACTOR == nFactor )
{
if ( aOptimalBtn.IsChecked() )
@@ -11075,7 +10864,7 @@
}
else
{
-@@ -472,7 +610,11 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button
+@@ -454,7 +592,11 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button
}
#if !TEST_LAYOUT
pOutSet = new SfxItemSet( rSet );
@@ -11091,12 +10880,12 @@
Index: toolkit/workben/layout/zoom.hxx
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/zoom.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
---- toolkit/workben/layout/zoom.hxx 6 Mar 2008 12:09:14 -0000 1.2
-+++ toolkit/workben/layout/zoom.hxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -77,16 +77,21 @@ class SvxZoomDialog : public SfxModalDia
+retrieving revision 1.3
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.3 -r1.2.6.2
+--- toolkit/workben/layout/zoom.hxx 11 Apr 2008 09:44:04 -0000 1.3
++++ toolkit/workben/layout/zoom.hxx 30 Jul 2008 12:36:31 -0000 1.2.6.2
+@@ -66,16 +66,21 @@ class SvxZoomDialog : public SfxModalDia
{
private:
FixedLine aZoomFl;
@@ -11123,7 +10912,7 @@
OKButton aOKBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
-@@ -100,6 +105,9 @@ private:
+@@ -89,6 +94,9 @@ private:
#ifdef _SVX_ZOOM_CXX
DECL_LINK( UserHdl, RadioButton* );
DECL_LINK( SpinHdl, MetricField* );
@@ -11201,43 +10990,39 @@
===================================================================
RCS file: /cvs/gsl/toolkit/workben/layout/zoom_def.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.6.1
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.1
+retrieving revision 1.2.6.2
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.6.2
--- toolkit/workben/layout/zoom_def.hxx 6 Mar 2008 12:09:37 -0000 1.2
-+++ toolkit/workben/layout/zoom_def.hxx 20 Mar 2008 11:56:32 -0000 1.2.6.1
-@@ -1,3 +1,38 @@
++++ toolkit/workben/layout/zoom_def.hxx 30 Jul 2008 11:18:03 -0000 1.2.6.2
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+ * MA 02110-1301 USA
++ * 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.
+ *
+ ************************************************************************/
+
Modified: trunk/patches/dev300/cws-layoutdialogs-transex3.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-transex3.diff (original)
+++ trunk/patches/dev300/cws-layoutdialogs-transex3.diff Thu Jul 31 10:32:58 2008
@@ -1,74 +1,47 @@
-cvs diff: Diffing transex3
-cvs diff: Diffing transex3/inc
-cvs diff: Diffing transex3/inc/pch
-cvs diff: Diffing transex3/inc/transex3
-cvs diff: Diffing transex3/java
-cvs diff: Diffing transex3/java/l10nconv
-cvs diff: Diffing transex3/java/l10nconv/documentation
-cvs diff: Diffing transex3/java/l10nconv/java
-cvs diff: Diffing transex3/java/l10nconv/java/com
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star/tooling
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star/tooling/converter
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd
-cvs diff: Diffing transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver
-cvs diff: Diffing transex3/java/receditor
-cvs diff: Diffing transex3/java/receditor/java
-cvs diff: Diffing transex3/java/receditor/java/transex3
-cvs diff: Diffing transex3/java/receditor/java/transex3/controller
-cvs diff: Diffing transex3/java/receditor/java/transex3/model
-cvs diff: Diffing transex3/java/receditor/java/transex3/view
-cvs diff: Diffing transex3/layout
Index: transex3/layout/layoutparse.cxx
===================================================================
RCS file: /cvs/l10n/transex3/layout/layoutparse.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.2.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.3
+retrieving revision 1.2.2.4
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.4
--- transex3/layout/layoutparse.cxx 6 Mar 2008 12:35:12 -0000 1.2
-+++ transex3/layout/layoutparse.cxx 4 Apr 2008 09:11:45 -0000 1.2.2.3
-@@ -1,3 +1,38 @@
++++ transex3/layout/layoutparse.cxx 30 Jul 2008 11:29:33 -0000 1.2.2.4
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * 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.
+ *
+ ************************************************************************/
+
#include "layoutparse.hxx"
#define STRING( str ) String( str, RTL_TEXTENCODING_UTF8 )
-@@ -20,6 +55,8 @@ LayoutXMLFile::SearchL10NElements( XMLPa
+@@ -20,6 +51,8 @@ LayoutXMLFile::SearchL10NElements( XMLPa
for ( ULONG i = 0; i < lst->Count(); i++ )
if ( lst->GetObject( i )->GetNodeType() == XML_NODE_TYPE_ELEMENT )
HandleElement( ( XMLElement* )lst->GetObject( i ) );
@@ -77,7 +50,7 @@
}
std::vector<XMLAttribute*>
-@@ -42,13 +79,14 @@ LayoutXMLFile::HandleElement( XMLElement
+@@ -42,13 +75,14 @@ LayoutXMLFile::HandleElement( XMLElement
if ( interesting.size() )
{
@@ -99,50 +72,46 @@
===================================================================
RCS file: /cvs/l10n/transex3/layout/layoutparse.hxx,v
retrieving revision 1.2
-retrieving revision 1.2.2.2
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.2
+retrieving revision 1.2.2.3
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.3
--- transex3/layout/layoutparse.hxx 6 Mar 2008 12:35:24 -0000 1.2
-+++ transex3/layout/layoutparse.hxx 27 Mar 2008 13:09:53 -0000 1.2.2.2
-@@ -1,3 +1,38 @@
++++ transex3/layout/layoutparse.hxx 30 Jul 2008 11:29:33 -0000 1.2.2.3
+@@ -1,3 +1,34 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * 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.
+ *
+ ************************************************************************/
+
#ifndef LAYOUTPARSE_HXX
#define LAYOUTPARSE_HXX
-@@ -14,6 +49,9 @@ public:
+@@ -14,6 +45,9 @@ public:
BOOL Write( ByteString &aFilename );
void HandleElement( XMLElement* element );
void InsertL10NElement( ByteString const& id, XMLElement* element );
@@ -156,50 +125,46 @@
===================================================================
RCS file: /cvs/l10n/transex3/layout/makefile.mk,v
retrieving revision 1.2
-retrieving revision 1.2.2.3
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.3
+retrieving revision 1.2.2.5
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.5
--- transex3/layout/makefile.mk 6 Mar 2008 12:36:23 -0000 1.2
-+++ transex3/layout/makefile.mk 30 Mar 2008 13:36:03 -0000 1.2.2.3
-@@ -1,3 +1,38 @@
++++ transex3/layout/makefile.mk 30 Jul 2008 11:29:33 -0000 1.2.2.5
+@@ -1,3 +1,34 @@
+#*************************************************************************
+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
+#
-+# last change: $Author$ $Date$
++# OpenOffice.org - a multi-platform office productivity suite
+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
++# $RCSfile$
+#
++# $Revision$
+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
++# This file is part of OpenOffice.org.
+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
++# 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.
+#
-+# This library 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 for more details.
++# 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 along with this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
-+# MA 02110-1301 USA
++# 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=..
INCPRE=$(MISC)
-@@ -20,14 +55,8 @@ CFLAGS+=-DSYSTEM_EXPAT
+@@ -20,14 +51,8 @@ CFLAGS+=-DSYSTEM_EXPAT
# --- Files --------------------------------------------------------
@@ -214,11 +179,14 @@
OBJFILES =\
$(OBJ)/export2.obj\
$(OBJ)/helpmerge.obj\
-@@ -41,27 +70,16 @@ APP1OBJS = $(OBJFILES)
+@@ -39,29 +64,18 @@ OBJFILES =\
+ APP1OBJS = $(OBJFILES)
+
APP1STDLIBS =\
- $(EXPATASCII3RDLIB)\
+- $(EXPATASCII3RDLIB)\
$(TOOLSLIB)\
- $(VOSLIB)
++ $(EXPATASCII3RDLIB)\
+ $(VOSLIB)\
+ $(CPPULIB) \
+ $(SALLIB)
@@ -251,43 +219,39 @@
===================================================================
RCS file: /cvs/l10n/transex3/layout/tralay.cxx,v
retrieving revision 1.2
-retrieving revision 1.2.2.7
-diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.7
+retrieving revision 1.2.2.8
+diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.8
--- transex3/layout/tralay.cxx 6 Mar 2008 12:36:58 -0000 1.2
-+++ transex3/layout/tralay.cxx 4 Apr 2008 09:11:45 -0000 1.2.2.7
-@@ -1,6 +1,43 @@
++++ transex3/layout/tralay.cxx 30 Jul 2008 11:29:33 -0000 1.2.2.8
+@@ -1,6 +1,39 @@
+/*************************************************************************
+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
+ *
-+ * last change: $Author$ $Date$
++ * OpenOffice.org - a multi-platform office productivity suite
+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
++ * $RCSfile$
+ *
++ * $Revision$
+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ * This file is part of OpenOffice.org.
+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
++ * 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.
+ *
-+ * This library 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 for more details.
++ * 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 along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * 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.
+ *
+ ************************************************************************/
+
@@ -299,7 +263,7 @@
#include "export.hxx"
#include "layoutparse.hxx"
#include "helpmerge.hxx"
-@@ -12,7 +49,9 @@
+@@ -12,7 +45,9 @@
#define STRING( str ) String( str, RTL_TEXTENCODING_UTF8 )
#define BSTRING( str ) ByteString( str, RTL_TEXTENCODING_UTF8 )
@@ -310,7 +274,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-@@ -31,7 +70,7 @@ class TranslateLayout : public Applicati
+@@ -31,7 +66,7 @@ class TranslateLayout : public Applicati
public:
TranslateLayout();
@@ -319,7 +283,7 @@
ByteString GetCommandLineParam( int i );
ByteString GetOptionArgument( int const i );
void ExceptionalMain();
-@@ -40,6 +79,8 @@ public:
+@@ -40,6 +75,8 @@ public:
void MergeLanguage( ByteString const& language );
void ParseCommandLine();
void CreateSDF();
@@ -328,7 +292,7 @@
};
static void usage()
-@@ -55,9 +96,29 @@ static void usage()
+@@ -55,9 +92,29 @@ static void usage()
exit( 2 );
}
@@ -359,7 +323,7 @@
}
ByteString TranslateLayout::GetOptionArgument( int const i )
-@@ -90,14 +151,14 @@ void TranslateLayout::ParseCommandLine()
+@@ -90,14 +147,14 @@ void TranslateLayout::ParseCommandLine()
mLocalize = GetOptionArgument( ++i );
}
else if ( aParam.Equals( "-o" ) || aParam.Equals( "--output" ) )
@@ -376,7 +340,7 @@
}
if ( !mFiles.size() )
{
-@@ -129,10 +190,14 @@ translateElement( XMLElement* element, B
+@@ -129,10 +186,14 @@ translateElement( XMLElement* element, B
ResData* resData, MergeDataFile& mergeData )
{
XMLAttributeList* attributes = element->GetAttributeList();
@@ -395,7 +359,7 @@
{
ByteString attributeId = id;
attributeId += BSTRING ( **i );
-@@ -154,24 +219,47 @@ translateElement( XMLElement* element, B
+@@ -154,24 +215,47 @@ translateElement( XMLElement* element, B
}
}
}
@@ -450,7 +414,7 @@
}
void TranslateLayout::MergeLanguage( ByteString const& language )
-@@ -190,6 +278,7 @@ void TranslateLayout::MergeLanguage( Byt
+@@ -190,6 +274,7 @@ void TranslateLayout::MergeLanguage( Byt
}
layoutXml->Extract();
@@ -458,7 +422,7 @@
ResData resData( "", "", "" );
resData.sResTyp = mProject; /* mGid1 ?? */
-@@ -204,7 +293,11 @@ void TranslateLayout::MergeLanguage( Byt
+@@ -204,7 +289,11 @@ void TranslateLayout::MergeLanguage( Byt
translateElement( element, language, &resData, mergeData );
}
@@ -470,7 +434,7 @@
if ( mOutput.Len() )
{
outFile = mOutput;
-@@ -235,7 +328,11 @@ void TranslateLayout::Merge()
+@@ -235,7 +324,11 @@ void TranslateLayout::Merge()
void TranslateLayout::CreateSDF()
{
ByteString xmlFile = mFiles.front();
@@ -482,7 +446,7 @@
if ( mOutput.Len() )
sdf = mOutput;
Export::SetLanguages( mLanguages );
-@@ -289,7 +386,7 @@ TranslateLayout::TranslateLayout()
+@@ -289,7 +382,7 @@ TranslateLayout::TranslateLayout()
, mLocalize( "localize.sdf" )
, mOutput()
, mProject( "layout" )
@@ -507,7 +471,3 @@
<modaldialog xmlns="http://openoffice.org/2007/layout";
xmlns:cnt="http://openoffice.org/2007/layout/container";
-cvs diff: Diffing transex3/prj
-cvs diff: Diffing transex3/scripts
-cvs diff: Diffing transex3/source
-cvs diff: Diffing transex3/workbench
Modified: trunk/patches/dev300/layout-plugin-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-plugin-toolkit.diff (original)
+++ trunk/patches/dev300/layout-plugin-toolkit.diff Thu Jul 31 10:32:58 2008
@@ -449,7 +449,7 @@
uno::Reference< awt::XWindowPeer > xWinPeer;
try
{
-- DBG_ERROR1("Asking toolkit: %s\n", OUSTRING_CSTR( desc.WindowServiceName ) );
+-// DBG_ERROR1("Asking toolkit: %s\n", OUSTRING_CSTR( desc.WindowServiceName ) );
+ OSL_TRACE("Asking toolkit: %s", OUSTRING_CSTR( desc.WindowServiceName ) );
xWinPeer = xToolkit->createWindow( desc );
if ( !xWinPeer.is() )
@@ -588,34 +588,6 @@
#include <hash_map>
#include <com/sun/star/awt/XLayoutRoot.hpp>
-@@ -46,6 +47,7 @@
- #include <com/sun/star/lang/XInitialization.hpp>
- #include <cppuhelper/implbase3.hxx>
- #include <cppuhelper/interfacecontainer.h>
-+#include <toolkit/dllapi.h>
-
- #include "proplist.hxx"
-
-@@ -70,7 +72,7 @@ css::uno::Reference< css::io::XInputStream > getFileAsStream( const rtl::OUStrin
-
- class LayoutWidget;
-
--class LayoutRoot : public ::cppu::WeakImplHelper3<
-+class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3<
- css::awt::XLayoutRoot,
- css::lang::XInitialization,
- css::lang::XComponent>
-@@ -130,7 +132,7 @@ public:
- virtual LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs, css::uno::Reference< css::awt::XLayoutContainer > xParent );
- };
-
--class LayoutWidget
-+class TOOLKIT_DLLPUBLIC LayoutWidget
- {
- friend class LayoutRoot;
-
-diff --git a/source/layout/translate.cxx b/source/layout/translate.cxx
-index 7eac2ba..97ed3c7 100644
--- toolkit/source/layout/translate.cxx
+++ toolkit/source/layout/translate.cxx
@@ -37,7 +37,7 @@
@@ -666,7 +638,7 @@
index e88a2bb..6188ac1 100644
--- toolkit/source/vclcompat/wrapper.cxx
+++ toolkit/source/vclcompat/wrapper.cxx
-@@ -35,21 +35,22 @@
+@@ -35,20 +35,21 @@
#include "wrapper.hxx"
@@ -692,7 +664,6 @@
+#include <toolkit/awt/vclxwindow.hxx>
+#include <vcl/ctrl.hxx>
#include <vcl/image.hxx>
- #include <stdio.h>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
Modified: trunk/patches/dev300/layout-simple-dialogs-offapi.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-offapi.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-offapi.diff Thu Jul 31 10:32:58 2008
@@ -1,18 +1,56 @@
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
-index a9b99dc..3cde809 100644
+index 70aafbc..83d4ca8 100644
--- offapi/com/sun/star/awt/XDialog2.idl
+++ offapi/com/sun/star/awt/XDialog2.idl
-@@ -12,11 +12,12 @@ module com { module sun { module star { module awt {
+@@ -12,7 +12,7 @@ module com { module sun { module star { module awt {
//=============================================================================
-/** Makes it possible to end a dialog.
+/** Makes it possible to end a dialog and set a help id.
+
+ @since OOo 3.0
*/
- published interface XDialog2: com::sun::star::awt::XDialog
- {
+@@ -22,6 +22,10 @@ interface XDialog2: com::sun::star::awt::XDialog
+ to return with the given result value.
+ */
void endDialog ( [in] long Result );
++ /** sets the help id so that the standard help button action will
++ show the appropriate help page.
++ */
+ void setHelpId ( [in] long Id );
};
//=============================================================================
+diff --git a/offapi/com/sun/star/awt/XDialog2.idl.rej b/offapi/com/sun/star/awt/XDialog2.idl.rej
+new file mode 100644
+index 0000000..d7e663f
+--- /dev/null
++++ offapi/com/sun/star/awt/XDialog2.idl.rej
+@@ -0,0 +1,26 @@
++*************** module com { module sun { module star { module awt {
++*** 12,22 ****
++
++ //=============================================================================
++
++- /** Makes it possible to end a dialog.
++ */
++ published interface XDialog2: com::sun::star::awt::XDialog
++ {
++ void endDialog ( [in] long Result );
++ };
++
++ //=============================================================================
++--- 12,23 ----
++
++ //=============================================================================
++
+++ /** Makes it possible to end a dialog and set a help id.
++ */
++ published interface XDialog2: com::sun::star::awt::XDialog
++ {
++ void endDialog ( [in] long Result );
+++ void setHelpId ( [in] long Id );
++ };
++
++ //=============================================================================
Modified: trunk/patches/dev300/layout-simple-dialogs-sc-localize.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sc-localize.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-sc-localize.diff Thu Jul 31 10:32:58 2008
@@ -1,8 +1,8 @@
diff --git a/sc/uiconfig/layout/localize.sdf b/sc/uiconfig/layout/localize.sdf
-index 14a2333..9c16333 100644
+index 14a2333..99775d4 100644
--- sc/uiconfig/layout/localize.sdf
+++ sc/uiconfig/layout/localize.sdf
-@@ -1872,3 +1872,859 @@ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 xh
+@@ -1872,3 +1872,1251 @@ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 xh
layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zh-CN æå 2002-02-02 02:02:02
layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zh-TW æå 2002-02-02 02:02:02
layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zu Hlela 2002-02-02 02:02:02
@@ -862,3 +862,395 @@
+layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zh-CN æååäè(~N) 2002-02-02 02:02:02
+layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zh-TW æååäè(~N) 2002-02-02 02:02:02
+layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zu Iphepha eli~sha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 af ~Kopieer 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ar ~ØÙØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 be-BY ÐÐÐÑÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 bg ~ÐÐÐÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 br ~Eilaà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 bs Kopir~aj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ca ~Copia 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 cs KopÃrovat 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 cy ~CopÃo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 da K~opier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 de ~kopieren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 dz ààààààààà(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 el ÎÎÏÎ~ÎÏÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 en-GB ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 en-ZA ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 eo Kopii 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 es ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 et Kopeerimine 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fa ~ÙØØÙâØØØØØÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fi K~opioi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fr ~Copier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ga ~CÃipeÃil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gl ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gu ààà (~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gu-IN ààà ààà (~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hi-IN ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hr ~Kopiraj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hu ~MÃsolÃs 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 it ~Copia 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ja ããã(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ka ~áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 km ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ko ëì(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ku Ji ber ~bigire 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 lt ~Kopijuoti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 mk ~ÐÐÐÐÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ml-IN ààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 mr-IN ~ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nb ~Kopier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ne ààààààààà àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nl ~KopiÃren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nn ~Kopier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nr ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ns ~KopiÅa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 or-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pa-IN ààà(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pl ~Kopiuj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pt ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pt-BR ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ru ÐÐÐÐÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 rw Gukoporora 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sh ~UmnoÅi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sk ~KopÃrovaÅ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sl Kopira~j 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sr ~ÐÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ss ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 st ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sv ~Kopiera 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sw-TZ Nakili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ta ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ta-IN ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 te-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tg ~ÐÑÑÑÐÐÐÑÓ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 th ~àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ti-ER ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tn ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tr ~Kopyala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ts ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 uk ~ÐÐÐÑÑÐÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ur-IN ÙÙÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 uz ~Nusxa olish 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ve ~Kopani 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 vi ~ChÃp 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 xh ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zh-CN åå(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zh-TW èè(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zu ~Khipha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 af Aan ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ar ØÙÙ ØÙ~ÙØØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 as-IN àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 be-BY Ð ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 bg ÐÑÐ ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 br Da~vet an teul 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 bs U ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ca Al ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 cs Do dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 cy I ~ddogfen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 da I dokumentet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 de ~Ins Dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 dz ààààààààà(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 el ÎÏÎ Î~ÎÎÏÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 en-GB To ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 en-ZA To ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 eo Al dokumento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 es ~Al documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 et Dokumenti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fa ØÙ ~ÙÙØØØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fi ~Asiakirjaan 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fr ~Vers le document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ga Go ~cÃipÃis 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gl Ao documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gu ààààààààààà (~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gu-IN ààààààààààà (~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hi-IN àààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hr Na ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hu A ~dokumentumba: 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 it In ~documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ja çååããããããå(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ka ~ááááááááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 km ááâááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ko ëìì(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ku Bo ~Belgeyà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 lt Ä ~skaiÄiuoklÄs dokumentÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 mk ÐÐ ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ml-IN àààààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 mr-IN ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nb ~Til dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ne àààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nl ~Naar document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nn ~Til dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nr E~mtlolweni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ns To~komane 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 or-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pa-IN àààààààà àà(~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pl Do dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pt ~Documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pt-BR Ao ~documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ru Ð ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 rw Gushyira mu nyandiko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sh U ~dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sk K ~dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sl V ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sr Ð ~ÐÐÐÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ss Ku~dokhumenta 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 st Ho ~tokomane 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sv T~ill dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sw-TZ Kwenye andiko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ta ~ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ta-IN ~ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 te-IN ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tg ÐÐ ÒÑÒÒÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 th àààààà~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ti-ER áá áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tn Go ~setlankana 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tr ~Belgeye 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ts Eka ~dokumente 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 uk Ð ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ur-IN ØØØØÙÛØÙÛÚ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 uz Hujjatga 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ve Kha ~áiáwalo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 vi VÃo tÃi ~liáu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 xh Ukuya ~kuxwebhu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zh-CN ååææ(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zh-TW ååæä(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zu ~Oshicilelweni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 af ~Voeg in voor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ar ØØ~ØØØ ÙØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 as-IN ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 be-BY ÐÑÑÐÐÑÑÑ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 bg ~ÐÐÑÐÐÐÐÐ ÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 br E~nlakaat a-raok 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 bs Stav~i ispred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ca ~Insereix abans de 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 cs VloÅit pÅed 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 cy ~Mewnosod cyn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 da ~IndsÃt fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 de Ei~nfÃgen vor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 dz ààààààààààà(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 el Î~ÎÏÎÎÏÎÎ ÏÏÎÎ ÎÏÏ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 en-GB ~Insert before 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 en-ZA ~Insert before 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 eo Enmeti antaux 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 es Insertar ~delante de 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 et JÃrgmine leht: 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 fi ~LisÃÃ eteen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 fr I~nsÃrer avant 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ga ~IonsÃigh roimh 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gl ~Inserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gu àààààà ààààà (~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gu-IN àààààà ààààà (~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 he ××××× ×××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hi-IN àà àààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hr ~Umetni prije 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hu ~BeszÃrÃs elà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 it Prima del foglio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ja æãèãåãæå(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ka áááááááá -~ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 km ááááááâááâááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ko ìì ìì(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ku ~Li pÃÅ zÃde bike 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 lt ~Äterpti prieÅ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 mk ~ÐÐÐÑÐÐ ÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ml-IN ààààààààààààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 mr-IN àààà ààà àààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nb ~Sett inn fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ne ààà ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nl ~Invoegen voor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nn ~Set inn fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nr ~Faka ngaphambi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ns ~Nokela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 or-IN àààààààààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pa-IN àààààà ààààà(~i) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pl W~staw przed 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pt I~nserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pt-BR ~Inserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ru ÐÑÑÐÐÐÑÑ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 rw Kongeramo mbere 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sh ~Umetni pre 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sk VloÅ~iÅ pred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sl ~Vstavi pred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sr ~ÐÐÐÑÐÐ ÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ss ~Faka kucala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 st ~Kenya pele ha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sv I~nfoga framfÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sw-TZ Chomeka kabla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ta ~àààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ta-IN ~àààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 te-IN ààààà àààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tg ÐÐÐÐÐÐÑÐÐ ÐÐÑ ÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 th à~ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ti-ER áá ááá ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tn ~Tsenya pele 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tr ~Ãne ekle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ts ~Nghenisa emahlweni ka 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 uk ÐÑÑ~ÐÐÐÑÐ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ur-IN ÚØÙÙÛØÛ ÙÛÙÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ve ~Longelani phanáa ha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 vi ChÃn vÃo t~rÆác 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 xh ~Faka ngethuba langaphambili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zh-CN åçä(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zh-TW åçæ(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zu ~Faka ngaphambili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 af Verskuif/kopieer blaai 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ar ÙÙÙ/ÙØØ ØÙÙØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 as-IN àààààà ààààà àààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 be-BY ÐÐÑÐÐÑÑÑÑÑÑ ÑÑ ÐÐÐÑÑÐÐÐÑÑ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 bg ÐÐÑÑÐÐÐ/ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 br Dilec'hiaÃ/eilaà ar follennad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 bs Pomjeri/kopiraj list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ca Mou/Copia el full 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 cs PÅesunout/KopÃrovat list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 cy Symud/CopÃo Dolen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 da Flyt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 de Tabelle verschieben/kopieren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 dz ààààààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 el ÎÎÏÎÎÎÎÎÏÎ/ÎÎÏÎÎÏÎÏÎ ÎÏÎÎÎÏ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 en-GB Move/Copy Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 en-ZA Move/Copy Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 eo Movi/kopii folion 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 es Desplazar/Copiar hoja 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 et Lehe teisaldamine/kopeerimine 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fa ØØØÙâØØÛÛ/ÙØØÙâØØØØØÛ ØØ ØØÚÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fi SiirrÃ/kopioi taulukko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fr DÃplacer/copier la feuille 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ga Bog/CÃipeÃil Bileog 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gl Mover/Copiar folla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gu ààà ààààà/ààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gu-IN ààà ààààà/ààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 he ××××/××××× ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hi-IN ààà àà ààààà àààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hr Pomakni/kopiraj list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hu Munkalap ÃthelyezÃse/mÃsolÃsa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 it Sposta o copia tabella 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ja ããããçåãããããã 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ka ááááááá áááááááá/áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 km áááááááá/áááááâ áááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ko ìí ìë/ëì 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ku RÃpel VeguhezÃne/Ji Ber Bigire 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 lt LakÅto kopijavimas arba perkÄlimas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 mk ÐÑÐÐÐÑÑÑÐÐÑÐ/ÐÐÐÐÑÐÑÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ml-IN àààààà ààààààà/àààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 mr-IN àààà ààààà/àààààààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nb Flytt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ne àààà àààààààààà/ààààààààà àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nl Blad verplaatsen/kopiÃren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nn Flytt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nr Tjhidisa/Kopa iKhasi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ns ÅuthiÅa/Kopolla letlakala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 or-IN ààà ààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pa-IN ààà àààà/ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pl PrzenieÅ/Kopiuj arkusz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pt Mover/Copiar folha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pt-BR Mover / Copiar planilha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ru ÐÐÑÐÐÐÑÑÐÑÑ/ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 rw Kwimura/Gukoporora Urupapuro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sh Pomeri/umnoÅi stranicu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sk PresunÃÅ/KopÃrovaÅ list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sl Premakni/kopiraj delovni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sr ÐÐÐÐÑÐ/ÑÐÐÐÐÐ ÑÑÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ss Hambisa/Kopa lishithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 st Tsamaisa/Kopisa Pampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sv Kopiera/flytta tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sw-TZ Sogeza/Nakili Laha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ta àààà ààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ta-IN àààà ààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 te-IN ààà àààà/ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tg ÒÐÐÐÐÐÐÐÑÐÓ/ÐÑÑÑÐÐÐÑÐÐ ÐÐÑÐÒ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 th àààà/ààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ti-ER áá áááááá/ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tn samaisa/Kopisa Letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tr SayfayÄ TaÅÄ/Kopyala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ts Fambisa/kopisa phepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 uk ÐÐÑÐÐÑÑÑÐÑÐ / ÐÐÐÑÑÐÐÑÐ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ur-IN ØÛÙ ÚØ ÙÙØÙ ØØØÛÙ /ÙÙÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 uz Varaqni koÊchirish/nusxa olish 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ve Sendedzani/Kopani Shithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 vi Chuyán/ChÃp trang 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 xh Shenxisa/Kopa Icwecwe 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zh-CN çåæåååäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zh-TW çåæèèåäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zu Nyakazisa/Khiphela Iphepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 af - nuwe dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ar - ÙØØÙØ ØØÙØ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 as-IN - àààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 be-BY - ÐÐÐÑ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 bg - ÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 br - Teul nevez - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 bs - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ca - document nou - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 cs - novà dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 cy - dogfen newydd - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 da - nyt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 de - neues Dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 dz ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 el - ÎÎÎ ÎÎÎÏÎÏÎ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 en-GB - new document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 en-ZA - new document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 eo - nova dokumento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 es - nuevo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 et - uus dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fa â ÙÙØØØØ ØØÛØ â 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fi - uusi asiakirja - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fr - nouveau document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ga - cÃipÃis nua - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gl - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gu - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gu-IN - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 he - ×××× ××× - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hi-IN - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hr - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hu - Ãj dokumentum - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 it - nuovo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ja -æèãããããã- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ka ~ááááá ááááááááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 km - áááááâáááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ko -ì ëì - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ku - belgeyeke nà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 lt - naujas dokumentas - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 mk - ÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ml-IN ààààà àààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 mr-IN -ààà ààààààà- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nb - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ne - àààà àààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nl - nieuw document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nn - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nr - umtlolo omutjha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ns - tokumente e mpsha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 or-IN -ààà àààà- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pa-IN - àààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pl - nowy dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pt - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pt-BR - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ru - ÐÐÐÑÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 rw - Inyandiko nshya - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sh - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sk - novà dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sl - nov dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sr - ÐÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ss - idokhumenti lensha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 st - tokomane e ntjha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sv - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sw-TZ - andiko jipya - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ta - ààààà ààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ta-IN - ààààà ààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 te-IN ààààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tg - ÒÑÒÒÐÑÐ ÐÐÐ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 th - àààààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ti-ER - ááá áááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tn - ntsha setlankana - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tr - yeni belge - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ts - dokumente yintshwa - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 uk - ÐÐÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ur-IN ÙØÛ ØØØØÙÛØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 uz - yangi hujjat - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ve - áiáwalo áiswaw - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 vi - tÃi liáu mái - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 xh - uxwebhu olutsha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zh-CN - æææ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zh-TW - ææä - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zu - ushicilelo olusha - 2002-02-02 02:02:02
Modified: trunk/patches/dev300/layout-simple-dialogs-sc.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sc.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-sc.diff Thu Jul 31 10:32:58 2008
@@ -50,6 +50,28 @@
+
#endif // SC_INSTBDLG_HXX
+diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
+index ab3f88e..6a03527 100644
+--- sc/source/ui/inc/mvtabdlg.hxx
++++ sc/source/ui/inc/mvtabdlg.hxx
+@@ -38,6 +38,9 @@
+ #include <vcl/lstbox.hxx>
+ #include <vcl/fixed.hxx>
+
++#include <layout/layout.hxx>
++#include <layout/layout-pre.hxx>
++
+ //------------------------------------------------------------------------
+
+ class ScMoveTableDlg : public ModalDialog
+@@ -72,6 +75,7 @@ private:
+ DECL_LINK( SelHdl, ListBox * );
+ };
+
++#include <layout/layout-post.hxx>
+
+ #endif // SC_MVTABDLG_HXX
+
diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index 7ec9bc1..5cc06c6 100644
--- sc/source/ui/inc/strindlg.hxx
@@ -73,7 +95,7 @@
#endif // SC_STRINDLG_HXX
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
-index 24d8b97..a3a57d9 100644
+index 60b49e8..f772631 100644
--- sc/source/ui/miscdlgs/instbdlg.cxx
+++ sc/source/ui/miscdlgs/instbdlg.cxx
@@ -55,6 +55,17 @@
@@ -105,7 +127,7 @@
Init_Impl( bFromFile );
FreeResource();
}
-@@ -146,6 +161,10 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
+@@ -152,6 +167,10 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
//------------------------------------------------------------------------
@@ -116,7 +138,7 @@
short __EXPORT ScInsertTableDlg::Execute()
{
// set Parent of DocumentInserter and Doc-Manager
-@@ -156,6 +175,7 @@ short __EXPORT ScInsertTableDlg::Execute()
+@@ -162,6 +181,7 @@ short __EXPORT ScInsertTableDlg::Execute()
aBrowseTimer.Start();
short nRet = ModalDialog::Execute();
@@ -124,6 +146,37 @@
Application::SetDefDialogParent( pOldDefParent );
return nRet;
}
+diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
+index ea36044..67db04a 100644
+--- sc/source/ui/miscdlgs/mvtabdlg.cxx
++++ sc/source/ui/miscdlgs/mvtabdlg.cxx
+@@ -47,6 +47,15 @@
+ #include "scresid.hxx"
+ #include "globstr.hrc"
+
++#include <layout/layout-pre.hxx>
++
++#if ENABLE_LAYOUT
++#undef ScResId
++#define ScResId(x) #x
++#undef ModalDialog
++#define ModalDialog( parent, id ) Dialog( parent, "move-copy-sheet.xml", id )
++#endif /* ENABLE_LAYOUT */
++
+ //==================================================================
+
+ ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
+@@ -66,6 +75,10 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
+ nTable ( 0 ),
+ bCopyTable ( FALSE )
+ {
++#if ENABLE_LAYOUT
++#undef ScResId
++ SetHelpId (FID_TAB_MOVE);
++#endif /* ENABLE_LAYOUT */
+ Init();
+ FreeResource();
+ }
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 8056bbb..46e40d4 100644
--- sc/source/ui/miscdlgs/strindlg.cxx
@@ -159,7 +212,7 @@
# drawattr.cxx fuer IDL (enums), sollte in den Svx gehen??
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
-index c77c556..7c12966 100644
+index d845c3b..6987883 100644
--- sc/source/ui/view/tabvwshf.cxx
+++ sc/source/ui/view/tabvwshf.cxx
@@ -40,6 +40,7 @@
@@ -178,7 +231,7 @@
#include "scabstdlg.hxx" //CHINA001
#define IS_AVAILABLE(WhichId,ppItem) \
-@@ -623,11 +623,19 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
+@@ -623,11 +623,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
// wenn's nicht von Basic kommt, nochmal nachfragen:
@@ -188,11 +241,9 @@
- ScGlobal::GetRscString(STR_QUERY_DELTAB)
- ).Execute() );
+#if ENABLE_LAYOUT
-+//This is plural: delete sheetS, but plural is used in the English and German questions too
-+//Guess Dutch is broken
++// Using layout::QueryBox without client code modification is
++// deprecated, rather add HIG-complient buttons with verbs.
+#define QueryBox( parent, winbits, question ) layout::QueryBox (parent, question, ScGlobal::GetRscString (STR_UNDO_DELETE_TAB))
-+//Seems OK in en-US, nl, de; this string has no `contents' or `undo', only delete...
-+//#define QueryBox( parent, winbits, question ) layout::QueryBox (parent, question, ScGlobal::GetRscString (STR_UNDO_DELETECONTENTS))
+#endif /* ENABLE_LAYOUT */
+
+ bDoIt = ( RET_YES ==
@@ -305,17 +356,1274 @@
-# Don't want to overwrite filled localize.sdf with empty template
-template.sdf:
- $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
+diff --git a/sc/uiconfig/layout/localize.sdf b/sc/uiconfig/layout/localize.sdf
+index 14a2333..99775d4 100644
+--- sc/uiconfig/layout/localize.sdf
++++ sc/uiconfig/layout/localize.sdf
+@@ -1872,3 +1872,1251 @@ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 xh
+ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zh-CN æå 2002-02-02 02:02:02
+ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zh-TW æå 2002-02-02 02:02:02
+ layout sc\uiconfig\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 zu Hlela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 af Ska~kel 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ar Ø~ØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 as-IN ààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 be-BY ÐÐÐÑÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 bg ~ÐÑÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 br ~Eren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 bs Lin~k 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ca Enlla~Ã 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 cs Odkaz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 cy Cysw~llt 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 da Sammen~kÃd 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 de Ver~knÃpfen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 dz ààààààààà(~k) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 el ÎÏÎ~ÎÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 en-GB Lin~k 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 en-ZA Lin~k 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 eo Ligi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 es ~Vincular 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 et Lin~k 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 fi Lin~kki 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 fr ~Lier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ga Nas~c 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 gl ~LigazÃn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 gu ààà (~k) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 gu-IN ààà (~k) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 hi-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 hr ~Veza 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 hu Hiv~atkozÃs 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 it ~Collega 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ja ããã(~K) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ka á~áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 km ááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ko ëí(~K) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ku LÃn~k 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 lt S~usieti su Åaltiniu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 mk ~ÐÑÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ml-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 mr-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 nb ~Lenke 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ne ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 nl ~Koppelen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 nn ~Lenkje 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 nr Thintani~sa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ns Lomagany~a 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 or-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 pa-IN àààà(~k) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 pl ÅÄc~z z plikiem 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 pt Li~gaÃÃo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 pt-BR ~Vincular 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ru ÐÐÑÐÑ Ñ ÑÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 rw Ihuza 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sh Ve~za 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sk Od~kaz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sl Po~vezava 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sr ÐÐ~ÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ss Sihlangani~si 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 st Hok~ahanya 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sv LÃn~ka 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 sw-TZ Kiungo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ta à~àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ta-IN à~àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 te-IN ~ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 tg ÐÐÐÒÐ ÐÐ ÐÐÑÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 th ààààààà~àà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ti-ER ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 tn Kgo~lagano 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 tr BaÄ~lantÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ts Hlanga~nisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 uk ~ÐÐ'ÑÐÐÐ Ð ÑÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ur-IN ØÙÚÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 uz ~BogÊlama 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 ve áhuman~yo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 vi LiÃn ~kát 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 xh Nxuluman~isa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 zh-CN éæ(~K) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 zh-TW éç(~K) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout CB_LINK_label 0 zu Isi~xhumanisi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 af Posisie 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ar ÙÙØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 as-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 be-BY ÐÐÐÑÑÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 bg ÐÐÐÐÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 br Lec'hiadur 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 bs PoloÅaj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ca Posicià 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 cs UmÃstÄnà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 cy Safle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 da Placering 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 de Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 dz àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 el ÎÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 en-GB Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 en-ZA Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 eo Pozicio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 es PosiciÃn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 et Paigutus 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 fi Sijainti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 fr Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ga Ionad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 gl PosiciÃn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 gu ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 gu-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 he ×××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 hi-IN Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 hr PoloÅaj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 hu PozÃcià 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 it Posizione 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ja äç 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ka áááááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 km ááááááâ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ko ìì 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ku Cih 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 lt PadÄtis 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 mk ÐÐÐÐÑÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 nb Posisjon 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ne àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 nl Positie 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 nn Posisjon 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 nr Ubujamo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ns Boemo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 or-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 pa-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 pl Pozycja 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 pt PosiÃÃo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 pt-BR PosiÃÃo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ru ÐÐÐÐÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 rw Ibirindiro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sh Pozicija 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sk Umiestnenie 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sl PoloÅaj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sr ÐÐÐÐÑÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ss Sikhundla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 st Maemo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sv Placering 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 sw-TZ Position 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ta ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ta-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 te-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 tg ÒÐÐÐÐÑÑÐÐÓ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 th ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ti-ER áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 tn Maemo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 tr Konum 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ts Xiyimo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 uk ÐÐÐÐÑÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ur-IN ÙÙØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 uz OÊrni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 ve Vhuimo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 vi Vá trà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 xh Indawo ekuyo into 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 zh-CN äç 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 zh-TW äç 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_POSITION_text 0 zu Isimo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 af Vel 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ar ØÙÙØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 as-IN ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 be-BY ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 bg ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 br Follenn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 bs Tabela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ca Full 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 cs List 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 cy Dalen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 da Ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 de Tabelle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 dz ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 el ÎÏÎÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 en-GB Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 en-ZA Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 eo Folio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 es Hoja 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 et Leht 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 fi Taulukko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 fr Feuille 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ga Bileog 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 gl Folla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 gu ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 gu-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 hi-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 hr List 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 hu Munkalap 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 it Tabella 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ja ããã 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ka ááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 km áááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ko ìí 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ku RÃpel 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 lt LakÅtas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 mk ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ml-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 mr-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 nb Ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ne àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 nl Blad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 nn Ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 nr Ikhasi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ns Pampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 or-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 pa-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 pl Arkusz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 pt Folha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 pt-BR Planilha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ru ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 rw Urupapuro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sh List 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sk List 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sl Delovni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sr ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ss Lishithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 st Pampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sv Tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 sw-TZ Laha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ta àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ta-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 te-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 tg ÐÐÑÐÒ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 th ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ti-ER áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 tn Letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 tr ÃalÄÅma SayfasÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ts Phepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 uk ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ur-IN ØÛÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 uz Varaq 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 ve Lumveru 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 vi Trang tÃnh 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 xh Icwecwe 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 zh-CN åäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 zh-TW åäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FL_TABLE_text 0 zu Iphepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 af G~etal blaaie 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ar ~ØØØ ØÙØÙØØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 as-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 be-BY ÐÐÐÑÐÐÑÑÑ ÐÑÐÑÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 bg ~ÐÑ. ÐÐÑÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 br ~Niver 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 bs Br. list~ova 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ca Nombre de fulls 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 cs PoÄet listÅ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 cy ~Nifer o ddalenni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 da An~tal ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 de An~zahl 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 dz àààààààààààààààààààà(~o) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 el ÎÏÎ~ÎÎÏÏ ÏÏÎÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 en-GB N~o. of sheets 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 en-ZA N~o. of sheets 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 eo N-ro de folioj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 es ~NÃm. de hojas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 et L~ehtede arv 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 fi ~Taulukoiden mÃÃrà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 fr N~o. de feuilles 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ga LÃ~on na mbileog 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 gl ~NÃmero de follas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 gu àààààà àààààà (~o) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 gu-IN àààààà àààààà (~o) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 he ×××× ×××××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 hi-IN ààààà àà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 hr B~r. stranica 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 hu ~HÃny lapot? 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 it N~o. di tabelle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ja ããããæ(~O) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ka ááááááá á~ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 km áááááâáááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ko ìí êì(~O) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ku Hijmara rÃpelan 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 lt LakÅtÅ ~skaiÄius 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 mk ~ÐÑ. ÐÐ ÐÐÑÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ml-IN ààààààààààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 mr-IN àààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 nb ~Antall ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ne ààààààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 nl Aan~tal 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 nn ~Tal pà ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 nr Isi~balo samakhasi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ns N~omoro ya dipampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 or-IN àààààààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 pa-IN ààààà àà ààààà(~o) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 pl ~Liczba arkuszy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 pt NÂ de ~folhas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 pt-BR NÂ de p~lanilhas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ru ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 rw Inomero y'impapuro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sh B~r. listova 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sk P~oÄet listov 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sl Åt. delovnih list~ov 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sr Ð~Ñ. ÐÐÑÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ss I~namba yemashithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 st N~o. ya dipampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sv An~tal 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 sw-TZ Idadi ya laha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ta àà~ààààààà ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ta-IN àà~ààààààà ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 te-IN àààà ~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 tg ÐÑÐÐÑÐÐ ÐÐÑÐÒÒÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 th à~ààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ti-ER ááá ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 tn Pa~lo ya matlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 tr ÃalÄÅma SayfasÄ Adeti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ts No~mb. ya maphepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 uk ~ÐÑÐÑÐÑÑÑÑ ÐÑÐÑÑÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ur-IN ØÛÙØ ÚÛ ØØØØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 uz Varaqlar ~soni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 ve N~omboro ya mashithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 vi ~Sá trang 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 xh I~nani lamacwecwe 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 zh-CN åäèæç(~O) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 zh-TW æç(~O) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_COUNT_label 0 zu Isibalo sama~pheshana 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 af Naa~m 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ar ØÙØØ~Ù 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 as-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 be-BY ÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 bg ~ÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 br Anv 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 bs I~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ca No~m 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 cs NÃzev 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 cy E~nw 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 da Na~vn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 de Na~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 dz ààààà(~m) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 el ÎÎÎ~ÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 en-GB Na~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 en-ZA Na~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 eo Nomo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 es No~mbre 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 et Ni~mi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 fi ~Nimi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 fr ~Nom 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ga Ain~m 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 gl ~Nome 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 gu ààà (~m) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 gu-IN ààà (~m) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 he ×× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 hi-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 hr ~Ime 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 hu ~NÃv 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 it No~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ja åå(~M) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ka áá~áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 km ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ko ìë(~M) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ku ~Nav 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 lt ~Vardas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 mk Ð~ÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ml-IN àààâà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 mr-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 nb ~Navn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ne ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 nl ~Naam 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 nn ~Namn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 nr Iga~ma 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ns Le~ina 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 or-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 pa-IN ààà(~m) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 pl Naz~wa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 pt No~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 pt-BR No~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ru ÐÐÐÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 rw Izina 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sh ~Ime 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sk ~NÃzov 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sl I~me 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sr ~ÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ss Li~bito 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 st Le~bitso 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sv Na~mn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 sw-TZ Jina 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ta àà~ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ta-IN àà~ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 te-IN ~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 tg ÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 th ààà~à 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ti-ER áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 tn Lei~na 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 tr ~Ad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ts Vi~to 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 uk ~ÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ur-IN ÙØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 uz No~mi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 ve Dzi~na 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 vi TÃ~n 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 xh Iga~ma 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 zh-CN åç(~M) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 zh-TW åç(~M) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout FT_NAME_label 0 zu ~Igama 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 af Voeg vel in 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ar ØØØØØ ÙØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 as-IN ààààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 be-BY ÐÑÑÐÐÑÑÑ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 bg ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 br Enlakaat follennoà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 bs Umetni tabela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ca Insereix un full 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 cs VloÅit list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 cy Mewnosod Dalen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 da IndsÃt ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 de Tabelle einfÃgen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 dz ààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 el ÎÎÏÎÎÏÎÎ ÏÏÎÎÎÏ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 en-GB Insert Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 en-ZA Insert Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 eo Enmeti folion 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 es Insertar hoja 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 et Lehe lisamine 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 fi LisÃÃ taulukko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 fr InsÃrer une feuille 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ga IonsÃigh Bileog 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 gl Inserir folla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 gu ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 gu-IN ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 he ××××× ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 hi-IN ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 hr Ubaci list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 hu Munkalap beszÃrÃsa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 it Inserisci tabella 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ja ããããæå 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ka ááááááá áááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 km ááááááâáááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ko ìí ìì 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ku RÃpelà lÃzÃde bike 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 lt LakÅtÅ Äterpimas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 mk ÐÐÐÑÐÑÐÐÑÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ml-IN àààààà ààà ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 mr-IN ààà àààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 nb Sett inn ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ne àààà ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 nl Blad invoegen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 nn Set inn ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 nr Faka ikhasi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ns Tsenya Pampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 or-IN àààà ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 pa-IN ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 pl Wstaw arkusz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 pt Inserir folha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 pt-BR Inserir planilha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ru ÐÑÑÐÐÐÑÑ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 rw Kongeramo Urupapuro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sh Umetni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sk VloÅiÅ list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sl Vstavi delovni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sr ÐÐÐÑÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ss Faka lishithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 st Kenya Dipampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sv Infoga tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 sw-TZ Chomeka Laha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ta àààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ta-IN àààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 te-IN ààààà àààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 tg ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÒ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 th ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ti-ER áá ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 tn Tsenya Letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 tr ÃalÄÅma SayfasÄ Ekle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ts Nghenisa phepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 uk ÐÑÑÐÐÐÑÐ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ur-IN ØÛÙ ØØØÙ ÚØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 uz Varaq qoÊyish 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 ve Longelani Shithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 vi ChÃn trang 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 xh Faka Icwecwe 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 zh-CN æååäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 zh-TW æååäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RID_SCDLG_INSERT_TABLE_title 0 zu Faka Iphepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 af ~Blaai... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ar Ø~ØØØØØØ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 as-IN àààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 be-BY ÐÑÐÑÐÑÑ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 bg ~ÐÑÐÐÐÐÐ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 br ~Kantreal... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 bs Po~traÅi... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ca ~Navega... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 cs ProchÃzet... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 cy ~Pori... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 da ~Gennemse... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 de ~Durchsuchen... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 dz ààààààààà(~B) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 el ÎÎÎ~ÎÎÏÎÏÎ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 en-GB ~Browse... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 en-ZA ~Browse... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 eo Foliumi... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 es E~xaminar... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 et ~Lehitse... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 fi ~Selaa... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 fr ~Parcourir... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ga ~BrabhsÃil... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 gl ~Explorar... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 gu àààà... (~B) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 gu-IN àààà... (~B) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 he ××××...â 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 hi-IN ààààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 hr ~PotraÅi... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 hu ~TallÃzÃs... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 it ~Sfoglia... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ja æç(~B)... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ka ~áááááá... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 km ááááá... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ko ììëê(~B)... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ku ~Bigere... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 lt ~Parinkti... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 mk ÐÑ~ÐÐÐÑÑÐÑ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ml-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 mr-IN ~àààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 nb ~Bla gjennom ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ne àààààà ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 nl ~Bladeren... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 nn ~Bla gjennom ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 nr ~Zuma nge-inthanethi... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ns ~Fetleka... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 or-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 pa-IN ààà(~B)... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 pl ~PrzeglÄdaj... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 pt ~Procurar... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 pt-BR ~Procurar... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ru ÐÐÐÐÑ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 rw Gushakisha... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sh ~Pregledaj... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sk ~ListovaÅ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sl Pre~brskaj ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sr ~ÐÑÐÐÐÐÐÐÑ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ss T~funguluta... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 st ~Batlisisa... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sv ~GenomsÃk... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 sw-TZ ~Browse... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ta ~àààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ta-IN ~àààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 te-IN ~àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 tg ÐÐÐÐÐÑ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 th à~àààààà... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ti-ER áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 tn ~Batla... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 tr ~GÃzat... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ts ~Phendla... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 uk ~ÐÐÐÑÐ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ur-IN ØØØØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 uz Ta~nlash... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 ve ~Swaswarani... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 vi ~Duyát... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 xh ~Khangela... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 zh-CN æè(~B)... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 zh-TW çè(~B)... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout BTN_BROWSE_label 0 zu ~Cinga... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 af V~oor huidige blaai 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ar ÙØÙ ØÙÙØ~ÙØ ØÙØØÙÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 as-IN ààààààà àààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 be-BY ÐÐÑÐÐ ÐÑÑÑÐ ÐÑÐÑÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 bg ~ÐÑÐÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 br ~A-raok ar follennad red 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 bs Pr~ije trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ca A~bans del full actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 cs PÅed aktivnà list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 cy ~Cyn y ddalen bresennol 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 da ~FÃr nuvÃrende ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 de ~Vor aktueller Tabelle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 dz àààààààààààààààààààààààààà(~e) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 el Î~ÏÎÎ ÎÏÏ ÏÎ ÎÎÎÏÎÏ ÏÏÎÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 en-GB B~efore current sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 en-ZA B~efore current sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 eo Antaux aktuala folio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 es ~Delante de la hoja actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 et ~Enne kÃesolevat lehte 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 fi ~Ennen nykyistà taulukkoa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 fr A~vant la feuille active 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ga Roimh an bhil~eog reatha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 gl ~Antes da folla actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 gu ààààààà ààà ààà (~e) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 gu-IN ààààààà ààà ààà (~e) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 he ×××× ×××××× ×××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 hi-IN ààààààà ààà àà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 hr ~Prije trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 hu J~elenlegi munkalap elà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 it ~Prima della tabella corrente 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ja èçäãããããåã(~E) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ka ááááááááá áááá~ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 km áááâááááááâááááááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ko íì ìí ìì(~E) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ku Ber~Ã rÃpela derbazbar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 lt p~rieÅ aktyvÅjÄ lakÅtÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 mk ÐÑÐÐ ÑÐÐÐÐÐÐÐÑ ~ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ml-IN àààààààààà àààààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 mr-IN àààà àààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 nb ~FÃr dette arket 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ne ààààà àààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 nl ~Voor huidig blad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 nn ~FÃr dette arket 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 nr Nga~phambi kwekhasi lanjesi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ns P~ele ga pampiri ya gona bjale 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 or-IN àààà àààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 pa-IN àààààà ààà ààà àààààà(~e) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 pl Przed ~bieÅÄcym arkuszem 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 pt ~Antes da folha actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 pt-BR Ant~es da planilha atual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ru ÐÐÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 rw Mbere y'urupapuro rugenzweho 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sh P~re trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sk Pr~ed aktuÃlny list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sl Pr~ed trenutnim delovnim listom 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sr Ð~ÑÐ ÑÑÐÐÑÑÐÐÐ ÐÐÑÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ss K~ucala kunalelishithi leli 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 st P~ele ha pampiri ya honajwalo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sv ~FÃre aktuell tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 sw-TZ Kabla ya laha ya sasa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ta à~àààààààà àààààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ta-IN à~àààààààà àààààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 te-IN àààààààà ààààà ~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 tg ÐÐÑ ÐÐ ÐÐÑÐÒÐ ÒÐÑÓ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 th àà~ààààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ti-ER ááá áá áá áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 tn Pe~le jaanong letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 tr GeÃerli sayfadan Ãnc~e 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ts E~mahlweni ka phepha ra sweswi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 uk Ð~ÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÑÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ur-IN ØØØÛÛ ØÛÙ ØÛ ÙÛÙÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 uz Joriy varaqdan o~ldin 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 ve M~urahu ha shithi áino 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 vi T~rÆác trang hián tái 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 xh Pha~mbi kwecwecwe langoku 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 zh-CN åååçåäèäå(~E) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 zh-TW åçåçåäèäå(~E) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEFORE_label 0 zu Nga~phambili kwephepha lamanje 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 af ~NÃ huidige blaai 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ar ØØØ ØÙÙØÙØ ØÙ~ØØÙÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 as-IN ààààààà àààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 be-BY ÐÐÑÐÑ ÐÑÑÐÐÐ ÐÑÐÑÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 bg ~ÐÐÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 br Goude ~ar follenn red 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 bs ~Nakon trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ca ~DesprÃs del full actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 cs Za aktivnà list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 cy ~Ar Ãl y ddalen bresennol 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 da ~Efter nuvÃrende ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 de ~Nach aktueller Tabelle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 dz ààààààààààààààààààààààààààà(~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 el ~ÎÎÏÎ ÎÏÏ ÏÎ ÎÎÎÏÎÏ ÏÏÎÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 en-GB ~After current sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 en-ZA ~After current sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 eo Post aktuala folio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 es DetrÃs de la ~hoja actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 et PÃr~ast kÃesolevat lehte 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 fi Nykyisen taulukon ~perÃÃn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 fr ~AprÃs la feuille active 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ga T~ar Ãis na bileoige reatha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 gl ~Despois da folla actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 gu ààààààà ààà ààà (~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 gu-IN ààààààà ààà ààà (~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 he ×××× ×××××× ×××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 hi-IN ààààààà ààà àà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 hr ~Nakon trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 hu Jelenlegi mu~nkalap mÃgà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 it ~Dopo la tabella corrente 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ja èçäãããããåã(~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ka ááááááááá ááááááá áá~áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 km áááááááââááââááááááâááááááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ko íì ìí ëì(~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ku DÃ rÃ~pela derbazbar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 lt p~o aktyviojo lakÅto 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 mk ÐÐ ÑÐÐÐÐÐÐÐÑ Ð~ÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ml-IN àààààààààà àààààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 mr-IN ~àààà àààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 nb ~Etter dette arket 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ne ààààà àààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 nl ~Na huidig blad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 nn ~Etter dette arket 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 nr ~Ngemva kwekhasi lanjesi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ns ~Ka morago ga pampiri ya gona bjale 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 or-IN àààà àààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 pa-IN àààààà ààà àà àààà(~a) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 pl P~o bieÅÄcym arkuszu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 pt A ~seguir à folha actual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 pt-BR ~ApÃs a planilha atual 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ru ÐÐÑÐÐ ÑÐÐÑÑÐÐÐ ÐÐÑÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 rw Nyuma y'urupapuro rugezweho 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sh ~Posle trenutnog lista 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sk Z~a aktuÃlny list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sl ~Za trenutnim delovnim listom 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sr ~ÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐ ÐÐÑÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ss ~Emvakwaleli lishithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 st ~Kamora pampiri ya honajwale 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sv ~Efter aktuell tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 sw-TZ Baada ya laha ya sasa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ta ~ààààààààà àààààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ta-IN ~ààààààààà àààààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 te-IN àààààààà ààààà ~àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 tg ÐÐÑÐ ÐÐ ÐÐÑÐÒÐ ÒÐÑÓ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 th ~ààààààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ti-ER ááá áá áá áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 tn ~Morago jaanong letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 tr GeÃerli s~ayfadan sonra 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ts ~Endzhaku ka phepha ra sweswi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 uk Ð~ÑÑÐÑ ÐÐÑÐÑÐÐÐÐ ÐÑÐÑÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ur-IN ØØØÛÛ ØÛÙ ÚÛØØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 uz Joriy varaqdan ~keyin 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 ve ~Phanáa ha shithi áino 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 vi S~au trang hián tái 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 xh ~Emva kwecwecwe langoku 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 zh-CN åååçåäèäå(~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 zh-TW åçåçåäèäå(~A) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_BEHIND_label 0 zu Nge~muva kwephepha lamanje 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 af ~Vanaf lÃer 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ar ØÙØØØ ÙÙ ~ÙÙÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 as-IN ààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 be-BY Ð ÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 bg ~ÐÑ ÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 br ~Krouidigezh diouzh ur restr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 bs ~Iz datoteke 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ca Des d'un ~fitxer 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 cs Ze souboru 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 cy ~O ffeil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 da ~Fra fil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 de ~Aus Datei erstellen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 dz ààààààààààààààà(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 el ÎÎÎÎÎÏÏÎÎ~Î ÎÏÏ ÎÏÏÎÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 en-GB ~From file 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 en-ZA ~From file 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 eo El dosiero 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 es ~A partir de archivo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 et ~Failist 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 fi ~Tiedostosta 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 fr à ~partir d'un fichier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ga à ~chomhad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 gl ~Do ficheiro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 gu àààà ààààà (~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 gu-IN àààà ààààà (~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 hi-IN àààà àà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 hr ~Iz datoteke 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 hu ~FÃjlbÃl 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 it ~Da file 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ja ããããããäæ(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ka ~áááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 km ááâááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ko íììì ìì(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ku Ji ~Pelà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 lt ~IÅ failo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 mk ÐÐ ~ÐÐÑÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ml-IN àààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 mr-IN ~àààààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 nb ~Fra fil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ne ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 nl ~Uit bestand 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 nn ~Frà fil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 nr ~Buya efayilini 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ns ~Go tÅwa faeleng 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 or-IN ààààà àà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 pa-IN àààà ààà(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 pl Z plik~u 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 pt Do fic~heiro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 pt-BR ~Do arquivo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ru ÐÐ ÑÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 rw Bivuye mu dosiye 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sh ~Iz datoteke 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sk Zo sÃ~boru 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sl ~Iz datoteke 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sr ~ÐÐ ÐÐÑÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ss ~Kusuka efayeleni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 st ~Ho tswa faeleng 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sv Sk~apa frÃn fil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 sw-TZ Kutoka faili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ta ~ààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ta-IN ~ààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 te-IN àààààààà ~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 tg ÐÐ ÐÐÑÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 th ~ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ti-ER áá ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 tn ~Go tswa go faele 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 tr ~Dosyadan 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ts Ku ~suka eka fayili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 uk Ð ~ÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ur-IN ØÛÙ ÙØØÙ ØÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 uz ~Fayldan 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 ve ~U bva kha faela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 vi ~Tá táp tin 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 xh ~Ukusuka kwifayili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 zh-CN äæäåå(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 zh-TW åæææå(~F) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_FROMFILE_label 0 zu Ku~suka efayeleni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 af ~Nuwe blaai 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ar Ù~ØÙØ ØØÙØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 as-IN àààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 be-BY ÐÐÐÑ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 bg ~ÐÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 br Krouià 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 bs ~Novi list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ca Full ~nou 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 cs Novà list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 cy ~Dalen newydd 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 da ~Nyt ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 de Neu ~erstellen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 dz àààààààààààààà(~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 el ÎÎ~ÎÎÎÏÏÎÎÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 en-GB ~New sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 en-ZA ~New sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 eo Nova folio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 es ~Crear nueva 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 et ~Uus leht 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 fi ~Uusi taulukko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 fr ~Nouvelle feuille 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ga Bileog ~nua 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 gl ~Nova folla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 gu ààà ààà (~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 gu-IN ààà ààà (~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 he ××××× ××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 hi-IN ààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 hr ~Novi list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 hu Ã~j munkalap 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 it ~Nuova tabella 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ja æããäæ(~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ka ~ááááá ááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 km ááááááâáááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ko ì ìí(~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ku ~RÃpela NÃ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 lt ~Naujas lakÅtas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 mk ~ÐÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ml-IN ààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 mr-IN ~àààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 nb ~Nytt ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ne àààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 nl ~Nieuw blad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 nn ~Nytt ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 nr ~Ikhasi elitjha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ns ~Pampiri e mpsha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 or-IN ààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 pa-IN àààà ààà(~n) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 pl ~Nowy arkusz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 pt ~Nova folha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 pt-BR ~Nova planilha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ru ÐÐÐÑÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 rw Urupapuro rushya 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sh ~Novi list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sk ~Novà list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sl ~Nov delovni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sr ~ÐÐÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ss ~Lishithi lelisha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 st ~Pampiri e ntjha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sv Skapa ~ny 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 sw-TZ Laha mpya 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ta ~àààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ta-IN ~àààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 te-IN ~ààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 tg ÐÐÑÐÒÐ ÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 th àààààààà~ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ti-ER ááá áá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 tn ~Ntsha letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 tr ~Yeni ÃalÄÅma sayfasÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ts ~Phepha rintshwa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 uk ~ÐÐÐÐÐ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ur-IN ÙØÛ ØÛÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 uz ~Yangi varaq 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 ve ~Shithi áiswa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 vi Tra~ng mái 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 xh ~Icwecwe elitsha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zh-CN æååäè(~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zh-TW æååäè(~N) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\insert-sheet.xml 0 layout RB_NEW_label 0 zu Iphepha eli~sha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 af ~Kopieer 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ar ~ØÙØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 be-BY ÐÐÐÑÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 bg ~ÐÐÐÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 br ~Eilaà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 bs Kopir~aj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ca ~Copia 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 cs KopÃrovat 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 cy ~CopÃo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 da K~opier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 de ~kopieren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 dz ààààààààà(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 el ÎÎÏÎ~ÎÏÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 en-GB ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 en-ZA ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 eo Kopii 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 es ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 et Kopeerimine 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fa ~ÙØØÙâØØØØØÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fi K~opioi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 fr ~Copier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ga ~CÃipeÃil 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gl ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gu ààà (~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 gu-IN ààà ààà (~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hi-IN ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hr ~Kopiraj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 hu ~MÃsolÃs 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 it ~Copia 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ja ããã(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ka ~áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 km ááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ko ëì(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ku Ji ber ~bigire 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 lt ~Kopijuoti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 mk ~ÐÐÐÐÑÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ml-IN ààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 mr-IN ~ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nb ~Kopier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ne ààààààààà àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nl ~KopiÃren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nn ~Kopier 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 nr ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ns ~KopiÅa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 or-IN ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pa-IN ààà(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pl ~Kopiuj 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pt ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 pt-BR ~Copiar 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ru ÐÐÐÐÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 rw Gukoporora 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sh ~UmnoÅi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sk ~KopÃrovaÅ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sl Kopira~j 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sr ~ÐÐÐÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ss ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 st ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sv ~Kopiera 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 sw-TZ Nakili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ta ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ta-IN ~Copy 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 te-IN àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tg ~ÐÑÑÑÐÐÐÑÓ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 th ~àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ti-ER ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tn ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 tr ~Kopyala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ts ~Kopisa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 uk ~ÐÐÐÑÑÐÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ur-IN ÙÙÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 uz ~Nusxa olish 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 ve ~Kopani 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 vi ~ChÃp 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 xh ~Kopa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zh-CN åå(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zh-TW èè(~C) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout BTN_COPY_label 0 zu ~Khipha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 af Aan ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ar ØÙÙ ØÙ~ÙØØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 as-IN àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 be-BY Ð ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 bg ÐÑÐ ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 br Da~vet an teul 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 bs U ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ca Al ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 cs Do dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 cy I ~ddogfen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 da I dokumentet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 de ~Ins Dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 dz ààààààààà(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 el ÎÏÎ Î~ÎÎÏÎÏÎ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 en-GB To ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 en-ZA To ~document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 eo Al dokumento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 es ~Al documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 et Dokumenti 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fa ØÙ ~ÙÙØØØØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fi ~Asiakirjaan 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 fr ~Vers le document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ga Go ~cÃipÃis 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gl Ao documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gu ààààààààààà (~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 gu-IN ààààààààààà (~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 he ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hi-IN àààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hr Na ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 hu A ~dokumentumba: 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 it In ~documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ja çååããããããå(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ka ~ááááááááááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 km ááâááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ko ëìì(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ku Bo ~Belgeyà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 lt Ä ~skaiÄiuoklÄs dokumentÄ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 mk ÐÐ ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ml-IN àààààààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 mr-IN ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nb ~Til dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ne àààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nl ~Naar document 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nn ~Til dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 nr E~mtlolweni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ns To~komane 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 or-IN àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pa-IN àààààààà àà(~d) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pl Do dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pt ~Documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 pt-BR Ao ~documento 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ru Ð ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 rw Gushyira mu nyandiko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sh U ~dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sk K ~dokumentu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sl V ~dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sr Ð ~ÐÐÐÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ss Ku~dokhumenta 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 st Ho ~tokomane 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sv T~ill dokument 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 sw-TZ Kwenye andiko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ta ~ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ta-IN ~ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 te-IN ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tg ÐÐ ÒÑÒÒÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 th àààààà~ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ti-ER áá áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tn Go ~setlankana 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 tr ~Belgeye 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ts Eka ~dokumente 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 uk Ð ~ÐÐÐÑÐÐÐÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ur-IN ØØØØÙÛØÙÛÚ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 uz Hujjatga 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 ve Kha ~áiáwalo 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 vi VÃo tÃi ~liáu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 xh Ukuya ~kuxwebhu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zh-CN ååææ(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zh-TW ååæä(~D) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_DEST_label 0 zu ~Oshicilelweni 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 af ~Voeg in voor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ar ØØ~ØØØ ÙØÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 as-IN ààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 be-BY ÐÑÑÐÐÑÑÑ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 bg ~ÐÐÑÐÐÐÐÐ ÐÑÐÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 br E~nlakaat a-raok 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 bs Stav~i ispred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ca ~Insereix abans de 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 cs VloÅit pÅed 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 cy ~Mewnosod cyn 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 da ~IndsÃt fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 de Ei~nfÃgen vor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 dz ààààààààààà(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 el Î~ÎÏÎÎÏÎÎ ÏÏÎÎ ÎÏÏ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 en-GB ~Insert before 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 en-ZA ~Insert before 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 eo Enmeti antaux 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 es Insertar ~delante de 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 et JÃrgmine leht: 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 fi ~LisÃÃ eteen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 fr I~nsÃrer avant 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ga ~IonsÃigh roimh 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gl ~Inserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gu àààààà ààààà (~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 gu-IN àààààà ààààà (~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 he ××××× ×××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hi-IN àà àààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hr ~Umetni prije 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 hu ~BeszÃrÃs elà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 it Prima del foglio 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ja æãèãåãæå(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ka áááááááá -~ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 km ááááááâááâááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ko ìì ìì(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ku ~Li pÃÅ zÃde bike 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 lt ~Äterpti prieÅ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 mk ~ÐÐÐÑÐÐ ÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ml-IN ààààààààààààààà àààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 mr-IN àààà ààà àààààààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nb ~Sett inn fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ne ààà ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nl ~Invoegen voor 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nn ~Set inn fÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 nr ~Faka ngaphambi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ns ~Nokela 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 or-IN àààààààààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pa-IN àààààà ààààà(~i) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pl W~staw przed 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pt I~nserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 pt-BR ~Inserir antes 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ru ÐÑÑÐÐÐÑÑ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 rw Kongeramo mbere 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sh ~Umetni pre 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sk VloÅ~iÅ pred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sl ~Vstavi pred 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sr ~ÐÐÐÑÐÐ ÐÑÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ss ~Faka kucala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 st ~Kenya pele ha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sv I~nfoga framfÃr 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 sw-TZ Chomeka kabla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ta ~àààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ta-IN ~àààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 te-IN ààààà àààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tg ÐÐÐÐÐÐÑÐÐ ÐÐÑ ÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 th à~ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ti-ER áá ááá ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tn ~Tsenya pele 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 tr ~Ãne ekle 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ts ~Nghenisa emahlweni ka 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 uk ÐÑÑ~ÐÐÐÑÐ ÐÐÑÐÐ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ur-IN ÚØÙÙÛØÛ ÙÛÙÛ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 ve ~Longelani phanáa ha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 vi ChÃn vÃo t~rÆác 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 xh ~Faka ngethuba langaphambili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zh-CN åçä(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zh-TW åçæ(~I) 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout FT_INSERT_label 0 zu ~Faka ngaphambili 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 af Verskuif/kopieer blaai 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ar ÙÙÙ/ÙØØ ØÙÙØÙØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 as-IN àààààà ààààà àààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 be-BY ÐÐÑÐÐÑÑÑÑÑÑ ÑÑ ÐÐÐÑÑÐÐÐÑÑ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 bg ÐÐÑÑÐÐÐ/ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 br Dilec'hiaÃ/eilaà ar follennad 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 bs Pomjeri/kopiraj list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ca Mou/Copia el full 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 cs PÅesunout/KopÃrovat list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 cy Symud/CopÃo Dolen 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 da Flyt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 de Tabelle verschieben/kopieren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 dz ààààààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 el ÎÎÏÎÎÎÎÎÏÎ/ÎÎÏÎÎÏÎÏÎ ÎÏÎÎÎÏ... 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 en-GB Move/Copy Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 en-ZA Move/Copy Sheet 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 eo Movi/kopii folion 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 es Desplazar/Copiar hoja 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 et Lehe teisaldamine/kopeerimine 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fa ØØØÙâØØÛÛ/ÙØØÙâØØØØØÛ ØØ ØØÚÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fi SiirrÃ/kopioi taulukko 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 fr DÃplacer/copier la feuille 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ga Bog/CÃipeÃil Bileog 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gl Mover/Copiar folla 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gu ààà ààààà/ààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 gu-IN ààà ààààà/ààà ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 he ××××/××××× ××××× 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hi-IN ààà àà ààààà àààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hr Pomakni/kopiraj list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 hu Munkalap ÃthelyezÃse/mÃsolÃsa 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 it Sposta o copia tabella 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ja ããããçåãããããã 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ka ááááááá áááááááá/áááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 km áááááááá/áááááâ áááááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ko ìí ìë/ëì 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ku RÃpel VeguhezÃne/Ji Ber Bigire 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 lt LakÅto kopijavimas arba perkÄlimas 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 mk ÐÑÐÐÐÑÑÑÐÐÑÐ/ÐÐÐÐÑÐÑÐ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ml-IN àààààà ààààààà/àààààà ààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 mr-IN àààà ààààà/àààààààààà àààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nb Flytt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ne àààà àààààààààà/ààààààààà àààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nl Blad verplaatsen/kopiÃren 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nn Flytt/kopier ark 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 nr Tjhidisa/Kopa iKhasi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ns ÅuthiÅa/Kopolla letlakala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 or-IN ààà ààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pa-IN ààà àààà/ààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pl PrzenieÅ/Kopiuj arkusz 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pt Mover/Copiar folha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 pt-BR Mover / Copiar planilha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ru ÐÐÑÐÐÐÑÑÐÑÑ/ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 rw Kwimura/Gukoporora Urupapuro 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sh Pomeri/umnoÅi stranicu 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sk PresunÃÅ/KopÃrovaÅ list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sl Premakni/kopiraj delovni list 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sr ÐÐÐÐÑÐ/ÑÐÐÐÐÐ ÑÑÑÐÐÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ss Hambisa/Kopa lishithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 st Tsamaisa/Kopisa Pampiri 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sv Kopiera/flytta tabell 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 sw-TZ Sogeza/Nakili Laha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ta àààà ààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ta-IN àààà ààààààààà/ààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 te-IN ààà àààà/ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tg ÒÐÐÐÐÐÐÐÑÐÓ/ÐÑÑÑÐÐÐÑÐÐ ÐÐÑÐÒ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 th àààà/ààààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ti-ER áá áááááá/ááá 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tn samaisa/Kopisa Letlhare 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 tr SayfayÄ TaÅÄ/Kopyala 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ts Fambisa/kopisa phepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 uk ÐÐÑÐÐÑÑÑÐÑÐ / ÐÐÐÑÑÐÐÑÐ ÐÑÐÑÑ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ur-IN ØÛÙ ÚØ ÙÙØÙ ØØØÛÙ /ÙÙÙ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 uz Varaqni koÊchirish/nusxa olish 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 ve Sendedzani/Kopani Shithi 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 vi Chuyán/ChÃp trang 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 xh Shenxisa/Kopa Icwecwe 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zh-CN çåæåååäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zh-TW çåæèèåäè 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout RID_SCDLG_MOVETAB_title 0 zu Nyakazisa/Khiphela Iphepha 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 af - nuwe dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ar - ÙØØÙØ ØØÙØ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 as-IN - àààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 be-BY - ÐÐÐÑ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 bg - ÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 br - Teul nevez - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 bs - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ca - document nou - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 cs - novà dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 cy - dogfen newydd - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 da - nyt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 de - neues Dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 dz ààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 el - ÎÎÎ ÎÎÎÏÎÏÎ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 en-GB - new document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 en-ZA - new document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 eo - nova dokumento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 es - nuevo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 et - uus dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fa â ÙÙØØØØ ØØÛØ â 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fi - uusi asiakirja - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 fr - nouveau document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ga - cÃipÃis nua - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gl - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gu - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 gu-IN - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 he - ×××× ××× - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hi-IN - ààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hr - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 hu - Ãj dokumentum - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 it - nuovo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ja -æèãããããã- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ka ~ááááá ááááááááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 km - áááááâáááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ko -ì ëì - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ku - belgeyeke nà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 lt - naujas dokumentas - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 mk - ÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ml-IN ààààà àààààààààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 mr-IN -ààà ààààààà- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nb - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ne - àààà àààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nl - nieuw document - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nn - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 nr - umtlolo omutjha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ns - tokumente e mpsha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 or-IN -ààà àààà- 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pa-IN - àààà àààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pl - nowy dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pt - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 pt-BR - novo documento - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ru - ÐÐÐÑÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 rw - Inyandiko nshya - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sh - novi dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sk - novà dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sl - nov dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sr - ÐÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ss - idokhumenti lensha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 st - tokomane e ntjha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sv - nytt dokument - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 sw-TZ - andiko jipya - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ta - ààààà ààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ta-IN - ààààà ààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 te-IN ààààà ààààà 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tg - ÒÑÒÒÐÑÐ ÐÐÐ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 th - àààààààààà - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ti-ER - ááá áááá - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tn - ntsha setlankana - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 tr - yeni belge - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ts - dokumente yintshwa - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 uk - ÐÐÐÐÐ ÐÐÐÑÐÐÐÑ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ur-IN ÙØÛ ØØØØÙÛØ 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 uz - yangi hujjat - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 ve - áiáwalo áiswaw - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 vi - tÃi liáu mái - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 xh - uxwebhu olutsha - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zh-CN - æææ - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zh-TW - ææä - 2002-02-02 02:02:02
++layout sc\uiconfig\layout\move-copy-sheet.xml 0 layout STR_NEWDOC_text 0 zu - ushicilelo olusha - 2002-02-02 02:02:02
diff --git a/sc/uiconfig/layout/makefile.mk b/sc/uiconfig/layout/makefile.mk
-index 274d9a9..7697de3 100644
+index 274d9a9..6392427 100644
--- sc/uiconfig/layout/makefile.mk
+++ sc/uiconfig/layout/makefile.mk
-@@ -43,7 +43,12 @@ TARGET=layout
+@@ -43,7 +43,13 @@ TARGET=layout
all: ALLTAR
-XML_FILES=sort-options.xml
+XML_FILES=\
+ insert-sheet.xml\
++ move-copy-sheet.xml\
+ sort-options.xml\
+ string-input.xml\
+
@@ -323,6 +1631,33 @@
.INCLUDE : layout.mk
+diff --git a/sc/uiconfig/layout/move-copy-sheet.xml b/sc/uiconfig/layout/move-copy-sheet.xml
+new file mode 100644
+index 0000000..7d3455e
+--- /dev/null
++++ sc/uiconfig/layout/move-copy-sheet.xml
+@@ -0,0 +1,21 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template. i18n translation is not performed in-place;
++ i18n translated XML files are generated from this template by
++ transex3/layout/tralay. !-->
++
++<modaldialog sizeable="true" closeable="false" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
++ <vbox spacing="5" border="5">
++ <string id="STR_NEWDOC" _text="- new document -"/>
++ <fixedtext id="FT_DEST" _label="To ~document"/>
++ <listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
++ <fixedtext id="FT_INSERT" _label="~Insert before"/>
++ <listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
++ <checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
++ <dialogbuttonhbox border="5" spacing="5">
++ <flow/>
++ <cancelbutton id="BTN_CANCEL" tabstop="true"/>
++ <helpbutton id="BTN_HELP" tabstop="true"/>
++ <okbutton default="true" id="BTN_OK" tabstop="true"/>
++ </dialogbuttonhbox>
++ </vbox>
++</modaldialog>
diff --git a/sc/uiconfig/layout/string-input.xml b/sc/uiconfig/layout/string-input.xml
new file mode 100644
index 0000000..0a59899
Modified: trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-toolkit.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-toolkit.diff Thu Jul 31 10:32:58 2008
@@ -1,5 +1,5 @@
diff --git a/toolkit/doc/layout/TODO b/toolkit/doc/layout/TODO
-index abd717c..35ba8e8 100644
+index abd717c..fbc2c85 100644
--- toolkit/doc/layout/TODO
+++ toolkit/doc/layout/TODO
@@ -4,6 +4,11 @@
@@ -22,21 +22,23 @@
*** missing properties
'title' -> 'Set Zoom'
Missing prop Title
-@@ -109,6 +113,9 @@ grep zoom.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t
+@@ -109,6 +113,11 @@ grep zoom.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t
grep wordcountdialog.src sw/source/ui/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\workben.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/FL_\([A-Z]*\)_label/FL_\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/'s
*** sortdlg
grep sortdlg.src ../../../sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\sort-options.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' | grep -E ' (nl|de|en-US) ' > localize-str.sdf
+grep sortdlg.src sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sc/uiconfig/layout/localize-sort-options.sdf
+*** insert-sheet
+grep instbdlg.src sc/source/ui/miscdlgs/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\insert-sheet.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > sc/uiconfig/layout/localize-insert-sheet.sdf
++*** move-copy-sheet
++grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\move-copy-sheet.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/' > sc/uiconfig/layout/localize-move-copy-sheet.sdf
* i18n
diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
-index 09f90bf..45f047c 100644
+index 54ed610..bf41277 100644
--- toolkit/inc/layout/layout-post.hxx
+++ toolkit/inc/layout/layout-post.hxx
-@@ -38,6 +38,10 @@
+@@ -34,6 +34,10 @@
#if ENABLE_LAYOUT
@@ -47,7 +49,7 @@
#undef AdvancedButton
#undef ApplyButton
#undef Box
-@@ -49,6 +53,7 @@
+@@ -45,6 +49,7 @@
#undef Control
#undef Dialog
#undef Edit
@@ -55,7 +57,7 @@
#undef FixedImage
#undef FixedInfo
#undef FixedLine
-@@ -56,11 +61,15 @@
+@@ -52,11 +57,15 @@
#undef HBox
#undef HelpButton
#undef IgnoreButton
@@ -71,7 +73,7 @@
#undef NoButton
#undef NumericField
#undef NumericFormatter
-@@ -68,17 +77,20 @@
+@@ -64,17 +73,20 @@
#undef Plugin
#undef ProgressBar
#undef PushButton
@@ -93,7 +95,7 @@
#undef SfxModalDialog
#undef SfxTabPage
-@@ -86,18 +98,6 @@
+@@ -82,18 +94,6 @@
#undef Window
@@ -113,10 +115,10 @@
#endif /* _LAYOUT_POST_HXX */
diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
-index 327da0b..fb70789 100644
+index fbbc1df..702470c 100644
--- toolkit/inc/layout/layout-pre.hxx
+++ toolkit/inc/layout/layout-pre.hxx
-@@ -38,15 +38,8 @@
+@@ -34,15 +34,8 @@
#if ENABLE_LAYOUT
@@ -134,7 +136,7 @@
#define AdvancedButton layout::AdvancedButton
#define ApplyButton layout::ApplyButton
-@@ -59,6 +52,7 @@
+@@ -55,6 +48,7 @@
#define Control layout::Control
#define Dialog layout::Dialog
#define Edit layout::Edit
@@ -142,7 +144,7 @@
#define FixedImage layout::FixedImage
#define FixedInfo layout::FixedInfo
#define FixedLine layout::FixedLine
-@@ -66,11 +60,15 @@
+@@ -62,11 +56,15 @@
#define HBox layout::HBox
#define HelpButton layout::HelpButton
#define IgnoreButton layout::IgnoreButton
@@ -158,7 +160,7 @@
#define NoButton layout::NoButton
#define NumericField layout::NumericField
#define NumericFormatter layout::NumericFormatter
-@@ -78,17 +76,20 @@
+@@ -74,17 +72,20 @@
#define Plugin layout::Plugin
#define ProgressBar layout::ProgressBar
#define PushButton layout::PushButton
@@ -180,7 +182,7 @@
#define SfxModalDialog Dialog
#define SfxTabPage TabPage
-@@ -99,43 +100,8 @@
+@@ -95,43 +96,8 @@
#define LAYOUT_DIALOG_PARENT\
VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow()
@@ -227,35 +229,51 @@
#endif /* _LAYOUT_PRE_HXX */
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
-index ff223e7..b1d9d55 100644
+index 62b7ffa..ee831f3 100644
--- toolkit/inc/layout/layout.hxx
+++ toolkit/inc/layout/layout.hxx
-@@ -46,6 +46,7 @@
-
- // FIXME: eventually wrap FieldUnit
+@@ -32,28 +32,32 @@
+ #ifndef _LAYOUT_HXX
+ #define _LAYOUT_HXX
+
+-#include <com/sun/star/uno/XInterface.hpp>
+ #include <com/sun/star/awt/XLayoutContainer.hpp>
++#include <com/sun/star/uno/XInterface.hpp>
+ #include <com/sun/star/util/Color.hpp>
+ #include <i18npool/lang.h>
++#include <toolkit/dllapi.h>
+ #include <tools/gen.hxx>
+ #include <tools/link.hxx>
+ #include <tools/string.hxx>
+-
+-// FIXME: eventually wrap FieldUnit
++#include <vcl/combobox.h>
#include <vcl/fldunit.hxx>
+-// FIXME: eventually wrap this too ...
++#include <vcl/lstbox.h>
+#include <vcl/smartid.hxx>
- // FIXME: eventually wrap this too ...
#include <vcl/wintypes.hxx>
-@@ -53,11 +54,14 @@
-
+-#include <toolkit/dllapi.h>
+-
class Control;
class Image;
-class SfxPoolItem;
++class ListBox;
+class MultiListBox;
+class Pointer;
+class RadioButton;
class SfxItemSet;
+class SfxPoolItem;
+class TabPage;
++class VCLXRadioButton;
class VCLXWindow;
class Window;
-class TabPage;
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-@@ -74,7 +78,7 @@ class TOOLKIT_DLLPUBLIC Context
+@@ -70,7 +74,7 @@ class TOOLKIT_DLLPUBLIC Context
public:
Context( char const* pPath );
virtual ~Context();
@@ -264,7 +282,7 @@
void setToplevel( PeerHandle xToplevel );
PeerHandle getToplevel();
PeerHandle getRoot();
-@@ -87,11 +91,14 @@ public:
+@@ -83,11 +87,17 @@ public:
par( pImpl ) {} \
char const* GetUnoName() const; \
public: \
@@ -274,13 +292,16 @@
#define DECL_GET_IMPL(t) \
inline t##Impl &getImpl() const
-+#define DECL_GET_WINDOW( cls ) ::cls* Get##cls()
-+#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() { return reinterpret_cast< ::cls*>( GetWindow() ); }
++#define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const
++#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return reinterpret_cast< ::cls*>( GetWindow() ); }
++
++#define DECL_GET_VCLXWINDOW( cls ) ::VCLX##cls* GetVCLX##cls() const
++#define IMPL_GET_VCLXWINDOW( cls ) ::VCLX##cls* cls::Get##VCLX##cls() const { return reinterpret_cast< ::VCLX##cls*>( GetVCLXWindow() ); }
+
// follows the VCL inheritance hierarchy ...
class WindowImpl;
-@@ -106,27 +113,35 @@ public:
+@@ -102,27 +112,35 @@ public:
explicit Window( WindowImpl *pImpl );
virtual ~Window();
@@ -325,16 +346,18 @@
};
class ControlImpl;
-@@ -189,7 +204,7 @@ class TOOLKIT_DLLPUBLIC Button : public Control
+@@ -184,8 +202,9 @@ class TOOLKIT_DLLPUBLIC Button : public Control
+ DECL_GET_IMPL( Button );
DECL_CONSTRUCTORS( Button, Control, 0 );
public:
++ static String GetStandardText (sal_uInt16 button_type);
void SetText( String const& rStr );
- BOOL SetModeImage( const Image& rImage );
+ bool SetModeImage( const Image& rImage );
void SetImageAlign( ImageAlign eAlign );
void SetClickHdl( Link const& rLink );
-@@ -202,8 +217,8 @@ class TOOLKIT_DLLPUBLIC PushButton : public Button
+@@ -198,8 +217,8 @@ class TOOLKIT_DLLPUBLIC PushButton : public Button
DECL_GET_IMPL( PushButton );
DECL_CONSTRUCTORS( PushButton, Button, 0 );
public:
@@ -345,11 +368,12 @@
void Toggle();
void SetToggleHdl( Link const& rLink );
-@@ -272,9 +287,10 @@ class TOOLKIT_DLLPUBLIC RadioButton : public Button
+@@ -268,9 +287,11 @@ class TOOLKIT_DLLPUBLIC RadioButton : public Button
{
DECL_GET_IMPL( RadioButton );
DECL_CONSTRUCTORS( RadioButton, Button, 0 );
+ DECL_GET_WINDOW( RadioButton );
++ DECL_GET_VCLXWINDOW( RadioButton );
public:
- void Check( BOOL bCheck = TRUE );
- BOOL IsChecked() const;
@@ -358,7 +382,7 @@
void Toggle();
void SetToggleHdl( Link const& rLink );
-@@ -286,8 +302,8 @@ class TOOLKIT_DLLPUBLIC CheckBox : public Button
+@@ -282,8 +303,8 @@ class TOOLKIT_DLLPUBLIC CheckBox : public Button
DECL_GET_IMPL( CheckBox );
DECL_CONSTRUCTORS( CheckBox, Button, 0 );
public:
@@ -369,7 +393,18 @@
void Toggle();
void SetToggleHdl( Link const& rLink );
-@@ -350,7 +366,7 @@ class TOOLKIT_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
+@@ -295,8 +316,8 @@ class TOOLKIT_DLLPUBLIC Edit : public Control
+ DECL_GET_IMPL( Edit );
+ DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
+ public:
+- void SetText( XubString const& rStr ) const;
+- XubString GetText() const;
++ void SetText( String const& rStr ) const;
++ String GetText() const;
+ void SetModifyHdl( Link const& rLink );
+ void SetSelection( Selection const& rSelection );
+ };
+@@ -346,7 +367,7 @@ class TOOLKIT_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
{
DECL_GET_IMPL( NumericField );
public:
@@ -378,7 +413,7 @@
NumericField( Window *pParent, WinBits nStyle );
};
-@@ -377,7 +393,7 @@ class TOOLKIT_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
+@@ -373,12 +394,10 @@ class TOOLKIT_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
{
DECL_GET_IMPL( MetricField );
public:
@@ -387,31 +422,105 @@
MetricField( Window *pParent, WinBits nStyle );
};
-@@ -421,8 +437,8 @@ public:
- XubString GetEntry( USHORT nPos ) const;
- USHORT GetEntryCount() const;
+-#define COMBOBOX_APPEND ((USHORT)0xFFFF)
+-#define COMBOBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF)
+ class ComboBoxImpl;
+ class TOOLKIT_DLLPUBLIC ComboBox : public Edit
+ {
+@@ -386,59 +405,66 @@ class TOOLKIT_DLLPUBLIC ComboBox : public Edit
+ DECL_CONSTRUCTORS( ComboBox, Edit, 0 );
+
+ public:
+- USHORT InsertEntry( XubString const& rStr, USHORT nPos = COMBOBOX_APPEND );
++ sal_uInt16 InsertEntry( XubString const& rStr, sal_uInt16 nPos=COMBOBOX_APPEND );
+ void RemoveEntry( XubString const& rStr );
+- void RemoveEntry( USHORT nPos );
++ void RemoveEntry( sal_uInt16 nPos );
+ void Clear();
+
+- USHORT GetEntryPos( XubString const& rStr ) const;
+- XubString GetEntry( USHORT nPos ) const;
+- USHORT GetEntryCount() const;
++ sal_uInt16 GetEntryPos( XubString const& rStr ) const;
++ XubString GetEntry( sal_uInt16 nPos ) const;
++ sal_uInt16 GetEntryCount() const;
+
+ void SetClickHdl( Link const& rLink );
+ void SetSelectHdl( Link const& rLink );
+ };
+
+-#define LISTBOX_APPEND ((USHORT)0xFFFF)
+-#define LISTBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF)
+ class ListBoxImpl;
+ class TOOLKIT_DLLPUBLIC ListBox : public Control
+ {
+ DECL_GET_IMPL( ListBox );
+ DECL_CONSTRUCTORS( ListBox, Control, WB_BORDER );
++ DECL_GET_WINDOW (ListBox);
+ public:
+- USHORT InsertEntry( XubString const& rStr, USHORT nPos = LISTBOX_APPEND );
++ sal_uInt16 InsertEntry( XubString const& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
+
+ void RemoveEntry( XubString const& rStr );
+- void RemoveEntry( USHORT nPos );
++ void RemoveEntry( sal_uInt16 nPos );
+ void Clear();
+
+- USHORT GetEntryPos( XubString const& rStr ) const;
+- XubString GetEntry( USHORT nPos ) const;
+- USHORT GetEntryCount() const;
++ sal_uInt16 GetEntryPos( XubString const& rStr ) const;
++ XubString GetEntry( sal_uInt16 nPos ) const;
++ sal_uInt16 GetEntryCount() const;
- void SelectEntry( XubString const& rStr, BOOL bSelect = TRUE );
- void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
+ void SelectEntry( XubString const& rStr, bool bSelect = true );
-+ void SelectEntryPos( USHORT nPos, bool bSelect = true );
++ void SelectEntryPos( sal_uInt16 nPos, bool bSelect = true );
- USHORT GetSelectEntryCount() const;
- XubString GetSelectEntry( USHORT nSelIndex = 0 ) const;
-@@ -445,20 +461,81 @@ public:
- bool IsLanguageSelected( const LanguageType/*eLangType*/) const { return true; }
- };
+- USHORT GetSelectEntryCount() const;
+- XubString GetSelectEntry( USHORT nSelIndex = 0 ) const;
+- USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
++ sal_uInt16 GetSelectEntryCount() const;
++ XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const;
++ sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const;
+ void SetSelectHdl( Link const& rLink );
+ void SetClickHdl( Link const& rLink );
+
+- void SetEntryData( USHORT/*nPos*/, void*/*pNewData*/) { }
+- void* GetEntryData( USHORT/*nPos*/) const { return 0; }
++ void SetEntryData (sal_uInt16 pos, void* data);
++ void* GetEntryData (sal_uInt16 pos) const;
+
+ // SvxLanguageBox
+- void SetLanguageList( INT16/*nLangList*/, bool/*bHasLangNone*/, bool /*bLangNoneIsLangAll*/= false, bool /*bCheckSpellAvail*/= false ) { }
++ void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
+
+- USHORT InsertLanguage( const LanguageType/*eLangType*/, USHORT/*nPos*/= LISTBOX_APPEND ) { return 0; }
+- USHORT InsertLanguage( const LanguageType/*eLangType*/, bool/*bCheckEntry*/, USHORT /*nPos*/= LISTBOX_APPEND ) { return 0; }
+- void RemoveLanguage( const LanguageType/*eLangType*/) { }
+- void SelectLanguage( const LanguageType/*eLangType*/, bool/*bSelect*/= true) { }
+- LanguageType GetSelectLanguage() const { return 0; }
+- bool IsLanguageSelected( const LanguageType/*eLangType*/) const { return true; }
++ sal_uInt16 InsertLanguage (LanguageType const type, sal_uInt16 pos=LISTBOX_APPEND);
++ sal_uInt16 InsertLanguage (LanguageType const type, bool checkEntry, sal_uInt16 pos=LISTBOX_APPEND);
++ void RemoveLanguage (LanguageType const type);
++ void SelectLanguage (LanguageType const type, bool select=true);
++ LanguageType GetSelectLanguage () const;
++ bool IsLanguageSelected( LanguageType const type) const;
++};
++
+class MultiListBoxImpl;
+class TOOLKIT_DLLPUBLIC MultiListBox : public ListBox
+{
+ DECL_GET_IMPL( MultiListBox );
+ DECL_CONSTRUCTORS( MultiListBox, ListBox, 0 );
+ DECL_GET_WINDOW( MultiListBox );
-+};
-+
+ };
+
class DialogImpl;
- class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
+@@ -446,15 +472,72 @@ class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
{
DECL_GET_IMPL( Dialog );
public:
@@ -429,21 +538,21 @@
+#define DECL_MESSAGE_BOX_CTORS(Name)\
+ public:\
+ Name##Box (::Window *parent, char const* message,\
-+ char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
-+ char const* xml_file="message-box.xml", char const* id="message-box");\
++ char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
++ char const* xml_file="message-box.xml", char const* id="message-box");\
+ Name##Box (::Window *parent, rtl::OUString const& message,\
-+ rtl::OUString yes=rtl::OUString::createFromAscii (""),\
-+ rtl::OUString no=rtl::OUString::createFromAscii (""),\
-+ sal_uIntPtr help_id=0,\
-+ char const* xml_file="message-box.xml", char const* id="message-box");\
++ rtl::OUString yes=String (),\
++ rtl::OUString no=String (),\
++ sal_uIntPtr help_id=0,\
++ char const* xml_file="message-box.xml", char const* id="message-box");\
+ Name##Box (::Window *parent, WinBits, char const* message,\
-+ char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
-+ char const* xml_file="message-box.xml", char const* id="message-box");\
++ char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
++ char const* xml_file="message-box.xml", char const* id="message-box");\
+ Name##Box (::Window *parent, WinBits, rtl::OUString const& message,\
-+ rtl::OUString yes=rtl::OUString::createFromAscii (""),\
-+ rtl::OUString no=rtl::OUString::createFromAscii (""),\
-+ sal_uIntPtr help_id=0,\
-+ char const* xml_file="message-box.xml", char const* id="message-box")\
++ rtl::OUString yes=String (),\
++ rtl::OUString no=String (),\
++ sal_uIntPtr help_id=0,\
++ char const* xml_file="message-box.xml", char const* id="message-box")\
+
+class TOOLKIT_DLLPUBLIC MessageBox : public Dialog
+{
@@ -457,9 +566,13 @@
+ FixedText messageText;
+ CancelButton cancelButton;
+ HelpButton helpButton;
++ IgnoreButton ignoreButton;
+ NoButton noButton;
++ RetryButton retryButton;
+ YesButton yesButton;
+
++ void bits_init (WinBits bits, rtl::OUString const& message,
++ rtl::OUString yes, rtl::OUString, sal_uIntPtr help_id);
+ void init (rtl::OUString const& message,
+ rtl::OUString const& yes, rtl::OUString const& no, sal_uIntPtr help_id);
+ void init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id);
@@ -485,7 +598,7 @@
class TabPageImpl;
class TOOLKIT_DLLPUBLIC TabPage : public Context, public Window
{
-@@ -466,11 +543,10 @@ class TOOLKIT_DLLPUBLIC TabPage : public Context, public Window
+@@ -462,11 +545,10 @@ class TOOLKIT_DLLPUBLIC TabPage : public Context, public Window
public:
static ::Window* global_parent;
@@ -500,7 +613,7 @@
virtual void ActivatePage();
virtual void DeactivatePage();
#if 0
-@@ -480,8 +556,8 @@ public:
+@@ -476,8 +558,8 @@ public:
class TOOLKIT_DLLPUBLIC SfxTabPage : public TabPage
{
public:
@@ -511,7 +624,16 @@
#endif
// SfxTabPage...
enum PageAction { KEEP_PAGE, LEAVE_PAGE, REFRESH_SET };
-@@ -520,7 +596,7 @@ protected:
+@@ -488,7 +570,7 @@ public:
+ SfxItemSet const& GetItemSet() const { return *pSet; }
+ virtual void Reset( SfxItemSet const& r );
+ void SetExchangeSupport( bool exchangeSupport = true ) { bHasExchangeSupport = exchangeSupport; }
+- //static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
++ //static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot );
+ virtual void ActivatePage( SfxItemSet const& ) { }
+ virtual int DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; }
+ };
+@@ -516,7 +598,7 @@ protected:
css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
Container( rtl::OUString const& rName, sal_Int32 nBorder );
public:
@@ -520,7 +642,7 @@
void Add( Window *pWindow );
void Add( Container *pContainer );
-@@ -544,7 +620,7 @@ class TOOLKIT_DLLPUBLIC Table : public Container
+@@ -540,7 +622,7 @@ class TOOLKIT_DLLPUBLIC Table : public Container
protected:
Table( sal_Int32 nBorder, sal_Int32 nColumns );
public:
@@ -529,7 +651,7 @@
void Add( Window *pWindow, bool bXExpand, bool bYExpand,
sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
void Add( Container *pContainer, bool bXExpand, bool bYExpand,
-@@ -560,7 +636,7 @@ class TOOLKIT_DLLPUBLIC Box : public Container
+@@ -556,7 +638,7 @@ class TOOLKIT_DLLPUBLIC Box : public Container
protected:
Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous );
public:
@@ -538,7 +660,7 @@
void Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding);
void Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding);
-@@ -572,13 +648,13 @@ private:
+@@ -568,13 +650,13 @@ private:
class TOOLKIT_DLLPUBLIC HBox : public Box
{
public:
@@ -554,7 +676,7 @@
VBox( sal_Int32 nBorder, bool bHomogeneous );
};
-@@ -589,7 +665,7 @@ class TOOLKIT_DLLPUBLIC Plugin : public Control
+@@ -585,7 +667,7 @@ class TOOLKIT_DLLPUBLIC Plugin : public Control
//DECL_CONSTRUCTORS( Plugin, Control, 0 );
public:
::Control *mpPlugin;
@@ -563,7 +685,7 @@
};
class LocalizedStringImpl;
-@@ -597,7 +673,7 @@ class TOOLKIT_DLLPUBLIC LocalizedString : public Window
+@@ -593,7 +675,7 @@ class TOOLKIT_DLLPUBLIC LocalizedString : public Window
{
DECL_GET_IMPL( LocalizedString );
public:
@@ -572,7 +694,7 @@
String operator =( String const& );
operator String();
-@@ -606,4 +682,10 @@ public:
+@@ -602,4 +684,10 @@ public:
} // end namespace layout
@@ -596,7 +718,7 @@
};
// ----------------------------------------------------
-diff --git toolkit/prj/build.lst toolkit/prj/build.lst
+diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index 8b7ac22..1448f0d 100644
--- toolkit/prj/build.lst
+++ toolkit/prj/build.lst
@@ -608,6 +730,8 @@
ti toolkit\source\helper nmake - all ti_helper ti_inc NULL
ti toolkit\source\awt nmake - all ti_awt ti_inc NULL
ti toolkit\source\controls nmake - all ti_controls ti_inc NULL
+diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
+index 88ee9c8..743e2d6 100644
--- toolkit/prj/d.lst
+++ toolkit/prj/d.lst
@@ -52,3 +52,5 @@ mkdir: %_DEST%\inc%_EXT%\layout
@@ -617,10 +741,10 @@
+
+..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
-index f54996b..f72500c 100644
+index 98de970..02d02fc 100644
--- toolkit/source/awt/vclxdialog.cxx
+++ toolkit/source/awt/vclxdialog.cxx
-@@ -215,6 +215,15 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
+@@ -211,6 +211,15 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
pWindow->SetText( Title );
}
@@ -637,10 +761,10 @@
{
::vos::OGuard aGuard( GetMutex() );
diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
-index c270e63..64a90f6 100644
+index 7f45718..337d780 100644
--- toolkit/source/awt/vclxdialog.hxx
+++ toolkit/source/awt/vclxdialog.hxx
-@@ -106,6 +106,7 @@ public:
+@@ -102,6 +102,7 @@ public:
// ::com::sun::star::awt::XDialog2
void SAL_CALL endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException);
@@ -666,11 +790,50 @@
// ----------------------------------------------------
// class VCLXSpinField
// ----------------------------------------------------
+diff --git a/toolkit/source/layout/helper.cxx b/toolkit/source/layout/helper.cxx
+index 1e96643..920c6d6 100644
+--- toolkit/source/layout/helper.cxx
++++ toolkit/source/layout/helper.cxx
+@@ -378,6 +378,9 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
+ #include <vcl/tabctrl.hxx>
+ #include <vcl/tabpage.hxx>
+
++#include <toolkit/awt/vclxwindows.hxx>
++#include <vcl/lstbox.hxx>
++
+ #include <typeinfo>
+
+ namespace layoutimpl
+@@ -530,13 +533,23 @@ uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
+ pNewWindow = new Window( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
+ pNewComp = new layoutimpl::LocalizedString();
+ }
++#if 0 // parent paranoia
++ else if ( aName.equalsAscii( "listbox" ) )
++ {
++ WindowAttributes |= awt::VclWindowPeerAttribute::DROPDOWN;
++ WinBits nStyle = ImplGetWinBits( WindowAttributes, 0 );
++ nStyle |= WB_DROPDOWN;
++ pNewWindow = new ListBox( pParent, nStyle );
++ pNewComp = new VCLXListBox ();
++ }
++#endif
+
+ if ( !pNewWindow )
+ return xRef;
+
+ pNewWindow->SetCreatedWithToolkit( sal_True );
+ if ( pNewComp )
+- pNewComp->SetCreatedWithToolkit( TRUE );
++ pNewComp->SetCreatedWithToolkit( true );
+ xRef = pNewComp;
+ pNewWindow->SetComponentInterface( pNewComp );
+ if ( WindowAttributes & awt::WindowAttribute::SHOW )
diff --git a/toolkit/source/layout/import.cxx b/toolkit/source/layout/import.cxx
-index 87b3a32..104dd06 100644
+index 47857e6..60cf33b 100644
--- toolkit/source/layout/import.cxx
+++ toolkit/source/layout/import.cxx
-@@ -103,7 +103,16 @@ SAL_THROW (())
+@@ -99,7 +99,16 @@ SAL_THROW (())
{
OUString aTitle;
if ( findAndRemove( "title", aProps, aTitle ) )
@@ -687,7 +850,7 @@
} // DEBUG:
else if ( pParent == NULL )
{
-@@ -126,13 +135,11 @@ SAL_THROW (())
+@@ -122,13 +131,11 @@ SAL_THROW (())
if ( DialogButtonHBox *b = dynamic_cast<DialogButtonHBox *> ( mpWidget->getPeer().get() ) )
b->setOrdering ( aOrdering );
@@ -704,7 +867,7 @@
// we need to add radio buttons to the group after their properties are
// set, so we can check if they should be the one selected by default or not.
-@@ -141,17 +148,10 @@ SAL_THROW (())
+@@ -137,17 +144,10 @@ SAL_THROW (())
{
static int i = 0;
i++;
@@ -723,7 +886,7 @@
}
WidgetElement::~WidgetElement()
-@@ -185,7 +185,7 @@ WidgetElement::startChildElement ( sal_Int32 nUid, OUString const &name,
+@@ -181,7 +181,7 @@ WidgetElement::startChildElement ( sal_Int32 nUid, OUString const &name,
// transex3 hack.
void SAL_CALL
WidgetElement::characters( OUString const& rChars )
@@ -732,7 +895,7 @@
{
if ( mpWidget && rChars.trim().getLength() )
{
-@@ -250,4 +250,97 @@ uno::Reference< xml::input::XElement > ImportContext::startRootElement(
+@@ -246,4 +246,97 @@ uno::Reference< xml::input::XElement > ImportContext::startRootElement(
return new ToplevelElement( rLocalName, xAttributes, this );
}
@@ -817,7 +980,7 @@
+}
+
+// awt::XActionListener
-+void RadioGroups::RadioGroup::actionPerformed( const awt::ActionEvent& e )
++void RadioGroups::RadioGroup::actionPerformed( const awt::ActionEvent& )
+ throw (uno::RuntimeException)
+{
+ handleSelected ();
@@ -831,10 +994,10 @@
+
} // namespace layoutimpl
diff --git a/toolkit/source/layout/import.hxx b/toolkit/source/layout/import.hxx
-index 3026e15..dc36710 100644
+index e6d7e51..44e4dcf 100644
--- toolkit/source/layout/import.hxx
+++ toolkit/source/layout/import.hxx
-@@ -41,8 +41,11 @@
+@@ -37,8 +37,11 @@
#define _BACKWARD_BACKWARD_WARNING_H 1
#include <hash_map>
@@ -846,7 +1009,7 @@
namespace layoutimpl
{
-@@ -50,94 +53,41 @@ class LayoutRoot;
+@@ -46,94 +49,41 @@ class LayoutRoot;
class LayoutWidget;
namespace css = ::com::sun::star;
@@ -956,7 +1119,7 @@
};
// each RadioGroup will stay alive after RadioGroups die with the ImportContext
-@@ -145,7 +95,6 @@ private:
+@@ -141,7 +91,6 @@ private:
typedef std::map< rtl::OUString, css::uno::Reference< RadioGroup > > RadioGroupsMap;
RadioGroupsMap mxRadioGroups;
};
@@ -964,7 +1127,7 @@
#if 0
// generator
-@@ -201,9 +150,7 @@ class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
+@@ -197,9 +146,7 @@ class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
public:
sal_Int32 XMLNS_LAYOUT_UID, XMLNS_CONTAINER_UID;
LayoutRoot &mrRoot; // switch to XNameContainer ref ?
@@ -975,10 +1138,10 @@
inline ImportContext( LayoutRoot &rRoot ) SAL_THROW( () )
: mrRoot( rRoot ) {}
diff --git a/toolkit/source/layout/proplist.cxx b/toolkit/source/layout/proplist.cxx
-index 02b510a..a3fe1f4 100644
+index c16d979..f63fba1 100644
--- toolkit/source/layout/proplist.cxx
+++ toolkit/source/layout/proplist.cxx
-@@ -408,7 +408,8 @@ findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
+@@ -404,7 +404,8 @@ findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
for ( it = rProps.begin(); it != rProps.end(); it++ )
{
@@ -989,10 +1152,10 @@
rValue = it->second;
rProps.erase( it );
diff --git a/toolkit/source/vclcompat/wbutton.cxx b/toolkit/source/vclcompat/wbutton.cxx
-index 5300e70..b6e54be 100644
+index 5617f4f..f08a7f9 100644
--- toolkit/source/vclcompat/wbutton.cxx
+++ toolkit/source/vclcompat/wbutton.cxx
-@@ -43,6 +43,7 @@
+@@ -39,6 +39,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxwindow.hxx>
@@ -1000,7 +1163,7 @@
#include <toolkit/helper/convert.hxx>
#include <vcl/button.hxx>
#include <vcl/event.hxx>
-@@ -53,6 +54,7 @@
+@@ -49,6 +50,7 @@
#include <list>
#include "layout/layoutcore.hxx"
@@ -1008,7 +1171,7 @@
using namespace ::com::sun::star;
-@@ -88,10 +90,10 @@ class ButtonImpl : public ControlImpl
+@@ -84,10 +86,10 @@ class ButtonImpl : public ControlImpl
, public ::cppu::WeakImplHelper1< awt::XItemListener >
{
Link maClickHdl;
@@ -1021,7 +1184,7 @@
uno::Reference< awt::XButton > mxButton;
ButtonImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
: ControlImpl( pCtx, xPeer, pWindow )
-@@ -106,7 +108,7 @@ class ButtonImpl : public ControlImpl
+@@ -102,7 +104,7 @@ class ButtonImpl : public ControlImpl
virtual void Click() { /* make me pure virtual? */ };
@@ -1030,7 +1193,7 @@
{
maClickHdl = rLink;
if ( !rLink )
-@@ -117,9 +119,11 @@ class ButtonImpl : public ControlImpl
+@@ -113,9 +115,11 @@ class ButtonImpl : public ControlImpl
virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
throw (css::uno::RuntimeException)
@@ -1044,7 +1207,7 @@
throw (css::uno::RuntimeException)
{
if ( !maClickHdl )
-@@ -128,14 +132,14 @@ class ButtonImpl : public ControlImpl
+@@ -124,20 +128,25 @@ class ButtonImpl : public ControlImpl
maClickHdl.Call( static_cast<Window *>( mpWindow ) );
}
@@ -1061,7 +1224,18 @@
{
setProperty( "Graphic", uno::Any( xGraph ) );
return true;
-@@ -154,7 +158,7 @@ void Button::SetClickHdl( const Link& rLink )
+ }
+ };
+
++String Button::GetStandardText (sal_uInt16 button_type)
++{
++ return ::Button::GetStandardText (button_type);
++}
++
+ void Button::SetText( String const& rStr )
+ {
+ if ( !getImpl().mxButton.is() )
+@@ -150,7 +159,7 @@ void Button::SetClickHdl( const Link& rLink )
getImpl().SetClickHdl( rLink );
}
@@ -1070,7 +1244,7 @@
{
return getImpl().SetModeImage( rImage.getImpl().mxGraphic );
}
-@@ -201,14 +205,14 @@ class PushButtonImpl : public ButtonImpl
+@@ -197,14 +206,14 @@ class PushButtonImpl : public ButtonImpl
}
};
@@ -1087,7 +1261,7 @@
{
return !!( getImpl().getProperty( "State" ).get< sal_Int16 >() );
}
-@@ -226,9 +230,6 @@ void PushButton::SetToggleHdl( const Link& rLink )
+@@ -222,9 +231,6 @@ void PushButton::SetToggleHdl( const Link& rLink )
IMPL_GET_IMPL( PushButton );
IMPL_CONSTRUCTORS( PushButton, Button, "pushbutton" );
@@ -1097,21 +1271,21 @@
class RadioButtonImpl : public ButtonImpl
{
public:
-@@ -237,55 +238,41 @@ public:
+@@ -233,55 +239,41 @@ public:
: ButtonImpl( pCtx, xPeer, pWindow )
, mxRadioButton( xPeer, uno::UNO_QUERY )
{
- // TEMP:
- mpRadioGroup.push_back( this );
- mxRadioButton->addItemListener( this );
-- }
--
+ }
+
- ~RadioButtonImpl()
- {
- //mxRadioButton->removeItemListener( this );
- mpRadioGroup.pop_front();
- }
-
+- }
+-
- void Check( BOOL bCheck )
+ void Check( bool bCheck )
{
@@ -1124,10 +1298,10 @@
+ ::RadioButton *r = static_cast<RadioButton*>(mpWindow)->GetRadioButton ();
+ bool state = r->IsRadioCheckEnabled ();
+ r->EnableRadioCheck();
-+ mxRadioButton->setState( !!bCheck );
+ mxRadioButton->setState( !!bCheck );
+ r->EnableRadioCheck (state);
+#else
- mxRadioButton->setState( !!bCheck );
++ mxRadioButton->setState( !!bCheck );
+#endif
fireToggle();
-
@@ -1167,7 +1341,7 @@
}
inline void fireToggle()
-@@ -293,24 +280,37 @@ public:
+@@ -289,24 +281,37 @@ public:
maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
}
@@ -1186,7 +1360,7 @@
+ // IWBN to add an XRadioButton2 and layout::VCLXRadioButton
+ // with {get,set}RadioGroup() (and a "radiogroup" property
+ // even) and handle the grouping here in RadioButtonImpl.
-+ uno::Reference< uno::XInterface > x = static_cast<VCLXRadioButton*> (mpWindow->GetVCLXWindow ())->getFirstActionListener ();
++ uno::Reference< uno::XInterface > x = static_cast<RadioButton*> (mpWindow)->GetVCLXRadioButton ()->getFirstActionListener ();
+ uno::Reference< awt::XActionListener > a = uno::Reference< awt::XActionListener> (x ,uno::UNO_QUERY );
+ mxButton->removeActionListener (a);
+ ButtonImpl::SetClickHdl (rLink);
@@ -1214,12 +1388,13 @@
{
return getImpl().IsChecked();
}
-@@ -321,20 +321,8 @@ void RadioButton::SetToggleHdl( const Link& rLink )
+@@ -317,20 +322,9 @@ void RadioButton::SetToggleHdl( const Link& rLink )
}
IMPL_GET_IMPL( RadioButton );
-#if 1
+IMPL_GET_WINDOW( RadioButton );
++IMPL_GET_VCLXWINDOW( RadioButton );
IMPL_CONSTRUCTORS( RadioButton, Button, "radiobutton" );
-#else //debugging aid
-RadioButton::RadioButton( Context *pCtx, const char *pId, sal_uInt32 nId )
@@ -1236,7 +1411,7 @@
class CheckBoxImpl : public ButtonImpl
{
-@@ -354,17 +342,17 @@ class CheckBoxImpl : public ButtonImpl
+@@ -350,17 +344,17 @@ class CheckBoxImpl : public ButtonImpl
}
};
@@ -1257,11 +1432,22 @@
return getImpl().mxCheckBox->getState() != 0;
}
+@@ -557,8 +551,8 @@ public:
+ MoreButtonImpl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow )
+ : AdvancedButtonImpl( pCtx, xPeer, pWindow)
+ {
+- mAdvancedLabel = ::Button::GetStandardText( BUTTON_LESS );
+- mSimpleLabel = ::Button::GetStandardText( BUTTON_MORE );
++ mAdvancedLabel = Button::GetStandardText( BUTTON_LESS );
++ mSimpleLabel = Button::GetStandardText( BUTTON_MORE );
+ }
+ void AddWindow( Window* w ) { AddAdvanced( w ); }
+ void RemoveWindow( Window* w ) { RemoveAdvanced( w ); }
diff --git a/toolkit/source/vclcompat/wfield.cxx b/toolkit/source/vclcompat/wfield.cxx
-index 8d9ab13..fb7bb4d 100644
+index 015cf63..9c86730 100644
--- toolkit/source/vclcompat/wfield.cxx
+++ toolkit/source/vclcompat/wfield.cxx
-@@ -44,6 +44,7 @@
+@@ -40,6 +40,7 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/awt/XActionListener.hpp>
#include <com/sun/star/awt/XItemListener.hpp>
@@ -1269,31 +1455,204 @@
using namespace ::com::sun::star;
-@@ -498,7 +499,7 @@ public:
+@@ -308,7 +309,7 @@ public:
+ {
+ }
+
+- USHORT InsertEntry( XubString const& rStr, USHORT nPos )
++ sal_uInt16 InsertEntry( XubString const& rStr, sal_uInt16 nPos )
+ {
+ if ( nPos == COMBOBOX_APPEND )
+ nPos = GetEntryCount();
+@@ -316,29 +317,29 @@ public:
+ return nPos;
+ }
+
+- void RemoveEntry( USHORT nPos )
++ void RemoveEntry( sal_uInt16 nPos )
+ {
+ mxComboBox->removeItems( nPos, 1 );
+ }
+
+- USHORT GetEntryPos( const XubString& rStr ) const
++ sal_uInt16 GetEntryPos( const XubString& rStr ) const
+ {
+ uno::Sequence< rtl::OUString> aItems( mxComboBox->getItems() );
+ rtl::OUString rKey( rStr );
+ for( unsigned int i = 0; aItems.getLength(); i++ )
+ {
+ if ( aItems[ i ] == rKey )
+- return sal::static_int_cast< USHORT >( i );
++ return sal::static_int_cast< sal_uInt16 >( i );
+ }
+ return COMBOBOX_ENTRY_NOTFOUND;
+ }
+
+- XubString GetEntry( USHORT nPos ) const
++ XubString GetEntry( sal_uInt16 nPos ) const
+ {
+ return XubString( mxComboBox->getItem( nPos ) );
+ }
+
+- USHORT GetEntryCount() const
++ sal_uInt16 GetEntryCount() const
+ {
+ return mxComboBox->getItemCount();
+ }
+@@ -386,7 +387,7 @@ public:
+ }
+ };
+
+-USHORT ComboBox::InsertEntry( const XubString &rStr, USHORT nPos )
++sal_uInt16 ComboBox::InsertEntry( const XubString &rStr, sal_uInt16 nPos )
+ {
+ return getImpl().InsertEntry( rStr, nPos );
+ }
+@@ -396,7 +397,7 @@ void ComboBox::RemoveEntry( const XubString& rStr )
+ getImpl().RemoveEntry( GetEntryPos( rStr ) );
+ }
+
+-void ComboBox::RemoveEntry( USHORT nPos )
++void ComboBox::RemoveEntry( sal_uInt16 nPos )
+ {
+ getImpl().RemoveEntry( nPos );
+ }
+@@ -407,18 +408,18 @@ void ComboBox::Clear()
+ getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
+ }
+
+-USHORT ComboBox::GetEntryPos( const XubString& rStr ) const
++sal_uInt16 ComboBox::GetEntryPos( const XubString& rStr ) const
+ {
+ return getImpl().GetEntryPos( rStr );
+ }
+
+-XubString ComboBox::GetEntry( USHORT nPos ) const
++XubString ComboBox::GetEntry( sal_uInt16 nPos ) const
+ {
+ rtl::OUString rItem = getImpl().mxComboBox->getItem( nPos );
+ return XubString( rItem );
+ }
+
+-USHORT ComboBox::GetEntryCount() const
++sal_uInt16 ComboBox::GetEntryCount() const
+ {
+ return getImpl().GetEntryCount();
+ }
+@@ -451,7 +452,7 @@ public:
+ SelectEntryPos( 0, true );
+ }
+
+- USHORT InsertEntry(const XubString& rStr, USHORT nPos)
++ sal_uInt16 InsertEntry(const XubString& rStr, sal_uInt16 nPos)
+ {
+ if ( nPos == LISTBOX_APPEND )
+ nPos = mxListBox->getItemCount();
+@@ -459,12 +460,12 @@ public:
+ return nPos;
+ }
+
+- void RemoveEntry( USHORT nPos )
++ void RemoveEntry( sal_uInt16 nPos )
+ {
+ mxListBox->removeItems( nPos, 1 );
+ }
+
+- USHORT RemoveEntry(const XubString& rStr, USHORT nPos)
++ sal_uInt16 RemoveEntry(const XubString& rStr, sal_uInt16 nPos)
+ {
+ if ( nPos == LISTBOX_APPEND )
+ nPos = mxListBox->getItemCount();
+@@ -472,41 +473,41 @@ public:
+ return nPos;
+ }
+
+- USHORT GetEntryPos( const XubString& rStr ) const
++ sal_uInt16 GetEntryPos( const XubString& rStr ) const
+ {
+ uno::Sequence< rtl::OUString> aItems( mxListBox->getItems() );
+ rtl::OUString rKey( rStr );
+ for( unsigned int i = 0; aItems.getLength(); i++ )
+ {
+ if ( aItems[ i ] == rKey )
+- return sal::static_int_cast< USHORT >( i );
++ return sal::static_int_cast< sal_uInt16 >( i );
+ }
+ return LISTBOX_ENTRY_NOTFOUND;
+ }
+
+- XubString GetEntry( USHORT nPos ) const
++ XubString GetEntry( sal_uInt16 nPos ) const
+ {
+ return mxListBox->getItem( nPos );
+ }
+
+- USHORT GetEntryCount() const
++ sal_uInt16 GetEntryCount() const
+ {
return mxListBox->getItemCount();
}
- void SelectEntryPos( USHORT nPos, BOOL bSelect )
-+ void SelectEntryPos( USHORT nPos, bool bSelect )
++ void SelectEntryPos( sal_uInt16 nPos, bool bSelect )
{
mxListBox->selectItemPos( nPos, bSelect );
}
-@@ -537,8 +538,7 @@ public:
- if ( !rLink )
- mxListBox->removeItemListener( this );
- else
-- mxListBox->addItemListener( this );
-- }
-+ mxListBox->addItemListener( this ); }
- virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
- throw (css::uno::RuntimeException)
-@@ -598,12 +598,12 @@ USHORT ListBox::GetEntryCount() const
+- USHORT GetSelectEntryCount() const
++ sal_uInt16 GetSelectEntryCount() const
+ {
+- return sal::static_int_cast< USHORT >( mxListBox->getSelectedItems().getLength() );
++ return sal::static_int_cast< sal_uInt16 >( mxListBox->getSelectedItems().getLength() );
+ }
+
+- USHORT GetSelectEntryPos( USHORT nSelIndex ) const
++ sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex ) const
+ {
+- USHORT nSelected = 0;
++ sal_uInt16 nSelected = 0;
+ if ( mxListBox->isMutipleMode() )
+ {
+ uno::Sequence< short > aItems( mxListBox->getSelectedItemsPos() );
+@@ -558,12 +559,12 @@ public:
+ }
+ };
+
+-USHORT ListBox::InsertEntry(const XubString& rStr, USHORT nPos)
++sal_uInt16 ListBox::InsertEntry(const XubString& rStr, sal_uInt16 nPos)
+ {
+ return getImpl().InsertEntry(rStr, nPos);
+ }
+
+-void ListBox::RemoveEntry( USHORT nPos )
++void ListBox::RemoveEntry( sal_uInt16 nPos )
+ {
+ return getImpl().RemoveEntry( nPos );
+ }
+@@ -579,42 +580,42 @@ void ListBox::Clear()
+ getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
+ }
+
+-USHORT ListBox::GetEntryPos( const XubString& rStr ) const
++sal_uInt16 ListBox::GetEntryPos( const XubString& rStr ) const
+ {
+ return getImpl().GetEntryPos( rStr );
+ }
+
+-XubString ListBox::GetEntry( USHORT nPos ) const
++XubString ListBox::GetEntry( sal_uInt16 nPos ) const
+ {
+ return getImpl().GetEntry( nPos );
+ }
+
+-USHORT ListBox::GetEntryCount() const
++sal_uInt16 ListBox::GetEntryCount() const
+ {
return getImpl().GetEntryCount();
}
-void ListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
-+void ListBox::SelectEntryPos( USHORT nPos, bool bSelect )
++void ListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
{
getImpl().SelectEntryPos( nPos, bSelect );
}
@@ -1303,10 +1662,72 @@
{
SelectEntryPos( GetEntryPos( rStr ), bSelect );
}
-@@ -636,4 +636,18 @@ void ListBox::SetClickHdl( const Link& rLink )
+
+-USHORT ListBox::GetSelectEntryCount() const
++sal_uInt16 ListBox::GetSelectEntryCount() const
+ {
+ return getImpl().GetSelectEntryCount();
+ }
+
+-USHORT ListBox::GetSelectEntryPos( USHORT nSelIndex ) const
++sal_uInt16 ListBox::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
+ {
+ return getImpl().GetSelectEntryPos( nSelIndex );
+ }
+
+-XubString ListBox::GetSelectEntry( USHORT nSelIndex ) const
++XubString ListBox::GetSelectEntry( sal_uInt16 nSelIndex ) const
+ {
+ return GetEntry( GetSelectEntryPos( nSelIndex ) );
+ }
+@@ -629,7 +630,62 @@ void ListBox::SetClickHdl( const Link& rLink )
+ getImpl().SetClickHdl( rLink );
+ }
+
++
++void ListBox::SetEntryData( sal_uInt16 pos, void* data)
++{
++ GetListBox ()->SetEntryData (pos, data);
++}
++
++void* ListBox::GetEntryData( sal_uInt16 pos) const
++{
++ return GetListBox ()->GetEntryData (pos);
++}
++
++// SvxLanguageBox
++void ListBox::SetLanguageList( sal_Int16/*list*/, bool/*hasLangNone*/, bool /*langNoneIsLangAll*/, bool /*checkSpellAvail*/)
++{
++}
++
++sal_uInt16 ListBox::InsertLanguage( const LanguageType/*type*/, sal_uInt16/*pos*/)
++{
++ return 0;
++}
++sal_uInt16 ListBox::InsertLanguage( const LanguageType/*type*/, bool/*checkEntry*/, sal_uInt16 /*pos*/)
++{
++ return 0;
++}
++void ListBox::RemoveLanguage( const LanguageType/*type*/)
++{
++}
++void ListBox::SelectLanguage( const LanguageType/*type*/, bool/*select*/)
++{
++}
++LanguageType ListBox::GetSelectLanguage() const
++{
++ return 0;
++}
++bool ListBox::IsLanguageSelected( const LanguageType/*type*/) const
++{
++ return true;
++}
++
++
IMPL_CONSTRUCTORS( ListBox, Control, "listbox" );
IMPL_GET_IMPL( ListBox );
-
++IMPL_GET_WINDOW (ListBox);
++
+// Window/Control/List/MultiListBox
+class MultiListBoxImpl : public ListBoxImpl
+{
@@ -1320,14 +1741,18 @@
+IMPL_CONSTRUCTORS_BODY( MultiListBox, ListBox, "multilistbox", GetMultiListBox()->EnableMultiSelection( true ); );
+IMPL_GET_IMPL( MultiListBox );
+IMPL_GET_WINDOW( MultiListBox );
-+
+
} // namespace layout
diff --git a/toolkit/source/vclcompat/wrapper.cxx b/toolkit/source/vclcompat/wrapper.cxx
-index 95bc106..8c5e9d4 100644
+index 93f3a5f..12aa239 100644
--- toolkit/source/vclcompat/wrapper.cxx
+++ toolkit/source/vclcompat/wrapper.cxx
-@@ -138,13 +138,13 @@ PeerHandle Context::getRoot()
- return pImpl->getRoot();
+@@ -131,16 +131,16 @@ PeerHandle Context::getToplevel()
+ }
+ PeerHandle Context::getRoot()
+ {
+- return pImpl->getRoot();
++ return pImpl->getRoot();
}
-PeerHandle Context::GetPeerHandle( const char *pId, sal_uInt32 nId ) const
@@ -1343,7 +1768,7 @@
}
if ( nId != 0 )
-@@ -188,33 +188,53 @@ Context *Window::getContext()
+@@ -184,33 +184,53 @@ Context *Window::getContext()
return this && mpImpl ? mpImpl->mpCtx : NULL;
}
@@ -1402,7 +1827,7 @@
struct ToolkitVclPropsMap
{
WinBits vclStyle;
-@@ -364,7 +384,7 @@ void Window::Enable( bool bEnable )
+@@ -360,7 +380,7 @@ void Window::Enable( bool bEnable )
getImpl().mxWindow->setEnable( bEnable );
}
@@ -1411,7 +1836,7 @@
{
if ( !getImpl().mxWindow.is() )
return;
-@@ -378,6 +398,31 @@ void Window::GrabFocus()
+@@ -374,6 +394,31 @@ void Window::GrabFocus()
getImpl().mxWindow->setFocus();
}
@@ -1443,7 +1868,7 @@
class DialogImpl : public WindowImpl
{
public:
-@@ -391,17 +436,17 @@ public:
+@@ -387,17 +432,17 @@ public:
IMPL_GET_IMPL( Dialog )
@@ -1451,7 +1876,7 @@
- : Context( pXMLPath )
- , Window( new DialogImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
+Dialog::Dialog( Window *pParent, const char *xml_file, const char *id, sal_uInt32 nId )
-+ : Context( xml_file )
++: Context( xml_file )
+ , Window( new DialogImpl( this, Context::GetPeerHandle( id, nId ), this ) )
{
if ( pParent )
@@ -1467,7 +1892,7 @@
{
if ( pParent )
SetParent( pParent );
-@@ -423,11 +468,116 @@ void Dialog::EndDialog( long nResult )
+@@ -419,11 +464,165 @@ void Dialog::EndDialog( long nResult )
void Dialog::SetText( String const& rStr )
{
@@ -1481,8 +1906,8 @@
getImpl().mxDialog->setTitle( rStr );
}
-+#define MESSAGE_BOX_IMPL\
-+ : Dialog (parent, xml_file, id)\
++#define MESSAGE_BOX_MEMBER_INIT\
++ Dialog (parent, xml_file, id)\
+ , imageError (this, "FI_ERROR")\
+ , imageInfo (this, "FI_INFO")\
+ , imageQuery (this, "FI_QUERY")\
@@ -1490,35 +1915,82 @@
+ , messageText (this, "FT_MESSAGE")\
+ , cancelButton (this, "BTN_CANCEL")\
+ , helpButton (this, "BTN_HELP")\
++ , ignoreButton (this, "BTN_IGNORE")\
+ , noButton (this, "BTN_NO")\
-+ , yesButton (this, "BTN_YES")\
-+{\
-+ init (message, yes, no, help_id);\
-+}\
++ , retryButton (this, "BTN_RETRY")\
++ , yesButton (this, "BTN_YES")
+
+MessageBox::MessageBox (::Window *parent, char const* message,
-+ char const* yes, char const* no, sal_uIntPtr help_id,
-+ char const* xml_file, char const* id)
-+MESSAGE_BOX_IMPL
++ char const* yes, char const* no, sal_uIntPtr help_id,
++ char const* xml_file, char const* id)
++ : MESSAGE_BOX_MEMBER_INIT
++{
++ ignoreButton.Hide ();
++ retryButton.Hide ();
++ init (message, yes, no, help_id);
++}
+
+MessageBox::MessageBox (::Window *parent, OUString const& message,
-+ OUString yes, OUString no, sal_uIntPtr help_id,
-+ char const* xml_file, char const* id)
-+MESSAGE_BOX_IMPL
-+
-+MessageBox::MessageBox (::Window *parent, WinBits, char const* message,
-+ char const* yes, char const* no, sal_uIntPtr help_id,
-+ char const* xml_file, char const* id)
-+MESSAGE_BOX_IMPL
-+
-+MessageBox::MessageBox (::Window *parent, WinBits, OUString const& message,
-+ OUString yes, OUString no, sal_uIntPtr help_id,
-+ char const* xml_file, char const* id)
-+MESSAGE_BOX_IMPL
++ OUString yes, OUString no, sal_uIntPtr help_id,
++ char const* xml_file, char const* id)
++ : MESSAGE_BOX_MEMBER_INIT
++{
++ ignoreButton.Hide ();
++ retryButton.Hide ();
++ init (message, yes, no, help_id);
++}
++
++MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message,
++ char const* yes, char const* no, sal_uIntPtr help_id,
++ char const* xml_file, char const* id)
++ : MESSAGE_BOX_MEMBER_INIT
++{
++ // HIG suggests using verbs instead of yes/no/retry etc.
++ // This constructor provides client-code compatibility: Client code should be fixed.
++ OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
++ bits_init (bits, OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
++}
++
++MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message,
++ OUString yes, OUString no, sal_uIntPtr help_id,
++ char const* xml_file, char const* id)
++ : MESSAGE_BOX_MEMBER_INIT
++{
++ // HIG suggests using verbs instead of yes/no/retry etc.
++ // This constructor provides client-code compatibility: Client code should be fixed.
++ OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
++ bits_init (bits, message, yes, no, help_id);
++}
++
++void MessageBox::bits_init (WinBits bits, OUString const& message,
++ OUString yes, OUString no, sal_uIntPtr help_id)
++{
++ if ( bits & ( WB_OK_CANCEL | WB_OK ))
++ yes = Button::GetStandardText ( BUTTON_OK );
++ if ( bits & (WB_YES_NO | WB_YES_NO_CANCEL ))
++ {
++ yes = Button::GetStandardText ( BUTTON_YES );
++ no = Button::GetStandardText ( BUTTON_NO );
++ }
++ if (! (bits & (WB_RETRY_CANCEL | WB_YES_NO_CANCEL | WB_ABORT_RETRY_IGNORE )))
++ cancelButton.Hide ();
++ if (! (bits & (WB_RETRY_CANCEL | WB_ABORT_RETRY_IGNORE)))
++ retryButton.Hide ();
++ if ( bits & WB_ABORT_RETRY_IGNORE )
++ cancelButton.SetText ( Button::GetStandardText (BUTTON_ABORT));
++ else
++ ignoreButton.Hide ();
++ if ( !(bits & ( WB_OK | WB_OK_CANCEL | WB_YES_NO | WB_YES_NO_CANCEL)))
++ yesButton.Hide ();
++ if ( !(bits & ( WB_YES_NO | WB_YES_NO_CANCEL)))
++ noButton.Hide ();
++
++ init (message, yes, no, help_id);
++}
+
+void MessageBox::init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id)
+{
-+ init (OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
++ init ( OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
+}
+
+void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, sal_uIntPtr help_id)
@@ -1532,7 +2004,9 @@
+ if (yes.getLength ())
+ {
+ yesButton.SetText (yes);
-+ SetTitle (yes);
++ if (yes != OUString (Button::GetStandardText (BUTTON_OK))
++ && yes != OUString (Button::GetStandardText (BUTTON_YES)))
++ SetTitle (yes);
+ if (no.getLength ())
+ noButton.SetText (no);
+ else
@@ -1554,7 +2028,7 @@
+ image##Name.Show ();\
+ }\
+ Name##Box::Name##Box (::Window *parent, OUString const& message,\
-+ OUString yes, OUString no, sal_uIntPtr help_id,\
++ OUString yes, OUString no, sal_uIntPtr help_id,\
+ char const* xml_file, char const* id)\
+ : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
+ {\
@@ -1584,7 +2058,7 @@
class TabPageImpl : public WindowImpl
{
public:
-@@ -443,9 +593,9 @@ public:
+@@ -439,9 +638,9 @@ public:
IMPL_GET_IMPL( TabPage )
@@ -1592,12 +2066,12 @@
- : Context( pXMLPath )
- , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
+TabPage::TabPage( Window *pParent, const char *xml_file, const char *id, sal_uInt32 nId, SfxItemSet const* set )
-+ : Context( xml_file )
++: Context( xml_file )
+ , Window( new TabPageImpl( this, Context::GetPeerHandle( id, nId ), this ) )
, bHasExchangeSupport( false )
, pSet( set )
{
-@@ -453,9 +603,9 @@ TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uI
+@@ -449,9 +648,9 @@ TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uI
SetParent( pParent );
}
@@ -1610,7 +2084,7 @@
, bHasExchangeSupport( false )
, pSet( set )
{
-@@ -479,15 +629,15 @@ void TabPage::DeactivatePage()
+@@ -475,31 +674,31 @@ void TabPage::DeactivatePage()
}
#if 0
@@ -1630,7 +2104,36 @@
{
}
-@@ -644,8 +794,8 @@ FixedImage::~FixedImage()
+ /* FIXME: static method, full c&p from sfx2/source/dialog/tabdlg.cxx */
+-//const SfxPoolItem* TabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot )
+-const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot )
++//const SfxPoolItem* TabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot )
++const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot )
+
+ {
+ const SfxItemPool* pPool = rSet.GetPool();
+- USHORT nWh = pPool->GetWhich( nSlot );
++ sal_uInt16 nWh = pPool->GetWhich( nSlot );
+ const SfxPoolItem* pItem = 0;
+ #ifdef DEBUG
+ SfxItemState eState;
+ eState =
+ #endif
+- rSet.GetItemState( nWh, TRUE, &pItem ); // -Wall required??
++ rSet.GetItemState( nWh, true, &pItem ); // -Wall required??
+
+ if ( !pItem && nWh != nSlot )
+ pItem = &pPool->GetDefaultItem( nWh );
+@@ -625,7 +824,7 @@ void FixedImage::setImage( ::Image const& i )
+
+ #if 0
+
+- FixedImage::FixedImage( const char *pName )
++FixedImage::FixedImage( const char *pName )
+ : pImpl( new FixedImageImpl( pName ) )
+ {
+ }
+@@ -640,8 +839,8 @@ FixedImage::~FixedImage()
IMPL_CONSTRUCTORS( ProgressBar, Control, "ProgressBar" );
#if 0
@@ -1641,7 +2144,14 @@
{
}
ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
-@@ -716,8 +866,8 @@ public:
+@@ -706,14 +905,14 @@ public:
+ vcl->SetPlugin( mpPlugin );
+ plugin->SetParent( parent );
+ plugin->SetStyle( vcl->mStyle );
+- plugin->SetCreatedWithToolkit( TRUE );
++ plugin->SetCreatedWithToolkit( true );
+ plugin->SetComponentInterface( vcl );
+ plugin->Show();
}
};
@@ -1652,7 +2162,7 @@
, mpPlugin( plugin )
{
}
-@@ -748,8 +898,8 @@ public:
+@@ -776,8 +975,8 @@ public:
IMPL_GET_IMPL( LocalizedString );
@@ -1664,10 +2174,10 @@
}
diff --git a/toolkit/source/vclcompat/wrapper.hxx b/toolkit/source/vclcompat/wrapper.hxx
-index 5df64bc..e5332de 100644
+index 25dbd90..36a491f 100644
--- toolkit/source/vclcompat/wrapper.hxx
+++ toolkit/source/vclcompat/wrapper.hxx
-@@ -116,15 +116,18 @@ inline WindowImpl &Window::getImpl() const
+@@ -112,15 +112,18 @@ inline WindowImpl &Window::getImpl() const
{ \
return *(static_cast<t##Impl *>(mpImpl)); \
}
@@ -1695,6 +2205,13 @@
@@ -0,0 +1 @@
+empty
\ No newline at end of file
+diff --git a/toolkit/uiconfig/layout/localize.sdf b/toolkit/uiconfig/layout/localize.sdf
+new file mode 100644
+index 0000000..ea30561
+--- /dev/null
++++ toolkit/uiconfig/layout/localize.sdf
+@@ -0,0 +1 @@
++#empty
diff --git a/toolkit/uiconfig/layout/makefile.mk b/toolkit/uiconfig/layout/makefile.mk
new file mode 100644
index 0000000..2cc6d95
@@ -1760,10 +2277,10 @@
+.INCLUDE : target.mk
diff --git a/toolkit/uiconfig/layout/message-box.xml b/toolkit/uiconfig/layout/message-box.xml
new file mode 100644
-index 0000000..5a2228f
+index 0000000..237f549
--- /dev/null
+++ toolkit/uiconfig/layout/message-box.xml
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is a template. i18n translation is not performed in-place;
+ i18n translated xml files are generated from this template by
@@ -1794,6 +2311,10 @@
+ </hbox>
+ <dialogbuttonhbox border="0" spacing="5">
+ <flow/>
++ <!-- deprecoted vcl/MsgBox compatibility !-->
++ <retrybutton id="BTN_RETRY" />
++ <ignorebutton id="BTN_IGNORE" />
++
+ <yesbutton id="BTN_YES"/>
+ <cancelbutton id="BTN_CANCEL"/>
+ <helpbutton id="BTN_HELP"/>
@@ -1887,10 +2408,10 @@
+ </vbox>
+</modaldialog>
diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
-index 2b2609c..4664078 100644
+index e82e1c9..4f2a2e1 100644
--- toolkit/workben/layout/makefile.mk
+++ toolkit/workben/layout/makefile.mk
-@@ -47,12 +47,10 @@ ENABLE_EXCEPTIONS=TRUE
+@@ -43,12 +43,10 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS += -I$(PRJ)/source/layout
# Allow zoom and wordcount to be built without depending on svx,sv,sfx2
@@ -1904,19 +2425,20 @@
.IF "$(COMNAME)" == "gcc3"
CFLAGS+=-Wall -Wno-non-virtual-dtor
.ENDIF
-@@ -96,8 +94,11 @@ default: ALLTAR
+@@ -92,8 +90,12 @@ default: ALLTAR
.INCLUDE : target.mk
XML_FILES=\
+ insert-sheet.xml\
+ message-box.xml\
++ move-copy-sheet.xml\
recover.xml\
sort-options.xml\
+ string-input.xml\
wordcount.xml\
zoom.xml\
-@@ -123,12 +124,15 @@ $(svtools):
+@@ -119,12 +121,15 @@ $(svtools):
ln -sf ..$/$(PRJ)$/svtools$/inc $(INCCOM)$/svtools
dist .PHONY :
@@ -1932,11 +2454,12 @@
# FIXME: broken setup
ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx
$(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
-@@ -137,6 +141,9 @@ dist .PHONY :
+@@ -133,6 +138,10 @@ dist .PHONY :
$(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
+ cp -pv insert-sheet.xml ../$(PRJ)/sc/uiconfig/layout
++ cp -pv move-copy-sheet.xml ../$(PRJ)/sc/uiconfig/layout
+ cp -pv sort-options.xml ../$(PRJ)/sc/uiconfig/layout
+ cp -pv string-input.xml ../$(PRJ)/sc/uiconfig/layout
@@ -1944,10 +2467,10 @@
all .PHONY:
diff --git a/toolkit/workben/layout/message-box.xml b/toolkit/workben/layout/message-box.xml
new file mode 100644
-index 0000000..5a2228f
+index 0000000..237f549
--- /dev/null
+++ toolkit/workben/layout/message-box.xml
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is a template. i18n translation is not performed in-place;
+ i18n translated xml files are generated from this template by
@@ -1978,6 +2501,10 @@
+ </hbox>
+ <dialogbuttonhbox border="0" spacing="5">
+ <flow/>
++ <!-- deprecoted vcl/MsgBox compatibility !-->
++ <retrybutton id="BTN_RETRY" />
++ <ignorebutton id="BTN_IGNORE" />
++
+ <yesbutton id="BTN_YES"/>
+ <cancelbutton id="BTN_CANCEL"/>
+ <helpbutton id="BTN_HELP"/>
@@ -1985,11 +2512,38 @@
+ </dialogbuttonhbox>
+ </vbox>
+</modaldialog>
+diff --git a/toolkit/workben/layout/move-copy-sheet.xml b/toolkit/workben/layout/move-copy-sheet.xml
+new file mode 100644
+index 0000000..7d3455e
+--- /dev/null
++++ toolkit/workben/layout/move-copy-sheet.xml
+@@ -0,0 +1,21 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template. i18n translation is not performed in-place;
++ i18n translated XML files are generated from this template by
++ transex3/layout/tralay. !-->
++
++<modaldialog sizeable="true" closeable="false" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
++ <vbox spacing="5" border="5">
++ <string id="STR_NEWDOC" _text="- new document -"/>
++ <fixedtext id="FT_DEST" _label="To ~document"/>
++ <listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
++ <fixedtext id="FT_INSERT" _label="~Insert before"/>
++ <listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
++ <checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
++ <dialogbuttonhbox border="5" spacing="5">
++ <flow/>
++ <cancelbutton id="BTN_CANCEL" tabstop="true"/>
++ <helpbutton id="BTN_HELP" tabstop="true"/>
++ <okbutton default="true" id="BTN_OK" tabstop="true"/>
++ </dialogbuttonhbox>
++ </vbox>
++</modaldialog>
diff --git a/toolkit/workben/layout/recover.cxx b/toolkit/workben/layout/recover.cxx
-index 76eec92..45cf261 100644
+index 706ee21..a0cc56b 100644
--- toolkit/workben/layout/recover.cxx
+++ toolkit/workben/layout/recover.cxx
-@@ -59,6 +59,13 @@ using namespace com::sun::star;
+@@ -55,6 +55,13 @@ using namespace com::sun::star;
#include <layout/layout-pre.hxx>
@@ -2026,10 +2580,10 @@
+ </vbox>
+</modaldialog>
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
-index f825417..ed5a67e 100644
+index 159cbc9..cba8245 100644
--- toolkit/workben/layout/test.cxx
+++ toolkit/workben/layout/test.cxx
-@@ -241,19 +241,21 @@ void LayoutTest::RunEditor()
+@@ -237,19 +237,21 @@ void LayoutTest::RunEditor()
editor.Execute();
}
@@ -2057,7 +2611,7 @@
}
#if SORT_DLG
-@@ -274,6 +276,11 @@ void TestDialog( OUString const& name )
+@@ -270,6 +272,19 @@ void TestDialog( OUString const& name )
PluginDialog plugin ( 0 );
RunDialog( plugin );
}
@@ -2066,6 +2620,14 @@
+ QueryBox query ( 0, "Do you want to do?", "do");
+ RunDialog( query );
+ }
++ else if ( name.equalsAscii( "query-compat" ) )
++ {
++ QueryBox query ( 0,
++ WinBits( WB_YES_NO | WB_DEF_YES ),
++// WinBits( WB_ABORT_RETRY_IGNORE ),
++ OUString::createFromAscii ("Do you want to do?"));
++ RunDialog( query );
++ }
else if ( name.equalsAscii( "recover" ) )
{
SvxRecoverDialog recover ( 0 );
@@ -2248,10 +2810,3 @@
</align>
<flow cnt:padding="10" cnt:expand="false"/>
<metricfield id="ED_COLUMNS" value-step="1"
-diff --git toolkit/uiconfig/layout/localize.sdf toolkit/uiconfig/layout/localize.sdf
-new file mode 100644
-index 0000000..ea30561
---- /dev/null
-+++ toolkit/uiconfig/layout/localize.sdf
-@@ -0,0 +1 @@
-+#empty
Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff (original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff Thu Jul 31 10:32:58 2008
@@ -47,10 +47,10 @@
* i18n
diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
-index 25e1cfc..09f90bf 100644
+index ac74ee8..54ed610 100644
--- toolkit/inc/layout/layout-post.hxx
+++ toolkit/inc/layout/layout-post.hxx
-@@ -73,12 +73,16 @@
+@@ -69,12 +69,16 @@
#undef RetryButton
#undef SpinField
#undef Table
@@ -68,10 +68,10 @@
#undef Window
diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
-index f1ff571..327da0b 100644
+index 9581604..fbbc1df 100644
--- toolkit/inc/layout/layout-pre.hxx
+++ toolkit/inc/layout/layout-pre.hxx
-@@ -83,12 +83,16 @@
+@@ -79,12 +79,16 @@
#define RetryButton layout::RetryButton
#define SpinField layout::SpinField
#define Table layout::Table
@@ -89,10 +89,10 @@
#define Window ::Window
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
-index ecbf73c..ff223e7 100644
+index 76c5f8e..62b7ffa 100644
--- toolkit/inc/layout/layout.hxx
+++ toolkit/inc/layout/layout.hxx
-@@ -39,6 +39,8 @@
+@@ -35,6 +35,8 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/awt/XLayoutContainer.hpp>
#include <com/sun/star/util/Color.hpp>
@@ -101,7 +101,7 @@
#include <tools/link.hxx>
#include <tools/string.hxx>
-@@ -51,7 +53,13 @@
+@@ -47,7 +49,13 @@
class Control;
class Image;
@@ -115,7 +115,7 @@
namespace layout
{
-@@ -65,7 +73,7 @@ class TOOLKIT_DLLPUBLIC Context
+@@ -61,7 +69,7 @@ class TOOLKIT_DLLPUBLIC Context
ContextImpl *pImpl;
public:
Context( char const* pPath );
@@ -124,7 +124,7 @@
PeerHandle GetPeerHandle( char const* pId, sal_uInt32 nId = 0 ) const;
void setToplevel( PeerHandle xToplevel );
PeerHandle getToplevel();
-@@ -94,12 +102,13 @@ protected:
+@@ -90,12 +98,13 @@ protected:
static PeerHandle CreatePeer( Window *pParent, WinBits nStyle,
char const* pName);
public:
@@ -140,7 +140,7 @@
void Enable( bool bEnable = true );
inline void Disable() { Enable( false ); }
void Show( BOOL bVisible = TRUE );
-@@ -107,8 +116,17 @@ public:
+@@ -103,8 +112,17 @@ public:
void GrabFocus();
void FreeResource() {}
@@ -158,7 +158,7 @@
};
class ControlImpl;
-@@ -123,7 +141,6 @@ public:
+@@ -119,7 +137,6 @@ public:
class FixedLineImpl;
class TOOLKIT_DLLPUBLIC FixedLine : public Control
{
@@ -166,7 +166,7 @@
DECL_GET_IMPL( FixedLine );
DECL_CONSTRUCTORS( FixedLine, Control, WB_HORZ );
public:
-@@ -133,7 +150,6 @@ public:
+@@ -129,7 +146,6 @@ public:
class FixedTextImpl;
class TOOLKIT_DLLPUBLIC FixedText : public Control
{
@@ -174,7 +174,7 @@
DECL_GET_IMPL( FixedText );
DECL_CONSTRUCTORS( FixedText, Control, 0 );
public:
-@@ -143,7 +159,6 @@ public:
+@@ -139,7 +155,6 @@ public:
class FixedImageImpl;
class TOOLKIT_DLLPUBLIC FixedImage : public Control
{
@@ -182,7 +182,7 @@
DECL_GET_IMPL( FixedImage );
DECL_CONSTRUCTORS( FixedImage, Control, 0 );
public:
-@@ -153,7 +168,6 @@ public:
+@@ -149,7 +164,6 @@ public:
class FixedInfoImpl;
class TOOLKIT_DLLPUBLIC FixedInfo : public FixedText
{
@@ -190,7 +190,7 @@
DECL_GET_IMPL( FixedInfo );
DECL_CONSTRUCTORS( FixedInfo, FixedText, 0 );
};
-@@ -171,7 +185,6 @@ public:
+@@ -167,7 +181,6 @@ public:
class ButtonImpl;
class TOOLKIT_DLLPUBLIC Button : public Control
{
@@ -198,7 +198,7 @@
DECL_GET_IMPL( Button );
DECL_CONSTRUCTORS( Button, Control, 0 );
public:
-@@ -289,6 +302,7 @@ public:
+@@ -285,6 +298,7 @@ public:
void SetText( XubString const& rStr ) const;
XubString GetText() const;
void SetModifyHdl( Link const& rLink );
@@ -206,7 +206,7 @@
};
class MultiLineEditImpl;
-@@ -416,14 +430,25 @@ public:
+@@ -412,14 +426,25 @@ public:
void SetSelectHdl( Link const& rLink );
void SetClickHdl( Link const& rLink );
@@ -234,7 +234,7 @@
public:
Dialog( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
Dialog( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-@@ -432,6 +457,46 @@ public:
+@@ -428,6 +453,46 @@ public:
void SetText( String const& rStr );
};
@@ -281,7 +281,7 @@
class ProgressBarImpl;
class TOOLKIT_DLLPUBLIC ProgressBar : public Control
{
-@@ -520,7 +585,6 @@ public:
+@@ -516,7 +581,6 @@ public:
class PluginImpl;
class TOOLKIT_DLLPUBLIC Plugin : public Control
{
@@ -289,7 +289,7 @@
DECL_GET_IMPL( Plugin );
//DECL_CONSTRUCTORS( Plugin, Control, 0 );
public:
-@@ -528,6 +592,18 @@ public:
+@@ -524,6 +588,18 @@ public:
Plugin( Context *pCtx, char const* pId, ::Control *plugin );
};
@@ -323,10 +323,10 @@
SRS1NAME=$(TARGET)
SRC1FILES=\
diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
-index f49b6f0..48f6203 100644
+index f08e4f5..1740dca 100644
--- toolkit/source/awt/vclxbutton.cxx
+++ toolkit/source/awt/vclxbutton.cxx
-@@ -35,7 +35,7 @@
+@@ -31,7 +31,7 @@
#include "vclxbutton.hxx"
@@ -336,10 +336,10 @@
#include <vcl/button.hxx>
diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
-index 8c01a48..c270e63 100644
+index 84d7e3b..7f45718 100644
--- toolkit/source/awt/vclxdialog.hxx
+++ toolkit/source/awt/vclxdialog.hxx
-@@ -65,7 +65,7 @@ protected:
+@@ -61,7 +61,7 @@ protected:
Window* GetWindowImpl();
TopWindowListenerMultiplexer& GetTopWindowListenersImpl();
@@ -377,10 +377,10 @@
}
diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
-index cecc592..9b73c91 100644
+index 66662f6..f2efbb3 100644
--- toolkit/source/awt/vclxsplitter.cxx
+++ toolkit/source/awt/vclxsplitter.cxx
-@@ -54,9 +54,9 @@ using namespace ::com::sun::star::beans;
+@@ -50,9 +50,9 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
VCLXSplitter::ChildProps::ChildProps( VCLXSplitter::ChildData *pData )
@@ -393,23 +393,27 @@
&(pData->mbShrink) );
}
-@@ -76,13 +76,13 @@ VCLXSplitter::ChildProps*
- VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
+@@ -66,7 +66,7 @@ VCLXSplitter::ChildData*
+ VCLXSplitter::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
{
- return new ChildProps( static_cast<VCLXSplitter::ChildData*> ( pData ) );
+ return new ChildData( xChild );
- }
+}
-
+ VCLXSplitter::ChildProps*
+ VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
+@@ -78,8 +78,8 @@ VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
DBG_NAME( VCLXSplitter );
VCLXSplitter::VCLXSplitter( bool bHorizontal )
-: VCLXWindow()
-+ : VCLXWindow()
- , Box_Base()
+- , Box_Base()
++ : VCLXWindow()
++ , Box_Base()
{
DBG_CTOR( VCLXSplitter, NULL );
-@@ -230,13 +230,13 @@ void SAL_CALL VCLXSplitter::allocateArea(
+ mnHandleRatio = 0.5;
+@@ -226,13 +226,13 @@ void SAL_CALL VCLXSplitter::allocateArea(
void VCLXSplitter::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
@@ -659,20 +663,20 @@
+
+#endif /* LAYOUT_AWT_VCLXTABPAGE_HXX */
diff --git a/toolkit/source/layout/box-base.hxx b/toolkit/source/layout/box-base.hxx
-index 04f0c95..d8b580b 100644
+index 2a20372..44e0434 100644
--- toolkit/source/layout/box-base.hxx
+++ toolkit/source/layout/box-base.hxx
-@@ -91,4 +91,4 @@ public:
+@@ -87,4 +87,4 @@ public:
} // namespace layoutimpl
-#endif /* CORE_BOX__BASE HXX */
+#endif /* CORE_BOX_BASE HXX */
diff --git a/toolkit/source/layout/container.cxx b/toolkit/source/layout/container.cxx
-index 22e3b08..b34bfe5 100644
+index 3af0f4c..c9b4513 100644
--- toolkit/source/layout/container.cxx
+++ toolkit/source/layout/container.cxx
-@@ -140,7 +140,7 @@ Container::getLabel() // debug label
+@@ -136,7 +136,7 @@ Container::getLabel() // debug label
uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
aChildren = xParent->getChildren();
@@ -682,10 +686,10 @@
break;
}
diff --git a/toolkit/source/layout/factory.cxx b/toolkit/source/layout/factory.cxx
-index b83b706..a072b12 100644
+index f4f3606..e687ca8 100644
--- toolkit/source/layout/factory.cxx
+++ toolkit/source/layout/factory.cxx
-@@ -79,7 +79,7 @@ sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, vo
+@@ -75,7 +75,7 @@ sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, vo
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
@@ -694,7 +698,7 @@
xNewKey->createKey( aServices.getConstArray()[i] );
return sal_True;
-@@ -129,10 +129,10 @@ sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& Service
+@@ -125,10 +125,10 @@ sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& Service
throw ( uno::RuntimeException )
{
uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
@@ -708,10 +712,10 @@
}
diff --git a/toolkit/source/layout/flow.cxx b/toolkit/source/layout/flow.cxx
-index a99ba70..13d90fe 100644
+index 002ba53..4bfd1b9 100644
--- toolkit/source/layout/flow.cxx
+++ toolkit/source/layout/flow.cxx
-@@ -79,8 +79,8 @@ void SAL_CALL
+@@ -75,8 +75,8 @@ void SAL_CALL
Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild )
throw (css::uno::RuntimeException)
{
@@ -722,7 +726,7 @@
{
if ( (*it)->xChild == xChild )
{
-@@ -100,8 +100,8 @@ Flow::getChildren()
+@@ -96,8 +96,8 @@ Flow::getChildren()
{
uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
unsigned int i = 0;
@@ -734,10 +738,10 @@
return children;
diff --git a/toolkit/source/layout/helper.cxx b/toolkit/source/layout/helper.cxx
-index 78cdbd4..92e63ea 100644
+index 413c2c3..1e96643 100644
--- toolkit/source/layout/helper.cxx
+++ toolkit/source/layout/helper.cxx
-@@ -40,6 +40,7 @@
+@@ -36,6 +36,7 @@
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
@@ -745,7 +749,7 @@
#include <tools/debug.hxx>
#include "proplist.hxx"
-@@ -100,11 +101,12 @@ getToplevel( uno::Reference< uno::XInterface > xRef )
+@@ -96,11 +97,12 @@ getToplevel( uno::Reference< uno::XInterface > xRef )
}
@@ -760,7 +764,7 @@
namespace layoutimpl
{
-@@ -154,14 +156,31 @@ createToolkitWidget( uno::Reference< awt::XToolkit > xToolkit,
+@@ -150,14 +152,31 @@ createToolkitWidget( uno::Reference< awt::XToolkit > xToolkit,
{
desc.Type = awt::WindowClass_SIMPLE;
@@ -795,7 +799,7 @@
desc.Parent = xWinParent;
}
-@@ -227,6 +246,7 @@ createWidget( uno::Reference< awt::XToolkit > xToolkit,
+@@ -223,6 +242,7 @@ createWidget( uno::Reference< awt::XToolkit > xToolkit,
#else
xPeer = createToolkitWidget( xToolkit, xParent, rName, nProps );
#endif
@@ -803,7 +807,7 @@
return xPeer;
}
-@@ -254,7 +274,7 @@ PropHelper::getInfoHelper()
+@@ -250,7 +270,7 @@ PropHelper::getInfoHelper()
if ( ! pHelper )
{
uno::Sequence< beans::Property > aProps( maDetails.size() );
@@ -812,7 +816,7 @@
{
aProps[i].Name = maDetails[i].aName;
aProps[i].Type = maDetails[i].aType;
-@@ -349,10 +369,11 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
+@@ -345,10 +365,11 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
#include <awt/vclxbutton.hxx>
#include <awt/vclxdialog.hxx>
#include <awt/vclxfixedline.hxx>
@@ -825,7 +829,7 @@
#include <toolkit/awt/vclxtoolkit.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/button.hxx>
-@@ -366,6 +387,8 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
+@@ -362,6 +383,8 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
namespace layoutimpl
{
@@ -834,7 +838,7 @@
uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
uno::Reference< uno::XInterface > xParent,
OUString aName, long WindowAttributes )
-@@ -488,6 +511,29 @@ uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
+@@ -484,6 +507,29 @@ uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, pParent, typeid( *pParent ).name() );
pNewComp = new layoutimpl::VCLXPlugin( pNewWindow, ImplGetWinBits( WindowAttributes, 0 ) );
}
@@ -865,10 +869,10 @@
if ( !pNewWindow )
return xRef;
diff --git a/toolkit/source/layout/import.cxx b/toolkit/source/layout/import.cxx
-index 71e5a16..87b3a32 100644
+index 29788ab..47857e6 100644
--- toolkit/source/layout/import.cxx
+++ toolkit/source/layout/import.cxx
-@@ -243,7 +243,7 @@ uno::Reference< xml::input::XElement > ImportContext::startRootElement(
+@@ -239,7 +239,7 @@ uno::Reference< xml::input::XElement > ImportContext::startRootElement(
uno::Reference< xml::input::XAttributes > const & xAttributes )
throw (xml::sax::SAXException, uno::RuntimeException)
{
@@ -1061,10 +1065,10 @@
+
+#endif /* CORE_LOCALIZED_STRING_HXX */
diff --git a/toolkit/source/layout/makefile.mk b/toolkit/source/layout/makefile.mk
-index 7521c42..8531f53 100644
+index c89f0be..d62b9e1 100644
--- toolkit/source/layout/makefile.mk
+++ toolkit/source/layout/makefile.mk
-@@ -63,6 +63,7 @@ SLOFILES= \
+@@ -55,6 +55,7 @@ SLOFILES= \
$(SLO)$/flow.obj \
$(SLO)$/helper.obj \
$(SLO)$/import.obj \
@@ -1073,10 +1077,10 @@
$(SLO)$/root.obj \
$(SLO)$/table.obj \
diff --git a/toolkit/source/layout/proplist.cxx b/toolkit/source/layout/proplist.cxx
-index eef28ea..02b510a 100644
+index 6dba3b4..c16d979 100644
--- toolkit/source/layout/proplist.cxx
+++ toolkit/source/layout/proplist.cxx
-@@ -200,8 +200,8 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
+@@ -196,8 +196,8 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
uno::Sequence< OUString > seq( values.size() );
i = 0;
@@ -1087,7 +1091,7 @@
seq[ i ] = *it;
return uno::makeAny( seq );
-@@ -255,17 +255,17 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
+@@ -251,17 +251,17 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
if ( !prophlp::canHandleProps( xPeer ) )
{
DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" );
@@ -1111,7 +1115,7 @@
}
void
-@@ -353,7 +353,7 @@ static const AttributesMap attribsMap[] =
+@@ -349,7 +349,7 @@ static const AttributesMap attribsMap[] =
{ "spin", awt::VclWindowPeerAttribute::SPIN, false },
{ "vscroll", awt::VclWindowPeerAttribute::VSCROLL, false },
@@ -1120,7 +1124,7 @@
};
static const int attribsMapLen = sizeof( attribsMap ) / sizeof( AttributesMap );
-@@ -385,10 +385,8 @@ long getAttribute( const OUString &rName, bool bTopWindow )
+@@ -381,10 +381,8 @@ long getAttribute( const OUString &rName, bool bTopWindow )
void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttributes,
PropList &rProps, sal_Int32 nNamespace )
{
@@ -1132,7 +1136,7 @@
{
if ( nNamespace != xAttributes->getUidByIndex( i ) )
continue;
-@@ -405,15 +403,15 @@ void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttri
+@@ -401,15 +399,15 @@ void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttri
bool
findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
{
@@ -1153,7 +1157,7 @@
return true;
}
}
-@@ -436,7 +434,7 @@ getAttributeProps( PropList &rProps )
+@@ -432,7 +430,7 @@ getAttributeProps( PropList &rProps )
else
nAttrs |= awt::WindowAttribute::SHOW;
@@ -1163,10 +1167,10 @@
if ( findAndRemove( attribsMap[i].name, rProps, aValue ) )
{
diff --git a/toolkit/source/layout/proplist.hxx b/toolkit/source/layout/proplist.hxx
-index 59a1b4f..446bd48 100644
+index 64923b0..123de61 100644
--- toolkit/source/layout/proplist.hxx
+++ toolkit/source/layout/proplist.hxx
-@@ -62,8 +62,18 @@ bool findAndRemove( const char *pAttr, PropList &rProps, rtl::OUString &rValue);
+@@ -58,8 +58,18 @@ bool findAndRemove( const char *pAttr, PropList &rProps, rtl::OUString &rValue);
}
@@ -1187,10 +1191,10 @@
#endif // CORE_PROPLIST_HXX
diff --git a/toolkit/source/layout/root.cxx b/toolkit/source/layout/root.cxx
-index 3cec64e..906ceae 100644
+index 95c19c1..a50f42d 100644
--- toolkit/source/layout/root.cxx
+++ toolkit/source/layout/root.cxx
-@@ -105,11 +105,12 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
+@@ -101,11 +101,12 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
xMessageBox->execute();
//FIXME: exceptions not caught and printed at top level??
//else
@@ -1204,7 +1208,7 @@
ShowMessageBox( mxFactory, mxToolkit,
OUString::createFromAscii( "Fatal error" ),
message );
-@@ -252,9 +253,9 @@ uno::Sequence< OUString > SAL_CALL LayoutRoot::getElementNames()
+@@ -248,9 +249,9 @@ uno::Sequence< OUString > SAL_CALL LayoutRoot::getElementNames()
uno::Sequence< OUString > aNames( maItems.size() );
sal_Int32 nPos = 0;
@@ -1217,7 +1221,7 @@
return aNames;
}
-@@ -338,21 +339,21 @@ LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attr
+@@ -334,21 +335,21 @@ LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attr
}
#if 0
@@ -1255,10 +1259,10 @@
LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
diff --git a/toolkit/source/layout/table.cxx b/toolkit/source/layout/table.cxx
-index 658ef95..6df27c2 100644
+index 1c4d8ed..87c15e2 100644
--- toolkit/source/layout/table.cxx
+++ toolkit/source/layout/table.cxx
-@@ -162,7 +162,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+@@ -158,7 +158,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
unsigned int end =( child->mnRightCol-1 ) +( ( child->mnBottomRow-1 )*mnColsLen );
if ( aTable.size() < end+1 )
aTable.resize( end+1, NULL );
@@ -1267,7 +1271,7 @@
aTable[ i ] = child;
nRowsLen = SAL_MAX( nRowsLen, child->mnBottomRow );
-@@ -170,7 +170,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+@@ -166,7 +166,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
}
// 2. calculate columns/rows sizes
@@ -1276,7 +1280,7 @@
{
std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
-@@ -215,7 +215,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+@@ -211,7 +211,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
child->maRequisition = child->mxChild->getMinimumSize();
int size = 0;
int expandables = 0;
@@ -1285,7 +1289,7 @@
{
size += aGroup[ i ].mnSize;
if ( aGroup[ i ].mbExpand )
-@@ -232,7 +232,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+@@ -228,7 +228,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
else
extra /= nLastAttach - nFirstAttach;
@@ -1294,7 +1298,7 @@
if ( expandables == 0 || aGroup[ i ].mbExpand )
aGroup[ i ].mnSize += extra;
}
-@@ -243,14 +243,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+@@ -239,14 +239,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
// 3. Sum everything up
mnColExpandables =( mnRowExpandables = 0 );
maRequisition.Width =( maRequisition.Height = 0 );
@@ -1311,7 +1315,7 @@
it != maRows.end(); it++ )
{
maRequisition.Height += it->mnSize;
-@@ -284,13 +284,13 @@ Table::allocateArea( const awt::Rectangle &rArea )
+@@ -280,13 +280,13 @@ Table::allocateArea( const awt::Rectangle &rArea )
awt::Rectangle rChildArea( rArea.X, rArea.Y, 0, 0 );
@@ -1327,7 +1331,7 @@
{
int gSize = aGroup[ i ].mnSize;
if ( aGroup[ i ].mbExpand )
-@@ -300,7 +300,7 @@ Table::allocateArea( const awt::Rectangle &rArea )
+@@ -296,7 +296,7 @@ Table::allocateArea( const awt::Rectangle &rArea )
else
rChildArea.Y += gSize;
}
@@ -1337,10 +1341,10 @@
int gSize = aGroup[ i ].mnSize;
if ( aGroup[ i ].mbExpand )
diff --git a/toolkit/source/layout/timer.cxx b/toolkit/source/layout/timer.cxx
-index e36fedc..159acbe 100644
+index af3e009..26874a0 100644
--- toolkit/source/layout/timer.cxx
+++ toolkit/source/layout/timer.cxx
-@@ -104,12 +104,12 @@ public:
+@@ -100,12 +100,12 @@ public:
mxLastAdded = uno::Reference< awt::XLayoutContainer >();
// 1. remove duplications and children
@@ -1355,7 +1359,7 @@
it != mxContainers.end(); it++ )
{
uno::Reference< awt::XLayoutContainer > xContainer = *it;
-@@ -130,7 +130,7 @@ public:
+@@ -126,7 +126,7 @@ public:
}
// 3. force re-calculations
@@ -1365,10 +1369,10 @@
(*it)->allocateArea( (*it)->getAllocatedArea() );
}
diff --git a/toolkit/source/vclcompat/wbutton.cxx b/toolkit/source/vclcompat/wbutton.cxx
-index 17c2142..5300e70 100644
+index 9f348fb..5617f4f 100644
--- toolkit/source/vclcompat/wbutton.cxx
+++ toolkit/source/vclcompat/wbutton.cxx
-@@ -142,7 +142,7 @@ class ButtonImpl : public ControlImpl
+@@ -138,7 +138,7 @@ class ButtonImpl : public ControlImpl
}
};
@@ -1377,7 +1381,7 @@
{
if ( !getImpl().mxButton.is() )
return;
-@@ -168,8 +168,8 @@ void Button::Click()
+@@ -164,8 +164,8 @@ void Button::Click()
{
}
@@ -1388,7 +1392,7 @@
class PushButtonImpl : public ButtonImpl
{
-@@ -223,8 +223,8 @@ void PushButton::SetToggleHdl( const Link& rLink )
+@@ -219,8 +219,8 @@ void PushButton::SetToggleHdl( const Link& rLink )
getImpl().SetToggleHdl( rLink );
}
@@ -1399,7 +1403,7 @@
// HACK: put every radio button into a group :/
static std::list< RadioButtonImpl*> mpRadioGroup;
-@@ -320,9 +320,9 @@ void RadioButton::SetToggleHdl( const Link& rLink )
+@@ -316,9 +316,9 @@ void RadioButton::SetToggleHdl( const Link& rLink )
getImpl().SetToggleHdl( rLink );
}
@@ -1411,7 +1415,7 @@
#else //debugging aid
RadioButton::RadioButton( Context *pCtx, const char *pId, sal_uInt32 nId )
: Button( new RadioButtonImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -373,8 +373,8 @@ void CheckBox::SetToggleHdl( const Link& rLink )
+@@ -369,8 +369,8 @@ void CheckBox::SetToggleHdl( const Link& rLink )
getImpl().SetToggleHdl( rLink );
}
@@ -1422,7 +1426,7 @@
#define BUTTON_IMPL(t, parent, response) \
class t##Impl : public parent##Impl \
-@@ -410,15 +410,15 @@ BUTTON_IMPL( ResetButton, PushButton, BUTTONID_RESET );
+@@ -406,15 +406,15 @@ BUTTON_IMPL( ResetButton, PushButton, BUTTONID_RESET );
BUTTON_IMPL( ApplyButton, PushButton, BUTTONID_APPLY ); /* Deprecated? */
BUTTON_IMPL( HelpButton, PushButton, BUTTONID_HELP );
@@ -1447,7 +1451,7 @@
class AdvancedButtonImpl : public PushButtonImpl
{
-@@ -551,8 +551,8 @@ void AdvancedButton::RemoveSimple( Window* w )
+@@ -547,8 +547,8 @@ void AdvancedButton::RemoveSimple( Window* w )
getImpl().RemoveSimple( w );
}
@@ -1458,7 +1462,7 @@
class MoreButtonImpl : public AdvancedButtonImpl
-@@ -570,8 +570,8 @@ public:
+@@ -566,8 +566,8 @@ public:
// TODO
//BUTTON_IMPL( MoreButton, PushButton, 0 );
@@ -1470,10 +1474,10 @@
void MoreButton::AddWindow( Window* w )
{
diff --git a/toolkit/source/vclcompat/wfield.cxx b/toolkit/source/vclcompat/wfield.cxx
-index 7ceed85..8d9ab13 100644
+index a5e97fb..015cf63 100644
--- toolkit/source/vclcompat/wfield.cxx
+++ toolkit/source/vclcompat/wfield.cxx
-@@ -87,7 +87,14 @@ class EditImpl : public ControlImpl,
+@@ -83,7 +83,14 @@ class EditImpl : public ControlImpl,
}
};
@@ -1489,7 +1493,7 @@
{
if ( !getImpl().mxEdit.is() )
return;
-@@ -106,8 +113,8 @@ void Edit::SetModifyHdl( const Link& rLink )
+@@ -102,8 +109,8 @@ void Edit::SetModifyHdl( const Link& rLink )
getImpl().SetModifyHdl( rLink );
}
@@ -1500,7 +1504,7 @@
// Window/Control/Edit/MultiLineEdit
class MultiLineEditImpl : public EditImpl
-@@ -119,8 +126,8 @@ public:
+@@ -115,8 +122,8 @@ public:
}
};
@@ -1511,7 +1515,7 @@
// Window/Control/Edit/SpinField
class SpinFieldImpl : public EditImpl
-@@ -132,7 +139,7 @@ class SpinFieldImpl : public EditImpl
+@@ -128,7 +135,7 @@ class SpinFieldImpl : public EditImpl
}
};
@@ -1520,7 +1524,7 @@
// Window/Control/Edit/SpinField/NumericField
class NumericFieldImpl : public SpinFieldImpl
-@@ -154,9 +161,9 @@ class MetricFieldImpl : public SpinFieldImpl
+@@ -150,9 +157,9 @@ class MetricFieldImpl : public SpinFieldImpl
}
};
@@ -1533,7 +1537,7 @@
// FormatterBase
class FormatterBaseImpl
-@@ -246,7 +253,7 @@ sal_Int64 NumericFormatter::GetValue() const
+@@ -242,7 +249,7 @@ sal_Int64 NumericFormatter::GetValue() const
#undef SET_IMPL
@@ -1542,7 +1546,7 @@
// MetricFormatter
-@@ -289,7 +296,7 @@ sal_Int64 MetricFormatter::GetValue( FieldUnit nUnit ) const
+@@ -285,7 +292,7 @@ sal_Int64 MetricFormatter::GetValue( FieldUnit nUnit ) const
return getFormatImpl().mxField->getValue( MetricUnitVclToUno( nUnit ) );
}
@@ -1551,7 +1555,7 @@
// Window/Control/Edit/ComboBox
class ComboBoxImpl : public EditImpl,
-@@ -305,7 +312,7 @@ public:
+@@ -301,7 +308,7 @@ public:
{
}
@@ -1560,7 +1564,7 @@
{
if ( nPos == COMBOBOX_APPEND )
nPos = GetEntryCount();
-@@ -430,8 +437,8 @@ void ComboBox::SetSelectHdl( const Link& rLink )
+@@ -426,8 +433,8 @@ void ComboBox::SetSelectHdl( const Link& rLink )
getImpl().SetSelectHdl( rLink );
}
@@ -1571,7 +1575,7 @@
// Window/Control/ListBox
class ListBoxImpl : public ControlImpl,
-@@ -445,6 +452,7 @@ public:
+@@ -441,6 +448,7 @@ public:
: ControlImpl( pCtx, xPeer, pWindow ),
mxListBox( xPeer, uno::UNO_QUERY )
{
@@ -1579,7 +1583,7 @@
}
USHORT InsertEntry(const XubString& rStr, USHORT nPos)
-@@ -625,7 +633,7 @@ void ListBox::SetClickHdl( const Link& rLink )
+@@ -621,7 +629,7 @@ void ListBox::SetClickHdl( const Link& rLink )
getImpl().SetClickHdl( rLink );
}
@@ -1590,10 +1594,10 @@
} // namespace layout
diff --git a/toolkit/source/vclcompat/wrapper.cxx b/toolkit/source/vclcompat/wrapper.cxx
-index 6188ac1..95bc106 100644
+index 157297b..93f3a5f 100644
--- toolkit/source/vclcompat/wrapper.cxx
+++ toolkit/source/vclcompat/wrapper.cxx
-@@ -36,23 +36,34 @@
+@@ -32,22 +32,34 @@
#include "wrapper.hxx"
#include <awt/vclxplugin.hxx>
@@ -1613,24 +1617,23 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/image.hxx>
--#include <stdio.h>
+#include <vcl/tabpage.hxx>
#include <vcl/window.hxx>
-+
++
+#if 0
+/* FIXME: move to sfx2 or svtools/layout.hxx */
+#include <svtools/itempool.hxx>
+#include <svtools/itemset.hxx>
+#include <svtools/poolitem.hxx>
+#endif
-+
++
using namespace ::com::sun::star;
+using rtl::OUString;
namespace layout
{
-@@ -68,16 +79,16 @@ public:
+@@ -63,16 +75,16 @@ public:
ContextImpl( char const *pPath )
{
uno::Sequence< uno::Any > aParams( 1 );
@@ -1650,7 +1653,7 @@
uno::Reference< uno::XInterface >() );
}
mxRoot = uno::Reference< awt::XLayoutRoot >(
-@@ -91,7 +102,7 @@ public:
+@@ -86,7 +98,7 @@ public:
{
}
@@ -1659,7 +1662,7 @@
{
uno::Any val = mxNameAccess->getByName( rName );
PeerHandle xRet;
-@@ -130,7 +141,7 @@ PeerHandle Context::getRoot()
+@@ -125,7 +137,7 @@ PeerHandle Context::getRoot()
PeerHandle Context::GetPeerHandle( const char *pId, sal_uInt32 nId ) const
{
PeerHandle xHandle;
@@ -1668,7 +1671,7 @@
if ( !xHandle.is() )
{
DBG_ERROR1( "Failed to fetch widget '%s'", pId );
-@@ -144,24 +155,10 @@ PeerHandle Context::GetPeerHandle( const char *pId, sal_uInt32 nId ) const
+@@ -139,24 +151,10 @@ PeerHandle Context::GetPeerHandle( const char *pId, sal_uInt32 nId ) const
return xHandle;
}
@@ -1695,7 +1698,7 @@
{
}
-@@ -172,6 +169,20 @@ Window::~Window()
+@@ -167,6 +165,20 @@ Window::~Window()
mpImpl = NULL;
}
@@ -1716,7 +1719,7 @@
Context *Window::getContext()
{
return this && mpImpl ? mpImpl->mpCtx : NULL;
-@@ -179,11 +190,31 @@ Context *Window::getContext()
+@@ -174,11 +186,31 @@ Context *Window::getContext()
PeerHandle Window::GetPeer()
{
@@ -1749,7 +1752,7 @@
struct ToolkitVclPropsMap
{
WinBits vclStyle;
-@@ -304,11 +335,11 @@ uno::Reference< awt::XToolkit > getToolkit()
+@@ -299,11 +331,11 @@ uno::Reference< awt::XToolkit > getToolkit()
// Urgh ...
xToolkit = uno::Reference< awt::XToolkit >(
::comphelper::getProcessServiceFactory()->createInstance(
@@ -1763,7 +1766,7 @@
uno::Reference< uno::XInterface >() );
}
return xToolkit;
-@@ -323,7 +354,7 @@ PeerHandle Window::CreatePeer( Window *pParent, WinBits nStyle, const char *pNam
+@@ -318,7 +350,7 @@ PeerHandle Window::CreatePeer( Window *pParent, WinBits nStyle, const char *pNam
nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
return layoutimpl::createWidget( getToolkit(), pParent->GetPeer(),
@@ -1772,7 +1775,7 @@
}
void Window::Enable( bool bEnable )
-@@ -347,6 +378,19 @@ void Window::GrabFocus()
+@@ -342,6 +374,19 @@ void Window::GrabFocus()
getImpl().mxWindow->setFocus();
}
@@ -1792,7 +1795,7 @@
Dialog::Dialog( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
: Context( pXMLPath )
, Window( new DialogImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
-@@ -363,20 +407,6 @@ Dialog::Dialog( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uI
+@@ -358,20 +403,6 @@ Dialog::Dialog( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uI
SetParent( pParent );
}
@@ -1813,7 +1816,7 @@
short Dialog::Execute()
{
if ( !getImpl().mxDialog.is() )
-@@ -391,13 +421,104 @@ void Dialog::EndDialog( long nResult )
+@@ -386,13 +417,104 @@ void Dialog::EndDialog( long nResult )
getImpl().mxDialog->endDialog( nResult );
}
@@ -1919,7 +1922,7 @@
class FixedLineImpl : public ControlImpl
{
public:
-@@ -407,8 +528,8 @@ public:
+@@ -402,8 +524,8 @@ public:
}
};
@@ -1930,7 +1933,7 @@
bool FixedLine::IsEnabled()
{
-@@ -433,10 +554,10 @@ public:
+@@ -428,10 +550,10 @@ public:
}
};
@@ -1944,7 +1947,7 @@
{
if ( !getImpl().mxFixedText.is() )
return;
-@@ -452,8 +573,8 @@ public:
+@@ -447,8 +569,8 @@ public:
}
};
@@ -1955,7 +1958,7 @@
class ProgressBarImpl : public ControlImpl
{
-@@ -494,8 +615,8 @@ public:
+@@ -489,8 +611,8 @@ public:
}
};
@@ -1966,7 +1969,7 @@
void FixedImage::setImage( ::Image const& i )
{
-@@ -521,7 +642,7 @@ FixedImage::~FixedImage()
+@@ -516,7 +638,7 @@ FixedImage::~FixedImage()
#endif
@@ -1975,7 +1978,7 @@
#if 0
ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
: Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -534,7 +655,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
+@@ -529,7 +651,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
}
#endif
@@ -1984,7 +1987,7 @@
void ProgressBar::SetForegroundColor( css::util::Color color )
-@@ -601,7 +722,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
+@@ -628,7 +750,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
{
}
@@ -2033,10 +2036,10 @@
} // namespace layout
diff --git a/toolkit/source/vclcompat/wrapper.hxx b/toolkit/source/vclcompat/wrapper.hxx
-index f56bc0a..5df64bc 100644
+index cdc2e98..25dbd90 100644
--- toolkit/source/vclcompat/wrapper.hxx
+++ toolkit/source/vclcompat/wrapper.hxx
-@@ -111,12 +111,12 @@ inline WindowImpl &Window::getImpl() const
+@@ -107,12 +107,12 @@ inline WindowImpl &Window::getImpl() const
// Helpers for defining boiler-plate constructors ...
// Could in-line in top-level but not with safe static_casts.
@@ -2051,7 +2054,7 @@
t::t( Context *pCtx, const char *pId, sal_uInt32 nId ) \
: par( new t##Impl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) ) \
{ \
-@@ -125,7 +125,7 @@ inline WindowImpl &Window::getImpl() const
+@@ -121,7 +121,7 @@ inline WindowImpl &Window::getImpl() const
: par( new t##Impl( pParent->getContext(), Window::CreatePeer( pParent, nBits, unoName ), this ) ) \
{ \
}
@@ -2141,10 +2144,10 @@
+
+ Start a [Writer] document and choose View/Zoom or Extra/Word count.
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
-index a13030e..c09d2c5 100644
+index f78de24..402c9e8 100644
--- toolkit/workben/layout/editor.cxx
+++ toolkit/workben/layout/editor.cxx
-@@ -66,11 +66,6 @@ using rtl::OUString;
+@@ -62,11 +62,6 @@ using rtl::OUString;
#include "root.hxx"
#include "helper.hxx"
@@ -2157,10 +2160,10 @@
struct WidgetSpec {
const char *pLabel, *pName, *pIconName;
diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
-index 7126deb..2b2609c 100644
+index 43918f3..e82e1c9 100644
--- toolkit/workben/layout/makefile.mk
+++ toolkit/workben/layout/makefile.mk
-@@ -47,7 +47,7 @@ ENABLE_EXCEPTIONS=TRUE
+@@ -43,7 +43,7 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS += -I$(PRJ)/source/layout
# Allow zoom and wordcount to be built without depending on svx,sv,sfx2
@@ -2169,7 +2172,7 @@
.INCLUDE : $(PRJ)$/util$/makefile.pmk
-@@ -70,6 +70,8 @@ OBJFILES=\
+@@ -66,6 +66,8 @@ OBJFILES=\
$(OBJ)$/plugin.obj \
$(OBJ)$/recover.obj \
$(OBJ)$/test.obj \
@@ -2178,7 +2181,7 @@
$(OBJ)$/wordcountdialog.obj \
$(OBJ)$/zoom.obj
-@@ -95,6 +97,7 @@ default: ALLTAR
+@@ -91,6 +93,7 @@ default: ALLTAR
XML_FILES=\
recover.xml\
@@ -2186,7 +2189,7 @@
wordcount.xml\
zoom.xml\
-@@ -128,6 +131,12 @@ dist .PHONY :
+@@ -124,6 +127,12 @@ dist .PHONY :
touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
# FIXME: broken setup
ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx
@@ -2902,10 +2905,10 @@
+ </vbox>
+</tabdialog>
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
-index 0408590..f825417 100644
+index 5ba4248..159cbc9 100644
--- toolkit/workben/layout/test.cxx
+++ toolkit/workben/layout/test.cxx
-@@ -42,6 +42,7 @@
+@@ -38,6 +38,7 @@
#include <cstdio>
#include <cstdlib>
@@ -2913,7 +2916,7 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <comphelper/processfactory.hxx>
-@@ -50,6 +51,12 @@
+@@ -46,6 +47,12 @@
#include <ucbhelper/configurationkeys.hxx>
#include <ucbhelper/contentbroker.hxx>
@@ -2926,7 +2929,7 @@
#include "editor.hxx"
#include "plugin.hxx"
-@@ -58,6 +65,11 @@
+@@ -54,6 +61,11 @@
#include "recover.hxx"
#undef _LAYOUT_POST_HXX
@@ -2938,7 +2941,7 @@
#include "wordcountdialog.hxx"
#undef _LAYOUT_POST_HXX
-@@ -158,12 +170,29 @@ void LayoutTest::InitUCB()
+@@ -154,12 +166,29 @@ void LayoutTest::InitUCB()
}
}
@@ -2971,7 +2974,7 @@
mxContext = defaultBootstrap_InitialComponentContext();
mxMSF = new UnoBootstrapLayout( Reference< lang::XMultiServiceFactory >( mxContext->getServiceManager(), UNO_QUERY ) );
::comphelper::setProcessServiceFactory( mxMSF );
-@@ -216,9 +245,7 @@ void RunDialog( Dialog& dialog )
+@@ -212,9 +241,7 @@ void RunDialog( Dialog& dialog )
{
dialog.Show();
dialog.Execute();
@@ -2982,7 +2985,7 @@
}
#undef Dialog
-@@ -226,11 +253,18 @@ void RunDialog( ::Dialog& dialog )
+@@ -222,11 +249,18 @@ void RunDialog( ::Dialog& dialog )
{
dialog.Show();
dialog.Execute();
@@ -3004,7 +3007,7 @@
void TestDialog( OUString const& name )
{
if ( 0 )
-@@ -245,6 +279,14 @@ void TestDialog( OUString const& name )
+@@ -241,6 +275,14 @@ void TestDialog( OUString const& name )
SvxRecoverDialog recover ( 0 );
RunDialog( recover );
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
