[Libreoffice-commits] .: 2 commits - cui/source offapi/com offapi/UnoApi_offapi.mk scp2/prj scp2/source sc/Package_uiconfig.mk sc/source sc/uiconfig sfx2/inc sfx2/Package_inc.mk sfx2/source solenv/inc svx/inc svx/uiconfig sw/inc sw/source sw/uiconfig toolkit/doc toolkit/inc toolkit/Library_tk.mk toolkit/Module_toolkit.mk toolkit/Package_inc.mk toolkit/Package_source.mk toolkit/source toolkit/uiconfig
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Nov 16 15:51:39 PST 2011
cui/source/inc/numfmt.hxx | 1
cui/source/inc/zoom.hxx | 1
offapi/UnoApi_offapi.mk | 5
offapi/com/sun/star/awt/XLayoutContainer.idl | 77 -
offapi/com/sun/star/awt/XLayoutFlow.idl | 32
offapi/com/sun/star/awt/XLayoutFlowContainer.idl | 27
offapi/com/sun/star/awt/XLayoutRoot.idl | 27
offapi/com/sun/star/awt/XLayoutUnit.idl | 29
sc/Package_uiconfig.mk | 4
sc/source/ui/attrdlg/scdlgfact.cxx | 1
sc/source/ui/inc/instbdlg.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 2
sc/source/ui/inc/strindlg.hxx | 2
sc/source/ui/view/tabvwshf.cxx | 1
sc/uiconfig/layout/delzip | 1
sc/uiconfig/layout/insert-sheet.xml | 57 -
sc/uiconfig/layout/move-copy-sheet.xml | 21
sc/uiconfig/layout/sort-options.xml | 40
sc/uiconfig/layout/string-input.xml | 16
scp2/prj/build.lst | 3
scp2/source/layout/layout.scp | 62 -
scp2/source/layout/makefile.mk | 46
sfx2/Package_inc.mk | 1
sfx2/inc/sfx2/layout.hxx | 64 -
sfx2/source/layout/factory.cxx | 71 -
sfx2/source/layout/sfxdialog.cxx | 41
sfx2/source/layout/sfxtabdialog.cxx | 74 -
sfx2/source/layout/sfxtabpage.cxx | 68 -
solenv/inc/layout.mk | 32
svx/inc/svx/fontlb.hxx | 1
svx/inc/svx/langbox.hxx | 1
svx/inc/svx/srchdlg.hxx | 2
svx/uiconfig/layout/delzip | 1
svx/uiconfig/layout/layout.mk | 33
svx/uiconfig/layout/makefile.mk | 36
svx/uiconfig/layout/zoom.xml | 59 -
sw/inc/mdiexp.hxx | 1
sw/source/ui/inc/view.hxx | 1
sw/source/ui/inc/wordcountdialog.hxx | 1
sw/uiconfig/layout/delzip | 1
sw/uiconfig/layout/layout.mk | 33
sw/uiconfig/layout/wordcount.xml | 50 -
toolkit/Library_tk.mk | 28
toolkit/Module_toolkit.mk | 1
toolkit/Package_inc.mk | 1
toolkit/Package_source.mk | 50 -
toolkit/doc/layout/README | 24
toolkit/doc/layout/TODO | 227 ----
toolkit/doc/layout/apinotes.txt | 76 -
toolkit/doc/layout/metricfield.txt | 57 -
toolkit/doc/layout/notes.txt | 117 --
toolkit/doc/layout/oldnotes.txt | 224 ----
toolkit/doc/layout/vcl.txt | 20
toolkit/inc/layout/layout.hxx | 405 --------
toolkit/source/awt/vclxbutton.cxx | 129 --
toolkit/source/awt/vclxbutton.hxx | 117 --
toolkit/source/awt/vclxdialog.cxx | 274 -----
toolkit/source/awt/vclxdialog.hxx | 109 --
toolkit/source/awt/vclxfixedline.cxx | 127 --
toolkit/source/awt/vclxfixedline.hxx | 78 -
toolkit/source/awt/vclxplugin.cxx | 79 -
toolkit/source/awt/vclxplugin.hxx | 68 -
toolkit/source/awt/vclxscroller.cxx | 204 ----
toolkit/source/awt/vclxscroller.hxx | 90 -
toolkit/source/awt/vclxsplitter.cxx | 249 -----
toolkit/source/awt/vclxsplitter.hxx | 124 --
toolkit/source/awt/vclxtabcontrol.cxx | 505 ----------
toolkit/source/awt/vclxtabcontrol.hxx | 146 ---
toolkit/source/awt/vclxtabpage.cxx | 147 ---
toolkit/source/awt/vclxtabpage.hxx | 76 -
toolkit/source/awt/vclxtoolkit.cxx | 1
toolkit/source/helper/registerservices.cxx | 4
toolkit/source/layout/core/bin.cxx | 201 ----
toolkit/source/layout/core/bin.hxx | 116 --
toolkit/source/layout/core/box-base.cxx | 176 ---
toolkit/source/layout/core/box-base.hxx | 90 -
toolkit/source/layout/core/box.cxx | 284 -----
toolkit/source/layout/core/box.hxx | 105 --
toolkit/source/layout/core/byteseq.cxx | 79 -
toolkit/source/layout/core/container.cxx | 131 --
toolkit/source/layout/core/container.hxx | 139 --
toolkit/source/layout/core/dialogbuttonhbox.cxx | 283 -----
toolkit/source/layout/core/dialogbuttonhbox.hxx | 76 -
toolkit/source/layout/core/factory.cxx | 126 --
toolkit/source/layout/core/factory.hxx | 77 -
toolkit/source/layout/core/flow.cxx | 213 ----
toolkit/source/layout/core/flow.hxx | 98 --
toolkit/source/layout/core/helper.cxx | 556 -----------
toolkit/source/layout/core/helper.hxx | 145 ---
toolkit/source/layout/core/import.cxx | 328 ------
toolkit/source/layout/core/import.hxx | 214 ----
toolkit/source/layout/core/localized-string.cxx | 83 -
toolkit/source/layout/core/localized-string.hxx | 79 -
toolkit/source/layout/core/precompiled_xmlscript.hxx | 38
toolkit/source/layout/core/proplist.cxx | 410 --------
toolkit/source/layout/core/proplist.hxx | 92 -
toolkit/source/layout/core/root.cxx | 386 --------
toolkit/source/layout/core/root.hxx | 156 ---
toolkit/source/layout/core/table.cxx | 314 ------
toolkit/source/layout/core/table.hxx | 105 --
toolkit/source/layout/core/timer.cxx | 151 ---
toolkit/source/layout/core/timer.hxx | 52 -
toolkit/source/layout/core/translate.cxx | 133 --
toolkit/source/layout/core/translate.hxx | 43
toolkit/source/layout/core/vcl.cxx | 69 -
toolkit/source/layout/core/vcl.hxx | 51 -
toolkit/source/layout/vcl/wbutton.cxx | 284 -----
toolkit/source/layout/vcl/wfield.cxx | 290 ------
toolkit/source/layout/vcl/wrapper.cxx | 909 -------------------
toolkit/source/layout/vcl/wrapper.hxx | 149 ---
toolkit/uiconfig/layout/delzip | 1
toolkit/uiconfig/layout/message-box.xml | 41
toolkit/uiconfig/layout/tab-dialog.xml | 20
113 files changed, 1 insertion(+), 12077 deletions(-)
New commits:
commit ce8f0a7e7205e70e7ec5f1be0024e52903fdec7a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Nov 16 23:26:51 2011 +0100
Removing the last remnants of layout - sorry to see it go :-(
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c56b83b..8cd2ecf 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -356,7 +356,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a
UnoControlThrobberModel \
UnoControlTimeField \
UnoControlTimeFieldModel \
- XLayoutFlowContainer \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
UnoControlGrid \
@@ -1706,10 +1705,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\
XKeyHandler \
XKeyListener \
XLayoutConstrains \
- XLayoutContainer \
- XLayoutFlow \
- XLayoutRoot \
- XLayoutUnit \
XListBox \
XMenu \
XMenuBar \
diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl
deleted file mode 100644
index 76d1605..0000000
--- a/offapi/com/sun/star/awt/XLayoutContainer.idl
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
-#define __com_sun_star_awt_XLayoutContainer_idl__
-
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#include <com/sun/star/awt/Rectangle.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/container/XChild.idl>
-#include <com/sun/star/awt/MaxChildrenException.idl>
-#include <com/sun/star/awt/XLayoutUnit.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module awt {
-
-//=============================================================================
-
-interface XLayoutUnit;
-
-/** specifies the layout constraints for a surrounding container.
-
- @since OOo 3.0
- */
-interface XLayoutContainer: com::sun::star::container::XChild
-{
- /** 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
- rich API that allows, e.g., for introspection.
- Should rarely be a need to use; containers shall provide an interface
- for setting properties more comfortably. */
- com::sun::star::beans::XPropertySet getChildProperties(
- [in] com::sun::star::awt::XLayoutConstrains Child );
-
- /** Set at initialization, 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.
- 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
- 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
- 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();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/awt/XLayoutFlow.idl b/offapi/com/sun/star/awt/XLayoutFlow.idl
deleted file mode 100644
index fa67142..0000000
--- a/offapi/com/sun/star/awt/XLayoutFlow.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __com_sun_star_awt_XLayoutFlow_idl__
-#define __com_sun_star_awt_XLayoutFlow_idl__
-
-//=============================================================================
-
-#include <com/sun/star/uno/XInterface.idl>
-
-module com { module sun { module star { module awt {
-
-//=============================================================================
-
-/** Enables height-for-width layout negotiations, 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().
-
- @since OOo 3.0
- */
-interface XLayoutFlow
-{
- /** returns the preferred height this layout element would need for the given width. */
- long getHeightForWidth( [in] long Width );
-
- /** Allow the container/widget to toggle the functionality. */
- boolean hasHeightForWidth();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl b/offapi/com/sun/star/awt/XLayoutFlowContainer.idl
deleted file mode 100644
index 4568596..0000000
--- a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
-#define __com_sun_star_awt_XLayoutUnit_idl__
-
-#include <com/sun/star/awt/XLayoutContainer.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module awt {
-
-//=============================================================================
-
-/** 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.
-
- @since OOo 3.0
- */
-interface XLayoutContainer
-{
- void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl
deleted file mode 100644
index 064a2b4..0000000
--- a/offapi/com/sun/star/awt/XLayoutRoot.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __com_sun_star_awt_XLayoutRoot_idl__
-#define __com_sun_star_awt_XLayoutRoot_idl__
-
-#include <com/sun/star/awt/XLayoutContainer.idl>
-#include <com/sun/star/container/XNameAccess.idl>
-#include <com/sun/star/container/XNameContainer.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module awt {
-
-//=============================================================================
-
-/** specifies an interface for a top-level layoutable widget
-
- @since OOo 3.0
-*/
-interface XLayoutRoot: com::sun::star::container::XNameAccess
-{
- com::sun::star::awt::XLayoutContainer getLayoutContainer();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl
deleted file mode 100644
index a3bcd8e..0000000
--- a/offapi/com/sun/star/awt/XLayoutUnit.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
-#define __com_sun_star_awt_XLayoutUnit_idl__
-
-#include <com/sun/star/awt/XLayoutContainer.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module awt {
-
-//=============================================================================
-
-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.
-
- @since OOo 3.0
- */
-interface XLayoutUnit
-{
- void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk
index 18eb76d..bc3ec4d 100644
--- a/sc/Package_uiconfig.mk
+++ b/sc/Package_uiconfig.mk
@@ -21,10 +21,6 @@
# instead of those above.
$(eval $(call gb_Package_Package,sc_uiconfig,$(SRCDIR)/sc/uiconfig))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/layout/insert-sheet.xml,layout/insert-sheet.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/layout/move-copy-sheet.xml,layout/move-copy-sheet.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/layout/sort-options.xml,layout/sort-options.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/layout/string-input.xml,layout/string-input.xml))
$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml))
$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml))
$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml))
diff --git a/sc/uiconfig/layout/delzip b/sc/uiconfig/layout/delzip
deleted file mode 100644
index 7b4d68d..0000000
--- a/sc/uiconfig/layout/delzip
+++ /dev/null
@@ -1 +0,0 @@
-empty
\ No newline at end of file
diff --git a/sc/uiconfig/layout/insert-sheet.xml b/sc/uiconfig/layout/insert-sheet.xml
deleted file mode 100644
index 35a55e4..0000000
--- a/sc/uiconfig/layout/insert-sheet.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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="true" moveable="true" output-size="true" id="RID_SCDLG_INSERT_TABLE" sv-look="true" _title="Insert Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
- <vbox spacing="5" border="5">
- <fixedline id="FL_POSITION" _text="Position"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-position" id="RB_BEFORE" tabstop="true" _label="B~efore current sheet"/>
- <radiobutton radiogroup="insert-sheet-position" id="RB_BEHIND" tabstop="true" _label="~After current sheet"/>
- </vbox>
- </hbox>
- <fixedline id="FL_TABLE" _text="Sheet"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-source" id="RB_NEW" _label="~New sheet"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5" cnt:fill="false" cnt:expand="false">
- <fixedtext id="FT_COUNT" _label="N~o. of sheets"/>
- <fixedtext id="FT_NAME" _label="Na~me"/>
- </vbox>
- <vbox>
- <hbox>
- <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="true"/>
- </hbox>
- <edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
- </vbox>
- </hbox>
- </vbox>
- </hbox>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <radiobutton radiogroup="insert-sheet-source" id="RB_FROMFILE" _label="~From file"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <hbox>
- <multilistbox auto-hscroll="true" has_border="true" id="LB_TABLES" simple-mode="true" string-item-list=" : : : : " cnt:fill="true" cnt:expand="true"/>
- <vbox cnt:fill="false" cnt:expand="false" spacing="5">
- <pushbutton id="BTN_BROWSE" _label="~Browse..." cnt:expand="false"/>
- <checkbox id="CB_LINK" _label="Lin~k" cnt:expand="false"/>
- <flow/>
- </vbox>
- </hbox>
- <fixedtext id="FT_PATH" label="FT-PATH"/>
- </vbox>
- </hbox>
- </vbox>
- </hbox>
- <dialogbuttonhbox border="5" spacing="5">
- <okbutton defbutton="true" id="BTN_OK"/>
- <cancelbutton id="BTN_CANCEL"/>
- <helpbutton id="BTN_HELP"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/sc/uiconfig/layout/move-copy-sheet.xml b/sc/uiconfig/layout/move-copy-sheet.xml
deleted file mode 100644
index 3d26db1..0000000
--- a/sc/uiconfig/layout/move-copy-sheet.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="true" 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 defbutton="true" id="BTN_OK" tabstop="true"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/sc/uiconfig/layout/sort-options.xml b/sc/uiconfig/layout/sort-options.xml
deleted file mode 100644
index a409ac2..0000000
--- a/sc/uiconfig/layout/sort-options.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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. !-->
-
-<tabpage help-id="HID_SCPAGE_SORT_OPTIONS"
- id="RID_SCPAGE_SORT_OPTIONS"
- sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container"
- optimumsize="true"
- sizeable="true" moveable="true">
- <vbox spacing="4" border="5">
- <string id="STR_COL_LABEL" _text="Range contains column la~bels"/>
- <string id="STR_ROW_LABEL" _text="Range contains ~row labels"/>
- <string id="SCSTR_UNDEFINED" _text="- undefined -"/>
- <vbox spacing="4" border="5">
- <checkbox id="BTN_CASESENSITIVE" tabstop="true" _label="Case ~sensitive"/>
- <checkbox id="BTN_LABEL" tabstop="true"/>
- <checkbox id="BTN_FORMATS" tabstop="true" _label="Include ~formats"/>
- <checkbox id="BTN_NATURALSORT" tabstop="true" _label="Enable ~natural sort"/>
- <checkbox id="BTN_COPYRESULT" tabstop="true" _label="~Copy sort results to:"/>
- <hbox>
- <listbox has_border="true" dropdown="true" id="LB_OUTAREA" tabstop="true"/>
- <edit has_border="true" disable="true" id="ED_OUTAREA" tabstop="true"/>
- </hbox>
- <checkbox id="BTN_SORT_USER" tabstop="true" _label="Custom sort ~order"/>
- <listbox has_border="true" disable="true" dropdown="true" id="LB_SORT_USER" tabstop="true"/>
- <hbox>
- <fixedtext id="FT_LANGUAGE" _label="~Language"/>
- <fixedtext id="FT_ALGORITHM" _label="O~ptions"/>
- </hbox>
- <hbox>
- <svxlanguagebox has_border="true" dropdown="true" id="LB_LANGUAGE" sort="true" tabstop="true" _string-item-list="Default"/>
- <listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
- </hbox>
- <fixedline id="FL_DIRECTION" _text="Direction"/>
- <radiobutton id="BTN_TOP_DOWN" radiogroup="sort-options" tabstop="true" _label="~Top to bottom (sort rows)"/>
- <radiobutton id="BTN_LEFT_RIGHT" radiogroup="sort-options" tabstop="true" _label="L~eft to right (sort columns)"/>
- </vbox>
- </vbox>
-</tabpage>
diff --git a/sc/uiconfig/layout/string-input.xml b/sc/uiconfig/layout/string-input.xml
deleted file mode 100644
index b1aed51..0000000
--- a/sc/uiconfig/layout/string-input.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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" moveable="true" output-size="true" id="RID_SCDLG_STRINPUT" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container" title="Insert String">
- <vbox spacing="5" border="5">
- <fixedtext id="FT_LABEL" label="FT-LABEL"/>
- <edit has_border="true" id="ED_INPUT" tabstop="true"/>
- <dialogbuttonhbox border="5" spacing="5">
- <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
- <cancelbutton id="BTN_CANCEL" tabstop="true"/>
- <helpbutton id="BTN_HELP" tabstop="true"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index f225c3e..8f13970 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -14,7 +14,6 @@ cp scp2\source\graphicfilter nmake - all cp_graphicfilter cp_langm
cp scp2\source\impress nmake - all cp_impress cp_langmacros cp_langtemplates NULL
cp scp2\source\javafilter nmake - all cp_javafilter cp_langmacros cp_langtemplates NULL
cp scp2\source\kde nmake - all cp_kde cp_langmacros cp_langtemplates NULL
-cp scp2\source\layout nmake - all cp_layout cp_langmacros NULL
cp scp2\source\math nmake - all cp_math cp_langmacros cp_langtemplates NULL
cp scp2\source\ooo nmake - all cp_ooo cp_langmacros cp_langtemplates NULL
cp scp2\source\python nmake - all cp_python cp_langmacros cp_langtemplates NULL
@@ -27,4 +26,4 @@ cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacr
cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL
cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL
cp scp2\source\accessories nmake - all cp_accessories cp_langmacros NULL
-cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
+cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
deleted file mode 100644
index a080a04..0000000
--- a/scp2/source/layout/layout.scp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Directory gid_Dir_Share_Layout
- ParentID = gid_Brand_Dir_Share;
- DosName = "layout";
-End
-
-File gid_File_Zip_Toolkit_Layout
- Dir = gid_Dir_Share_Layout;
- USER_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "toolkit-layout.zip";
-End
-
-File gid_File_Zip_Sc_Layout
- Dir = gid_Dir_Share_Layout;
- USER_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "sc-layout.zip";
-End
-
-File gid_File_Zip_Svx_Layout
- Dir = gid_Dir_Share_Layout;
- USER_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "svx-layout.zip";
-End
-
-File gid_File_Zip_Sw_Layout
- Dir = gid_Dir_Share_Layout;
- USER_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "sw-layout.zip";
-End
-
diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
deleted file mode 100644
index f2e759c..0000000
--- a/scp2/source/layout/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=layout
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES=
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/solenv/inc/layout.mk b/solenv/inc/layout.mk
deleted file mode 100644
index 7b808f0..0000000
--- a/solenv/inc/layout.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
-XML_DEST=$(DLLDEST)
-XML_LANGS=$(alllangiso)
-
-ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j"))
-
-# Must remove the -j (no duplicate base file names) flag
-ZIPUPDATE=-u
-XML_ZIP = $(PRJNAME)-layout
-
-ALLTAR: localize.sdf $(XML_ZIP)
-
-$(XML_ZIP): $(ALL_XMLS)
-
-ZIP1DIR=$(XML_DEST)
-ZIP1TARGET=$(XML_ZIP)
-ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
-
-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<"
-
-$(XML_DEST)/%.xml: %.xml
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
- $(COMMAND_ECHO)$(COPY) "$<" "$@"
-
-# Don't want to overwrite filled localize.sdf with empty template
-template.sdf:
- $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
-
-$(ZIP1LIST): localize.sdf
diff --git a/svx/uiconfig/layout/delzip b/svx/uiconfig/layout/delzip
deleted file mode 100755
index 7b4d68d..0000000
--- a/svx/uiconfig/layout/delzip
+++ /dev/null
@@ -1 +0,0 @@
-empty
\ No newline at end of file
diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
deleted file mode 100755
index f6bea87..0000000
--- a/svx/uiconfig/layout/layout.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# TODO: move to solenv/inc
-# copies: sw/uiconfig/layout svx/uiconfig/layout
-
-TRALAY=tralay
-XML_DEST=$(DLLDEST)
-XML_LANGS=$(alllangiso)
-
-ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
-
-# Must remove the -j (no duplicate base file names) flag
-ZIPUPDATE=-u
-XML_ZIP = $(PRJNAME)-layout
-
-ALLTAR: $(XML_ZIP)
-
-$(XML_ZIP): $(ALL_XMLS)
-
-ZIP1DIR=$(XML_DEST)
-ZIP1TARGET=$(XML_ZIP)
-ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
-
-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- -$(MKDIR) $(@:d)
- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
-
-$(XML_DEST)/%.xml: %.xml
- -$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-# 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/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
deleted file mode 100755
index 876e465..0000000
--- a/svx/uiconfig/layout/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-PRJNAME=svx
-TARGET=layout
-
-.INCLUDE : settings.mk
-
-all .PHONY:
-
-.INCLUDE : target.mk
diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
deleted file mode 100755
index 78e30ee..0000000
--- a/svx/uiconfig/layout/zoom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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 xmlns="http://openoffice.org/2007/layout"
- xmlns:cnt="http://openoffice.org/2007/layout/container"
- id="RID_SVXDLG_ZOOM" _title="Zoom & View Layout" optimumsize="true"
- help-id="SID_ATTR_ZOOM"
- has_border="true" sizeable="true" moveable="true">
- <vbox spacing="5" border="5">
- <hbox spacing="0" border="0">
- <vbox spacing="5" border="5">
- <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
- <radiobutton radiogroup="zoom" id="BTN_OPTIMAL" _label="Optimal"/>
- <radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
- <radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" _label="Page Width"/>
- <radiobutton radiogroup="zoom" id="BTN_100" _label="100 %"/>
- <hbox cnt:expand="false" cnt:fill="true">
- <align cnt:expand="false" cnt:fill="true">
- <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
- </align>
- <flow cnt:padding="10" cnt:expand="false"/>
- <metricfield id="ED_USER" value-step="1"
- repeat="true" has_border="true" spin="true"
- _text="100%" unit="11" custom-unit-text="%"
- right="true"
- cnt:expand="false"/>
- </hbox>
- </vbox>
- <vbox spacing="5" border="5">
- <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
- <radiobutton radiogroup="zoom" id="BTN_AUTOMATIC" _label="~Automatic"/>
- <radiobutton radiogroup="zoom" id="BTN_SINGLE" _label="~Single page"/>
- <hbox cnt:expand="false" cnt:fill="true">
- <align cnt:expand="false" cnt:fill="true">
- <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_COLUMNS" _label="~Columns"/>
- </align>
- <flow cnt:padding="10" cnt:expand="false"/>
- <metricfield id="ED_COLUMNS" value-step="1"
- repeat="true" has_border="true" spin="true"
- _text="100%"
- right="true"
- spin-value-min="1"
- spin-value="1"
- cnt:expand="false"/>
- </hbox>
- <hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
- </vbox>
- </hbox>
- <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- <dialogbuttonhbox border="5" spacing="5">
- <flow/>
- <okbutton id="BTN_ZOOM_OK"/>
- <cancelbutton id="BTN_ZOOM_CANCEL"/>
- <helpbutton id="BTN_ZOOM_HELP"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/sw/uiconfig/layout/delzip b/sw/uiconfig/layout/delzip
deleted file mode 100644
index 7b4d68d..0000000
--- a/sw/uiconfig/layout/delzip
+++ /dev/null
@@ -1 +0,0 @@
-empty
\ No newline at end of file
diff --git a/sw/uiconfig/layout/layout.mk b/sw/uiconfig/layout/layout.mk
deleted file mode 100644
index f6bea87..0000000
--- a/sw/uiconfig/layout/layout.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# TODO: move to solenv/inc
-# copies: sw/uiconfig/layout svx/uiconfig/layout
-
-TRALAY=tralay
-XML_DEST=$(DLLDEST)
-XML_LANGS=$(alllangiso)
-
-ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
-
-# Must remove the -j (no duplicate base file names) flag
-ZIPUPDATE=-u
-XML_ZIP = $(PRJNAME)-layout
-
-ALLTAR: $(XML_ZIP)
-
-$(XML_ZIP): $(ALL_XMLS)
-
-ZIP1DIR=$(XML_DEST)
-ZIP1TARGET=$(XML_ZIP)
-ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
-
-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- -$(MKDIR) $(@:d)
- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
-
-$(XML_DEST)/%.xml: %.xml
- -$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-# 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/sw/uiconfig/layout/wordcount.xml b/sw/uiconfig/layout/wordcount.xml
deleted file mode 100644
index c8f8092..0000000
--- a/sw/uiconfig/layout/wordcount.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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 xmlns="http://openoffice.org/2007/layout"
- xmlns:cnt="http://openoffice.org/2007/layout/container"
- help-id="HID_DLG_WORDCOUNT"
- id="DLG_WORDCOUNT"
- sizeable="true" moveable="true" optimumsize="true"
- has_border="true" sv-look="true" _title="Word Count">
- <vbox border="5" spacing="5">
- <fixedline id="FL_CURRENT" _text="Current selection"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <hbox>
- <fixedtext id="FT_CURRENTWORD" _label="Words:"/>
- <flow cnt:padding="60"/>
- <fixedtext id="FI_CURRENTWORD" right="true" _label="0"/>
- </hbox>
- <hbox>
- <fixedtext id="FT_CURRENTCHARACTER" _label="Characters:"/>
- <flow cnt:padding="60"/>
- <fixedtext id="FI_CURRENTCHARACTER" right="true" _label="00"/>
- </hbox>
- </vbox>
- </hbox>
- <!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
- and reope the hbox/vbox thing !-->
- <fixedline id="FL_DOC" _text="Whole document"/>
- <hbox>
- <vbox cnt:padding="13" spacing="5">
- <hbox>
- <fixedtext id="FT_DOCWORD" _label="Words:"/>
- <fixedtext id="FI_DOCWORD" right="true" _label="000"/>
- </hbox>
- <hbox>
- <fixedtext id="FT_DOCCHARACTER" _label="Characters:"/>
- <fixedtext id="FI_DOCCHARACTER" right="true" _label="0000"/>
- </hbox>
- </vbox>
- </hbox>
- <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- <dialogbuttonhbox spacing="5">
- <flow/>
- <okbutton id="PB_OK"/>
- <helpbutton id="PB_HELP"/>
- </dialogbuttonhbox>
- </vbox>
-</modaldialog>
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 7164bc9..9a80827 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -66,24 +66,16 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/awt/stylesettings \
toolkit/source/awt/vclxaccessiblecomponent \
toolkit/source/awt/vclxbitmap \
- toolkit/source/awt/vclxbutton \
toolkit/source/awt/vclxcontainer \
toolkit/source/awt/vclxdevice \
- toolkit/source/awt/vclxdialog \
- toolkit/source/awt/vclxfixedline \
toolkit/source/awt/vclxfont \
toolkit/source/awt/vclxgraphics \
toolkit/source/awt/vclxmenu \
- toolkit/source/awt/vclxplugin \
toolkit/source/awt/vclxpointer \
toolkit/source/awt/vclxprinter \
toolkit/source/awt/vclxregion \
- toolkit/source/awt/vclxscroller \
toolkit/source/awt/vclxspinbutton \
- toolkit/source/awt/vclxsplitter \
toolkit/source/awt/vclxsystemdependentwindow \
- toolkit/source/awt/vclxtabcontrol \
- toolkit/source/awt/vclxtabpage \
toolkit/source/awt/vclxtabpagecontainer \
toolkit/source/awt/animatedimagespeer \
toolkit/source/awt/vclxtoolkit \
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 1ea85f3..89b8c42 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,toolkit,\
AllLangResTarget_tk \
Library_tk \
Package_inc \
- Package_source \
Package_util \
))
diff --git a/toolkit/Package_source.mk b/toolkit/Package_source.mk
deleted file mode 100644
index c5bcd97..0000000
--- a/toolkit/Package_source.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source))
-$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/toolkit/doc/layout/README b/toolkit/doc/layout/README
deleted file mode 100644
index d7ced38..0000000
--- a/toolkit/doc/layout/README
+++ /dev/null
@@ -1,24 +0,0 @@
-Layout engine for OpenOffice.org - Work in Progress
-
-Simple dialogs have been ported now: zoom and wordcount.
-
-New code lives in "layoutdialogs" CWS or ooo-build trunk.
-
-* Checkout layoutdialogs cws.
-
-* Configure using --enable-layout.
-
-* [d]make all
-
-* [d]make install DESTDIR=$(pwd)/ooo-layout/
-
-Integration into OOo:
-
-* After instaling, run
-
- cd ooo-cvs/program
- ./soffice.bin
-
- Start a [Writer] document and choose View/Zoom or Extra/Word count.
-
-* Also See workben/layout/README.
\ No newline at end of file
diff --git a/toolkit/doc/layout/TODO b/toolkit/doc/layout/TODO
deleted file mode 100644
index fdffa7f..0000000
--- a/toolkit/doc/layout/TODO
+++ /dev/null
@@ -1,227 +0,0 @@
--*-outline-*-
-
-* CWS
-** Move everything & development into new layout-dialogs CWS
-
-** cleanups
-*** Add XRadioButton2 and layout::VCLXRadioButton with
- {get,set}RadioGroup. Remove import.cxx RadioGroups::RadioGroup,
- VCLXRadioButton::getFirstActionListener () and [actionListener
- juggling in] layout::RadioButton_impl::SetClickHdl() and
- EnableRadioCheck() layout::RadioButton_impl::Check.
-*** layout/import.hxx: what's this generator stuff?
-#if 0
-// generator
-class Widget
-*** root.hxx:
-/*
- TODO: (ricardo) I think we should cut on LayoutRoot, stripping out its widget
- proxy interface (just make it return the root widget).
-
-*** root.cxx:
-LayoutWidget::~LayoutWidget()
-{
- /* should we dispose of the references...? */
- // at least of its children... Or should root?
-*** root.cxx:
-LayoutRoot::~LayoutRoot()
-{
-// TODO: we want to delete the top level LayoutWidget...
-
-
-* portability
-** --enable-layout does not compile on Sun?
-[SunStudio12 on Linux works...]
-
-TODO: Try not including layout-pre.hxx twice, but use
-layout-pre-header.hxx and layout-pre-source.hxx (both include an
-un-multiple-inclusion-shielded layout-pre.hxx).
-
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: layout is not a member of layout.
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: Formal argument 1 of type layout::RadioButton* in call to SvxZoomDialog::UserHdl(layout::RadioButton*) is being passed RadioButton*.
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 431: Error: layout is not a member of layout.
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 431: Error: Formal argument 1 of type layout::MetricField* in call to SvxZoomDialog::SpinHdl(layout::MetricField*) is being passed MetricField*.
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 441: Error: layout is not a member of layout.
-"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 441: Error: Formal argument 1 of type layout::Button* in call to SvxZoomDialog::OKHdl(layout::Button*) is being passed Button*.
-6 Error(s) detected.
-
- #412
- ( ( layout :: layout :: RadioButton * ) pCaller ) ; } long SvxZoomDialog :: UserHdl ( layout :: RadioButton * pBtn )
- {
- fprintf ( ( & __iob [ 2 ] ) , "SvxZoomDialog::UserHdl\n" ) ;
- bModified |= 1 ;
- if ( pBtn == & aUserBtn )
- {
- aUserEdit . Enable ( ) ;
- aUserEdit . GrabFocus ( ) ;
- }
- else
- aUserEdit . Disable ( ) ;
- return 0 ;
- }
-
-** LayoutDialogs compilation errors on Windows
-in VCL headers there, need to include more headers to also get stuff like HWND defined.
-
-* code
-** features
-*** Symbols on MoreButton/AdvancedButton?
-
-*** support more widgets (as necessary)
-**** see toolkit/source/awt/vclxtoolkit.cxx and svtools/source/uno/unoiface.cxx
-**** SubDialog
-**** Pull-down menu
-**** embed custom widget
-**** embed old .src TAB
-**** have a LAYOUT TAB be embedded in an old .src dialog
-**** FileControl?
-**** roadmap?
-**** datefield?
-**** patternfield?
-**** patternbox?
-**** dockingarea?
-**** errorbox?
-**** groupbox?
-**** menubutton?
-**** messbox?
-**** simpleanimation?
-
-*** support cnt:cnt:?
-*** support using label (verb) on yes/ok no/cancel buttons for some platforms
-but keep using yes/no on Windows, eg?
-*** remove -DTEST_LAYOUT=1 from util/makefile.mk?
-
-** fixes
-*** missing properties
- 'title' -> 'Set Zoom'
-Missing prop Title
-Missing prop ValueStep
-Missing prop Radiogroup
-Missing prop Default
-*** bug in wordcountdialog: right alignment of numbers `jump' when resizing
- the dialog. the 0 and 00 are never exactly aligned.
-*** look into code duplication: source/core/*.
-*** Remove magic constants
-fHorAlign = fVerAlign = 0.5; --> float const [CENTER?] = 0.5;
-
-** include full translations
-*** zoom
-grep zoom.src svx/source/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\\zoom.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_SVXDLG_ZOOM_title/'
-*** wordcount
-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
-*** find-and-replace
-grep srchdlg.src svx/source/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", "svx\\uiconfig\\layout\\find-and-replace.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_SVXDLG_SEARCH_title/' > svx/uiconfig/layout/localize-find-and-replace.sdf
-
-* i18n
- + forget java property files nonsense
- - dump old wiki pointers into layout/doc for reference
- + share code with vcl/source/gdi/impimagetree.cxx
- + 'layout.zip'?
- + support multiple translatable attributes
- + ? rewrite tralay from scratch (in python, perl, c++?) ?
-
-
-* distributing: [LayoutDialogs]
-git diff 5db78fc5 layout scp2 > layout-dialogs-layout.diff
-git diff 5db78fc5 |grep -v gitignore | grep 'git a'|grep -Ev 'a/(layout|scp2)/'|sed -e's at .*git a/@@' -e 's@/.*@@' | sort -u | tr '\n' ' '
-git diff 5db78fc5 $(git diff 5db78fc5 |grep -v gitignore | grep 'git a'| grep -Ev 'a/(layout|scp2)/' | sed -e's at .*git a/@@' -e 's@/.*@@' | sort -u | tr '\n' ' ') > layout-dialogs.diff
-
-Soo...
-
-m237: fc105178
-
-#git diff offapi toolkit > layout-dialogs-offapi-toolkit.diff
-
-git diff fc105178 layout | sed 's@^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-layout.diff
-git diff fc105178 config_office scp2 | sed 's@^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-config_office-scp2.diff
-git diff fc105178 svx sw | sed 's@^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-svx-sw.diff
-
-m241: 5e9b2546
-m241': b8e24264
-m241'': 53ddc663
-m1: fbde8234
-m1': d1f42c99
-m1'': 1a8dec5c
-m1'''': c93389f7
-
-* porting
-** Zoom dialog
-*** list of radio buttons indented: workben/zoom-indent.xml ?
-** Word Count dialog
-** Recover dialog (redesign)
-** pivotfilter dialog (Kohei?)
-** paragraph dialog
-
-
-TODO
-
-
-* play with / improve Ricardo's editor
-** broken after new uno registration
-
- it barfs on
-
- void selectedWidget( Widget *pWidget )
- {
- clear();
-
- it looks like a window is deleted twice.
-
-** this is not meant to be a production level tool, but still,
- it can be improved I think :-)
-
-* improve Kohei's converter (poke him on IRC (afternoons) about this)
-
-** current hack: workben/run-s2x
-
- . Imported into layout
-
- + Kohei wrote the start of a nice script to convert ugly,
- obsolete resource files to nice new XML files ;-)
- + unfortunately it is buggy.
- + see ooo-build/scratch/layout-src2xml/*
- + we should move this into the git repo.
- + bug to fix: case problems in XML
- + XML produced has wrong case items, and names are
- different to those we (and AWT) expects ->
- de-stdlycapsise
- + cf. layout/source/core/helper.cxx:
- toUnoNaming, anyFromString
- setProperties
- + NB. we want to have nice 'clean' looking non-stdlycaps XML
- + also toolkit/source/awt/vclxwindows.cxx /ImplGetPropertyIds/
- + also toolkit/source/helper/property.cxx
- + bug to fix: property name problems
- + often the resource name strings (cf. legacy resource
- compiler in rsc/) don't match the awt toolkit properties
- + ie. need to map Label="foo" to Text="foo" (or whatever).
-
-* OLD notes
-
-+ Before OOoCon
- + editor polish
- + cut / paste
- + export xml
- + "import .src"
- [ use native VCL menus ... ]
- + dialogs:
- + porting 'Format' dialog.
- + wrapper code - improving ...
- + XML fixes
- + "load" command for shared fragments
- + slides:
- + UNO object hierarchy for a given window ...
-
-+ Later
- + dual-compile code under VCL & 'layout' and compare
- event ordering (eg.).
- + test-tool
- + scrolled-pane impl.
-
diff --git a/toolkit/doc/layout/apinotes.txt b/toolkit/doc/layout/apinotes.txt
deleted file mode 100644
index dc5a8cf..0000000
--- a/toolkit/doc/layout/apinotes.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-Notes on API wrapper pieces ...
-
-SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
- Dialog( pParent, SVX_RES( RID_SVXDLG_ZOOM ) ),
-
-What do we do ?
- + lots of potential VCL/Svx/Sfx etc. top-levels ...
-
- + Create the window & the 1st member: 'FooHandle' ?
- + Multiply inherited ?
- + object from where ?
-
- + Default:
- + a pseudo-Dialog / wrapper ...
- + load using layout (etc.)
- + register an SID table ?
- + necessary ?
- + SIDs ? - post it ...
-
-
- + [ Otherwise ... hook up via a helper /
- constructor member ... ]
-
-* Fixed:
- + OKButton / CancelButton
- + don't chain to PushButton::Click
- + if there is no ClickHdl set ... [ !urgh! ...]
-
- * FIXME:
- other widgets ...
- * How do we cope ? *
- ....
- + priorities ? Layout ?
- + de-coupling ?
- + native widgets ?
- + hmm...
- + custom widgets ?
- + 'OKButton' ... (?) :-)
- + 'CancelButton'
- + 'HelpButton' ...
- + a VCL hack ...
- + create an 'addLayout()' method ?
- + [ like cl's ? ]
- + implement this ...
-
-** Lifecycle ?
- + how do we track the 'Impl'
- vs. the pImpl vs. (etc.)
- + held by mutual references ?
-
- + pointer to the widget itself passed in ?
- + MI ?
- + when the widget dies - just NULL the
- listener's back-ptr ?
-
- + Locking [!?] - how / why / what / who ?
- + urgh ...
- + threading bits ...
-
- + SID table (?) ...
- + [ necessary ? - just use the SID name as the XML attr ? ]
- + LAYOUT_ID(a) -> "#a" - stringified ...
-
-** FIXME:
- + we need a decent MetricField implementation
- + it is more than a SpinField
- + need to move the 'Border' property down (etc.)
- + re-arrange the properties to be next to the impls.
- in awt ...
-
- + fix the
-
-XCurrencyField (huh)
- needs implementing for VCLXMetricField (non-existent) ...
- copy the code from XCurrencyField ? make a sub-class there ?
-
diff --git a/toolkit/doc/layout/metricfield.txt b/toolkit/doc/layout/metricfield.txt
deleted file mode 100644
index 21ebe4b..0000000
--- a/toolkit/doc/layout/metricfield.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-** MetricField:
- + in vcl:
-class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
-class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter
-class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
-class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
-
-MetricFormatter - very simple sal_Int64 wrapping ...
- + no doubles ...
- + *Could* replicate this with the same interface:
- + prolly easier / better to add an XMetricField interface.
-
-vcl's MetricField - itself does a load of (double) casting ...
- + to get the value it wants :-)
- + Urgh ! ...
-
-** Can we just twist VCLXCurrencyField to this purpose ?
- + what differences would we want ?
- + LongCurrencyFormatter -> 'MetricFormatter' ...
-
-** Interesting !
- + VCLXCurrencyField is based on 'LongCurrencyField' not CurrencyField ...
- + this is really based on 'BigInt' [ curious ] - so even more precision loss.
-
- + So ... cut/paste VCLXCurencyField -> VCLXMetricField
-
- + Look at 'VCLXNumericField' interface ...
- + Use 'XNumericField' instead (?)
- + why does this just not "just work" ?
-
- + The 'MetricField' (is also a MetricFormatter)
- + MetricFormatter [ unusually ] has 'Unit' support
- + API grep shows:
- + a) requires 'fieldunit'
- + b) has "UserValue"
- + c) => new IDL interface required ...
- + sub-set / expand NumericField ?
-
- + add 'CustomConvert' ?
- + add '[SG]etFirst'/Last
- + Properties:
- + 'Unit'
- + 'CustomUnitText'
- + 'spin-size' -> 'value-step'
- + 'BaseValue' ...
- + sal_Int64 ... [!?] ...
- + CorrectedValue
- + Want properties for the UI designer (?)
- + move that stuff out into there ?
- + FIXME:
- + rationalise the 'Modify' event crud ...
- + share the code in a base-class ...
-
- + Wrapper:
- + need to have static methods 'ConvertDoubleValue' etc.
- + also 'ConvertValue' etc.
- + GetCorrectedValue - never used ...
diff --git a/toolkit/doc/layout/notes.txt b/toolkit/doc/layout/notes.txt
deleted file mode 100644
index 63bb164..0000000
--- a/toolkit/doc/layout/notes.txt
+++ /dev/null
@@ -1,117 +0,0 @@
---- How layout / hierarchy should work ---
-
-On-screen:
-
-+-------------------+
-| Label: [Entry] |
-| - - - - - - - - - | |
-| [ Ok ]|
-+-------------------+
-
-AWT Window hierarcy:
- Window
- + Label
- + Entry
- + Ok
-
- ie. unchanged, and backwards compatible - a flat
-representation.
-
-Toolkit Hierachy
-
- WindowContainer [Bin?]
- + Vbox
- + HBox
- + Label
- + Entry
- + Alignment
- + Ok
-
- the layout process would happen inside the toolkit code
-(perhaps eventually genericisd itself), and the result from the
-(re-)layout process would be a set of SetPosition/SetSize calls made
-to VCL.
-
---- code pointers ---
-
-** AWT interfaces:
- + offapi/com/sun/star/awt/* - eg. XButton.idl
- + 'XLayoutConstrains.idl' [ published & mis-named ! ]
-
- + We can build 'Layout' into the AWT at the toolkit level
- + this should be fairly easy, and wouldn't touch VCL much.
-
-** Toolkit (awt) implementation:
- + toolkit/source/awt/vclxwindows.cxx:
- + much of the implementation lurks in here ...
- + The size information is in 'vclxwindows.cxx' ...
-
- + toolkit/source/helper/unowrapper.cxx
- + factories / code to associate UNO peers with VCL windows
- + pWindow->
-
---- Tests ---
-
-Integration tests:
- cf. http://www.openoffice.org/issues/show_bug.cgi?id=78747
-
-
---- more thoughts ---
-
-** Extra Design constraints: [!?]
- + accessibility
- + QA test-tool-age ... - tests ~will need re-write (unfortunately)
-
-* New functionality we would like:
- + ShowAll (vs. Show/Hide) && HideAll ...
-
-Necessary to re- build && deliver svtools/ having delivered toolkit ...
- rm unxlngi6.pro/slo/textwindowaccessibility.* # first ...
-
-** Layout containers:
- + XIndexAccess ? - sorted container (?)
-
-* Consider 'XLayoutRoot' top-level ...
- + inherit from XNameContainer - widgets by name / id ...
- + hack a VCL dialog ?
- + we need a handle we can pass back of some form:
- + XWindowPeer getPeer() ... [ can use that I guess ? ]
- + also need a service interface ?
- + or parameters passed as Anys ? [ugh]
-
-* Decided
- + use 'layout' by itself & small patches
- to toolkit/ in ooo-build.
-
-* TODO:
- + need a 'queueResize' method ...
- + trigger on show/hide ...
- + allocateSize should take an awt::Rectangle ...
- + impl. XLayoutRoot
- + special cases:
- + radio-button-group
- + notebook
-
-* svx/source/dialog/zoom*
-
-Michael's Todo:
- + handle MetricField: 'unit' enum etc. - introspection ? or ...
- + make OK/Cancel buttons function as they should ...
- + merge layout-svtools.diff into CWS as last step before inclusion ...
- + FixedLine:
- + get sizing right ...
- + hook up new virtual methods into toolkit/ (m225) - i#80754
- + copy the crud from toolkit's custom vclxwindows.cxx
- "calcMinimumSize" logic ...
- + get ok/help/cancel buttons working ...
-
- + fix / rationalise property adding in toolkit ...
- + simplify it with the new VCLWindow base :-)
- + simplify it ...
- + spreadsheet ...
- + VCLXImageConsumer - can't be instantiated itself
- anyway ! -> bin the 'true' & just add all these
- props unconditionally ...
-
- + switch construction attributes into their own xmlns to
- avoid treading on other properties ...
diff --git a/toolkit/doc/layout/oldnotes.txt b/toolkit/doc/layout/oldnotes.txt
deleted file mode 100644
index a5cb949..0000000
--- a/toolkit/doc/layout/oldnotes.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-* Obsolete notes ...
-
-** Form XML format:
-
- + from the basic editor:
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="204" dlg:top="148" dlg:width="136" dlg:height="115" dlg:closeable="true" dlg:moveable="true">
- <dlg:bulletinboard>
- <dlg:button dlg:id="OkButtonName" dlg:tab-index="0" dlg:left="86" dlg:top="92" dlg:width="44" dlg:height="19" dlg:value="OkButtonLabel"/>
- <dlg:titledbox dlg:id="FrameControl1" dlg:tab-index="1" dlg:left="4" dlg:top="7" dlg:width="68" dlg:height="41">
- <dlg:title dlg:value="FrameControl1"/>
- </dlg:titledbox>
- <dlg:scrollbar dlg:id="ScrollBar1" dlg:tab-index="2" dlg:left="82" dlg:top="10" dlg:width="45" dlg:height="24"/>
- <dlg:scrollbar dlg:id="ScrollBar2" dlg:tab-index="3" dlg:left="107" dlg:top="43" dlg:width="21" dlg:height="37" dlg:align="vertical"/>
- <dlg:timefield dlg:id="TimeField1" dlg:tab-index="4" dlg:left="4" dlg:top="92" dlg:width="28" dlg:height="19"/>
- <dlg:text dlg:id="Label1" dlg:tab-index="5" dlg:left="22" dlg:top="61" dlg:width="44" dlg:height="15" dlg:value="Label1"/>
- </dlg:bulletinboard>
-</dlg:window>
-
- + code to read this & generate UIs is in:
- + DTD: xmlscript/dtd/dialog.dtd
- + xmlscript/source/xmldlg_imexp/imp_share.hxx, line 674
- + xmlscript/source/misc/unoservices.cxx
- xmlscript/source/xmlflat_imexp/xmlbas_import.cxx (?)
- "com.sun.star.comp.xmlscript.XMLBasicImporter"
- + the dialog piece seems separate ?
- "importDialogModel" ...
- + cf. the interesting test code ...
- + cd xmlscript/test
- dmake
- ../unxlngi6.pro/bin/imexp /opt/OOInstall ./test.xml
- + generates & renders a dialog ...
-
- + This code has ~all we need to get a simple impl.
- + compatibility wrappers [!]
-
- // first create model:
- Reference< container::XNameContainer > xModel( xContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ), xContext ), UNO_QUERY );
- // NB. xmldlg_addfunc.cxx not xmldlg_import.cxx [!?] ;-)
- ::xmlscript::importDialogModel( ::xmlscript::createInputStream( bytes ),
- xModel, xContext );
-
- // second create view of model:
- Reference< awt::XControl > xDlg( xMSF->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialog" ) ) ), UNO_QUERY );
- xDlg->setModel( Reference< awt::XControlModel >::query( xModel ) );
-
- // third - associate toolkit / peer ...
- Reference< awt::XToolkit> xToolkit( xMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.ExtToolkit" ) ) ), UNO_QUERY );
- xDlg->createPeer( xToolkit, 0 );
-
- // fourth - execute [ nasty ... ]
- Reference< awt::XDialog > xD( xDlg, UNO_QUERY );
- xD->execute();
-
-
-** Basic dialog editor:
-
- + basctl/source/dlged/dlged.cxx
- + dialog editor (?)
- + basctl/source/basicide/basobj3.cxx
- + basctl/source/basicide/basides3.cxx
- + BasicIDEShell:CreateDlgWin ...
-
-
-** FIXME:
- + createPeer - when called is always passed
- the toplevel [ it seems ... ]
- + we need to pass a container instead ...
- + or have some separate hint / method ?
- + or call the 'setChild' inside the model
- construction bits ? [!?]
-
-UnoControlContainer::addingControl:
- + only caller to 'setContext'
- + sets the 'Parent' for peers ...
-
-Dialog is an UnoControlContainer ...
- + hmm ...
- + 'XControlContainer'
- + perhaps just what we need ... [!]
- + our VBox should be one ...
-
- + Other things: tab widgets are 'UnoControlContainers' ...
- + finally remembered: xml foo ...
- +
-
-
- + FIXME: it -seems- that we don't store
- much hierarchy in the model [ any ? ]
- + UnoControlModel -> ?
-
- + UnoControlDialogModel - has an XNameContainer ...
- + but ... only the UnoControl-Dialog-Model has this ...
-
-
- + Wow - even the percieved hierarchy:
- + 'exportDialogModel'
- + achieved by 'getElementNames'
- -> flat set of names ... [urgh]
-
- + So - we need to add more structure:
- + XNameContainers ...
- + that we insert into [!?]
- + we also need to retain order for packing.
-
- + need a list of sillies to reverse / revert (?) ...
-
- + back-compat:
- + kill bogus nesting eg. radiogroup ...
- [ have a group/tag instead - or hierarchical names ? ]
- + ditto for 'titledbox' ...
- + menulists - seem rather unrelated / bogus anyway.
- + Add into toplevel & child ...
-
- + copy Dialog bits into unocontrolcontainer.cxx ...
- + re-using unocontrolcontainer ...
-
-
-** FIXME:
- + we need property introspection on the awt widgets:
- + but they have no property interfaces [!] -
- interestingly the UnoControl's don't either
- only the UnoControlModel foo ...
- + unocontrols.cxx:
- Uno
- + source/helper/property.cxx
- + has all the type information ...
- + but no information on what properties are
- valid for a type ... - implicit in the UnoControlModel's
- code ...
- + ImplGetPropertyInfos ...
-
- + add to vclxwindow.cxx:
- + inc/toolkit/helper/property.hxx
- + 'getProperties' static ...
-
-** It seems that things like UnoControlComboBoxModel are missing
- some derived properties: EchoChar (etc.)
- UnoControlDateFieldModel - missing ... EchoChar too (?) - deliberate ?
- + query these ... [!?]
-
-layout container - start child 'combobox'
- missing property 46 (EchoChar)
- missing property 48 (HardLineBreaks)
- missing property 12 (HScroll)
- missing property 104 (LineEndFormat)
- missing property 10 (MultiLine)
- missing property 13 (VScroll)
-
- + add regression test:
- + count number of properties ...
-
-
-TODO:
- add 'XPropertySetInfo' to VCLXWindow:
- + trivial to implement :-)
- + hook it to Ricardo's parser ... [!] :-)
-
-* xmlscript
- + xmldlg_import.cxx -
- + xml_helper/xml_impctx.cxx - foo ...
-
-
-* plan:
- + hard-code container hooks into the xmlscript/ parser ...
- + create a layout object in toolkit/
- + populate it with good things ...
-
- + coupling to toolkit - widget instantiation: how ...
- + ComponentInfos
- + vclxtoolkit.cxx:
- + has a 'hook function' for 'fnSvtCreateWindow'
- for SVT widgets :-) [ grotesque ;-]
- + [ wow - fetched by dlopen! ;-]
-
- + A little app - a-la solver: using awt (?)
- + XMessageBoxFactory ...
- + XToolkit:
- + CreateWindow ...
- + ** how does the xml code generate these guys ? **
-
- + what APIs does the xmlimporter use ? not 'createWindow' seemingly.
-
-+ existing xml import uses: property bag a -lot-:
- Reference< beans::XPropertySet > xProps(
- _pImport->_xDialogModel, UNO_QUERY_THROW );
- * we do _xDialogModel->insertByName (new any<XControlModel>())
- + to build hierarchy ( cf. ~ControlImportContext )
-
- DialogImport:
- css::uno::Reference< css::container::XNameContainer > _xDialogModel;
-
- Reference< container::XNameContainer > xModel( xContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ), xContext ), UNO_QUERY );
-
- toolkit/source/controls/dialogcontrol.cxx
- + UnoControlButtonModel (eg.)
- + service 'UnoControlModel' ...
-
- + poke at 'titledbox' or 'radiogroup' to see how containment works there ...
- + how will child widget properties work ?
- + bug with a 'vbox' inside a 'titledbox' ...
- + titledbox - acts as a container (interesting)
- - offsetting child positions
- + how will pseudo-containers eg. "radiogroup" cope ?
-
- + propose new syntax: [ with child properties a-la glade ]:
-
- <hbox id="baa" flange="true">
- <child padding="0" expand="false" fill="false">
- <radio id="foo" value="..."/>
- </child>
- <radio id="foo" value="..."/>
- </hbox>
-
- + if 'child' element omitted - default properties used ...
- + if multiple elements in same 'child' set: all have the same props.
-
-
diff --git a/toolkit/doc/layout/vcl.txt b/toolkit/doc/layout/vcl.txt
deleted file mode 100644
index dbafbc5..0000000
--- a/toolkit/doc/layout/vcl.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-* How do very basic vcl widgets get peers:
-
- + toolkit/awt/ VCLXToolkit::ImplCreateWindow
- + calls GetComponentInterface (sal_True) - if no comp. iface.
-
- + vcl's Window:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( BOOL bCreate = TRUE );
-
- + vcl/inc/vcl/unowrap.hxx:
- // Window
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) = 0;
- virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0;
-
- + from svapp.cxx Application::SetUnoWrapper
- -> toolkit/awt 'ToolkitWorkerFunction' ( extern C / dlopen linkage )
-
- + from toolkit/source/helper/unowrapper.cxx:
- -> CreateXWindow -> 'return new VCLXWindow'
- ** FIXME: we need love in here too:
- + METRICBOX eg.
\ No newline at end of file
diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
deleted file mode 100644
index 5a36879..0000000
--- a/toolkit/source/awt/vclxbutton.cxx
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "vclxbutton.hxx"
-
-#include <layout/core/helper.hxx>
-#include <com/sun/star/awt/ImagePosition.hpp>
-#include <vcl/button.hxx>
-
-namespace css = com::sun::star;
-
-namespace layoutimpl
-{
-
-VCLXIconButton::VCLXIconButton( Window *p, rtl::OUString aDefaultLabel, char const *pGraphName )
- : VCLXButton()
-{
- /* FIXME: before Window is set, setLabel, setProperty->setImage
- * are silent no-ops. */
- p->SetComponentInterface( this );
-
- setLabel( aDefaultLabel );
- setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")),
- css::uno::Any( layoutimpl::loadGraphic( pGraphName ) ) );
- setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImagePosition")),
- css::uno::Any( css::awt::ImagePosition::LeftCenter ) );
- setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Align")),
- css::uno::Any( (sal_Int16) 1 /* magic - center */ ) );
-}
-
-// FIXME: l10n/i18n of Reset & Apply
-
-VCLXOKButton::VCLXOKButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_OK ),
- "cmd/sc_ok.png" )
-{
-}
-
-VCLXCancelButton::VCLXCancelButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_CANCEL ),
-// : VCLXIconButton( xButton, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Cancel ")),
- "cmd/sc_cancel.png" )
-{
-}
-
-VCLXYesButton::VCLXYesButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_YES ),
- "cmd/sc_yes.png" )
-{
-}
-
-VCLXNoButton::VCLXNoButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_NO ),
- "cmd/sc_no.png" )
-{
-}
-
-VCLXRetryButton::VCLXRetryButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_RETRY ),
- "cmd/sc_retry.png" )
-{
-}
-
-VCLXIgnoreButton::VCLXIgnoreButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_IGNORE ),
- "cmd/sc_ignore.png" )
-{
-}
-
-VCLXResetButton::VCLXResetButton( Window *p )
- : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Reset ")),
- "cmd/sc_reset.png" )
-{
-}
-
-VCLXApplyButton::VCLXApplyButton( Window *p )
- : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Apply")),
- "cmd/sc_apply.png" )
-{
-}
-
-VCLXHelpButton::VCLXHelpButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_HELP ),
- "cmd/sc_help.png" )
-{
-}
-
-VCLXMoreButton::VCLXMoreButton( Window *p )
- : VCLXIconButton( p, Button::GetStandardText( BUTTON_MORE ),
-// : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("More ")),
- "cmd/sc_more.png" )
-{
-}
-
-VCLXAdvancedButton::VCLXAdvancedButton( Window *p )
-// : VCLXIconButton( p, Button::GetStandardText( BUTTON_ADVANCED ),
- : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced ")),
- "cmd/sc_advanced.png" )
-{
-}
-
-} // namespace layoutimpl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxbutton.hxx b/toolkit/source/awt/vclxbutton.hxx
deleted file mode 100644
index 34ac8fe..0000000
--- a/toolkit/source/awt/vclxbutton.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef LAYOUT_AWT_VCLXBUTTON_HXX
-#define LAYOUT_AWT_VCLXBUTTON_HXX
-
-#include <toolkit/awt/vclxwindows.hxx>
-
-/* Replacements for broken toolkit/ impls. of ok, cancel, help button, etc. */
-
-namespace layoutimpl
-{
-
-class VCLXIconButton : public VCLXButton
-{
-public:
- VCLXIconButton( Window* p, rtl::OUString aDefaultLabel, const char *pGraphName );
- void Show ();
-};
-
-class VCLXOKButton : public VCLXIconButton
-{
-public:
- VCLXOKButton( Window *p );
-};
-
-class VCLXCancelButton : public VCLXIconButton
-{
-public:
- VCLXCancelButton( Window *p );
-};
-
-class VCLXYesButton : public VCLXIconButton
-{
-public:
- VCLXYesButton( Window *p );
-};
-
-class VCLXNoButton : public VCLXIconButton
-{
-public:
- VCLXNoButton( Window *p );
-};
-
-class VCLXRetryButton : public VCLXIconButton
-{
-public:
- VCLXRetryButton( Window *p );
-};
-
-class VCLXIgnoreButton : public VCLXIconButton
-{
-public:
- VCLXIgnoreButton( Window *p );
-};
-
-class VCLXResetButton : public VCLXIconButton
-{
-public:
- VCLXResetButton( Window *p );
-};
-
-class VCLXApplyButton : public VCLXIconButton
-{
-public:
- VCLXApplyButton( Window *p );
-};
-
-class VCLXHelpButton : public VCLXIconButton
-{
-public:
- VCLXHelpButton( Window *p );
-};
-
-// TODO. Reuse vcl/Morebutton, or make AdvancedButton reuse me?
-class VCLXMoreButton : public VCLXIconButton
-{
-public:
- VCLXMoreButton( Window *p );
-};
-
-class VCLXAdvancedButton : public VCLXIconButton
-{
-public:
- VCLXAdvancedButton( Window *p );
-};
-
-} // namespace layoutimpl
-
-#endif // LAYOUT_AWT_VCLXBUTTON_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
deleted file mode 100644
index 3d301e3..0000000
--- a/toolkit/source/awt/vclxdialog.cxx
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <boost/ptr_container/ptr_vector.hpp>
-#include "vclxdialog.hxx"
-
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/awt/SystemDependentXWindow.hpp>
-#include <com/sun/star/lang/SystemDependent.hpp>
-
-#include <cppuhelper/typeprovider.hxx>
-
-#include <toolkit/awt/vclxmenu.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/property.hxx>
-
-#ifdef QUARTZ
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
-#endif
-
-#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/sysdata.hxx>
-#include <vcl/wrkwin.hxx>
-
-#include "forward.hxx"
-
-namespace layoutimpl
-{
-
-DBG_NAME( VCLXDialog )
-
-VCLXDialog::VCLXDialog()
- : VCLXWindow()
- , VCLXTopWindow_Base( true )
- , VCLXDialog_Base()
- , Bin()
- , bRealized( false )
- , bResizeSafeguard( false )
-{
- DBG_CTOR( VCLXDialog, NULL );
-
-/* mxLayoutUnit = uno::Reference< awt::XLayoutUnit >( new LayoutUnit() );
- assert(mxLayoutUnit.is());*/
-}
-
-VCLXDialog::~VCLXDialog()
-{
- DBG_DTOR( VCLXDialog, NULL );
-}
-
-Window* VCLXDialog::GetWindowImpl()
-{
- return VCLXWindow::GetWindow();
-}
-
-::cppu::OInterfaceContainerHelper& VCLXDialog::GetTopWindowListenersImpl()
-{
- return GetTopWindowListeners();
-}
-
-IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXDialog, VCLXWindow, Bin, VCLXDialog_Base );
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base );
-
-void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException)
-{
- {
- SolarMutexGuard aGuard;
-
- ::com::sun::star::lang::EventObject aDisposeEvent;
- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
-// maTabListeners.disposeAndClear( aDisposeEvent );
- }
-
- VCLXWindow::dispose();
-}
-
-void VCLXDialog::resizedCb()
-{
- queueResize();
-}
-
-void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea )
- throw (css::uno::RuntimeException)
-{
- ::com::sun::star::awt::Size reqSize = Bin::getMinimumSize();
- reqSize.Height = getHeightForWidth( rArea.Width );
-
- if ( !bRealized )
- {
- setPosSize( 0, 0, reqSize.Width, reqSize.Height, ::com::sun::star::awt::PosSize::SIZE );
- bRealized = true;
- setVisible( true );
- }
- else
- {
- ::com::sun::star::awt::Size curSize = getSize();
- if ( reqSize.Width > curSize.Width )
- setPosSize( 0, 0, reqSize.Width, 0, ::com::sun::star::awt::PosSize::WIDTH );
- if ( reqSize.Height > curSize.Height )
- setPosSize( 0, 0, 0, reqSize.Height, ::com::sun::star::awt::PosSize::HEIGHT );
- }
-
- ::com::sun::star::awt::Size size = getSize();
- maAllocation.Width = size.Width;
- maAllocation.Height = size.Height;
-
- Bin::allocateArea( maAllocation );
-}
-
-void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-{
- SolarMutexClearableGuard aGuard;
-
- switch ( _rVclWindowEvent.GetId() )
- {
- case VCLEVENT_WINDOW_RESIZE:
- resizedCb();
- default:
- aGuard.clear();
- VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
- break;
- }
-}
-
-void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any &Value ) throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- if ( GetWindow() )
- {
-/* sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
- switch ( nPropertyId )
- {
- default:
-*/
- VCLXWindow::setProperty( PropertyName, Value );
-/* }
-*/
- }
-}
-
-::com::sun::star::uno::Any SAL_CALL VCLXDialog::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- ::com::sun::star::uno::Any aReturn;
- if ( GetWindow() )
- {
-/*
- sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
- switch ( nPropertyId )
- {
- default:
-*/
- aReturn = VCLXWindow::getProperty( PropertyName );
-/*
- }
-*/
- }
- return aReturn;
-}
-
-void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- Window* pWindow = GetWindow();
- if ( pWindow )
- pWindow->SetText( Title );
-}
-
-void VCLXDialog::setHelpId( const rtl::OUString& rId ) throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- Window* pWindow = GetWindow();
- if ( pWindow )
- pWindow->SetHelpId( rtl::OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) );
-}
-
-::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- ::rtl::OUString aTitle;
- Window* pWindow = GetWindow();
- if ( pWindow )
- aTitle = pWindow->GetText();
- return aTitle;
-}
-
-sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- sal_Int16 nRet = 0;
- if ( GetWindow() )
- {
- Dialog* pDlg = (Dialog*) GetWindow();
- Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP );
- Window* pOldParent = NULL;
- if ( pParent && !pParent->IsReallyVisible() )
- {
- pOldParent = pDlg->GetParent();
- Window* pFrame = pDlg->GetWindow( WINDOW_FRAME );
- if ( pFrame != pDlg )
- pDlg->SetParent( pFrame );
- }
- nRet = pDlg->Execute();
- if ( pOldParent )
- pDlg->SetParent( pOldParent );
- }
- return nRet;
-}
-
-void VCLXDialog::endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- if ( nResult == BUTTONID_HELP )
- {
- // UGH: c&p button.cxx
- ::Window* pFocusWin = Application::GetFocusWindow();
- if ( !pFocusWin )
- pFocusWin = GetWindow();
-
- HelpEvent aEvt( pFocusWin->GetPointerPosPixel(), HELPMODE_CONTEXT );
- pFocusWin->RequestHelp( aEvt );
- return;
- }
-
- Dialog* pDlg = (Dialog*) GetWindow();
- if ( pDlg )
- pDlg->EndDialog( nResult );
-}
-
-void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException)
-{
- endDialog( 0 );
-}
-
-} // namespace layoutimpl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
deleted file mode 100644
index 785f6b3..0000000
--- a/toolkit/source/awt/vclxdialog.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef LAYOUT_AWT_VCLXDIALOG_HXX
-#define LAYOUT_AWT_VCLXDIALOG_HXX
-
-#include <com/sun/star/awt/XDialog2.hpp>
-#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <comphelper/uno3.hxx>
-#include <layout/core/bin.hxx>
-#include <toolkit/awt/vclxtopwindow.hxx>
-
-namespace layoutimpl
-{
-
-typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XDialog2 > VCLXDialog_Base;
-
-class TOOLKIT_DLLPUBLIC VCLXDialog : public VCLXWindow
- , public VCLXTopWindow_Base
- , public VCLXDialog_Base
- , public Bin
-{
-private:
- bool bRealized, bResizeSafeguard;
- css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
-
- VCLXDialog( const VCLXDialog& ); // never implemented
- VCLXDialog& operator=( const VCLXDialog& ); // never implemented
-
-protected:
- Window* GetWindowImpl();
- ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl();
-
- ~VCLXDialog();
-
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
- // XComponent
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
- // VclWindowPeer
- virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
-
- // VCLXWindow
- void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
-
- // ::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);
- sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException);
-
- // ::com::sun::star::awt::XLayoutContainer
- virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
- throw (css::uno::RuntimeException);
-
- void resizedCb();
-
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &/*aIds*/ )
- {
- }
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
-
-
-public:
- VCLXDialog();
-
- // ::com::sun::star::awt::XDialog2
- void SAL_CALL endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setHelpId( const rtl::OUString& id ) throw(::com::sun::star::uno::RuntimeException);
-
-};
-
-} // namespace layoutimpl
-
-#endif /* LAYOUT_AWT_VCLXDIALOG_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
deleted file mode 100644
index 1d51def..0000000
--- a/toolkit/source/awt/vclxfixedline.cxx
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "vclxfixedline.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 <vcl/svapp.hxx>
-
-#include "forward.hxx"
-
-namespace layoutimpl
-{
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star;
-
-DBG_NAME( VCLXFixedLine )
-
-VCLXFixedLine::VCLXFixedLine()
- : VCLXWindow()
-{
- DBG_CTOR( VCLXFixedLine, NULL );
-}
-
-VCLXFixedLine::~VCLXFixedLine()
-{
- DBG_DTOR( VCLXFixedLine, NULL );
-}
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXFixedLine, VCLXWindow );
-
-void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException)
-{
- {
- SolarMutexGuard aGuard;
-
- EventObject aDisposeEvent;
- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- }
-
- VCLXWindow::dispose();
-}
-
-::com::sun::star::awt::Size SAL_CALL VCLXFixedLine::getMinimumSize()
- throw(::com::sun::star::uno::RuntimeException)
-{
- return awt::Size( 8, 8 );
-}
-
-void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-{
- SolarMutexGuard aGuard;
-
- VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
-}
-
-void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- if ( GetWindow() )
- {
-/*
- sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
- switch ( nPropertyId )
- {
- default:
-*/
- VCLXWindow::setProperty( PropertyName, Value );
-// }
- }
-}
-
-Any SAL_CALL VCLXFixedLine::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
-{
- SolarMutexGuard aGuard;
-
- Any aReturn;
- if ( GetWindow() )
- {
-/*
- sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
- switch ( nPropertyId )
- {
- default:
-*/
- aReturn = VCLXWindow::getProperty( PropertyName );
- // }
- }
- return aReturn;
-}
-
-} // namespace layoutimpl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxfixedline.hxx b/toolkit/source/awt/vclxfixedline.hxx
deleted file mode 100644
index 8bd26f5..0000000
--- a/toolkit/source/awt/vclxfixedline.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef LAYOUT_AWT_VCLXFIXEDLINE_HXX
-#define LAYOUT_AWT_VCLXFIXEDLINE_HXX
-
-#include <comphelper/uno3.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
-
-/* We just provide our own FixedLine, because default has no width... */
-
-class FixedLine;
-
-namespace layoutimpl
-{
-
-class VCLXFixedLine :public VCLXWindow
-{
-public:
- VCLXFixedLine();
-
-protected:
- ~VCLXFixedLine();
-
- // XInterface
- // DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
- // XComponent
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
- virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize()
- throw(::com::sun::star::uno::RuntimeException);
-
- // VclWindowPeer
- virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
-
- // VCLXWindow
- void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
-
-private:
- VCLXFixedLine( const VCLXFixedLine& ); // never implemented
- VCLXFixedLine& operator=( const VCLXFixedLine& ); // never implemented
-};
-
-} // namespace layoutimpl
-
-#endif /* LAYOUT_AWT_VCLXFIXEDLINE_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
deleted file mode 100644
index de37378..0000000
--- a/toolkit/source/awt/vclxplugin.cxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "vclxplugin.hxx"
-
-#include <com/sun/star/awt/PosSize.hpp>
-#include <toolkit/helper/convert.hxx>
-#include <toolkit/helper/property.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/svapp.hxx>
-
-#include "forward.hxx"
-
-namespace layoutimpl
-{
-
-using namespace ::com::sun::star;
-
-VCLXPlugin::VCLXPlugin( Window *p, WinBits b )
- : VCLXWindow()
- , mpWindow( p )
- , mpPlugin( 0 )
- , mStyle( b )
-{
-}
-
-VCLXPlugin::~VCLXPlugin()
-{
-}
-
-void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException)
-{
- {
- SolarMutexGuard aGuard;
-
- lang::EventObject aDisposeEvent;
- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- }
-
- VCLXWindow::dispose();
-}
-
-awt::Size SAL_CALL VCLXPlugin::getMinimumSize()
- throw(::com::sun::star::uno::RuntimeException)
-{
- SolarMutexGuard aGuard;
- if ( mpPlugin )
- return AWTSize( mpPlugin->GetSizePixel() );
- return awt::Size();
-}
-
-} // namespace layoutimpl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx
deleted file mode 100644
index 1b838a2..0000000
--- a/toolkit/source/awt/vclxplugin.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef LAYOUT_AWT_VCLXPLUGIN_HXX
-#define LAYOUT_AWT_VCLXPLUGIN_HXX
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <tools/wintypes.hxx>
-
-class Control;
-namespace layoutimpl
-{
-
-namespace css = ::com::sun::star;
-
-class VCLXPlugin : public VCLXWindow
-{
-public:
- Window *mpWindow;
- ::Control *mpPlugin;
- WinBits mStyle;
-
- VCLXPlugin( Window *p, WinBits b );
-
-protected:
- ~VCLXPlugin();
-
- // XComponent
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
- virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize()
- throw(::com::sun::star::uno::RuntimeException);
-
-private:
- VCLXPlugin( VCLXPlugin const & );
- VCLXPlugin& operator=( VCLXPlugin const & );
-};
-
-} // namespace layoutimpl
-
-#endif /* LAYOUT_AWT_VCLXPLUGIN_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
deleted file mode 100644
index 407b755..0000000
--- a/toolkit/source/awt/vclxscroller.cxx
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "vclxscroller.hxx"
-
-#include <assert.h>
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/awt/ScrollBarOrientation.hpp>
-#include <sal/macros.h>
-#include <toolkit/helper/property.hxx>
-#include <tools/debug.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/svapp.hxx>
-
-#include "forward.hxx"
-
-namespace layoutimpl
-{
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star;
-
-DBG_NAME( VCLXScroller )
-
-VCLXScroller::VCLXScroller()
- : VCLXWindow()
- , Bin()
-{
- DBG_CTOR( VCLXScroller, NULL );
- mpHorScrollBar = mpVerScrollBar = 0;
-}
-
-VCLXScroller::~VCLXScroller()
-{
- DBG_DTOR( VCLXScroller, NULL );
-}
-
-IMPLEMENT_2_FORWARD_XINTERFACE1( VCLXScroller, VCLXWindow, Container );
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXScroller, VCLXWindow );
-
-void SAL_CALL VCLXScroller::dispose() throw(RuntimeException)
-{
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list