diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:46 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:46 +0100 |
| commit | ba6f8af8a73c21b94c99e33c933bb8e689384d6f (patch) | |
| tree | fe0c13c24684fe7801bed94b6323138cd1580e93 | |
| parent | 932fb7b958f8e7204275cb709965b30e390c76ad (diff) | |
| parent | f8de01dde2707bcfd4bccf3cb0dc5b26bde851e9 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui
| -rw-r--r-- | i18npool/prj/build.lst | 2 | ||||
| -rw-r--r-- | rsc/doku/schriftw.16/change.sdw | 1105 | ||||
| -rw-r--r-- | toolkit/doc/layout/ChangeLog | 1286 | ||||
| -rw-r--r-- | toolkit/doc/layout/ChangeLog.0 | 546 | ||||
| -rw-r--r-- | toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 3 | ||||
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 85 | ||||
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 81 | ||||
| -rw-r--r-- | vcl/inc/vcl/glyphcache.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/glyphs/gcach_ftyp.hxx | 6 | ||||
| -rw-r--r-- | vcl/source/glyphs/glyphcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 8 |
12 files changed, 183 insertions, 2955 deletions
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst index 9e1b5c8d02b5..3a2e0c2d2b9c 100644 --- a/i18npool/prj/build.lst +++ b/i18npool/prj/build.lst @@ -1,4 +1,4 @@ -inp i18npool : bridges sax stoc comphelper ICU:icu i18nutil regexp cpputools LIBXSLT:libxslt NULL +inp i18npool : bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp cpputools LIBXSLT:libxslt NULL inp i18npool usr1 - all inp_mkout NULL inp i18npool\inc nmake - all inp_inc NULL inp i18npool\source\registerservices nmake - all inp_rserv inp_inc NULL diff --git a/rsc/doku/schriftw.16/change.sdw b/rsc/doku/schriftw.16/change.sdw deleted file mode 100644 index 4a2120bd1d3c..000000000000 --- a/rsc/doku/schriftw.16/change.sdw +++ /dev/null @@ -1,1105 +0,0 @@ -.\\\ WRITER 5 \\\
-S:\APP\SW5\STARLAB.LAY
-S:\APP\SW5\TREIBER\PS.BIN
-12
-00012
-00010
-00940
-00001
-00001
-00001
-00002
-00002
-00000
-00000
-00000
-00000
-N 383284761 Mm
-S 383284859 484 116 4
-D 0 0
-N 383996714 Mm
-S 383996741 494 117 4
-D 0 0
-N 384006675 Mm
-S 384006697 502 117 4
-D 0 0
-N 384133637 Mm
-S 384133699 502 117 3
-D 384133693 3 PostScript
-
-
-
-
-
-
-
-
-
-
-16836
-11338
-0
-0
-JA
-0
-0
-0
-JA
-
-
-
-9
-20
-4
-Helvetica 14 Pt
-H1
-97
-20
-0
-Helvetica 12 Pt
-H2
-65
-23
-0
-Helvetia 10 Pt
-H3
-65
-20
-0
-Courier 10 Pt
-C1
-1
-23
-0
-Helvetica 14 Pt Fett
-F1
-65
-27
-2
-Helvetica 12 Pt Fett
-F2
-65
-23
-2
-Helvetia 10 Pt Fett
-F3
-65
-20
-0
-Tasten
-T1
-129
-27
-0
-Grundschrift
-GA
-97
-20
-0
-Grund - Absatzlayout V1.5-LSLP8
-GA
-0
-0
-0
-0
-9
-97
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Grundabsatzlayout-rechtsbndig
-GR
-0
-0
-0
-0
-9
-35
-20
-0
-2
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Listing
-LI
-0
-0
-0
-0
-0
-1
-23
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift
-U0
-0
-0
-0
-0
-5
-35
-28
-2
-1
-0
-1
-0
-NEIN
-JA
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift X.
-U1
-0
-0
-0
-0
-5
-35
-28
-2
-1
-0
-1
-0
-NEIN
-JA
-240
-1
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift X.X.
-U2
-0
-0
-0
-0
-6
-35
-24
-2
-1
-0
-1
-0
-NEIN
-JA
-240
-2
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift X.X.X.
-U3
-0
-0
-0
-0
-6
-35
-20
-2
-1
-0
-1
-0
-NEIN
-JA
-240
-3
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift X.X.X.X.
-U4
-0
-0
-0
-0
-7
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-4
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-berschrift X.X.X.X.X.
-U5
-0
-0
-0
-0
-7
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-5
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Einrckung 4 Sp / 4 Sp
-E1
-576
-576
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Einrckung 8 Sp / 8 Sp
-E2
-1150
-1150
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Einrckung 0 Sp / 4 Sp
-E3
-0
-564
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Einrckung 4 Sp / 8 Sp
-E4
-564
-1150
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Funktionsparameter
-FP
-0
-2891
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Inhaltsverzeichnis
-IV
-0
-0
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-1
-7653
-0
-Stichwortverzeichnis
-SV
-0
-0
-0
-0
-9
-35
-20
-0
-1
-141
-1
-32
-NEIN
-NEIN
-240
-0
-1
-3744
-1
-Fettschrift einzeilig
-F1
-0
-0
-0
-0
-7
-65
-20
-2
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-576
-0
-1152
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Punktliste
-PL
-0
-564
-0
-0
-9
-35
-20
-0
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-13
-566
-0
-1133
-0
-1728
-0
-2304
-0
-2880
-0
-3456
-0
-4032
-0
-4608
-0
-5184
-0
-5760
-0
-6336
-0
-6912
-0
-7488
-0
-Fuzeile
-FZ
-0
-0
-0
-0
-3
-97
-20
-2
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-1
-7200
-1
-Kopfzeile
-KZ
-0
-0
-0
-0
-3
-97
-20
-2
-1
-0
-1
-0
-NEIN
-NEIN
-240
-0
-1
-7920
-1
-Grund-Seitenlayout
-GS
-566
-849
-2436
-679
-1416
-1416
-0
-0
-1
-0
-0
-0
-AkzBf3#_PFAD##_TEXTNAME# $-#_S#-
-Bf3
-
-AfzBf3$Date: 05 Jul 1991 13:18:52 $ $Revision: 1.1 $
-
-Stichwortverzeichnis
-SV
-566
-849
-2437
-680
-1416
-1416
-566
-0
-2
-0
-0
-0
-AliBf3Stichwortverzeichnis
-AliBf3 -
-
-Ali6Bf3- #_S# -B00
-
-GS - ohne Fuzeile
-KF
-566
-849
-2437
-680
-1416
-1416
-0
-0
-1
-0
-0
-0
-AliBf3#_KATEGORIE# / #_THEMA2#
-AliBf3
-
-Ali
-
-Inhaltsverzeichnis
-IV
-566
-849
-2437
-680
-1416
-1416
-0
-0
-1
-0
-0
-0
-AliBf3Inhaltsverzeichnis
-AliBf3 -
-
-Ali
-
-
-
-
-0
-
-0
-
-Au0nderungen von der rsc-Compilerversion 1.12 zur Version 1.13
-
-Aga- Die Lnge eines Strings in den Extradaten hat sich verndert.
-- Das Schlsselwort RESOURCE kann angegeben werden.
-- Die Klasse InfoBox wurde gestrichen, sie kann ber MessageBox definiert werden.
-- Die Klasse String kann jetzt als lokale Resource angegeben werden.
-- Die Abkrzung ID fr IDENTIFIER wurde gestrichen.
-- Anstelle von ENABLE gibt es jetzt DISABLE mit gegenteiliger Bedeutung.
-- Anstelle von VISIBLE gibt es jetzt HIDE mit gegenteiliger Bedeutung.
-- Jede Konstruktion mit Hilfen von AUTO_ID wurde gestrichen.
-- Anstelle von Justify = LEFT oder CENTER oder RIGHT wird jetzt Left = TRUE oder Center = -TRUE oder Right = TRUE geschrieben.
-- Innerhalb der Klasse Brush heit es statt
- Color BRUSHCOLOR {...}; jetzt
- BrushColor = Color { ... };
- und statt
- Color FILLCOLOR { ... }; jetzt
- FillColor = Color { ... };
-- Innerhalb der Klass Pen heit es statt
- Color { ... }; jetzt
- PenColor = Color { ... };
-- Innerhalb der Klasse MapMode sind die Schlsselwrter HORIZONTALSCALE und -VERTICALSCAL weggefallen. XSCALE und YSCALE sind jetzt Tupel.
-- Innerhalb der Klasse Accelerator heit es statt
- Accelerator {
- AcceleratorKey { ... };
- AcceleratorKey { ... };
- .
- .
- .
- }; jetzt
- Accelerator {
- KeyList = {
- AcceleratorKey { ... };
- AcceleratorKey { ... };
- };
- };
-- Innerhalb der Klasse AcceleratorKey heit es statt
- AcceleratorKey {
- Accelerator { ... };
- }; jetzt
- AcceleratorKey {
- SubAccelerator = Accelerator { ... };
- };
-- Innerhalb der Klasse OutputDevice heit es statt
- OutputDevice {
- Pen { ... };
- Brush BACKGROUNDBRUSH { ... };
- Brush FILLINBRUSH { ... };
- Font { ... };
- MapMode { ... };
- }; jetzt
- OutputDevice {
- OutputPen = Pen { ... };
- BackGroundBrush = Brush { ... };
- FillInBrush = Brush { ... };
- OutputFont = Font { ... };
- OutputMapMode = MapMode { ... };
- };
-- Innerhalb der Klasse Window heit es statt
- Window {
- Pointer { ... };
- }; jetzt
- WindowPointer = Pointer { ... };
-- Das Schlsselwort FOCUS wurde gestrichen.
-- Windows die automatisch geladen werden sollen werden jetzt durch
- Window {
- WinChilds = {
- FixedText { ... };
- FixedText { ... };
- };
- }; spezifiziert.
-- Innerhalb der Klasse WorkWindow heit es statt
- WorkWindow {
- Icon { ... };
- }; jetzt
- WorkWindow {
- WorkWindowIcon = Icon { ... };
- };
-- In der Klasse DialogBox wird
- Mode = SYSTEMMODAL oder Mode = APPLICATIONMODAL durch
- AppModal = TRUE oder SysModal = TRUE ersetzt.
-
-- Innerhalb der Klasse Menu heit es statt
- Menu {
- MenuItem { ... };
- MenuItem { ... };
- .
- .
- .
- }; jetzt
- Menu {
- ItemList = {
- MenuItem { ... };
- MenuItem { ... };
- };
- };
-und statt
- Menu { ... Separator; ... }; jetzt
- Menu { ...
- MenuItem { Seperator = TRUE; };
- ...
- };
-- Innerhalb der Klasse MenuItem heit es statt
- MenuItem {
- Menu { ... };
- }; jetzt
- MenuItem {
- SubMenu = Menu { ... };
- };
-- Innerhalb der Klasse ListBox heit es statt
- ListBox {
- StringList = "Ich", "heie", "Eddie";
- }; jetzt
- ListBox {
- StringList = { "Ich"; "heie"; "Eddie"; };
- };
-
\ No newline at end of file diff --git a/toolkit/doc/layout/ChangeLog b/toolkit/doc/layout/ChangeLog deleted file mode 100644 index 240db833847c..000000000000 --- a/toolkit/doc/layout/ChangeLog +++ /dev/null @@ -1,1286 +0,0 @@ -2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxwindow.cxx: Fix compile warning. - -2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * util/makefile.mk: Revert obsolete VERSION addition. - -2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/controls/dialogcontrol.cxx, - source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx, - util/defs/wntmsci11: Revert weird initial patch. - -2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO: Doc update. - -2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/awt/vclxbutton.cxx, - source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement - MoreButton. TODO: images. - -2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/vclcompat/wbutton.cxx: Remove redraw cruft, rename - redrawAlready to redraw. - -2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step - towards cleaner redraw. - -2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/awt/vclxbutton.cxx, - source/awt/vclxbutton.hxx, source/layout/helper.cxx, - source/vclcompat/wbutton.cxx, workben/layout/recover.cxx, - workben/layout/recover.hxx: Extract AdvancedButton implementation - from recover.cxx into new widget. - -2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/recover.cxx, workben/layout/recover.hxx, - workben/layout/recover.xml: Update recover dialog, make - advanced/simple switching work. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/zoom.cxx: In test mode, enable everything. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/localize.sdf: Manually add new translatable strings - and translations for de, nl. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor - and View layout alongside each other. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/zoom.cxx, workben/layout/zoom.hxx, - workben/layout/zoom.xml: Merge upstream's zoom. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx: - Nitpick, debugging aid. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement - FixedLine.IsEnabled(). - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * util/makefile.mk: Build lib name fix. - -2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx, - workben/layout/recover.cxx, workben/layout/recover.hxx, - workben/layout/recover.xml: Complete VBox/HBox wrappers. Not use - them in recover, spacing still wrong. - -2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, workben/layout/recover.cxx, - workben/layout/recover.hxx, workben/layout/recover.xml: More - recovery dialog mockuping. - -2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/layout/box-base.cxx: Implement visibility of - elements/containers better. - -2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/layout/helper.cxx, - source/layout/import.cxx, source/layout/proplist.cxx, - source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx, - source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx: - Implement FixedImage. Needed for recovery dialog. - -2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/layout/box-base.hxx, workben/layout/editor.cxx: Give - ChildData virtual distructor. - -2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/layout/helper.cxx, - source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx, - util/makefile.mk, workben/layout/makefile.mk, - workben/layout/recover.cxx, workben/layout/recover.hxx, - workben/layout/recover.xml, workben/layout/test.cxx: Stab at new - recover dialog. - -2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/editor.cxx: Do not clear fresh container. Disable - debug printing. - -2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for - wordcount. - -2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix - ID for displaying dialogs. - -2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, workben/layout/localize.sdf, - workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings - for all languages. - -2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, source/awt/vclxsplitter.cxx, - source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx, - source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx, - source/layout/box-base.hxx, source/layout/box.cxx, - source/layout/box.hxx, source/layout/container.cxx, - source/layout/dialogbuttonhbox.cxx, - source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx, - source/layout/flow.cxx, source/layout/helper.cxx, - source/layout/import.hxx, source/layout/makefile.mk, - source/layout/proplist.cxx, source/layout/root.cxx, - source/layout/table.cxx, source/layout/table.hxx, - source/layout/timer.cxx, source/vclcompat/wcontainer.cxx, - source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up - code duplication from layout: new Box_Base class implements - addChild, removeChild, getChildren, getChildProperties for Box, - Table, VCLXSplitter, VCLXTabControl. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, source/layout/root.cxx: Document more fixmes. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, source/layout/proplist.cxx: Remove m237 - workaround. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/layout/helper.cxx: More comment cleanups. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxtabcontrol.cxx, source/layout/box.cxx, - source/layout/container.cxx, source/vclcompat/wrapper.cxx: - Commented-out code cleanups. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, inc/layout/layoutcore.hxx, - source/awt/forward.hxx, source/awt/vclxbutton.cxx, - source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx, - source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx, - source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx, - source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx, - source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx, - source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx, - source/layout/bin.hxx, source/layout/box.cxx, - source/layout/box.hxx, source/layout/container.cxx, - source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx, - source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx, - source/layout/factory.hxx, source/layout/flow.cxx, - source/layout/flow.hxx, source/layout/helper.cxx, - source/layout/helper.hxx, source/layout/import.cxx, - source/layout/import.hxx, source/layout/makefile.mk, - source/layout/precompiled_xmlscript.hxx, - source/layout/proplist.cxx, source/layout/proplist.hxx, - source/layout/root.cxx, source/layout/root.hxx, - source/layout/table.cxx, source/layout/table.hxx, - source/layout/timer.cxx, source/layout/timer.hxx, - source/layout/translate.cxx, source/layout/translate.hxx, - source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx, - source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx, - source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx, - workben/layout/editor.cxx, workben/layout/editor.hxx, - workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx, - workben/layout/simple-paragraph.hxx, workben/layout/test.cxx, - workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence - headers. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/layout/meekfile.mk: Junk meekfile.mk - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO: Update TODO. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx, - source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize() - from VCLXWindow's switch to method. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx, - source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize() - from VCLXWindow's switch to method. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx, - source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, - source/awt/vclxtopwindow.cxx: Remove code duplication from - VCLXDialog. - -2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx, - source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx: - Comment cleanup. - -2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, source/layout/helper.hxx, - workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix - remaining SUN warnings. - -2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/awt/vclxfixedline.hxx, - source/layout/byteseq.cxx, source/layout/helper.hxx, - source/layout/import.cxx, source/layout/makefile.mk, - source/layout/proplist.cxx, source/layout/translate.hxx, - source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx, - source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx, - source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some - sunstudio12 warnings. - -2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * doc/layout/TODO, source/awt/makefile.mk, - source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, - source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx, - source/layout/helper.cxx: Junk VCLXProxy. - -2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/toolkit/awt/vclxwindows.hxx, - inc/toolkit/helper/listenermultiplexer.hxx, - source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, - source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, - source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label - and images. - -2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * .gitignore, source/awt/forward.hxx, source/awt/makefile.mk, - source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, - source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx, - source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx, - source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, - source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, - source/layout/makefile.mk, workben/layout/localize-de.sdf, - workben/layout/localize-nl.sdf: Cleanup of includes, namespace in - headers in awt. - -2008-02-11 Jan Nieuwenhuizen <janneke@gnu.org> - - * prj/build.lst: Have workspace depend on util, fixes parallel build - (thanks kendy, Fridrich). - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/ooo-patch: Update ooo-patch. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/ooo-patch: Add transex3 to ooo-patch. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Add transex3 to ooo-patch & update. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Add transex3 patch export. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/de/wordcount.xml, workben/de/zoom.xml, - workben/nl/wordcount.xml, workben/nl/zoom.xml: Remove - hand-translated xml files. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/core/proplist.cxx: Grok translatable attributes with - _ prefix. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add en-US,de,nl populated localize.sdf for zoom and wordcount. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk: Add compile time tralay translation rule. - -2008-02-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/de/wordcount.xml, workben/de/zoom.xml, - workben/nl/wordcount.xml, workben/nl/zoom.xml, - workben/wordcount.xml, workben/zoom.xml: Prefix translatable - attributes with _. - -2008-02-04 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/core/import.cxx, source/core/import.hxx, - source/core/proplist.cxx, source/core/proplist.hxx, - source/core/root.cxx, source/core/root.hxx, workben/zoom-1.xml, - workben/zoom-2.xml: Support Ivo Hinkelmann's move label/text/title - attribute to CONTENT transex3 hack. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/nl/zoom.xml, workben/zoom.xml: Remove unnecessary ~. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * prj/d.lst, workben/de/wordcount.xml, workben/de/zoom.xml, - workben/makefile.mk: Add manually translated de/zoom.xml and - de/wordcount.xml. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Update patch info. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/translate.cxx: Remove #if 0'ed fopen code in - fileExists. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Remove test code. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, prj/d.lst, workben/makefile.mk, workben/ooo-patch: Install - nl/*xml files. - -2008-01-10 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/core/makefile.mk, source/core/root.cxx, - source/core/translate.cxx, source/core/translate.hxx, - workben/nl/wordcount.xml, workben/nl/zoom.xml, workben/test.cxx: - Implement read-right translation, cheat nl translations for zoom and - wordcount. - -2008-01-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk: Check for ENABLE_LAYOUT == "TRUE" (was: != - ""). Disables harder, esp. on Sun. - -2008-01-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Add comment about Sun build problems. - -2008-01-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk: [!ENABLE_LAYOUT]: Do not compile anything in - workben. Also remove unnecessary not portable compiler flags. - -2008-01-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Put gcc flags inside GCC conditional. - -2008-01-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxbutton.cxx: Use plain sc_BUTTON.png names for - standard buttons. - -2008-01-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx: Remove zoom.src part from zoom-combobox patch. - -2008-01-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Update to m1. - -2008-01-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Update and add i18n TODO. - -2008-01-04 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/awt/vclxbutton.cxx: Fix l10n for default buttons. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/ooo-patch: Update for ooo-build svn up. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/dialogbuttonhbox.cxx, source/core/helper.cxx, - source/core/proplist.cxx, util/makefile.pmk, workben/makefile.mk: - TEST_LAYOUT cleanups and fixes. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * : [!TEST_LAYOUT]: Read *.xml from BASE_INSTALLATION/share/layout - only. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wrapper.cxx: Cleanups. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.xml: Update zoom.xml: in m241 FieldTypes:FUNIT_CUSTOM - == 13 (was: 11). - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/dialogbuttons-ok.xml, workben/dialogbuttons-reset.xml, - workben/dialogbuttons-save.xml, workben/dialogbuttons-yes.xml: - Remove some cruft from xml. - -2007-12-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/box.cxx, source/core/box.hxx, - source/core/container.cxx, source/core/dialogbuttonhbox.cxx, - source/core/dialogbuttonhbox.hxx, workben/shutdown.xml: Allow other - pushbuttons in dialogbuttonhbox too, sort as Action type. - -2007-12-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/ooo-patch: Add ooo-patch: facilitate export to ooo-build. - -2007-12-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/core/box.cxx, source/core/container.cxx, - workben/adjust.xml, workben/align.xml, workben/wordcount-tight.xml, - workben/wordcount.xml, workben/zoom-indent.xml, workben/zoom.xml: - Default to border=0, padding=0. Clean xml files. - -2007-12-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, inc/layout/layout.hxx, source/awt/vclxbutton.cxx, - source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx, - source/core/dialogbuttonhbox.cxx, source/core/dialogbuttonhbox.hxx, - source/wrapper/wbutton.cxx, source/wrapper/wcontainer.cxx, - workben/dialogbuttons-ok.xml, workben/dialogbuttons-reset.xml, - workben/dialogbuttons-save.xml, workben/dialogbuttons-yes.xml, - workben/dialogbuttons.xml, workben/editor.cxx, workben/makefile.mk: - Implement more buttons: Yes, No, Retry, Ignore, Reset, Apply. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/editor.cxx, workben/test.cxx: More whitespace nits. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/box.hxx, source/core/dialogbuttonhbox.cxx, - source/core/dialogbuttonhbox.hxx: Refactor dialogbuttonhbox. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * apinotes.txt, doc/apinotes.txt, doc/notes.txt, notes.txt: Move - documentation to doc/. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/table.cxx, workben/editor.cxx, workben/test.cxx, - workben/uno.hxx: More whitespace fixes. - -2007-12-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/dialogbuttonhbox.cxx: Comments and whitespace fixes. - -2007-12-18 Jan Nieuwenhuizen <janneke@gnu.org> - - * README, TODO, source/awt/vclxbutton.hxx, source/core/box.hxx, - source/core/dialogbuttonhbox.cxx, source/core/dialogbuttonhbox.hxx, - source/core/helper.cxx, source/core/import.cxx, - source/core/makefile.mk, source/core/proplist.cxx, - workben/dialogbuttons.xml, workben/wordcount.xml, workben/zoom.xml: - Implement dialog button ordering. - -2007-12-18 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxbutton.hxx, source/core/box.hxx, - source/core/helper.cxx, source/core/makefile.mk, - source/wrapper/wrapper.hxx, workben/editor.cxx, workben/test.cxx, - workben/zoom.xml: First attempt at AlertHBox. - -2007-12-17 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-12-17 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Merge lilypond.org:vc/layout.git/ - -2007-12-17 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/wrapper/wrapper.cxx: Implement - Dialog::SetParent, add Dialog (::Window *) constructor. - -2007-12-17 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Merge lilypond.org:vc/layout.git/ - -2007-12-17 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Bugfix: update install inc/layout/*. - -2007-12-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Apply Michael's TODO patch. - -2007-12-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/helper.cxx, source/core/helper.hxx, - source/core/proplist.cxx, source/core/proplist.hxx: Move - OUSTRING_CSTR define and debugging compile fix & feature. - -2007-12-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/timer.cxx: Remove commented-out include. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/editor.cxx, workben/uno.hxx: Add includes for m9. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Major cleanup of includes and header namespace pollution. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, inc/layout/layout-post.hxx, inc/layout/layout.hxx, - source/api/com/sun/star/awt/MaxChildrenException.idl, - source/api/com/sun/star/awt/XDialog2.idl, - source/api/com/sun/star/awt/XLayoutFlow.idl, - source/api/com/sun/star/awt/XLayoutFlowContainer.idl, - source/api/com/sun/star/awt/XLayoutRoot.idl, - source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx, - source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, - source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx, - source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx, - source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx, - source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, - source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, - source/core/bin.cxx, source/core/bin.hxx, source/core/box.cxx, - source/core/box.hxx, source/core/byteseq.cxx, - source/core/container.cxx, source/core/container.hxx, - source/core/factory.cxx, source/core/factory.hxx, - source/core/flow.cxx, source/core/flow.hxx, - source/core/globals.hxx, source/core/helper.cxx, - source/core/helper.hxx, source/core/import.cxx, - source/core/import.hxx, source/core/root.cxx, source/core/root.hxx, - source/core/table.cxx, source/core/table.hxx, - source/core/timeout.cxx, source/inc/layoutcore.hxx, - source/wrapper/wbutton.cxx, source/wrapper/wcontainer.cxx, - source/wrapper/wfield.cxx, source/wrapper/wimpl.hxx, - source/wrapper/wrapper.cxx: Whitespace and layout cleanups. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxdialog.hxx, source/core/byteseq.cxx, - source/core/import.hxx, source/core/root.cxx, - source/wrapper/wfield.cxx, source/wrapper/wimpl.hxx, - source/wrapper/wrapper.cxx: Cleanup: have braces on separate lines. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/uno.hxx, workben/uno.hxx: Move uno.hxx to workben, no - need to export it. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/uno.hxx, source/awt/vclxbutton.cxx, - source/awt/vclxdialog.cxx, source/awt/vclxfixedline.cxx, - source/awt/vclxproxy.cxx, source/awt/vclxscroller.cxx, - source/awt/vclxsplitter.cxx, source/awt/vclxtabcontrol.cxx, - source/core/bin.cxx, source/core/box.cxx, source/core/byteseq.cxx, - source/core/container.cxx, source/core/container.hxx, - source/core/flow.cxx, source/core/globals.hxx, - source/core/helper.cxx, source/core/import.cxx, - source/core/import.hxx, source/core/root.cxx, - source/core/table.cxx, source/core/timeout.cxx, - source/wrapper/wbutton.cxx, source/wrapper/wcontainer.cxx, - source/wrapper/wfield.cxx, source/wrapper/wimpl.hxx, - source/wrapper/wrapper.cxx: Use DBG_ERROR* instead of printing to - console. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/box.cxx, source/core/container.cxx, - source/core/container.hxx, source/core/helper.cxx, - source/core/import.cxx, source/core/table.cxx: Use DBG_ERROR instead - of printf for errors. - -2007-11-28 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, prj/build.lst: Fix dependency/concurrent make problem. - -2007-11-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.cxx: Update wordcountdialog.cxx from sw - tree. - -2007-11-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Move postprocessing to src2xml. - -2007-11-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Move src2xml postprocessing from run-s2x to src2xml.py. - -2007-11-27 Jan Nieuwenhuizen <janneke@gnu.org> - - * src2xml/source/globals.py: src2xml: write progress to stderr, - allows progress while using stdout output. - -2007-11-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * prj/build.lst, prj/d.lst, workben/makefile.mk: Install xml files - too. Thanks Fridrich! - -2007-11-23 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-23 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Put Ok/Help buttons in homogenous hbox. - -2007-11-23 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add extra hbox/vbox pairs to reduce cnt:padding duplication. - -2007-11-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * : More layout-pre.hxx cpp hacks to make zoom and wordcount diffs - smaller. - -2007-11-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk, workben/un-test.sh: Add un-test.sh to remove - TEST_LAYOUT code and dist into OO.o. - -2007-11-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx: Remove misguided NON_LAYOUT_COMPILE_FIXES and - whitespace nits. - -2007-11-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk, workben/pytt, workben/run-s2x, - workben/un-test.sh, workben/zoom.cxx: Add un-test.sh script and dist - target to `distribute' dialog code to OO.o. - -2007-11-21 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx, - inc/layout/layout.hxx, source/awt/makefile.mk, - source/core/makefile.mk, source/wrapper/makefile.mk, - workben/makefile.mk, workben/wordcountdialog.cxx, - workben/wordcountdialog.hxx, workben/zoom.cxx, workben/zoom.hxx: - Rename USE_LAYOUT -> ENABLE_LAYOUT. Make zoom, wordcount diffs bits - smaller. - -2007-11-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add <layout/layout-pre.hxx> <layout/layout-post.hxx> cpp - hacking. - -2007-11-20 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/run-s2x: Remove all geometry attributes. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/helper.cxx: Disable "fixedinfo" workaround. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcount.xml: Remove misguided "fixedinfo" from - wordcount.xml. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * .gitignore: Ingore pyc files. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcount-plain.xml, workben/wordcount-tight.xml, - workben/zoom-plain.xml: Add plain postprocessed output from src2xml. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Comment-out #include statements from .src files. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx, workben/zoom.xml: Use stringize to make zoom.cxx - diff smaller. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcount.xml, workben/wordcountdialog.cxx: Use stringize - to make wordcount diff smaller. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Fix standalone .xml loading for test. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/run-s2x: Add run-s2x: make .xml from src2xml - compilable for zoom, wordcount. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, source/core/helper.cxx: Small fixedline doco fix. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcount.xml, workben/wordcountdialog.hxx: Use - "fixedinfo" rather than "fixedtext" in wordcountdialog. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Use "fixedtext" to when asked to create "fixedinfo". - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/wrapper/wrapper.cxx: Implement - FixedInfo. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * cenarios, source/awt/vclxdialog.cxx, source/core/root.cxx, - source/wrapper/wimpl.hxx, source/wrapper/wrapper.cxx: Cleanups. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/uno.hxx, source/core/factory.cxx, - source/core/makefile.mk, source/core/root.cxx, - source/core/root.hxx, source/wrapper/makefile.mk, - source/wrapper/wrapper.cxx, workben/makefile.mk: Remove - [!LAYOUT_FACTORY] branch. - -2007-11-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/Documento por Gravar 1: Remove Documento por Gravar 1. - -2007-11-16 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.xml: Tweak. - -2007-11-16 Jan Nieuwenhuizen <janneke@gnu.org> - - * : [LAYOUT_FACTORY]: Add LayoutFactory and register that for Layout - Serviceinfo instead of LayoutRoot. - -2007-11-16 Jan Nieuwenhuizen <janneke@gnu.org> - - * README: Update README. - -2007-11-16 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Also grok TypeClass_ENUM. Set unit=11 (custom) on zoom - metricfield. - -2007-11-16 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.cxx: Typo in workben/wordcountdialog. - Fixes Document word count display. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcount.xml, workben/wordcountdialog.cxx, - workben/wordcountdialog.xml: Rename wordcountdialog.xml to - wordcount.xml, compile fixes from sw/... - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/import.cxx, source/core/import.hxx: Indentation fixes. - Move ~ElementBase destructor to cxx file. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Bugfix for test default --test argument. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.xml: Wordcountdialog default text tweak. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/root.cxx, source/core/root.hxx, - source/wrapper/wrapper.cxx: Remove LAYOUT_WEAK and other hackerish - feeble attempts at second init bug. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * : More attempts at tackling second init bug. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Lost of handwaving to try to destroy LayoutRoot. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/import.hxx: Add destructor for WidgetElement. - -2007-11-15 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Fix indentation of import.cxx. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO, workben/zoom-margin.xml, workben/zoom.xml: Tweak zoom - dialog. Add zoom-margin.xml. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.xml: Tweak wordcountdialog till it looks - nice. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.cxx: Typo. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.xml: Import workben/wordcountdialog.xml - straight from src2xml. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * : src2xml/source/src2xml.py: also grok -I option, do not print - progress. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.xml: Use modaldialog for zoom.xml. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.xml, workben/zoom_def.hxx: Oops, add - zoom_def.hxx and wordcountdialog.xml. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Refactor test program, also run wordcountdialog. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Prune unused headers. - -2007-11-14 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx, workben/zoom.hxx: Make zoom diff even smaller, - import from svx. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk, workben/wordcountdialog.cxx, - workben/wordcountdialog.hxx: Make wordcountdialog compilable under - test and add to makefile. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/wordcountdialog.cxx, workben/wordcountdialog.hxx: Import - wordcountdialog.cxx, wordcountdialog.hxx. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, inc/layout/uno.hxx, - source/awt/globals.hxx, source/awt/vclxdialog.cxx, - source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx, - source/awt/vclxfixedline.hxx, source/awt/vclxproxy.cxx, - source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx, - source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx, - source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx, - source/core/bin.cxx, source/core/bin.hxx, source/core/box.cxx, - source/core/box.hxx, source/core/byteseq.cxx, - source/core/container.cxx, source/core/container.hxx, - source/core/factory.cxx, source/core/flow.cxx, - source/core/flow.hxx, source/core/globals.hxx, - source/core/helper.cxx, source/core/helper.hxx, - source/core/import.cxx, source/core/import.hxx, - source/core/root.cxx, source/core/root.hxx, source/core/table.cxx, - source/core/table.hxx, source/core/timeout.cxx, - source/core/timeout.hxx, source/inc/layoutcore.hxx, - source/wrapper/wbutton.cxx, source/wrapper/wcontainer.cxx, - source/wrapper/wfield.cxx, source/wrapper/wrapper.cxx, - workben/editor.cxx, workben/editor.hxx, workben/paragraph.cxx, - workben/paragraph.hxx, workben/simple-paragraph.cxx, - workben/simple-paragraph.hxx, workben/test.cxx: Replace TAB -> 4 - spaces. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/helper.cxx, source/wrapper/wbutton.cxx, - source/wrapper/wimpl.hxx, source/wrapper/wrapper.cxx: Add debug - printing, ~ContextImpl. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.xml: Add space in custom-unit-text. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Remove core/dialog.hxx, core/dialog.cxx. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Make RadioButton hack more complete: - remove buttons from RadioButtonGroup too. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wimpl.hxx: Make WindowImpl hierarchy virtual from - top. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.xml: Add Id for FixedLine. Fixes warning. - -2007-11-13 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx: Fix comment. Import from svx. - -2007-11-12 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Replace XDialog2, VCXDialog, Dialog Cancel/Help/Ok by EndDialog - ( BUTTONID_* ) - -2007-11-12 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Actually return the result of a dialog. - -2007-11-12 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx, workben/zoom.hxx: Update zoom code from svx - module with TEST_LAYOUT switches. - -2007-11-12 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/makefile.mk: Also set -DTEST_LAYOUT in makefile. - -2007-11-12 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Workaround for radiobutton-unset - inside OOo. - -2007-11-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx: Add comment about using WeakImplHelper1 for - standalone run. - -2007-11-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/uno.hxx: Compile fix for using WeakImplHelper1 in - UnoBootstrapLayout. - -2007-11-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Rename UnoBootstrapSucks to UnoBootstrapLayout and move to - uno.hxx header. - -2007-11-09 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Rename #define LAYOUT to USE_LAYOUT. - -2007-11-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * : In-tree compile fixes for -DLAYOUT=1. - -2007-11-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.hxx: Make diff with svx/source/dialog/zoom.hxx - minimal. - -2007-11-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add FixedLine member to SvxZoomDialog. - -2007-11-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, workben/editor.cxx: Do not set namespace in - header. - -2007-11-08 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Make diff for zoom.cxx with svx/source/dialog/zoom.cxx minimal. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Use #if 0 rather than #if 1 and add - comment, easier to catch. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxdialog.cxx: Use BUTTONID_CANCEL, BUTTONID_OK from - msgbox.hxx rather than ERRCODE. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx: Remove debugging code. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/api/com/sun/star/awt/XDialog2.idl, - source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, - source/wrapper/wbutton.cxx, source/wrapper/wrapper.cxx: Implement Ok - and Help alongside Cancel in XDialog2, VCLXDialog, OKButton. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add workben/paragraph.* - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Use 'has_border' instead of 'border' for awt attributes. Also - put back fullsize, optimumsize, show properties. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/core/box.cxx: Spacing nits. - -2007-11-07 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Add Ricardo's suggestion for actual dialog. - -2007-11-05 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Make Window (top of layout hierarchy) virtual. - -2007-11-05 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Tweaks to zoom dialog. - -2007-11-05 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Remove debugging code and add explicit - casts for mpWindow in callbacks. - -2007-10-31 Michael Meeks <michael@t60p.(none)> - - * source/wrapper/wbutton.cxx: raw mpWindow static casting fix - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add Kohei's converter under src2xml. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * .gitignore: Ignore more. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Only print debugging if pointers are - wrong. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/zoom.cxx: Debug print. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/api/makefile.mk, source/awt/makefile.mk, - source/core/makefile.mk, source/wrapper/makefile.mk, - util/makefile.mk, workben/makefile.mk: Unification of .mk files. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Add mpWindow != &OKbutton debug code and crude fix. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Revert introduction of XDialog2." - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/api/makefile.mk, source/awt/vclxdialog.hxx, - source/core/dialog.cxx, source/core/dialog.hxx, - source/core/globals.hxx, source/core/import.cxx, - source/core/import.hxx, source/core/makefile.mk, - source/wrapper/wrapper.cxx, workben/test.cxx: Revert introduction of - XDialog2. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Revert - 338f4229e321fa79ab3564504d1546e5010c0b0b. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/api/com/sun/star/awt/XDialog2.idl: Spacing nit. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Add GetImplementation to VCLXProxy." - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Add Click and LINK (Click) to IconButton." - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Update TODO. - -2007-10-30 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Implement non-dummy HelpButton. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Oops, add XDialog2 to archive. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Implement cancel in vclxdialog. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Implement default callback to ButtonImpl using XButton. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Set click handler in Button instead of ButtonImpl, add - debug printing." - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Attempt at using DialogImpl to hold button Click - handler." - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Pass a Button instead of ButtonImpl to default click - handler." - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Revert "Use Dialog as the Click link handler." - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/wrapper/wbutton.cxx: Use Dialog as - the Click link handler. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Pass a Button instead of ButtonImpl to default click handler. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Attempt at using DialogImpl to hold button Click handler. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Set click handler in Button instead of ButtonImpl, add debug - printing. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wbutton.cxx: Add non-dummy implementation of - CancelButtonImpl. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxdialog.cxx: Add comment about XDialog2::cancel's - pure virtualness. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/wrapper/wrapper.cxx: Add debug print to - layout::Dialog::Cancel. - -2007-10-29 Jan Nieuwenhuizen <janneke@gnu.org> - - * : if(0)'ed code that sets default handler for ButtonImpl. - -2007-10-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx: Add Click - and LINK (Click) to IconButton. - -2007-10-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx: Add - GetImplementation to VCLXProxy. - -2007-10-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * inc/layout/layout.hxx, source/api/makefile.mk, - source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx, - source/core/dialog.cxx, source/core/dialog.hxx, - source/core/globals.hxx, source/core/import.cxx, - source/core/import.hxx, source/core/makefile.mk, - source/wrapper/wrapper.cxx, workben/test.cxx: Add XDialog2 with - dummy Cancel interface. Use it instead of XDialog. - -2007-10-26 Jan Nieuwenhuizen <janneke@gnu.org> - - * TODO: Add Michael's bug list, with progress. - -2007-10-25 Jan Nieuwenhuizen <janneke@gnu.org> - - * : Silence non-virtual-destructor warnings the proper way. - -2007-10-24 Jan Nieuwenhuizen <janneke@gnu.org> - - * ChangeLog: Put marker in ChangeLog to say it's discontinued. diff --git a/toolkit/doc/layout/ChangeLog.0 b/toolkit/doc/layout/ChangeLog.0 deleted file mode 100644 index 326cbe218ec6..000000000000 --- a/toolkit/doc/layout/ChangeLog.0 +++ /dev/null @@ -1,546 +0,0 @@ -2007-10-24 Jan Nieuwenhuizen <janneke@gnu.org> - - * Discontinued for now. Generate from git log. - -2007-10-22 Jan Nieuwenhuizen <janneke@gnu.org> - - * source/awt/vclxsplitter.hxx: - * source/awt/vclxtabcontrol.hxx: - * source/core/bin.cxx: - * source/core/bin.hxx: - * source/core/box.cxx: - * source/core/box.hxx: - * source/core/container.hxx: - * source/core/flow.cxx: - * source/core/flow.hxx: - * source/core/table.hxx (getHeightForWidth): Use sal_Int32 instead of - LONG. Fixes compile on x86_64. - - * source/awt/vclxsplitter.cxx: - * source/awt/vclxscroller.cxx: - * source/awt/vclxdialog.cxx: Use %d, as INT is used here, - not LONG. Fixes compile warnings on x86_64. - - * workben/refresh: FIXME: filter-out flood of - - class <> has virtual functions but non-virtual destructor - - for now, to make other messages visible. - - * Resolve conflicts. - -2007-10-19 Jan Nieuwenhuizen <janneke@gnu.org> - - * workben/test.cxx (MyApp::Main): Display usage () upon -h, --help. - - * workben/refresh: Append "$@" so that refresh --inst FOO works. - - * README: New file. - - * workben/refresh: Softcode outdir. Fixes running on x86_64. - - * workben/makefile.mk (APP1STDLIBS): Softcode layout library name. - Fixes linking on x86_64. - - * workben/zoom.cxx: Another <c..> include. Fixes compiling test - on x86_64. - -2007-10-18 Jan Nieuwenhuizen <janneke@gnu.org> - - * .gitignore: Ingore x86_64 output dir too. - - * source/wrapper/wimpl.hxx: - * source/core/timeout.cxx: - * source/core/deck.cxx: - * source/core/byteseq.cxx: - * source/core/bin.cxx: Add some <c..> includes. - -2007-10-22 Jan Nieuwenhuizen <janneke@gnu.org> - - * Remove two empty files. - - * Deleted workben/editor_pre - * Deleted workben/output - - * Incorporate http://www.alunos.dcc.fc.up.pt/~c0607045/trash/openoffice/layout.tgz - - * Modified source/core/box.cxx - * Modified source/core/table.cxx - * Modified source/wrapper/wcontainer.cxx - * Modified workben/editor.cxx - * Modified workben/flow.xml - * Added cenarios - * Added source/Documento por Gravar 1 - * Added source/api/com/sun/star/awt/XLayoutFlow.idl - * Added source/api/com/sun/star/awt/XLayoutFlowContainer.idl - * Added source/awt/non-interactable-containers.xml - * Added source/awt/vclxfactory.cxx - * Added source/awt/vclxfiledialog.cxx - * Added source/awt/vclxfiledialog.hxx - * Added source/awt/vclxline.cxx - * Added source/awt/vclxline.hxx - * Added source/awt/vclxpane.cxx - * Added source/awt/vclxpane.hxx - * Added source/awt/vclxradiobutton.cxx - * Added source/awt/vclxradiobutton.hxx - * Added source/gtk/vclxcommon.cxx - * Added source/gtk/vclxcommon.hxx - * Added source/gtk/vclxcontainer.cxx - * Added source/gtk/vclxcontainer.hxx - * Added source/gtk/vclxdialog.cxx - * Added source/gtk/vclxdialog.hxx - * Added source/gtk/vclxwidget.cxx - * Added source/gtk/vclxwidget.hxx - * Added workben/adjust.xml - * Added workben/editor-normal.xml - * Added workben/editor_pre - * Added workben/flow-container.xml - * Added workben/output - * Added workben/test.xml - -2007-08-20 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wimpl.hxx (wrapperGone): fix ordering - issue. - - * workben/editor.cxx (PropertiesList::destruct): bin, - use virtual destructors. - - * source/core/visualcnt.cxx: set only size, not - position too. - -2007-08-20 Michael Meeks <michael.meeks@novell.com> - - * merge Ricardo's nice work ... - -2007-08-20 Michael Meeks <michael.meeks@novell.com> - - * source/core/box.cxx (getMinimumSize): calculate size - correctly wrt. 2x padding. - -2007-08-17 Michael Meeks <michael.meeks@novell.com> - - * source/core/helper.cxx (findAndRemove): rename - border -> 'has_border' to not conflict with container / - widget prop of same name. - - * workben/*.xml: rename all border attributes. - - * source/core/box.hxx: bin bogus mnBorderWidth - use - the container instead. - - * source/core/helper.cxx: rename 'border' to - 'has_border' so container borders work. - (anyFromString): fix type of LONG, add unsigned types & - re-order into TypeClass.idl sequence. - - * source/awt/vclxbutton.cxx (IconButton): center - labels, somehow setting a graphic changes the behavior - of widgets with no align set. - -2007-08-16 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wcontainer.cxx (Clear): get condition - right. - - * source/core/container.cxx (setParent): cope with null - parents by not throwing. - - * workben/editor.cxx: add Alignment ... and adapt to new - property code - so we get container properties. - - * source/core/helper.cxx (setProperties): adapt to new - layoutimpl::prophlp helpers. - (canHandleProps, queryPropertyInfo, setProperty, getProperty): - impl. - -2007-08-16 Michael Meeks <michael.meeks@novell.com> - - * source/core/*.cxx: calm down debug. - - * source/core/align.cxx, box.cxx: add PROPHELPER_SET_INFO - to the child props too ... (doh). - - * source/core/helper.hxx (PROPHELPER_SET_INFO): impl. this - as a macro, comment it heavily. - * source/core/container.hxx, box.hxx, align.hxx, bin.hxx: add - the macro back cf. 2007-06-07 ... - - * source/core/import.cxx, source/wrapper/wimpl.hxx: calm the - churning debug problem down: finally can see the important - messages. - - * workben/editor.cxx (EditorDialog): add 'maDelete' member & - rename 'engine->mpEngine' - - * source/awt/vclxbutton.cxx (IconButton, VCLXCancelButton), - (VCLXHelpButton): impl. - - * source/core/import.cxx (handleCornerCases): bin. - -2007-08-16 Michael Meeks <michael.meeks@novell.com> - - * source/awt/vclxproxy.cxx (queryInterface): fixup. - - * source/awt/vclxbutton.cxx: impl OKButton stub. - - * source/awt/vclxproxy.cxx: gut-wrenching manual cut/paste - proxy creation: urgh. - - * source/core/import.cxx (handleCornerCases): bin okbutton - corner case. - -2007-08-15 Michael Meeks <michael.meeks@novell.com> - - * source/core/helper.cxx (setProperties): add debug for - dropped properties. - - * source/core/container.cxx (queryInterface, acquire, - release): unwind nightmarish UNO lifecycle evil: not - implementing acquire/release is a spectacularly bad - idea: trashed memory gets accessed by the next queryinterface. - -2007-08-15 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wrapper.cxx (GetPeer): bin debug. - (Clear): impl. for Ricardo. - - * workben/editor.cxx (naturalSize): impl. and call post - construction, so we size to the total size with the added - widgets. - - * source/core/root.hxx: remember to declare we impl. - XLayoutConstrains. - - * workben/editor.cxx (getDepth, makeListEntryName): impl. - & cleanup code. - - * workben/editor.hxx (class EditorEngine): bin maIdentList. - -2007-08-15 Michael Meeks <michael.meeks@novell.com> - - * workben/editor.cxx (PropertyEntry): show the - widgets post construction: now appears to work - as nicely, if not better than before. - - * source/wrapper/wcontainer.cxx (Container): add - warning if no peer to associate with is found. - (Container): actually assign mxContainer. - - * source/wrapper/wbutton.cxx (SetImageAlign): impl. - SetImageAlign, and use it to align-left the images. - - * workben/test.cxx (InitUCB): enable this. - (Main): set more magic environment variables: 'magic'! - -2007-08-14 Michael Meeks <michael.meeks@novell.com> - - * workben/test.cxx: attempt to defeat stupid configmgr - bootstrapping evilness. - - * workben/test.cxx (UnoBootstrapSucks): log component - instantiations, and exception text - caught config mgr. - not being happy. - - * source/inc/layoutcore.hxx: impl. - a header for - sharing code from core -> wrapper. - - * source/wrapper/wbutton.cxx (ImageImpl): impl. - and add SetImageMode method. - - * source/core/helper.cxx (loadGraphic): impl. - - * inc/layout/layout.hxx: add lstbox.h for - LISTBOX_ENTRY_NOT_FOUND & fix editor with this. - - * source/core/helper.cxx (createWidget): merge - conflicts. - -2007-08-09 Michael Meeks <michael.meeks@novell.com> - - * source/awt/vclxtabcontrol.?xx, source/awt/makefile.mk, - * utils/makefile.mk: import TabControl. - - * source/core/*.cxx: put in 'layoutimpl' namespace. - - * source/core/import.cxx (WidgetElement): handle - corner cases again. - -2007-08-09 Michael Meeks <michael.meeks@novell.com> - - * doc/stats.ods: statistics on widget impl. & attribute - priorities. - - * source/core/helper.cxx (createWidget): re-enable - handleCornerCases. - - * source/core/import.cxx (handleCornerCases): - un-comment handle-corner-cases. - -2007-08-09 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> - - * latest work. - -2007-07-30 Michael Meeks <michael.meeks@novell.com> - - * doc/vcl.txt: add notes on how fallback awt peer - creation happens. - - * doc/awt-props.ods: try to bring some sanity to the - cut/paste frenzy in the awt properties. - - * source/core/import.cxx (ToplevelElement): switch back - to the new pseudo-'root' 'XLayoutContainer' approach that - is cleaner & simpler. - -2007-07-30 Michael Meeks <michael.meeks@novell.com> - - * workben/editor.cxx (createWidget): fix variable naming - _name -> pName; fix createContainer call signature. - - * source/core/deck.cxx (setVisible): switch to queueRecalc. - - * source/core/root.cxx (getChildren, removeChild): impl. - - * source/core/container.cxx (getSingleChild): impl. - helper & upd. callers. - - * Resolve conflicts with Ricardo. - -2007-07-26 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> - - * Added SVLXTabControl that offers XWindow and XLayoutContainer - interfaces for the VCL TabControl. - But its allocateSize() isn't being called (though sometimes it - is), so multi tabs are broken. - - * Touched a bit XLayoutContainer interface: added getChildren() - and removeChildren(). And got rid of clearChildren(). - SPECIFICATION: setParent() must be called on child when added - or removed to a container -- in case child implements XChild - -- pass null to remove. - -2007-07-25 Michael Meeks <michael.meeks@novell.com> - - * notes.txt, doc/metricfield.txt, doc/oldnotes.txt: - move some of my cruft out of notes.txt - - * source/core/root.cxx: made LayoutRoot implement - XLayoutConstrains and XLayoutContainer (a simple bin). - - * source/core/timeout.cxx: do idle sizing via the - toplevel. - - * source/core/import.cxx (~ToplevelElement): simplify - toplevel sizing. Tie LayoutRoot to the toplevel window: - ok for now. - -2007-07-25 Michael Meeks <michael.meeks@novell.com> - - * workben/zoom.xml: update variously. - - * source/core/timeout.cxx: add evil hack using VCL - idle handler to layout idly (not that we do re-layout - yet). - - * source/core/container.cxx (allocateChildAt): calm - down debug spew. - - * source/wrapper: move fields pieces from wrapper.cxx - to 'wfields.cxx'. - - * NB. The code now depends on recent toolkit/ changes in - HEAD ooo-build. - -2007-07-13 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/*.cxx: propagate a Context* pointer - through to all wrapper instances; ready to implement - OKButton / CancelButton etc. - - * source/wrapper/wbutton.cxx: split from - * source/wrapper/wrapper.cxx: here. - - * source/core/import.cxx (handleCornerCases): impl. - and call - the ok/help/cancel buttons are -so- lame in - awt, we need to emulate them in the wrapper. - -2007-07-12 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wrapper.cxx (GetPeerHandle): switch - to just 1 impl, with an optional nId argument too, - in case we need it. - - * inc/layout/layout.hxx, source/wrapper/impl.hxx, - * source/wrapper/wrap_container.cxx, - * source/wrapper/wrapper.cxx: impl. new 'Box' - container type, also allow explicit widget - instantiation. - - * workben/editor.cxx: re-work to use a sequence of - PushButtons instead of create<N> thing. - -2007-07-06 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> - - * a bunch of stuff touched (in special workben/editor.hxx and cxx): - Sorry, will try to take better care of the ChangeLog in - the future... - - Made a first layout editor. Added temporary calls recalc() - and clearChildren() to the XLayoutContainer interface. :P - Quite hacky overall; but its already more functional than - was targetting for the milestone, and will be cleaning it up... - - Committed part of koehin's patch: the ListBox wrapper. - -2007-06-22 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wrapper.cxx: impl. NumericFormatter - - we still need MetricField to implement a (mis-named) - XCurrencyField interface though ... - -2007-06-22 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wrapper.cxx (WindowImpl): add - get/setProperty helpers. - (PushButton::[Is]Check[ed]): impl. - - * source/core/*: some debug calming action. - - * source/wrapper/wrapper.cxx (::Dialog): get toplevel - widget correctly. - (GetPeerHandle): calm debug. - -2007-06-21 Michael Meeks <michael.meeks@novell.com> - - * source/wrapper/wrapper.cxx (Dialog::SetText), - - * source/core/import.cxx (startRootElement): check - the namespace & allow non-framewindow toplevels. - (WidgetElement): !pParent -> WindowClass_TOP. - - * workben/zoom.xml: add 'group' attributes, hmm. Not - working that well for some reaosn. - - * source/wrapper/wrapper.cxx (ButtonImpl::SetClickHdl) - don't add the action listener until we need to to preserve - VCL's semantics. - -2007-06-20 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> - - * source/core/import.h/cxx: added support for radio groups. - As agreed, a group is specified by an id. So, the xml - would be: <radio group="pizza" value="margarita" /> ... - -2007-06-20 Michael Meeks <michael.meeks@novell.com> - - * source/core/import.cxx (WidgetElement): filter out 'id' - property and add into mrRoot. - - * source/core/helper.cxx (setProperties): remove 'id' bits. - -2007-06-20 Michael Meeks <michael.meeks@novell.com> - - * source/core/byteseq.cxx: add - gross hack, to go later. - * source/core/root.cxx: upd. to use it. - - * workben/test.cxx: move much of the file reading / - stream handling evil into the core & initialize via UNO. - - * workben/*: remove LAYOUT_API_TEST conditionals ... - -2007-06-20 Michael Meeks <michael.meeks@novell.com> - - * source/core/root.[ch]xx: start of XLayoutRoot impl. - - * source/core/factory.cxx: UNO component registration fun. - - * workben/test.cxx: turn off zoomy bits if - LAYOUT_API_TEST is not set. - - * source/wrapper/wrapper.cxx: impl. first cut at - wrapping logic; get a few things in order. - -2007-06-19 Michael Meeks <michael.meeks@novell.com> - - * source/*: move to source/core/* - - * source/wrapper: add. - - * prj/build.lst: upd. - -2007-06-19 Michael Meeks <michael.meeks@novell.com> - - * workben/zoom.[ch]xx: import cut/paste of - svx/source/dialog/zoom.[ch]xx - hack out svx dependencies - and port to: - - * inc/layout/layout.hxx: new 'layout' wrapper API - -2007-06-08 Michael Meeks <michael.meeks@novell.com> - - * source/helper.hxx: move ChildProps - * source/helper.hxx: to here, rename to PropHelper, - add include guards etc. - - * source/import.?xx: substantial clean up. - - * workben/*.xml: switch namespace - -2007-06-07 Michael Meeks <michael.meeks@novell.com> - - * source/container.cxx: remove static singleton setting - 'getPropertSetInfo' method, and make it abstract. - * source/bin.cxx, source/box.cxx: implement here, so we - get different SetInfo for each. - - * source/vbox.cxx (convertFastPropertyValue): impl. properly. - - * source/import.cxx (ChildElement::startChildElement): pass - the right child attributes. - (addChildWidget): actually set properties on the container's - child not the widget itself. - -2007-06-06 Michael Meeks <michael.meeks@novell.com> - - * source/makefile.mk, - * source/import.cxx: rename from newimport.cxx - - * source/newimport.cxx (getPropAsInt): bin, obsolete. - (addChildWidget): add setProperties call for child props. - (windowResized): do size request before allocate. - -2007-06-06 Michael Meeks <michael.meeks@novell.com> - - * source/newimport.cxx (getAttributeProps): re-factor & split. - (findAndRemove): this. - - * source/helper.cxx (setProperties, toUnoNaming, anyFromString): - split from newimport.cxx. - - * source/newimport.cxx (~ToplevelElement): add, so we - show the dialog post sizing. - - * workben/*.xml: remove 'show' attribute on toplevels. - -2007-06-06 Michael Meeks <michael.meeks@novell.com> - - * source/newimport.cxx: add hacks (missing Ricardo's - hierarchy parsing), to whack all children in 1 hbox. - We have layout at last. - - * source/vbox.cxx (allocateChildAt): get PosSize flags right. - - * source/newimport.cxx (startRootElement): upd. - (ResizeListener): impl. - - * source/newimport.hxx (class ToplevelElement): add. - -2007-06-05 Michael Meeks <michael.meeks@novell.com> - - * workben/layout.xml: add nested vbox. - - * workben/layout-flat.xml: flat xml - - * start a ChangeLog - diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index f6859690ce24..9e006f4afd1b 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -65,6 +65,7 @@ typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base class ControlModelContainerBase : public ControlModelContainer_IBase { public: + enum ChildOperation { Insert = 0, Remove }; // would like to make this typedef private, too, but the Forte 7 compiler does have // problems with this ..... typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString > @@ -97,13 +98,13 @@ protected: sal_Int16 m_nTabPageId; void Clone_Impl(ControlModelContainerBase& _rClone) const; - protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName ); + void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ); ControlModelContainerBase( const ControlModelContainerBase& rModel ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 07b208588835..3c7c51caeee2 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -495,7 +495,20 @@ void ControlModelContainerBase::replaceByName( const ::rtl::OUString& aName, con UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName ); if ( maModels.end() == aElementPos ) lcl_throwNoSuchElementException(); - + // Dialog behaviour is to have all containee names unique ( MSO Userform is the same ) + // With container controls you could have constructed an existing hierachy and are now + // add this to an existing container, in this case a name nested in the containment + // hierachy of the added control could contain a name clash, if we have access to the + // list of global names then recursively check for previously existing names ( we need + // to do this obviously before the 'this' objects container is updated + Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY ); + if ( xAllChildren.is() ) + { + // remove old control ( and children ) from global list of containees + updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() ); + // Add new control ( and containees if they exist ) + updateUserFormChildren( xAllChildren, aName, Insert, xNewModel ); + } // stop listening at the old model stopControlListening( aElementPos->first ); Reference< XControlModel > xReplaced( aElementPos->first ); @@ -582,6 +595,17 @@ void ControlModelContainerBase::insertByName( const ::rtl::OUString& aName, cons if ( maModels.end() != aElementPos ) lcl_throwElementExistException(); + // Dialog behaviour is to have all containee names unique ( MSO Userform is the same ) + // With container controls you could have constructed an existing hierachy and are now + // add this to an existing container, in this case a name nested in the containment + // hierachy of the added control could contain a name clash, if we have access to the + // list of global names then we need to recursively check for previously existing + // names ( we need to do this obviously before the 'this' objects container is updated + // remove old control ( and children ) from global list of containees + Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY ); + + if ( xAllChildren.is() ) + updateUserFormChildren( xAllChildren, aName, Insert, xM ); maModels.push_back( UnoControlModelHolder( xM, aName ) ); mbGroupsUpToDate = sal_False; startControlListening( xM ); @@ -604,6 +628,15 @@ void ControlModelContainerBase::removeByName( const ::rtl::OUString& aName ) thr if ( maModels.end() == aElementPos ) lcl_throwNoSuchElementException(); + // Dialog behaviour is to have all containee names unique ( MSO Userform is the same ) + // With container controls you could have constructed an existing hierachy and are now + // removing this control from an existing container, in this case all nested names in + // the containment hierachy of the control to be removed need to be removed from the global + // names cache ( we need to do this obviously before the 'this' objects container is updated ) + Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY ); + if ( xAllChildren.is() ) + updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() ); + ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElementPos->first; @@ -1858,3 +1891,53 @@ uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL return absoluteURL; } +void +ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +{ + if ( Operation < Insert || Operation > Remove ) + throw IllegalArgumentException(); + + if ( xAllChildren.is() ) + { + if ( Operation == Remove ) + { + Reference< XControlModel > xOldModel( xAllChildren->getByName( aName ), UNO_QUERY ); + xAllChildren->removeByName( aName ); + + Reference< XNameContainer > xChildContainer( xOldModel, UNO_QUERY ); + if ( xChildContainer.is() ) + { + Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY ); + // container control is being removed from this container, reset the + // global list of containees + if ( xProps.is() ) + xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer >() ) ); + Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames(); + for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index ) + updateUserFormChildren( xAllChildren, aChildNames[ index ], Operation, Reference< XControlModel > () ); + } + } + else if ( Operation == Insert ) + { + xAllChildren->insertByName( aName, uno::makeAny( xTarget ) ); + Reference< XNameContainer > xChildContainer( xTarget, UNO_QUERY ); + if ( xChildContainer.is() ) + { + // container control is being added from this container, reset the + // global list of containees to point to the correct global list + Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY ); + if ( xProps.is() ) + xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( xAllChildren ) ); + Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames(); + for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index ) + { + Reference< XControlModel > xChildTarget( xChildContainer->getByName( aChildNames[ index ] ), UNO_QUERY ); + updateUserFormChildren( xAllChildren, aChildNames[ index ], Operation, xChildTarget ); + } + } + } + } + else + throw IllegalArgumentException(); +} + diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 307e1b61bfb2..ed5505db2578 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -53,6 +53,8 @@ #include <vcl/graph.hxx> #include <vcl/image.hxx> #include <map> +#include <boost/unordered_map.hpp> +#include <cppuhelper/implbase1.hxx> #include <algorithm> #include <functional> #include "tools/urlobj.hxx" @@ -70,6 +72,82 @@ using namespace ::com::sun::star::util; #define PROPERTY_IMAGEURL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ImageURL" )) #define PROPERTY_GRAPHIC ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" )) // + +// we probably will need both a hash of control models and hash of controls +// => use some template magic + +typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer_BASE; + +template< typename T > +class SimpleNamedThingContainer : public SimpleNameContainer_BASE +{ + typedef boost::unordered_map< rtl::OUString, Reference< T >, ::rtl::OUStringHash, + ::std::equal_to< ::rtl::OUString > > NamedThingsHash; + NamedThingsHash things; + ::osl::Mutex m_aMutex; +public: + // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !hasByName( aName ) ) + throw NoSuchElementException(); + Reference< T > xElement; + if ( ! ( aElement >>= xElement ) ) + throw IllegalArgumentException(); + things[ aName ] = xElement; + } + virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !hasByName( aName ) ) + throw NoSuchElementException(); + return uno::makeAny( things[ aName ] ); + } + virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + Sequence< ::rtl::OUString > aResult( things.size() ); + typename NamedThingsHash::iterator it = things.begin(); + typename NamedThingsHash::iterator it_end = things.end(); + rtl::OUString* pName = aResult.getArray(); + for (; it != it_end; ++it, ++pName ) + *pName = it->first; + return aResult; + } + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + return ( things.find( aName ) != things.end() ); + } + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( hasByName( aName ) ) + throw ElementExistException(); + Reference< T > xElement; + if ( ! ( aElement >>= xElement ) ) + throw IllegalArgumentException(); + things[ aName ] = xElement; + } + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !hasByName( aName ) ) + throw NoSuchElementException(); + things.erase( things.find( aName ) ); + } + virtual Type SAL_CALL getElementType( ) throw (RuntimeException) + { + return T::static_type( NULL ); + } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + return ( things.size() > 0 ); + } +}; + ////HELPER ::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); @@ -99,6 +177,9 @@ UnoControlDialogModel::UnoControlDialogModel( const Reference< XMultiServiceFact aBool <<= (sal_Bool) sal_True; ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool ); ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool ); + // #TODO separate class for 'UserForm' ( instead of re-using Dialog ? ) + uno::Reference< XNameContainer > xNameCont = new SimpleNamedThingContainer< XControlModel >(); + ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( xNameCont ) ); } UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel ) diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index b346f55273ef..dc11ba1637d8 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -45,6 +45,7 @@ class ImplFontOptions; #include <tools/gen.hxx> #include <boost/unordered_map.hpp> #include <boost/unordered_set.hpp> +#include <boost/shared_ptr.hpp> namespace basegfx { class B2DPolyPolygon; } @@ -186,8 +187,9 @@ public: virtual bool TestFont() const { return true; } virtual void* GetFtFace() const { return 0; } virtual int GetLoadFlags() const { return 0; } - virtual void SetFontOptions( const ImplFontOptions*) {} - virtual const ImplFontOptions* GetFontOptions() const { return 0; } + virtual void SetFontOptions( boost::shared_ptr<ImplFontOptions> ) {} + virtual boost::shared_ptr<ImplFontOptions> GetFontOptions() const + { return boost::shared_ptr<ImplFontOptions>(); } virtual bool NeedsArtificialBold() const { return false; } virtual bool NeedsArtificialItalic() const { return false; } @@ -266,7 +268,7 @@ class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry { private: ServerFont* mpServerFont; - ImplFontOptions* mpFontOptions; + boost::shared_ptr<ImplFontOptions> mpFontOptions; bool mbGotFontOptions; public: diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 52c80febe64b..82fa925097ee 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -572,6 +572,7 @@ FreetypeManager::FreetypeManager() nDefaultPrioAutoHint = pEnv[0] - '0'; InitGammaTable(); + vclFontFileList::get(); } // ----------------------------------------------------------------------- @@ -769,7 +770,6 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn mpFontInfo( pFI ), maFaceFT( NULL ), maSizeFT( NULL ), - mpFontOptions( NULL ), mbFaceOk( false ), maRecodeConverter( NULL ), mpLayoutEngine( NULL ) @@ -915,7 +915,7 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void FreetypeServerFont::SetFontOptions( const ImplFontOptions* pFontOptions) +void FreetypeServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions) { mpFontOptions = pFontOptions; @@ -970,7 +970,7 @@ void FreetypeServerFont::SetFontOptions( const ImplFontOptions* pFontOptions) mnLoadFlags |= FT_LOAD_NO_BITMAP; } -const ImplFontOptions* FreetypeServerFont::GetFontOptions() const +boost::shared_ptr<ImplFontOptions> FreetypeServerFont::GetFontOptions() const { return mpFontOptions; } diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index caf8bfab1f9c..6b461fe59143 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -191,8 +191,8 @@ public: virtual int GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); } virtual bool TestFont() const; virtual void* GetFtFace() const; - virtual void SetFontOptions( const ImplFontOptions*); - virtual const ImplFontOptions* GetFontOptions() const; + virtual void SetFontOptions( boost::shared_ptr<ImplFontOptions> ); + virtual boost::shared_ptr<ImplFontOptions> GetFontOptions() const; virtual int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } virtual bool NeedsArtificialBold() const { return mbArtBold; } virtual bool NeedsArtificialItalic() const { return mbArtItalic; } @@ -239,7 +239,7 @@ private: FT_FaceRec_* maFaceFT; FT_SizeRec_* maSizeFT; - const ImplFontOptions* mpFontOptions; + boost::shared_ptr<ImplFontOptions> mpFontOptions; bool mbFaceOk; bool mbArtItalic; diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index deef658c0c56..ab56853dcf65 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -534,7 +534,6 @@ bool ServerFont::IsGlyphInvisible( int nGlyphIndex ) ImplServerFontEntry::ImplServerFontEntry( ImplFontSelectData& rFSD ) : ImplFontEntry( rFSD ) , mpServerFont( NULL ) -, mpFontOptions( NULL ) , mbGotFontOptions( false ) {} @@ -543,7 +542,6 @@ ImplServerFontEntry::ImplServerFontEntry( ImplFontSelectData& rFSD ) ImplServerFontEntry::~ImplServerFontEntry() { // TODO: remove the ServerFont here instead of in the GlyphCache - delete mpFontOptions; } // ======================================================================= diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index 6ce4656dc815..8f3c89a78c24 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -236,8 +236,8 @@ void ImplServerFontEntry::HandleFontOptions( void ) { // get and cache the font options mbGotFontOptions = true; - mpFontOptions = GetFCFontOptions( *maFontSelData.mpFontData, - maFontSelData.mnHeight ); + mpFontOptions.reset(GetFCFontOptions( *maFontSelData.mpFontData, + maFontSelData.mnHeight )); } // apply the font options mpServerFont->SetFontOptions( mpFontOptions ); @@ -536,12 +536,12 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout ) void* pFace = rFont.GetFtFace(); CairoFontsCache::CacheId aId; aId.mpFace = pFace; - aId.mpOptions = rFont.GetFontOptions(); + aId.mpOptions = rFont.GetFontOptions().get(); aId.mbEmbolden = rFont.NeedsArtificialBold(); font_face = (cairo_font_face_t*)m_aCairoFontsCache.FindCachedFont(aId); if (!font_face) { - const ImplFontOptions *pOptions = rFont.GetFontOptions(); + const ImplFontOptions *pOptions = rFont.GetFontOptions().get(); void *pPattern = pOptions ? pOptions->GetPattern(pFace, aId.mbEmbolden) : NULL; if (pPattern) font_face = rCairo.ft_font_face_create_for_pattern(pPattern); |