?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Update to m13
[ooovba.git] / applied_patches / 0631-layoutdialogs2-development.diff
blobfee4b89ceab51f1f294eee77cadd180f82b09d22
1 b7cd118... configure: Regenerate. Fixes naive builds.
2 d130ba7... Wordcount: minor HIG tweaks.
3 01a6fce... Zoom: minor HIG spacing tweaks.
4 67f2b82... Zoom: fix align-test and update zoom.xml.
5 fa8d7ec... Zoom: add align-test.xml to illustrate zoom alignment bug.
6 6c70e47... Find-and-Replace: request font-style-name="Bold", does not seem to work.
7 afacef2... Find-and-Replace: Add alignment for combobox labels.
8 27de12f... Find-and-Replace: Replace pairs of <flow> with <align>. Fixes ugly non-emptiness of more-<hbox>.
9 5e1f71e... Find-and-Replace: add nice 12pt border.
10 ba667ea... Find-and-Replace: also add rowsep at lower fixedline.
11 150333c... Find-and-Replace: Add poor man's colsep and rowsep substitute spaces.
12 fe770b8... Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons.
13 ab48d2a... Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion.
14 099e60d... Find-and-Replace: use sc icon. Fixes FIND button height.
15 a35e707... Bugfix have empty/invisible containers not take up space.
16 5520d73... Find-and-replace: Fix/remove most property errors.
17 ae26364... Table: make x, y expand default.
18 4269438... Use OSL_TRACE rather than printf. Fixes warning visibility.
19 3f9b304... Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors.
20 bc138f1... Junk extra <table> from boxtest. Fixes visual output.
21 0cf4adf... Eradicate PROPHELPER_SET_INFO: junk static caching.
22 f10be27... Update awk+sed localize generation rules. Fixes multiple (wrong) titles in Find & Replace.
23 5f02d6f... Use dash (-) instead of underscore (_) to separate language modifiers. Fixes en_GB etc.
24 e765573... Add "defbutton=true" to dialogs. Fixes ENTER doing default action: n#439222.
25 284c473... Michael's new table-based find and replace.
26 1c1f4cc... Apply Michael's boxtest patch.
27
28
29 diff --git sc/uiconfig/layout/insert-sheet.xml sc/uiconfig/layout/insert-sheet.xml
30 index 0ce5843..517a24d 100644
31 --- sc/uiconfig/layout/insert-sheet.xml
32 +++ sc/uiconfig/layout/insert-sheet.xml
33 @@ -49,7 +49,7 @@
34 </vbox>
35 </hbox>
36 <dialogbuttonhbox border="5" spacing="5">
37 - <okbutton default="true" id="BTN_OK"/>
38 + <okbutton defbutton="true" id="BTN_OK"/>
39 <cancelbutton id="BTN_CANCEL"/>
40 <helpbutton id="BTN_HELP"/>
41 </dialogbuttonhbox>
42 diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk
43 index 4688e04..4832e5c 100644
44 --- sc/uiconfig/layout/makefile.mk
45 +++ sc/uiconfig/layout/makefile.mk
46 @@ -60,8 +60,8 @@ all .PHONY:
47 .INCLUDE : target.mk
48
49 localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf
50 - grep instbdlg.src $(PRJ)/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/' > insert-sheet-$@
51 - grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(PRJ)/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/' > move-copy-sheet-$@
52 - grep sortdlg.src $(PRJ)/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/' > sort-options-$@
53 + grep instbdlg.src $(PRJ)/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", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@
54 + grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(PRJ)/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", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@
55 + grep sortdlg.src $(PRJ)/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", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@
56 echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
57 rm -f *-$@
58 diff --git sc/uiconfig/layout/move-copy-sheet.xml sc/uiconfig/layout/move-copy-sheet.xml
59 index 79720df..6e68b5a 100644
60 --- sc/uiconfig/layout/move-copy-sheet.xml
61 +++ sc/uiconfig/layout/move-copy-sheet.xml
62 @@ -15,7 +15,7 @@
63 <flow/>
64 <cancelbutton id="BTN_CANCEL" tabstop="true"/>
65 <helpbutton id="BTN_HELP" tabstop="true"/>
66 - <okbutton default="true" id="BTN_OK" tabstop="true"/>
67 + <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
68 </dialogbuttonhbox>
69 </vbox>
70 </modaldialog>
71 diff --git sc/uiconfig/layout/string-input.xml sc/uiconfig/layout/string-input.xml
72 index 0a59899..a29a564 100644
73 --- sc/uiconfig/layout/string-input.xml
74 +++ sc/uiconfig/layout/string-input.xml
75 @@ -8,7 +8,7 @@
76 <fixedtext id="FT_LABEL" label="FT-LABEL"/>
77 <edit has_border="true" id="ED_INPUT" tabstop="true"/>
78 <dialogbuttonhbox border="5" spacing="5">
79 - <okbutton default="true" id="BTN_OK" tabstop="true"/>
80 + <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
81 <cancelbutton id="BTN_CANCEL" tabstop="true"/>
82 <helpbutton id="BTN_HELP" tabstop="true"/>
83 </dialogbuttonhbox>
84 diff --git svx/uiconfig/layout/find-and-replace.xml svx/uiconfig/layout/find-and-replace.xml
85 index ad5af2b..aff0531 100644
86 --- svx/uiconfig/layout/find-and-replace.xml
87 +++ svx/uiconfig/layout/find-and-replace.xml
88 @@ -3,109 +3,165 @@
89 i18n translated XML files are generated from this template by
90 transex3/layout/tralay. !-->
91
92 -<sfxmodelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closeable="true" sizeable="true" moveable="true" output-size="true" id="RID_SVXDLG_SEARCH" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
93 - <vbox spacing="5" border="5">
94 +<sfxmodelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closeable="true" sizeable="true" moveable="true" id="RID_SVXDLG_SEARCH" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
95 + <hbox border="12">
96 + <table columns="3">
97 <string id="RID_SVXSTR_SEARCH_STYLES" _text="Including Styles"/>
98 <string id="RID_SVXSTR_SEARCH" _text="(Search)"/>
99 <string id="RID_SVXSTR_REPLACE" _text="(Replace)"/>
100 <string id="STR_WORDCALC" _text="~Entire cells"/>
101 <string id="STR_MORE_BTN" _text="More ~Options"/>
102 <string id="STR_LESS_BTN" _text="Less ~Options"/>
103 - <hbox homogeneous="false" spacing="5" border="0">
104 - <vbox spacing="5" border="0">
105 - <fixedtext id="FT_SEARCH" _label="~Search for"/>
106 - <combobox dropdown="true" id="ED_SEARCH" tabstop="true" cnt:expand="false"/>
107 - <listbox has_border="true" dropdown="true" show="false" id="LB_SEARCH" sort="true" tabstop="true"/>
108 - <fixedtext show="false" id="FT_SEARCH_ATTR" word-break="true"/>
109 - <fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
110 - <flow/>
111 - <flow/>
112 +
113 + <!-- row -->
114 + <align valign="1" halign="0">
115 + <fixedtext id="FT_SEARCH" _label="~Search for" font-style-name="Bold"/>
116 + </align>
117 + <!-- poor man's colsep -->
118 + <min-size cnt:x-expand="false" min-width="12"/>
119 + <vbox cnt:x-expand="false">
120 + <imagebutton defbutton="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"
121 + image-align="0" graphic="res/commandimagelist/sc_searchdialog.png"/>
122 + </vbox>
123 + <!-- row: poor man's rowsep -->
124 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
125 + <!-- row -->
126 + <vbox spacing="0" border="0" cnt:x-expand="true">
127 + <combobox dropdown="true" id="ED_SEARCH" tabstop="true" cnt:expand="true"/>
128 + <listbox has_border="true" dropdown="true" show="false" id="LB_SEARCH" sort="true" tabstop="true" cnt:expand="true"/>
129 + </vbox>
130 + <!-- poor man's colsep -->
131 + <min-size cnt:x-expand="false" min-width="12"/>
132 + <vbox cnt:x-expand="false">
133 + <pushbutton id="BTN_SEARCH_ALL" tabstop="true" _label="Find ~All" cnt:expand="false"/>
134 + </vbox>
135 + <!-- row -->
136 + <vbox spacing="0" border="0" cnt:expand="false" cnt:col-span="3">
137 + <fixedtext show="false" id="FT_SEARCH_ATTR" word-break="true"/>
138 + <fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
139 + </vbox>
140 + <!-- row: poor man's rowsep -->
141 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
142 + <!-- row -->
143 + <fixedline cnt:y-expand="false" cnt:col-span="3"/>
144 + <!-- row: poor man's rowsep -->
145 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
146 + <!-- row -->
147 + <align valign="1" halign="0">
148 + <fixedtext id="FT_REPLACE" _label="Re~place with" font-style-name="Bold"/>
149 + </align>
150 + <!-- poor man's colsep -->
151 + <min-size cnt:x-expand="false" min-width="12"/>
152 + <vbox cnt:x-expand="false">
153 + <pushbutton id="BTN_REPLACE" tabstop="true" _label="~Replace" cnt:expand="false"/>
154 + </vbox>
155 + <!-- row: poor man's rowsep -->
156 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
157 + <!-- row -->
158 + <vbox spacing="0" border="0" cnt:x-expand="true">
159 + <combobox dropdown="true" id="ED_REPLACE" tabstop="true" cnt:expand="true"/>
160 + <listbox has_border="true" dropdown="true" show="false" id="LB_REPLACE" sort="true" tabstop="true" cnt:expand="true"/>
161 + </vbox>
162 + <!-- poor man's colsep -->
163 + <min-size cnt:x-expand="false" min-width="12"/>
164 + <vbox cnt:x-expand="false">
165 + <pushbutton id="BTN_REPLACE_ALL" tabstop="true" _label="Replace A~ll" cnt:expand="false"/>
166 + </vbox>
167 + <!-- row -->
168 + <vbox spacing="6" border="0" cnt:col-span="3">
169 + <fixedtext show="false" id="FT_REPLACE_ATTR" word-break="true"/>
170 + <fixedtext show="false" id="FT_REPLACE_FORMATS" word-break="true"/>
171 + <fixedline show="false" id="FL_SEARCH_COMPONENT"/>
172 + </vbox>
173 + <!-- row: poor man's rowsep -->
174 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
175 + <!-- row -->
176 + <vbox spacing="6" border="0" cnt:col-span="3">
177 + <hbox spacing="12">
178 + <checkbox id="CB_MATCH_CASE" tabstop="true" _label="Ma~tch case"/>
179 + <min-size min-width="0"/>
180 + <vbox cnt:x-expand="false" cnt:padding="12">
181 + <pushbutton show="false" id="BTN_COMPONENT_1" tabstop="true" cnt:expand="false" cnt:padding="12"/>
182 + </vbox>
183 + <checkbox id="CB_WHOLE_WORDS" tabstop="true" _label="Whole wor~ds only"/>
184 + <min-size min-width="0"/>
185 + <vbox cnt:x-expand="false" cnt:padding="12">
186 + <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
187 + </vbox>
188 <flow/>
189 + </hbox>
190 + </vbox>
191 + <!-- row: poor man's rowsep -->
192 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
193 + <!-- row -->
194 + <fixedline cnt:y-expand="false" cnt:col-span="3"/>
195 + <!-- row: poor man's rowsep -->
196 + <min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
197 + <!-- row -->
198 + <hbox cnt:col-span="3">
199 + <vbox cnt:expand="false">
200 + <morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true" cnt:expand="false"/>
201 </vbox>
202 - <vbox cnt:expand="false" spacing="5" border="0">
203 - <min-size min-width="100" cnt:expand="false"/>
204 - <pushbutton default="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"/>
205 - <pushbutton id="BTN_SEARCH_ALL" tabstop="true" _label="Find ~All" cnt:expand="false"/>
206 - </vbox>
207 - </hbox>
208 - <hbox spacing="5" border="0">
209 <flow/>
210 - <vbox cnt:expand="false" spacing="5" border="0">
211 - <min-size min-width="100" cnt:expand="false"/>
212 - <fixedline id="FL_SEARCH_COMMAND"/>
213 - </vbox>
214 - </hbox>
215 - <hbox homogeneous="false" spacing="5" border="0">
216 - <vbox spacing="5" border="0">
217 - <fixedtext id="FT_REPLACE" _label="Re~place with"/>
218 - <combobox dropdown="true" id="ED_REPLACE" tabstop="true" cnt:expand="false"/>
219 - <listbox has_border="true" dropdown="true" show="false" id="LB_REPLACE" sort="true" tabstop="true"/>
220 - <fixedtext show="false" id="FT_REPLACE_ATTR" word-break="true"/>
221 - <fixedtext show="false" id="FT_REPLACE_FORMATS" word-break="true"/>
222 - <fixedline show="false" id="FL_SEARCH_COMPONENT"/>
223 - <flow/>
224 - <flow/>
225 - <flow/>
226 - </vbox>
227 - <vbox cnt:expand="false" spacing="5" border="0">
228 - <min-size min-width="100" cnt:expand="false"/>
229 - <pushbutton id="BTN_REPLACE" tabstop="true" _label="~Replace" cnt:expand="false"/>
230 - <pushbutton id="BTN_REPLACE_ALL" tabstop="true" _label="Replace A~ll" cnt:expand="false"/>
231 - </vbox>
232 - </hbox>
233 - <checkbox id="CB_MATCH_CASE" tabstop="true" _label="Ma~tch case"/>
234 - <pushbutton show="false" id="BTN_COMPONENT_1" tabstop="true" cnt:expand="false"/>
235 - <checkbox id="CB_WHOLE_WORDS" tabstop="true" _label="Whole wor~ds only"/>
236 - <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
237 - <fixedline id="FL_BUTTONS"/>
238 - <hbox>
239 - <morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true"/>
240 - <dialogbuttonhbox>
241 - <helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
242 - <cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
243 + <dialogbuttonhbox cnt:expand="false">
244 + <vbox cnt:expand="false" cnt:fill="false">
245 + <helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
246 + </vbox>
247 + <vbox cnt:expand="false" cnt:fill="false">
248 + <cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
249 + </vbox>
250 </dialogbuttonhbox>
251 </hbox>
252 - <fixedline show="false" id="FL_OPTIONS"/>
253 - <hbox homogeneous="false" spacing="5" border="0">
254 - <vbox spacing="5" border="0">
255 + <!-- row -->
256 + <fixedline show="false" id="FL_OPTIONS" cnt:col-span="3"/>
257 + <!-- row -->
258 + <hbox spacing="6" border="0" cnt:col-span="3">
259 + <vbox spacing="6" border="0">
260 + <min-size min-height="0"/>
261 <checkbox show="false" id="CB_SELECTIONS" tabstop="true" _label="Current selection ~only"/>
262 <checkbox show="false" id="CB_BACKWARDS" tabstop="true" _label="Bac~kwards"/>
263 <checkbox show="false" id="CB_REGEXP" tabstop="true" _label="Regular e~xpressions"/>
264 <hbox>
265 <checkbox show="false" id="CB_SIMILARITY" tabstop="true" _label="S~imilarity search"/>
266 - <flow/>
267 - <pushbutton show="false" id="PB_SIMILARITY" tabstop="true" _label="~..." cnt:expand="false"/>
268 - <flow/>
269 + <align halign="1">
270 + <vbox cnt:x-expand="false">
271 + <pushbutton show="false" id="PB_SIMILARITY" tabstop="true" _label="~..." cnt:expand="false"/>
272 + </vbox>
273 + </align>
274 </hbox>
275 <checkbox show="false" id="CB_LAYOUTS" tabstop="true" _label="Search for St~yles"/>
276 + <checkbox show="false" id="CB_NOTES" tabstop="true" _label="Notes"/>
277 <checkbox show="false" id="CB_JAP_MATCH_FULL_HALF_WIDTH" tabstop="true" _label="Match character width"/>
278 <hbox>
279 <checkbox show="false" id="CB_JAP_SOUNDS_LIKE" tabstop="true" _label="Sounds like (Japanese)"/>
280 - <flow/>
281 - <pushbutton show="false" id="PB_JAP_OPTIONS" tabstop="true" _label="..." cnt:expand="false"/>
282 - <flow/>
283 + <align halign="1">
284 + <vbox cnt:x-expand="false">
285 + <pushbutton show="false" id="PB_JAP_OPTIONS" tabstop="true" _label="..." cnt:expand="false"/>
286 + </vbox>
287 + </align>
288 </hbox>
289
290 <fixedline show="false" id="FL_CALC"/>
291 - <hbox spacing="5" border="0">
292 + <hbox spacing="6" border="0">
293 <fixedtext show="false" id="FT_CALC_SEARCHIN" _label="~Search in"/>
294 <listbox has_border="true" dropdown="true" show="false" id="LB_CALC_SEARCHIN" tabstop="true"/>
295 </hbox>
296 - <hbox spacing="5" border="0">
297 + <hbox spacing="6" border="0">
298 <fixedtext show="false" id="FT_CALC_SEARCHDIR" _label="~Search direction"/>
299 - <vbox spacing="5" border="5">
300 + <vbox spacing="6" border="6">
301 <radiobutton show="false" id="RB_CALC_ROWS" _label="Ro~ws"/>
302 <radiobutton show="false" id="RB_CALC_COLUMNS" _label="Col~umns"/>
303 </vbox>
304 </hbox>
305 <checkbox show="false" id="CB_ALL_SHEETS" _label="Search in all sheets"/>
306 </vbox>
307 - <vbox cnt:expand="false" spacing="5" border="0">
308 + <vbox spacing="6" border="0" cnt:x-expand="false">
309 <min-size min-width="100" cnt:expand="false"/>
310 <pushbutton show="false" id="BTN_ATTRIBUTE" tabstop="true" _label="Attri~butes..." cnt:expand="false"/>
311 <pushbutton show="false" id="BTN_FORMAT" tabstop="true" _label="For~mat..." cnt:expand="false"/>
312 <pushbutton show="false" id="BTN_NOFORMAT" tabstop="true" _label="~No Format" cnt:expand="false"/>
313 </vbox>
314 </hbox>
315 - </vbox>
316 + </table>
317 + </hbox>
318 </sfxmodelessdialog>
319 diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk
320 index 871db2f..26679e2 100644
321 --- svx/uiconfig/layout/makefile.mk
322 +++ svx/uiconfig/layout/makefile.mk
323 @@ -54,7 +54,7 @@ all .PHONY:
324 .INCLUDE : target.mk
325
326 localize.sdf: $(PRJ)/source/dialog/localize.sdf
327 - grep srchdlg.src $(PRJ)/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/' > find-and-replace-$@
328 - grep zoom.src $(PRJ)/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\\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/' > zoom-$@
329 + grep srchdlg.src $(PRJ)/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", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
330 + grep zoom.src $(PRJ)/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\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
331 echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
332 rm -f *-$@
333 diff --git svx/uiconfig/layout/zoom.xml svx/uiconfig/layout/zoom.xml
334 index 5938643..4b4270f 100644
335 --- svx/uiconfig/layout/zoom.xml
336 +++ svx/uiconfig/layout/zoom.xml
337 @@ -8,10 +8,10 @@
338 id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
339 help-id="SID_ATTR_ZOOM"
340 has_border="true" sizeable="true" moveable="true" closeable="true">
341 - <vbox spacing="5" border="5">
342 + <vbox spacing="0" border="12">
343 <hbox spacing="0" border="0">
344 - <vbox spacing="5" border="5">
345 - <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
346 + <vbox spacing="6" border="0">
347 + <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="false"/>
348 <radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL" _label="Optimal"/>
349 <radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
350 <radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
351 @@ -20,7 +20,7 @@
352 <align cnt:expand="false" cnt:fill="true">
353 <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
354 </align>
355 - <flow cnt:padding="10" cnt:expand="false"/>
356 + <flow cnt:padding="12" cnt:expand="false"/>
357 <metricfield id="ED_USER" value-step="1"
358 repeat="true" has_border="true" spin="true"
359 _text="100%" unit="11" custom-unit-text="%"
360 @@ -28,15 +28,16 @@
361 cnt:expand="false"/>
362 </hbox>
363 </vbox>
364 - <vbox spacing="5" border="5">
365 - <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
366 + <flow/>
367 + <vbox spacing="6" border="0">
368 + <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="false"/>
369 <radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
370 <radiobutton radiogroup="zoom-layout" id="BTN_SINGLE" _label="~Single page"/>
371 <hbox cnt:expand="false" cnt:fill="true">
372 <align cnt:expand="false" cnt:fill="true">
373 <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
374 </align>
375 - <flow cnt:padding="10" cnt:expand="false"/>
376 + <flow cnt:padding="12" cnt:expand="false"/>
377 <metricfield id="ED_COLUMNS" value-step="1"
378 repeat="true" has_border="true" spin="true"
379 _text="100%"
380 @@ -45,15 +46,15 @@
381 spin-value="1"
382 cnt:expand="false"/>
383 </hbox>
384 - <hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
385 + <hbox><flow cnt:expand="false" cnt:padding="12"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
386 </vbox>
387 </hbox>
388 - <fixedline cnt:padding="1" id="FL_BOTTOM"/>
389 - <dialogbuttonhbox border="5" spacing="5">
390 + <fixedline cnt:padding="6" id="FL_BOTTOM"/>
391 + <dialogbuttonhbox border="0" spacing="12">
392 <flow/>
393 - <okbutton id="BTN_ZOOM_OK"/>
394 + <okbutton defbutton="true" id="BTN_ZOOM_OK"/>
395 <cancelbutton id="BTN_ZOOM_CANCEL"/>
396 - <helpbutton id="BTN_ZOOM_HELP"/>
397 + <helpbutton id="BTN_ZOOM_HELP"/>
398 </dialogbuttonhbox>
399 </vbox>
400 </modaldialog>
401 diff --git sw/uiconfig/layout/makefile.mk sw/uiconfig/layout/makefile.mk
402 index 5f4bc52..8debaa6 100644
403 --- sw/uiconfig/layout/makefile.mk
404 +++ sw/uiconfig/layout/makefile.mk
405 @@ -50,6 +50,7 @@ all .PHONY:
406 .INCLUDE : target.mk
407
408 localize.sdf: $(PRJ)/source/ui/dialog/localize.sdf
409 - grep wordcountdialog.src $(PRJ)/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", "sw\\uiconfig\\layout\\wordcount.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/\tDLG_WORDCOUNT_title/' > wordcount-$@
410 +# grep wordcountdialog.src $(PRJ)/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", "sw\\uiconfig\\layout\\wordcount.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/\tDLG_WORDCOUNT_title/' > wordcount-$@
411 + grep wordcountdialog.src $(PRJ)/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", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tDLG_WORDCOUNT/\t/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
412 echo '#empty' | cat - wordcount-$@ > $@
413 rm -f *-$@
414 diff --git sw/uiconfig/layout/wordcount.xml sw/uiconfig/layout/wordcount.xml
415 index e922294..fc7ff94 100644
416 --- sw/uiconfig/layout/wordcount.xml
417 +++ sw/uiconfig/layout/wordcount.xml
418 @@ -9,10 +9,10 @@
419 id="DLG_WORDCOUNT"
420 sizeable="true" moveable="true" optimumsize="true" closeable="true"
421 has_border="true" sv-look="true" _title="Word Count">
422 - <vbox border="5" spacing="5">
423 + <vbox border="12" spacing="6">
424 <fixedline id="FL_CURRENT" _text="Current selection"/>
425 <hbox>
426 - <vbox cnt:padding="13" spacing="5">
427 + <vbox cnt:padding="12" spacing="6">
428 <hbox>
429 <fixedtext id="FT_CURRENTWORD" _label="Words:"/>
430 <flow cnt:padding="60"/>
431 @@ -25,11 +25,11 @@
432 </hbox>
433 </vbox>
434 </hbox>
435 - <!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
436 + <!-- if we could do cnt:cnt:padding="-12" here, we would not have to close
437 and reopen the hbox/vbox thing !-->
438 <fixedline id="FL_DOC" _text="Whole document"/>
439 <hbox>
440 - <vbox cnt:padding="13" spacing="5">
441 + <vbox cnt:padding="12" spacing="6">
442 <hbox>
443 <fixedtext id="FT_DOCWORD" _label="Words:"/>
444 <fixedtext id="FI_DOCWORD" right="true" _label="000"/>
445 @@ -41,9 +41,9 @@
446 </vbox>
447 </hbox>
448 <fixedline cnt:padding="1" id="FL_BOTTOM"/>
449 - <dialogbuttonhbox spacing="5">
450 + <dialogbuttonhbox spacing="12">
451 <flow/>
452 - <okbutton id="PB_OK"/>
453 + <okbutton defbutton="true" id="PB_OK"/>
454 <helpbutton id="PB_HELP"/>
455 </dialogbuttonhbox>
456 </vbox>
457 diff --git toolkit/source/layout/core/bin.cxx toolkit/source/layout/core/bin.cxx
458 index 62ea068..dad845d 100644
459 --- toolkit/source/layout/core/bin.cxx
460 +++ toolkit/source/layout/core/bin.cxx
461 @@ -165,6 +165,12 @@ Align::allocateArea( const awt::Rectangle &rArea )
462 allocateChildAt( mxChild, aChildArea );
463 }
464
465 +bool
466 +Align::emptyVisible ()
467 +{
468 + return true;
469 +}
470 +
471 /* MinSize */
472
473 MinSize::MinSize() : Bin()
474 @@ -178,6 +184,12 @@ MinSize::MinSize() : Bin()
475 &mnMinHeight );
476 }
477
478 +bool
479 +MinSize::emptyVisible ()
480 +{
481 + return true;
482 +}
483 +
484 awt::Size SAL_CALL MinSize::getMinimumSize()
485 throw(uno::RuntimeException)
486 {
487 diff --git toolkit/source/layout/core/bin.hxx toolkit/source/layout/core/bin.hxx
488 index c23c371..0b75bc2 100644
489 --- toolkit/source/layout/core/bin.hxx
490 +++ toolkit/source/layout/core/bin.hxx
491 @@ -75,8 +75,6 @@ public:
492 // css::awt::XLayoutConstrains
493 virtual css::awt::Size SAL_CALL getMinimumSize()
494 throw(css::uno::RuntimeException);
495 -
496 - PROPHELPER_SET_INFO
497 };
498
499 // Align gives control over child position on the allocated space.
500 @@ -91,11 +89,11 @@ protected:
501 public:
502 Align();
503
504 + bool emptyVisible ();
505 +
506 // css::awt::XLayoutContainer
507 virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
508 throw (css::uno::RuntimeException);
509 -
510 - PROPHELPER_SET_INFO
511 };
512
513 // Makes child request its or a specified size, whatever is larger.
514 @@ -108,11 +106,10 @@ protected:
515 public:
516 MinSize();
517
518 + bool emptyVisible ();
519 // css::awt::XLayoutContainer
520 virtual css::awt::Size SAL_CALL getMinimumSize()
521 throw(css::uno::RuntimeException);
522 -
523 - PROPHELPER_SET_INFO
524 };
525
526 } // namespace layoutimpl
527 diff --git toolkit/source/layout/core/box-base.cxx toolkit/source/layout/core/box-base.cxx
528 index f0b7a42..f03cd5c 100644
529 --- toolkit/source/layout/core/box-base.cxx
530 +++ toolkit/source/layout/core/box-base.cxx
531 @@ -69,9 +69,9 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
532 uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren
533 = xContainer->getChildren();
534
535 - // FIXME: <flow> workaround: empty visible containers always visible:
536 - if ( !aChildren.getLength() )
537 - return true;
538 + if (!aChildren.getLength ())
539 + if (Container *c = dynamic_cast <Container*> (xWidget.get ()))
540 + return c->emptyVisible ();
541
542 for ( int i = 0; i < aChildren.getLength(); i++ )
543 if ( isVisible( aChildren[i] ) )
544 diff --git toolkit/source/layout/core/box-base.hxx toolkit/source/layout/core/box-base.hxx
545 index 4fa7e53..67365a3 100644
546 --- toolkit/source/layout/core/box-base.hxx
547 +++ toolkit/source/layout/core/box-base.hxx
548 @@ -57,7 +57,6 @@ public:
549 struct ChildProps: public PropHelper
550 {
551 //ChildProps( ChildProps* );
552 - PROPHELPER_SET_INFO
553 };
554
555 protected:
556 diff --git toolkit/source/layout/core/box.hxx toolkit/source/layout/core/box.hxx
557 index 98190ca..d99a603 100644
558 --- toolkit/source/layout/core/box.hxx
559 +++ toolkit/source/layout/core/box.hxx
560 @@ -83,8 +83,6 @@ public:
561 // helper: mix of getMinimumSize() and getHeightForWidth()
562 css::awt::Size calculateSize( long nWidth = 0 );
563
564 - PROPHELPER_SET_INFO
565 -
566 private:
567 /* Helpers to deal with the joint Box directions. */
568 inline int primDim (const css::awt::Size &size)
569 diff --git toolkit/source/layout/core/container.cxx toolkit/source/layout/core/container.cxx
570 index c9b4513..608d5a4 100644
571 --- toolkit/source/layout/core/container.cxx
572 +++ toolkit/source/layout/core/container.cxx
573 @@ -50,6 +50,12 @@ Container::Container()
574 setChangeListener( this );
575 }
576
577 +/*bool
578 +Container::emptyVisible ()
579 +{
580 + return false;
581 +}
582 +*/
583 uno::Any
584 Container::queryInterface( const uno::Type & rType ) throw (uno::RuntimeException)
585 {
586 diff --git toolkit/source/layout/core/container.hxx toolkit/source/layout/core/container.hxx
587 index 5cac33d..71fba80 100644
588 --- toolkit/source/layout/core/container.hxx
589 +++ toolkit/source/layout/core/container.hxx
590 @@ -73,6 +73,8 @@ public:
591 Container();
592 virtual ~Container() {}
593
594 + virtual bool emptyVisible (){ return false; };
595 +
596 // XInterface
597 virtual void SAL_CALL acquire() throw() { PropHelper::acquire(); }
598 virtual void SAL_CALL release() throw() { PropHelper::release(); }
599 @@ -129,8 +131,6 @@ public:
600 css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize )
601 throw(css::uno::RuntimeException) { return rNewSize; }
602
603 -PROPHELPER_SET_INFO
604 -
605 protected:
606 void propertiesChanged();
607 };
608 diff --git toolkit/source/layout/core/dialogbuttonhbox.cxx toolkit/source/layout/core/dialogbuttonhbox.cxx
609 index 67a7ec0..0475723 100644
610 --- toolkit/source/layout/core/dialogbuttonhbox.cxx
611 +++ toolkit/source/layout/core/dialogbuttonhbox.cxx
612 @@ -39,13 +39,12 @@
613 #include "proplist.hxx"
614
615 #if TEST_LAYOUT && !defined( DBG_UTIL )
616 -#include <cstdio>
617 #undef DBG_ERROR
618 -#define DBG_ERROR printf
619 +#define DBG_ERROR OSL_TRACE
620 #undef DBG_ERROR1
621 -#define DBG_ERROR1 printf
622 +#define DBG_ERROR1 OSL_TRACE
623 #undef DBG_ERROR2
624 -#define DBG_ERROR2 printf
625 +#define DBG_ERROR2 OSL_TRACE
626 #endif /* TEST_LAYOUT && !DBG_UTIL */
627
628 namespace layoutimpl
629 diff --git toolkit/source/layout/core/flow.cxx toolkit/source/layout/core/flow.cxx
630 index 4bfd1b9..b004336 100644
631 --- toolkit/source/layout/core/flow.cxx
632 +++ toolkit/source/layout/core/flow.cxx
633 @@ -56,6 +56,12 @@ Flow::Flow()
634 &mnSpacing );
635 }
636
637 +bool
638 +Flow::emptyVisible ()
639 +{
640 + return true;
641 +}
642 +
643 void SAL_CALL
644 Flow::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
645 throw (uno::RuntimeException, css::awt::MaxChildrenException)
646 diff --git toolkit/source/layout/core/flow.hxx toolkit/source/layout/core/flow.hxx
647 index d550947..91aa829 100644
648 --- toolkit/source/layout/core/flow.hxx
649 +++ toolkit/source/layout/core/flow.hxx
650 @@ -63,6 +63,8 @@ protected:
651 public:
652 Flow();
653
654 + bool emptyVisible ();
655 +
656 // css::awt::XLayoutContainer
657 virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
658 throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
659 @@ -87,8 +89,6 @@ public:
660 virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
661 throw(css::uno::RuntimeException);
662
663 -PROPHELPER_SET_INFO
664 -
665 private:
666 // shared between getMinimumSize() and getHeightForWidth()
667 css::awt::Size calculateSize( long nMaxWidth );
668 diff --git toolkit/source/layout/core/helper.cxx toolkit/source/layout/core/helper.cxx
669 index ec4f80f..ff13269 100644
670 --- toolkit/source/layout/core/helper.cxx
671 +++ toolkit/source/layout/core/helper.cxx
672 @@ -42,13 +42,12 @@
673 #include "proplist.hxx"
674
675 #if TEST_LAYOUT && !defined( DBG_UTIL )
676 -#include <cstdio>
677 #undef DBG_ERROR
678 -#define DBG_ERROR printf
679 +#define DBG_ERROR OSL_TRACE
680 #undef DBG_ERROR1
681 -#define DBG_ERROR1 printf
682 +#define DBG_ERROR1 OSL_TRACE
683 #undef DBG_ERROR2
684 -#define DBG_ERROR2 printf
685 +#define DBG_ERROR2 OSL_TRACE
686 #endif /* TEST_LAYOUT && !DBG_UTIL */
687
688 namespace layoutimpl
689 @@ -357,6 +356,11 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
690 return OPropertySetHelper::queryInterface( rType );
691 }
692
693 +uno::Reference <beans::XPropertySetInfo> SAL_CALL PropHelper::getPropertySetInfo () throw (uno::RuntimeException)
694 +{
695 + return css::uno::Reference <css::beans::XPropertySetInfo> (createPropertySetInfo (getInfoHelper ()));
696 +}
697 +
698 } // namespace layoutimpl
699
700 #include <awt/vclxbutton.hxx>
701 diff --git toolkit/source/layout/core/helper.hxx toolkit/source/layout/core/helper.hxx
702 index 806efd0..bc74690 100644
703 --- toolkit/source/layout/core/helper.hxx
704 +++ toolkit/source/layout/core/helper.hxx
705 @@ -106,23 +106,13 @@ public:
706 virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue,
707 sal_Int32 nHandle ) const;
708
709 - // you -must- use this macro in sub-classes that define new properties.
710 - // NB. 'static' ...
711 - // com::sun::star::beans::XMultiPropertySet
712 -#define PROPHELPER_SET_INFO \
713 - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL \
714 - getPropertySetInfo() throw(css::uno::RuntimeException) \
715 - { \
716 - static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( \
717 - createPropertySetInfo( getInfoHelper() ) ); \
718 - return xInfo; \
719 - }
720 - PROPHELPER_SET_INFO
721 + virtual css::uno::Reference <css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo () throw (css::uno::RuntimeException);
722
723 struct Listener
724 {
725 virtual void propertiesChanged() = 0;
726 };
727 +
728 void setChangeListener( Listener *pListener )
729 {
730 mpListener = pListener;
731 diff --git toolkit/source/layout/core/proplist.cxx toolkit/source/layout/core/proplist.cxx
732 index 857bb51..483730b 100644
733 --- toolkit/source/layout/core/proplist.cxx
734 +++ toolkit/source/layout/core/proplist.cxx
735 @@ -42,13 +42,12 @@
736 #include "helper.hxx"
737
738 #if TEST_LAYOUT && !defined( DBG_UTIL )
739 -#include <cstdio>
740 #undef DBG_ERROR
741 -#define DBG_ERROR printf
742 +#define DBG_ERROR OSL_TRACE
743 #undef DBG_ERROR1
744 -#define DBG_ERROR1 printf
745 +#define DBG_ERROR1 OSL_TRACE
746 #undef DBG_ERROR2
747 -#define DBG_ERROR2 printf
748 +#define DBG_ERROR2 OSL_TRACE
749 #endif /* TEST_LAYOUT && !DBG_UTIL */
750
751 namespace layoutimpl
752 diff --git toolkit/source/layout/core/root.cxx toolkit/source/layout/core/root.cxx
753 index bb264f3..eafafca 100644
754 --- toolkit/source/layout/core/root.cxx
755 +++ toolkit/source/layout/core/root.cxx
756 @@ -32,7 +32,6 @@
757 #include "root.hxx"
758
759 #include <cassert>
760 -#include <cstdio>
761
762 #include <com/sun/star/awt/WindowAttribute.hpp>
763 #include <com/sun/star/awt/XMessageBox.hpp>
764 @@ -106,7 +105,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
765
766 void LayoutRoot::error( OUString const& message )
767 {
768 - printf( "%s\n", OUSTRING_CSTR( message ) );
769 + OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
770 ShowMessageBox( mxFactory, mxToolkit,
771 OUString::createFromAscii( "Fatal error" ),
772 message );
773 diff --git toolkit/source/layout/core/table.cxx toolkit/source/layout/core/table.cxx
774 index 87c15e2..2beefc1 100644
775 --- toolkit/source/layout/core/table.cxx
776 +++ toolkit/source/layout/core/table.cxx
777 @@ -47,20 +47,20 @@ namespace layoutimpl
778 using namespace com::sun::star;
779
780 Table::ChildProps::ChildProps( Table::ChildData *pData )
781 - {
782 - addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
783 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
784 +{
785 + addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
786 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
787 &( pData->mbExpand[ 0 ] ) );
788 - addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
789 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
790 + addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
791 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
792 &( pData->mbExpand[ 1 ] ) );
793 - addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
794 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
795 + addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
796 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
797 &( pData->mnColSpan ) );
798 - addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
799 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
800 + addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
801 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
802 &( pData->mnRowSpan ) );
803 - }
804 +}
805
806 bool Table::ChildData::isVisible()
807 {
808 @@ -79,21 +79,21 @@ Table::Table()
809
810 Table::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
811 : Box_Base::ChildData( xChild )
812 -// , mbExpand( { 0, 1 } )
813 +// , mbExpand( { 1, 1 } )
814 , mnColSpan( 1 )
815 , mnRowSpan( 1 )
816 , mnLeftCol( 0 )
817 , mnRightCol( 0 )
818 , mnTopRow( 0 )
819 , mnBottomRow( 0 )
820 - {
821 - mbExpand[ 0 ] = 0;
822 +{
823 + mbExpand[ 0 ] = 1;
824 mbExpand[ 1 ] = 1;
825 }
826
827 Table::ChildData*
828 Table::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
829 - {
830 +{
831 return new ChildData( xChild );
832 }
833
834 @@ -106,9 +106,9 @@ Table::createChildProps( Box_Base::ChildData *pData )
835 void SAL_CALL
836 Table::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
837 throw( uno::RuntimeException, awt::MaxChildrenException )
838 - {
839 +{
840 if ( xChild.is() )
841 - {
842 + {
843 Box_Base::addChild( xChild );
844 // cause of flicker
845 allocateChildAt( xChild, awt::Rectangle( 0,0,0,0 ) );
846 @@ -240,14 +240,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
847 mnColExpandables =( mnRowExpandables = 0 );
848 maRequisition.Width =( maRequisition.Height = 0 );
849 for ( std::vector<GroupData>::iterator it = maCols.begin();
850 - it != maCols.end(); it++ )
851 + it != maCols.end(); it++ )
852 {
853 maRequisition.Width += it->mnSize;
854 if ( it->mbExpand )
855 mnColExpandables++;
856 }
857 for ( std::vector<GroupData>::iterator it = maRows.begin();
858 - it != maRows.end(); it++ )
859 + it != maRows.end(); it++ )
860 {
861 maRequisition.Height += it->mnSize;
862 if ( it->mbExpand )
863 diff --git toolkit/source/layout/core/table.hxx toolkit/source/layout/core/table.hxx
864 index dac2aaa..b41be25 100644
865 --- toolkit/source/layout/core/table.hxx
866 +++ toolkit/source/layout/core/table.hxx
867 @@ -99,8 +99,6 @@ public:
868 virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 /*nWidth*/ )
869 throw(css::uno::RuntimeException)
870 { return maRequisition.Height; }
871 -
872 - PROPHELPER_SET_INFO
873 };
874
875 } // namespace layoutimpl
876 diff --git toolkit/source/layout/core/translate.cxx toolkit/source/layout/core/translate.cxx
877 index d0fc9f7..b059984 100644
878 --- toolkit/source/layout/core/translate.cxx
879 +++ toolkit/source/layout/core/translate.cxx
880 @@ -58,13 +58,13 @@ getLocaleSubdirList( lang::Locale const& rLocale )
881 {
882 std::list<OUString> aSubdirs;
883 aSubdirs.push_front( OUString::createFromAscii( "." ) );
884 - aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
885 + aSubdirs.push_front( OUString::createFromAscii( "en-US" ) );
886 if ( rLocale.Language.getLength() )
887 aSubdirs.push_front( rLocale.Language );
888 if ( rLocale.Country.getLength() )
889 {
890 OUString aLocaleCountry = rLocale.Language
891 - + OUString::createFromAscii( "_" )
892 + + OUString::createFromAscii( "-" )
893 + rLocale.Country;
894 aSubdirs.push_front( aLocaleCountry );
895 if ( rLocale.Variant.getLength() )
896 diff --git toolkit/src2xml/source/src2xml.py toolkit/src2xml/source/src2xml.py
897 index 128cfa1..b03c5e6 100644
898 --- toolkit/src2xml/source/src2xml.py
899 +++ toolkit/src2xml/source/src2xml.py
900 @@ -182,7 +182,7 @@ def post_process (s):
901 s = s.replace ('<modaldialog', '<modaldialog sizeable="true"')
902 s = s.replace (' rid=', ' id=')
903 s = s.replace (' border="true"', ' has_border="true"')
904 - s = s.replace (' def-button="true"', ' default="true"')
905 + s = s.replace (' def-button="true"', ' defbutton="true"')
906 s = s.replace (' drop-down="', ' dropdown="')
907 s = s.replace (' tab-stop="', ' tabstop="')
908 return s
909 diff --git toolkit/uiconfig/layout/tab-dialog.xml toolkit/uiconfig/layout/tab-dialog.xml
910 index 1d631e9..2639752 100644
911 --- toolkit/uiconfig/layout/tab-dialog.xml
912 +++ toolkit/uiconfig/layout/tab-dialog.xml
913 @@ -9,7 +9,7 @@
914 <tabcontrol id="ID_TABCONTROL"/>
915 <dialogbuttonhbox border="5" spacing="5" cnt:expand="false">
916 <flow/>
917 - <okbutton id="BTN_OK" show="false"/>
918 + <okbutton defbutton="true" id="BTN_OK" show="false"/>
919 <pushbutton id="BTN_USER" _label="&lt;User&gt;" show="false"/>
920 <cancelbutton id="BTN_CANCEL" show="false"/>
921 <helpbutton id="BTN_HELP" show="false"/>
922 diff --git toolkit/workben/layout/TEST toolkit/workben/layout/TEST
923 index d6a20cb..8a04a66 100755
924 --- toolkit/workben/layout/TEST
925 +++ toolkit/workben/layout/TEST
926 @@ -1,3 +1,11 @@
927 -export OOO_INSTALL_PREFIX=$(cd ../../../../.. && pwd)/ooo-svn
928 +#! /bin/sh
929 +for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
930 + if test -d $d; then
931 + export OOO_INSTALL_PREFIX=$d
932 + break
933 + fi
934 +done
935 +export SAL_ALLOW_LINKOO_SYMLINKS=1
936 test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
937 -LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib ../../unxlngx6.pro/bin/test "$@"
938 +export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib"
939 +../../unx*.pro/bin/test "$@"
940 diff --git toolkit/workben/layout/align-test.xml toolkit/workben/layout/align-test.xml
941 new file mode 100644
942 index 0000000..f01830e
943 --- /dev/null
944 +++ toolkit/workben/layout/align-test.xml
945 @@ -0,0 +1,30 @@
946 +<?xml version="1.0" encoding="UTF-8"?>
947 +<!-- This is a template. i18n translation is not performed in-place;
948 + i18n translated xml files are generated from this template by
949 + transex3/layout/tralay. !-->
950 +
951 +<dialog xmlns="http://openoffice.org/2007/layout"
952 + xmlns:cnt="http://openoffice.org/2007/layout/container"
953 + title="Align Test" optimumsize="true" has_border="true" sizeable="true" moveable="true">
954 + <vbox spacing="5" border="5">
955 + <fixedline/>
956 + <hbox spacing="0" border="0">
957 + <vbox spacing="5" border="5">
958 + <fixedline _text="X" cnt:expand="false"/>
959 + <pushbutton label="foo"/>
960 + <pushbutton label="foo"/>
961 + <pushbutton label="foo"/>
962 + <pushbutton label="foo"/>
963 + <pushbutton label="foo"/>
964 + <pushbutton label="foo"/>
965 + <pushbutton label="foo"/>
966 + </vbox>
967 + <vbox spacing="5" border="5">
968 + <fixedline _text="X" cnt:expand="false"/>
969 + <pushbutton label="bar"/>
970 + </vbox>
971 + </hbox>
972 + <fixedline/>
973 + <min-size cnt:spacing="0" min-width="200"/>
974 + </vbox>
975 +</dialog>
976 diff --git toolkit/workben/layout/boxtest.xml toolkit/workben/layout/boxtest.xml
977 index 8015b3f..263ae40 100644
978 --- toolkit/workben/layout/boxtest.xml
979 +++ toolkit/workben/layout/boxtest.xml
980 @@ -4,6 +4,8 @@
981 xmlns:cnt="http://openoffice.org/2007/layout/container"
982 title="Box Test" optimumsize="true" has_border="true" sizeable="true" moveable="true">
983 <vbox>
984 + <table>
985 + <vbox>
986 <hbox cnt:expand="false" cnt:fill="false">
987 <pushbutton label="XML Left"
988 cnt:expand="false" cnt:fill="false"/>
989 @@ -28,5 +30,7 @@
990 <pushbutton label="XML Right"
991 cnt:expand="true" cnt:fill="true"/>
992 </hbox>
993 + </vbox>
994 + </table>
995 </vbox>
996 </dialog>
997 diff --git toolkit/workben/layout/editor.cxx toolkit/workben/layout/editor.cxx
998 index f3ad65c..e10e54e 100644
999 --- toolkit/workben/layout/editor.cxx
1000 +++ toolkit/workben/layout/editor.cxx
1001 @@ -344,9 +344,14 @@ public:
1002 {
1003 beans::Property prop = it.next();
1004 rtl::OUString name( prop.Name );
1005 - rtl::OUString value( pChild->getProperty( name, CONTAINER_PROPERTY ) );
1006 - std::pair< rtl::OUString, rtl::OUString > pair( name, value );
1007 - pChild->maOriChildProps.push_back( pair );
1008 + try {
1009 + rtl::OUString value( pChild->getProperty( name, CONTAINER_PROPERTY ) );
1010 + std::pair< rtl::OUString, rtl::OUString > pair( name, value );
1011 + pChild->maOriChildProps.push_back( pair );
1012 + } catch ( beans::UnknownPropertyException &rEx ) {
1013 + fprintf (stderr, "ERROR: widget reports that it has a property it cannot return: '%s' this normally means that someone screwed up their PROPERTY_SET_INFO macro usage.\n",
1014 + rtl::OUStringToOString (rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
1015 + }
1016 }
1017 }
1018
1019 diff --git toolkit/workben/layout/empty.xml toolkit/workben/layout/empty.xml
1020 new file mode 100644
1021 index 0000000..a8408e5
1022 --- /dev/null
1023 +++ toolkit/workben/layout/empty.xml
1024 @@ -0,0 +1,26 @@
1025 +<?xml version="1.0" encoding="UTF-8"?>
1026 +<!-- This is a template. i18n translation is not performed in-place;
1027 + i18n translated xml files are generated from this template by
1028 + transex3/layout/tralay. !-->
1029 +
1030 +<dialog xmlns="http://openoffice.org/2007/layout"
1031 + xmlns:cnt="http://openoffice.org/2007/layout/container"
1032 + title="Empty Test" optimumsize="true" has_border="true" sizeable="true" moveable="true">
1033 + <vbox spacing="1" border="10">
1034 + <min-size min-width="200"/>
1035 + <fixedline height="1"/>
1036 + <vbox spacing="10">
1037 + <vbox show="false"/>
1038 + <vbox show="false"/>
1039 + <vbox show="false"/>
1040 + <vbox show="false"/>
1041 + <vbox show="false"/>
1042 + <vbox show="false"/>
1043 + <vbox show="false"/>
1044 + <vbox show="false"/>
1045 + <vbox show="false"/>
1046 + <vbox show="false"/>
1047 + </vbox>
1048 + <fixedline height="1"/>
1049 + </vbox>
1050 +</dialog>
1051 diff --git toolkit/workben/layout/insert-sheet.xml toolkit/workben/layout/insert-sheet.xml
1052 index 0ce5843..517a24d 100644
1053 --- toolkit/workben/layout/insert-sheet.xml
1054 +++ toolkit/workben/layout/insert-sheet.xml
1055 @@ -49,7 +49,7 @@
1056 </vbox>
1057 </hbox>
1058 <dialogbuttonhbox border="5" spacing="5">
1059 - <okbutton default="true" id="BTN_OK"/>
1060 + <okbutton defbutton="true" id="BTN_OK"/>
1061 <cancelbutton id="BTN_CANCEL"/>
1062 <helpbutton id="BTN_HELP"/>
1063 </dialogbuttonhbox>
1064 diff --git toolkit/workben/layout/move-copy-sheet.xml toolkit/workben/layout/move-copy-sheet.xml
1065 index 79720df..6e68b5a 100644
1066 --- toolkit/workben/layout/move-copy-sheet.xml
1067 +++ toolkit/workben/layout/move-copy-sheet.xml
1068 @@ -15,7 +15,7 @@
1069 <flow/>
1070 <cancelbutton id="BTN_CANCEL" tabstop="true"/>
1071 <helpbutton id="BTN_HELP" tabstop="true"/>
1072 - <okbutton default="true" id="BTN_OK" tabstop="true"/>
1073 + <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
1074 </dialogbuttonhbox>
1075 </vbox>
1076 </modaldialog>
1077 diff --git toolkit/workben/layout/plugin.xml toolkit/workben/layout/plugin.xml
1078 index f630e72..908907d 100644
1079 --- toolkit/workben/layout/plugin.xml
1080 +++ toolkit/workben/layout/plugin.xml
1081 @@ -20,7 +20,7 @@
1082 </hbox>
1083 <dialogbuttonhbox border="5" spacing="5">
1084 <flow/>
1085 - <okbutton id="BTN_OK"/>
1086 + <okbutton defbutton="true" id="BTN_OK"/>
1087 <cancelbutton id="BTN_CANCEL" />
1088 <helpbutton id="BTN_HELP"/>
1089 </dialogbuttonhbox>
1090 diff --git toolkit/workben/layout/recover.xml toolkit/workben/layout/recover.xml
1091 index 7c96191..1d74b59 100644
1092 --- toolkit/workben/layout/recover.xml
1093 +++ toolkit/workben/layout/recover.xml
1094 @@ -58,7 +58,7 @@ LINE TEST"/>
1095 <checkbox id="CH_LOGFILE" _label="Open additional text document to display the restore logfile"/>
1096 <dialogbuttonhbox border="5" spacing="5">
1097 <flow/>
1098 - <okbutton id="BTN_OK" _label="Restore"/>
1099 + <okbutton defbutton="true" id="BTN_OK" _label="Restore"/>
1100 <cancelbutton id="BTN_CANCEL" />
1101 <helpbutton id="BTN_HELP"/>
1102 </dialogbuttonhbox>
1103 diff --git toolkit/workben/layout/sortdlg.xml toolkit/workben/layout/sortdlg.xml
1104 index a17920e..ce45a60 100644
1105 --- toolkit/workben/layout/sortdlg.xml
1106 +++ toolkit/workben/layout/sortdlg.xml
1107 @@ -56,7 +56,7 @@
1108 </pagelist>
1109 </tabcontrol>
1110 <hbox>
1111 - <okbutton id="1" tabstop="true"/>
1112 + <okbutton defbutton="true" id="1" tabstop="true"/>
1113 <cancelbutton id="1" tabstop="true"/>
1114 <helpbutton id="1" tabstop="true"/>
1115 <pushbutton id="1" tabstop="true"/>
1116 diff --git toolkit/workben/layout/string-input.xml toolkit/workben/layout/string-input.xml
1117 index 0a59899..a29a564 100644
1118 --- toolkit/workben/layout/string-input.xml
1119 +++ toolkit/workben/layout/string-input.xml
1120 @@ -8,7 +8,7 @@
1121 <fixedtext id="FT_LABEL" label="FT-LABEL"/>
1122 <edit has_border="true" id="ED_INPUT" tabstop="true"/>
1123 <dialogbuttonhbox border="5" spacing="5">
1124 - <okbutton default="true" id="BTN_OK" tabstop="true"/>
1125 + <okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
1126 <cancelbutton id="BTN_CANCEL" tabstop="true"/>
1127 <helpbutton id="BTN_HELP" tabstop="true"/>
1128 </dialogbuttonhbox>
1129 diff --git toolkit/workben/layout/tab-dialog.xml toolkit/workben/layout/tab-dialog.xml
1130 index 1d631e9..2639752 100644
1131 --- toolkit/workben/layout/tab-dialog.xml
1132 +++ toolkit/workben/layout/tab-dialog.xml
1133 @@ -9,7 +9,7 @@
1134 <tabcontrol id="ID_TABCONTROL"/>
1135 <dialogbuttonhbox border="5" spacing="5" cnt:expand="false">
1136 <flow/>
1137 - <okbutton id="BTN_OK" show="false"/>
1138 + <okbutton defbutton="true" id="BTN_OK" show="false"/>
1139 <pushbutton id="BTN_USER" _label="&lt;User&gt;" show="false"/>
1140 <cancelbutton id="BTN_CANCEL" show="false"/>
1141 <helpbutton id="BTN_HELP" show="false"/>
1142 diff --git toolkit/workben/layout/wordcount-plain.xml toolkit/workben/layout/wordcount-plain.xml
1143 index cf31a76..a7c34fe 100644
1144 --- toolkit/workben/layout/wordcount-plain.xml
1145 +++ toolkit/workben/layout/wordcount-plain.xml
1146 @@ -22,7 +22,7 @@
1147 </hbox>
1148 <fixedline height="8" id="FL_BOTTOM" width="158" x="6" y="77"/>
1149 <hbox>
1150 - <okbutton def-button="true" height="14" id="PB_OK" width="50" x="61" y="88"/>
1151 + <okbutton defbutton="true" height="14" id="PB_OK" width="50" x="61" y="88"/>
1152 <helpbutton height="14" id="PB_HELP" width="50" x="114" y="88"/>
1153 </hbox>
1154 </vbox>
1155 diff --git toolkit/workben/layout/wordcount-tight.xml toolkit/workben/layout/wordcount-tight.xml
1156 index 9ff84b3..b027510 100644
1157 --- toolkit/workben/layout/wordcount-tight.xml
1158 +++ toolkit/workben/layout/wordcount-tight.xml
1159 @@ -28,7 +28,7 @@
1160 <fixedline cnt:padding="1" id="FL_BOTTOM"/>
1161 <hbox border="5">
1162 <flow homogeneous="true"/>
1163 - <okbutton id="PB_OK" cnt:expand="false" default="true"/>
1164 + <okbutton id="PB_OK" cnt:expand="false" defbutton="true"/>
1165 <helpbutton id="PB_HELP" cnt:expand="false"/>
1166 </hbox>
1167 </vbox>
1168 diff --git toolkit/workben/layout/wordcount.xml toolkit/workben/layout/wordcount.xml
1169 index e922294..fc7ff94 100644
1170 --- toolkit/workben/layout/wordcount.xml
1171 +++ toolkit/workben/layout/wordcount.xml
1172 @@ -9,10 +9,10 @@
1173 id="DLG_WORDCOUNT"
1174 sizeable="true" moveable="true" optimumsize="true" closeable="true"
1175 has_border="true" sv-look="true" _title="Word Count">
1176 - <vbox border="5" spacing="5">
1177 + <vbox border="12" spacing="6">
1178 <fixedline id="FL_CURRENT" _text="Current selection"/>
1179 <hbox>
1180 - <vbox cnt:padding="13" spacing="5">
1181 + <vbox cnt:padding="12" spacing="6">
1182 <hbox>
1183 <fixedtext id="FT_CURRENTWORD" _label="Words:"/>
1184 <flow cnt:padding="60"/>
1185 @@ -25,11 +25,11 @@
1186 </hbox>
1187 </vbox>
1188 </hbox>
1189 - <!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
1190 + <!-- if we could do cnt:cnt:padding="-12" here, we would not have to close
1191 and reopen the hbox/vbox thing !-->
1192 <fixedline id="FL_DOC" _text="Whole document"/>
1193 <hbox>
1194 - <vbox cnt:padding="13" spacing="5">
1195 + <vbox cnt:padding="12" spacing="6">
1196 <hbox>
1197 <fixedtext id="FT_DOCWORD" _label="Words:"/>
1198 <fixedtext id="FI_DOCWORD" right="true" _label="000"/>
1199 @@ -41,9 +41,9 @@
1200 </vbox>
1201 </hbox>
1202 <fixedline cnt:padding="1" id="FL_BOTTOM"/>
1203 - <dialogbuttonhbox spacing="5">
1204 + <dialogbuttonhbox spacing="12">
1205 <flow/>
1206 - <okbutton id="PB_OK"/>
1207 + <okbutton defbutton="true" id="PB_OK"/>
1208 <helpbutton id="PB_HELP"/>
1209 </dialogbuttonhbox>
1210 </vbox>
1211 diff --git toolkit/workben/layout/zoom-indent.xml toolkit/workben/layout/zoom-indent.xml
1212 index 5a6a226..648da86 100644
1213 --- toolkit/workben/layout/zoom-indent.xml
1214 +++ toolkit/workben/layout/zoom-indent.xml
1215 @@ -33,7 +33,7 @@
1216 </hbox>
1217 </vbox>
1218 <vbox border="6" spacing="4">
1219 - <okbutton id="OkButton" cnt:expand="false" default="true"/>
1220 + <okbutton id="OkButton" cnt:expand="false" defbutton="true"/>
1221 <cancelbutton id="CancelButton" cnt:expand="false"/>
1222 <helpbutton id="HelpButton" cnt:expand="false"/>
1223 </vbox>
1224 diff --git toolkit/workben/layout/zoom-plain.xml toolkit/workben/layout/zoom-plain.xml
1225 index 30b72a3..c8383b8 100644
1226 --- toolkit/workben/layout/zoom-plain.xml
1227 +++ toolkit/workben/layout/zoom-plain.xml
1228 @@ -3,7 +3,7 @@
1229 <modaldialog sizeable="true" height="142" help-id="SID_ATTR_ZOOM" moveable="true" output-size="true" id="RID_SVXDLG_ZOOM" sv-look="true" text="Zoom" width="160" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
1230 <vbox>
1231 <fixedline height="8" id="FL_ZOOM" text="Zoom factor" width="92" x="6" y="3"/>
1232 - <okbutton def-button="true" height="14" id="BTN_ZOOM_OK" width="50" x="104" y="6"/>
1233 + <okbutton defbutton="true" height="14" id="BTN_ZOOM_OK" width="50" x="104" y="6"/>
1234 <radiobutton height="10" id="BTN_WHOLE_PAGE" width="80" x="12" y="14"/>
1235 <cancelbutton height="14" id="BTN_ZOOM_CANCEL" width="50" x="104" y="23"/>
1236 <radiobutton height="10" id="BTN_PAGE_WIDTH" width="80" x="12" y="27"/>
1237 diff --git toolkit/workben/layout/zoom.xml toolkit/workben/layout/zoom.xml
1238 index e228ace..4b4270f 100644
1239 --- toolkit/workben/layout/zoom.xml
1240 +++ toolkit/workben/layout/zoom.xml
1241 @@ -8,10 +8,10 @@
1242 id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
1243 help-id="SID_ATTR_ZOOM"
1244 has_border="true" sizeable="true" moveable="true" closeable="true">
1245 - <vbox spacing="5" border="5">
1246 + <vbox spacing="0" border="12">
1247 <hbox spacing="0" border="0">
1248 - <vbox spacing="5" border="5">
1249 - <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
1250 + <vbox spacing="6" border="0">
1251 + <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="false"/>
1252 <radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL" _label="Optimal"/>
1253 <radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
1254 <radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
1255 @@ -20,7 +20,7 @@
1256 <align cnt:expand="false" cnt:fill="true">
1257 <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
1258 </align>
1259 - <flow cnt:padding="10" cnt:expand="false"/>
1260 + <flow cnt:padding="12" cnt:expand="false"/>
1261 <metricfield id="ED_USER" value-step="1"
1262 repeat="true" has_border="true" spin="true"
1263 _text="100%" unit="11" custom-unit-text="%"
1264 @@ -28,15 +28,16 @@
1265 cnt:expand="false"/>
1266 </hbox>
1267 </vbox>
1268 - <vbox spacing="5" border="5">
1269 - <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
1270 + <flow/>
1271 + <vbox spacing="6" border="0">
1272 + <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="false"/>
1273 <radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
1274 <radiobutton radiogroup="zoom-layout" id="BTN_SINGLE" _label="~Single page"/>
1275 <hbox cnt:expand="false" cnt:fill="true">
1276 <align cnt:expand="false" cnt:fill="true">
1277 <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
1278 </align>
1279 - <flow cnt:padding="10" cnt:expand="false"/>
1280 + <flow cnt:padding="12" cnt:expand="false"/>
1281 <metricfield id="ED_COLUMNS" value-step="1"
1282 repeat="true" has_border="true" spin="true"
1283 _text="100%"
1284 @@ -45,15 +46,15 @@
1285 spin-value="1"
1286 cnt:expand="false"/>
1287 </hbox>
1288 - <hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
1289 + <hbox><flow cnt:expand="false" cnt:padding="12"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
1290 </vbox>
1291 </hbox>
1292 - <fixedline cnt:padding="1" id="FL_BOTTOM"/>
1293 - <dialogbuttonhbox border="5" spacing="5">
1294 + <fixedline cnt:padding="6" id="FL_BOTTOM"/>
1295 + <dialogbuttonhbox border="0" spacing="12">
1296 <flow/>
1297 - <okbutton id="BTN_ZOOM_OK"/>
1298 + <okbutton defbutton="true" id="BTN_ZOOM_OK"/>
1299 <cancelbutton id="BTN_ZOOM_CANCEL"/>
1300 - <helpbutton id="BTN_ZOOM_HELP"/>
1301 + <helpbutton id="BTN_ZOOM_HELP"/>
1302 </dialogbuttonhbox>
1303 </vbox>
1304 </modaldialog>
vba interoperability for OOo