?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update ooo310-m15
[ooovba.git] / applied_patches / 0633-layout-simple-dialogs-sc.diff
blob08584d3ecc6778143c975ea364ce79635a9fa90b
1 --- sc/source/ui/attrdlg/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
2 +++ sc/source/ui/attrdlg/makefile.mk 2009-04-06 16:42:12.000000000 +0000
3 @@ -42,10 +42,6 @@ LIBTARGET=no
4 .INCLUDE : sc.mk
5 .INCLUDE : $(PRJ)$/util$/makefile.pmk
6
7 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
8 -CFLAGS+= -DENABLE_LAYOUT=1
9 -.ENDIF # ENABLE_LAYOUT == TRUE
10 -
11 # --- Files --------------------------------------------------------
12
13 CXXFILES = attrdlg.cxx \
14 --- sc/source/ui/attrdlg/scdlgfact.cxx.old 2009-04-06 16:42:07.000000000 +0000
15 +++ sc/source/ui/attrdlg/scdlgfact.cxx 2009-04-06 16:42:12.000000000 +0000
16 @@ -84,6 +84,7 @@
17
18 // ause
19 #include "editutil.hxx"
20 +#include <sfx2/layout.hxx>
21
22 IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); //add for ScColOrRowDlg
23 IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);//CHINA001 add for ScImportAsciiDlg
24 @@ -121,6 +122,40 @@ IMPL_ABSTDLG_BASE(AbstractScImportOption
25 IMPL_ABSTDLG_BASE(AbstractScLangChooserDlg_Impl);
26 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
27
28 +// AbstractTabDialog_Impl begin
29 +void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
30 +{
31 + pDlg->SetCurPageId( nId );
32 +}
33 +
34 +const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
35 +{
36 + return pDlg->GetOutputItemSet();
37 +}
38 +//add by CHINA001
39 +const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
40 +{
41 + return pDlg->GetInputRanges( pItem );
42 +}
43 +//add by CHINA001
44 +void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
45 +{
46 + pDlg->SetInputSet( pInSet );
47 +}
48 +//From class Window.
49 +void AbstractTabDialog_Impl::SetText( const XubString& rStr )
50 +{
51 + pDlg->SetText( rStr );
52 +}
53 +String AbstractTabDialog_Impl::GetText() const
54 +{
55 + return pDlg->GetText();
56 +}
57 +
58 +#if ENABLE_LAYOUT
59 +namespace layout
60 +{
61 +IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
62
63 // AbstractTabDialog_Impl begin
64 void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
65 @@ -151,6 +186,8 @@ String AbstractTabDialog_Impl::GetText()
66 {
67 return pDlg->GetText();
68 }
69 +}
70 +#endif /* ENABLE_LAYOUT */
71
72 //add for AbstractTabDialog_Impl end
73 // AbstractScImportAsciiDlg_Impl begin
74 @@ -1463,6 +1500,10 @@ SfxAbstractTabDialog * ScAbstractDialogF
75 }
76 //add for ScValidationDlg end
77
78 +#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
79 +#define SfxTabDialog layout::SfxTabDialog
80 +#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
81 +#endif /* ENABLE_LAYOUT */
82 //add for ScSortDlg begin
83 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
84 const SfxItemSet* pArgSet,int nId )
85 @@ -1481,6 +1522,9 @@ SfxAbstractTabDialog * ScAbstractDialogF
86 return new AbstractTabDialog_Impl( pDlg );
87 return 0;
88 }
89 +#undef SfxTabDialog
90 +#undef AbstractTabDialog_Impl
91 +
92 //add for ScSortDlg end
93 //------------------ Factories for TabPages--------------------
94 CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
95 --- sc/source/ui/attrdlg/scdlgfact.hxx.old 2009-04-06 16:42:07.000000000 +0000
96 +++ sc/source/ui/attrdlg/scdlgfact.hxx 2009-04-06 16:42:12.000000000 +0000
97 @@ -375,6 +375,23 @@ class AbstractTabDialog_Impl : public Sf
98 virtual void SetText( const XubString& rStr ); //add by CHINA001
99 virtual String GetText() const; //add by CHINA001
100 };
101 +#if ENABLE_LAYOUT
102 +namespace layout
103 +{
104 +//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
105 +class AbstractTabDialog_Impl : public SfxAbstractTabDialog
106 +{
107 + DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
108 + virtual void SetCurPageId( USHORT nId );
109 + virtual const SfxItemSet* GetOutputItemSet() const;
110 + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
111 + virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
112 + //From class Window.
113 + virtual void SetText( const XubString& rStr ); //add by CHINA001
114 + virtual String GetText() const; //add by CHINA001
115 +};
116 +} // end namespace layout
117 +#endif /* ENABLE_LAYOUT */
118 //------------------------------------------------------------------------
119 //AbstractDialogFactory_Impl implementations
120 class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
121 --- sc/source/ui/dbgui/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
122 +++ sc/source/ui/dbgui/makefile.mk 2009-04-06 16:42:12.000000000 +0000
123 @@ -42,10 +42,6 @@ LIBTARGET=no
124 .INCLUDE : sc.mk
125 .INCLUDE : $(PRJ)$/util$/makefile.pmk
126
127 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
128 -CFLAGS+= -DENABLE_LAYOUT=1
129 -.ENDIF # ENABLE_LAYOUT == TRUE
130 -
131 # --- Files --------------------------------------------------------
132
133 SLOFILES = \
134 --- sc/source/ui/dbgui/sortdlg.cxx.old 2009-04-06 16:42:11.000000000 +0000
135 +++ sc/source/ui/dbgui/sortdlg.cxx 2009-04-06 16:42:12.000000000 +0000
136 @@ -40,8 +40,9 @@
137 #include "scresid.hxx"
138 #include "sortdlg.hrc"
139
140 -
141 -//==================================================================
142 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
143 +#include <layout/layout-pre.hxx>
144 +#endif
145
146 ScSortDlg::ScSortDlg( Window* pParent,
147 const SfxItemSet* pArgSet ) :
148 @@ -52,8 +53,15 @@ ScSortDlg::ScSortDlg( Window* pParent,
149 bIsByRows ( FALSE )
150
151 {
152 +#ifdef LAYOUT_SFX_TABDIALOG_BROKEN
153 AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 );
154 AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
155 +#else
156 + String fields = rtl::OUString::createFromAscii ("fields");
157 + AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
158 + String options = rtl::OUString::createFromAscii ("options");
159 + AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
160 +#endif
161 FreeResource();
162 }
163
164 --- sc/source/ui/dbgui/tpsort.cxx.old 2009-04-06 16:42:11.000000000 +0000
165 +++ sc/source/ui/dbgui/tpsort.cxx 2009-04-06 16:42:12.000000000 +0000
166 @@ -550,7 +550,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHd
167 #undef ScResId
168 #define ScResId(x) #x
169 #undef SfxTabPage
170 -#define SfxTabPage( parent, id, args ) TabPage( parent, "sort-options.xml", id, 0, &args )
171 +#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
172 #endif /* ENABLE_LAYOUT */
173
174 ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
175 @@ -580,6 +580,7 @@ ScTabPageSortOptions::ScTabPageSortOptio
176 // aFtArea ( this, ScResId( FT_AREA ) ),
177 //
178 #if ENABLE_LAYOUT
179 +#undef this
180 #undef ScResId
181 #define ScResId(x) this, #x
182 #endif /* ENABLE_LAYOUT */
183 @@ -724,7 +725,6 @@ USHORT* __EXPORT ScTabPageSortOptions::G
184
185 #if ENABLE_LAYOUT
186 #undef SfxTabPage
187 -#define SfxTabPage TabPage
188 #endif /* ENABLE_LAYOUT */
189 SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
190 Window* pParent,
191 --- sc/source/ui/inc/instbdlg.hxx.old 2009-04-02 10:45:37.000000000 +0000
192 +++ sc/source/ui/inc/instbdlg.hxx 2009-04-06 16:42:12.000000000 +0000
193 @@ -56,6 +56,9 @@
194 #include <vcl/field.hxx>
195 #include "expftext.hxx"
196
197 +#include <layout/layout.hxx>
198 +#include <layout/layout-pre.hxx>
199 +
200 class ScViewData;
201 class ScDocument;
202 class ScDocShell;
203 @@ -130,5 +133,7 @@ private:
204 #endif
205 };
206
207 +#include <layout/layout-post.hxx>
208 +
209 #endif // SC_INSTBDLG_HXX
210
211 --- sc/source/ui/inc/mvtabdlg.hxx.old 2009-04-02 10:45:37.000000000 +0000
212 +++ sc/source/ui/inc/mvtabdlg.hxx 2009-04-06 16:42:12.000000000 +0000
213 @@ -38,6 +38,9 @@
214 #include <vcl/lstbox.hxx>
215 #include <vcl/fixed.hxx>
216
217 +#include <layout/layout.hxx>
218 +#include <layout/layout-pre.hxx>
219 +
220 //------------------------------------------------------------------------
221
222 class ScMoveTableDlg : public ModalDialog
223 @@ -72,6 +75,7 @@ private:
224 DECL_LINK( SelHdl, ListBox * );
225 };
226
227 +#include <layout/layout-post.hxx>
228
229 #endif // SC_MVTABDLG_HXX
230
231 --- sc/source/ui/inc/sortdlg.hxx.old 2009-04-02 10:45:37.000000000 +0000
232 +++ sc/source/ui/inc/sortdlg.hxx 2009-04-06 16:42:12.000000000 +0000
233 @@ -33,10 +33,12 @@
234
235 #include <sfx2/tabdlg.hxx>
236
237 -#ifndef _SFX_HXX
238 -#endif
239 +#define LAYOUT_SFX_TABDIALOG_BROKEN 1
240
241 -//==================================================================
242 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
243 +#include <sfx2/layout.hxx>
244 +#include <layout/layout-pre.hxx>
245 +#endif
246
247 class ScSortDlg : public SfxTabDialog
248 {
249 @@ -61,7 +63,8 @@ inline void ScSortDlg::SetByRows ( BOOL
250 inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; }
251 inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; }
252
253 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
254 +#include <layout/layout-post.hxx>
255 +#endif
256
257 #endif // SC_SORTDLG_HXX
258 -
259 -
260 --- sc/source/ui/inc/strindlg.hxx.old 2009-04-02 10:45:37.000000000 +0000
261 +++ sc/source/ui/inc/strindlg.hxx 2009-04-06 16:42:12.000000000 +0000
262 @@ -37,6 +37,9 @@
263 #include <vcl/imagebtn.hxx>
264 #include <vcl/edit.hxx>
265
266 +#include <layout/layout.hxx>
267 +#include <layout/layout-pre.hxx>
268 +
269 //------------------------------------------------------------------------
270
271 class ScStringInputDlg : public ModalDialog
272 @@ -59,6 +62,7 @@ private:
273 HelpButton aBtnHelp;
274 };
275
276 +#include <layout/layout-post.hxx>
277
278 #endif // SC_STRINDLG_HXX
279
280 --- sc/source/ui/inc/tpsort.hxx.old 2009-04-06 16:42:11.000000000 +0000
281 +++ sc/source/ui/inc/tpsort.hxx 2009-04-06 16:42:12.000000000 +0000
282 @@ -132,7 +132,7 @@ class ScRangeData;
283 class CollatorRessource;
284 class CollatorWrapper;
285
286 -#include <layout/layout.hxx>
287 +#include <sfx2/layout.hxx>
288 #include <layout/layout-pre.hxx>
289
290 class ScTabPageSortOptions : public SfxTabPage
291 @@ -142,12 +142,10 @@ public:
292 const SfxItemSet& rArgSet );
293 ~ScTabPageSortOptions();
294
295 -#if !ENABLE_LAYOUT
296 +#undef SfxTabPage
297 +#define SfxTabPage ::SfxTabPage
298 static SfxTabPage* Create ( Window* pParent,
299 const SfxItemSet& rArgSet );
300 -#else /* ENABLE_LAYOUT */
301 - static TabPage* Create ( Window* parent, SfxItemSet const& set );
302 -#endif /* ENABLE_LAYOUT */
303 static USHORT* GetRanges ();
304 virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
305 virtual void Reset ( const SfxItemSet& rArgSet );
306 @@ -185,13 +183,9 @@ private:
307
308 // FixedText aFtAreaLabel;
309 // FixedInfo aFtArea;
310 -#if ENABLE_LAYOUT
311 -#define String layout::LocalizedString
312 -#endif /* ENABLE_LAYOUT */
313 - String aStrRowLabel;
314 - String aStrColLabel;
315 - String aStrUndefined;
316 -#undef String
317 + LocalizedString aStrRowLabel;
318 + LocalizedString aStrColLabel;
319 + LocalizedString aStrUndefined;
320 String aStrNoName;
321 String aStrAreaLabel;
322
323 --- sc/source/ui/miscdlgs/instbdlg.cxx.old 2009-04-02 10:45:29.000000000 +0000
324 +++ sc/source/ui/miscdlgs/instbdlg.cxx 2009-04-06 16:42:12.000000000 +0000
325 @@ -55,6 +55,17 @@
326 #define SC_INSTBDLG_CXX
327 #include "instbdlg.hxx"
328
329 +#include <layout/layout-pre.hxx>
330 +
331 +#if ENABLE_LAYOUT
332 +#undef ScResId
333 +#define ScResId(x) #x
334 +#undef ModalDialog
335 +#define ModalDialog( parent, id ) Dialog( parent, "insert-sheet.xml", id )
336 +#define ErrorBox( this, bits, message ) ErrorBox (LAYOUT_THIS_WINDOW (this), bits, message)
337 +#define SetDefDialogParent( this ) SetDefDialogParent (LAYOUT_THIS_WINDOW (this))
338 +#endif /* ENABLE_LAYOUT */
339 +
340 //==================================================================
341
342 ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
343 @@ -86,6 +97,10 @@ ScInsertTableDlg::ScInsertTableDlg( Wind
344 nSelTabIndex ( 0 ),
345 nTableCount (nTabCount)
346 {
347 +#if ENABLE_LAYOUT
348 + SetHelpId (SID_INSERT_TABLE);
349 + aFtPath.SetText (EMPTY_STRING);
350 +#endif /* ENABLE_LAYOUT */
351 Init_Impl( bFromFile );
352 FreeResource();
353 }
354 @@ -152,6 +167,10 @@ void ScInsertTableDlg::Init_Impl( bool b
355
356 //------------------------------------------------------------------------
357
358 +#if ENABLE_LAYOUT
359 +#define ModalDialog Dialog
360 +#endif /* ENABLE_LAYOUT */
361 +
362 short __EXPORT ScInsertTableDlg::Execute()
363 {
364 // set Parent of DocumentInserter and Doc-Manager
365 @@ -162,6 +181,7 @@ short __EXPORT ScInsertTableDlg::Execute
366 aBrowseTimer.Start();
367
368 short nRet = ModalDialog::Execute();
369 +#undef SetDefDialogParent
370 Application::SetDefDialogParent( pOldDefParent );
371 return nRet;
372 }
373 --- sc/source/ui/miscdlgs/mvtabdlg.cxx.old 2009-04-02 10:45:29.000000000 +0000
374 +++ sc/source/ui/miscdlgs/mvtabdlg.cxx 2009-04-06 16:42:12.000000000 +0000
375 @@ -47,6 +47,15 @@
376 #include "scresid.hxx"
377 #include "globstr.hrc"
378
379 +#include <layout/layout-pre.hxx>
380 +
381 +#if ENABLE_LAYOUT
382 +#undef ScResId
383 +#define ScResId(x) #x
384 +#undef ModalDialog
385 +#define ModalDialog( parent, id ) Dialog( parent, "move-copy-sheet.xml", id )
386 +#endif /* ENABLE_LAYOUT */
387 +
388 //==================================================================
389
390 ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
391 @@ -66,6 +75,10 @@ ScMoveTableDlg::ScMoveTableDlg( Window*
392 nTable ( 0 ),
393 bCopyTable ( FALSE )
394 {
395 +#if ENABLE_LAYOUT
396 +#undef ScResId
397 + SetHelpId (FID_TAB_MOVE);
398 +#endif /* ENABLE_LAYOUT */
399 Init();
400 FreeResource();
401 }
402 --- sc/source/ui/miscdlgs/strindlg.cxx.old 2009-04-02 10:45:29.000000000 +0000
403 +++ sc/source/ui/miscdlgs/strindlg.cxx 2009-04-06 16:42:12.000000000 +0000
404 @@ -43,6 +43,14 @@
405 #include "scresid.hxx"
406 #include "miscdlgs.hrc"
407
408 +#include <layout/layout-pre.hxx>
409 +
410 +#if ENABLE_LAYOUT
411 +#undef ScResId
412 +#define ScResId(x) #x
413 +#undef ModalDialog
414 +#define ModalDialog( parent, id ) Dialog( parent, "string-input.xml", id )
415 +#endif /* ENABLE_LAYOUT */
416
417 //==================================================================
418
419 --- sc/source/ui/view/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
420 +++ sc/source/ui/view/makefile.mk 2009-04-06 16:42:12.000000000 +0000
421 @@ -40,10 +40,6 @@ TARGET=view
422 .INCLUDE : sc.mk
423 .INCLUDE : $(PRJ)$/util$/makefile.pmk
424
425 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
426 -CFLAGS+= -DENABLE_LAYOUT=1
427 -.ENDIF # ENABLE_LAYOUT == TRUE
428 -
429 # --- Files --------------------------------------------------------
430 # drawattr.cxx fuer IDL (enums), sollte in den Svx gehen??
431
432 --- sc/source/ui/view/tabvwshf.cxx.old 2009-04-06 16:42:06.000000000 +0000
433 +++ sc/source/ui/view/tabvwshf.cxx 2009-04-06 16:42:12.000000000 +0000
434 @@ -40,6 +40,7 @@
435 #include <sfx2/bindings.hxx>
436 #include <sfx2/viewfrm.hxx>
437 #include <basic/sbstar.hxx>
438 +#include <layout/layout.hxx>
439 #include <svtools/languageoptions.hxx>
440 #include <svtools/stritem.hxx>
441 #include <svtools/whiter.hxx>
442 @@ -57,7 +58,6 @@
443 //CHINA001 #include "mvtabdlg.hxx"
444 #include "docfunc.hxx"
445
446 -
447 #include "scabstdlg.hxx" //CHINA001
448
449 #include "tabbgcolor.hxx" //DBW
450 @@ -627,11 +627,17 @@ void ScTabViewShell::ExecuteTable( SfxRe
451 {
452 // wenn's nicht von Basic kommt, nochmal nachfragen:
453
454 - bDoIt = ( RET_YES ==
455 - QueryBox( GetDialogParent(),
456 - WinBits( WB_YES_NO | WB_DEF_YES ),
457 - ScGlobal::GetRscString(STR_QUERY_DELTAB)
458 - ).Execute() );
459 +#if ENABLE_LAYOUT
460 +// Using layout::QueryBox without client code modification is
461 +// deprecated, rather add HIG-complient buttons with verbs.
462 +#define QueryBox( parent, winbits, question ) layout::QueryBox (parent, question, ScGlobal::GetRscString (STR_UNDO_DELETE_TAB))
463 +#endif /* ENABLE_LAYOUT */
464 +
465 + bDoIt = ( RET_YES ==
466 + QueryBox( GetDialogParent(),
467 + WinBits( WB_YES_NO | WB_DEF_YES ),
468 + ScGlobal::GetRscString(STR_QUERY_DELTAB)
469 + ).Execute() );
470 }
471 if( bDoIt )
472 {
473 --- sc/uiconfig/layout/insert-sheet.xml.old 1970-01-01 00:00:00.000000000 +0000
474 +++ sc/uiconfig/layout/insert-sheet.xml 2009-04-06 16:42:12.000000000 +0000
475 @@ -0,0 +1,57 @@
476 +<?xml version="1.0" encoding="UTF-8"?>
477 +<!-- This is a template. i18n translation is not performed in-place;
478 + i18n translated XML files are generated from this template by
479 + transex3/layout/tralay. !-->
480 +
481 +<modaldialog sizeable="true" closeable="true" moveable="true" output-size="true" id="RID_SCDLG_INSERT_TABLE" sv-look="true" _title="Insert Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
482 + <vbox spacing="5" border="5">
483 + <fixedline id="FL_POSITION" _text="Position"/>
484 + <hbox>
485 + <vbox cnt:padding="13" spacing="5">
486 + <radiobutton radiogroup="insert-sheet-position" id="RB_BEFORE" tabstop="true" _label="B~efore current sheet"/>
487 + <radiobutton radiogroup="insert-sheet-position" id="RB_BEHIND" tabstop="true" _label="~After current sheet"/>
488 + </vbox>
489 + </hbox>
490 + <fixedline id="FL_TABLE" _text="Sheet"/>
491 + <hbox>
492 + <vbox cnt:padding="13" spacing="5">
493 + <radiobutton radiogroup="insert-sheet-source" id="RB_NEW" _label="~New sheet"/>
494 + <hbox>
495 + <vbox cnt:padding="13" spacing="5" cnt:fill="false" cnt:expand="false">
496 + <fixedtext id="FT_COUNT" _label="N~o. of sheets"/>
497 + <fixedtext id="FT_NAME" _label="Na~me"/>
498 + </vbox>
499 + <vbox>
500 + <hbox>
501 + <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="false"/>
502 + </hbox>
503 + <edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
504 + </vbox>
505 + </hbox>
506 + </vbox>
507 + </hbox>
508 + <hbox>
509 + <vbox cnt:padding="13" spacing="5">
510 + <radiobutton radiogroup="insert-sheet-source" id="RB_FROMFILE" _label="~From file"/>
511 + <hbox>
512 + <vbox cnt:padding="13" spacing="5">
513 + <hbox>
514 + <multilistbox auto-hscroll="true" has_border="true" id="LB_TABLES" simple-mode="true" string-item-list=" : : : : " cnt:fill="true" cnt:expand="true"/>
515 + <vbox cnt:fill="false" cnt:expand="false" spacing="5">
516 + <pushbutton id="BTN_BROWSE" _label="~Browse..." cnt:expand="false"/>
517 + <checkbox id="CB_LINK" _label="Lin~k" cnt:expand="false"/>
518 + <flow/>
519 + </vbox>
520 + </hbox>
521 + <fixedtext id="FT_PATH" label="FT-PATH"/>
522 + </vbox>
523 + </hbox>
524 + </vbox>
525 + </hbox>
526 + <dialogbuttonhbox border="5" spacing="5">
527 + <okbutton default="true" id="BTN_OK"/>
528 + <cancelbutton id="BTN_CANCEL"/>
529 + <helpbutton id="BTN_HELP"/>
530 + </dialogbuttonhbox>
531 + </vbox>
532 +</modaldialog>
533 --- sc/uiconfig/layout/layout.mk.old 2009-04-06 16:42:11.000000000 +0000
534 +++ sc/uiconfig/layout/layout.mk 1970-01-01 00:00:00.000000000 +0000
535 @@ -1,33 +0,0 @@
536 -# TODO: move to solenv/inc
537 -# copies: sc/uiconfig/layout svx/uiconfig/layout sw/uiconfig/layout
538 -
539 -TRALAY=tralay
540 -XML_DEST=$(DLLDEST)
541 -XML_LANGS=$(alllangiso)
542 -
543 -ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
544 -
545 -# Must remove the -j (no duplicate base file names) flag
546 -ZIPUPDATE=-u
547 -XML_ZIP = $(PRJNAME)-layout
548 -
549 -ALLTAR: $(XML_ZIP)
550 -
551 -$(XML_ZIP): $(ALL_XMLS)
552 -
553 -ZIP1DIR=$(XML_DEST)
554 -ZIP1TARGET=$(XML_ZIP)
555 -ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
556 -
557 -$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
558 - -$(MKDIR) $(@:d)
559 - @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
560 - $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
561 -
562 -$(XML_DEST)/%.xml: %.xml
563 - -$(MKDIR) $(@:d)
564 - $(COPY) $< $@
565 -
566 -# Don't want to overwrite filled localize.sdf with empty template
567 -template.sdf:
568 - $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
569 --- sc/uiconfig/layout/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
570 +++ sc/uiconfig/layout/makefile.mk 2009-04-06 16:42:12.000000000 +0000
571 @@ -43,7 +43,13 @@ TARGET=layout
572
573 all: ALLTAR
574
575 -XML_FILES=sort-options.xml
576 +XML_FILES=\
577 + insert-sheet.xml\
578 + move-copy-sheet.xml\
579 + sort-options.xml\
580 + string-input.xml\
581 +
582 +#
583
584 .INCLUDE : layout.mk
585
586 @@ -52,3 +58,10 @@ all .PHONY:
587 .ENDIF # ENABLE_LAYOUT != TRUE
588
589 .INCLUDE : target.mk
590 +
591 +localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf
592 + 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-$@
593 + 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-$@
594 + 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-$@
595 + echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
596 + rm -f *-$@
597 --- sc/uiconfig/layout/move-copy-sheet.xml.old 1970-01-01 00:00:00.000000000 +0000
598 +++ sc/uiconfig/layout/move-copy-sheet.xml 2009-04-06 16:42:12.000000000 +0000
599 @@ -0,0 +1,21 @@
600 +<?xml version="1.0" encoding="UTF-8"?>
601 +<!-- This is a template. i18n translation is not performed in-place;
602 + i18n translated XML files are generated from this template by
603 + transex3/layout/tralay. !-->
604 +
605 +<modaldialog sizeable="true" closeable="true" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
606 + <vbox spacing="5" border="5">
607 + <string id="STR_NEWDOC" _text="- new document -"/>
608 + <fixedtext id="FT_DEST" _label="To ~document"/>
609 + <listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
610 + <fixedtext id="FT_INSERT" _label="~Insert before"/>
611 + <listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
612 + <checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
613 + <dialogbuttonhbox border="5" spacing="5">
614 + <flow/>
615 + <cancelbutton id="BTN_CANCEL" tabstop="true"/>
616 + <helpbutton id="BTN_HELP" tabstop="true"/>
617 + <okbutton default="true" id="BTN_OK" tabstop="true"/>
618 + </dialogbuttonhbox>
619 + </vbox>
620 +</modaldialog>
621 --- sc/uiconfig/layout/sort-options.xml.old 2009-04-06 16:42:11.000000000 +0000
622 +++ sc/uiconfig/layout/sort-options.xml 2009-04-06 16:42:12.000000000 +0000
623 @@ -33,8 +33,8 @@
624 <listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
625 </hbox>
626 <fixedline id="FL_DIRECTION" _text="Direction"/>
627 - <radiobutton id="BTN_TOP_DOWN" tabstop="true" _label="~Top to bottom (sort rows)"/>
628 - <radiobutton id="BTN_LEFT_RIGHT" tabstop="true" _label="L~eft to right (sort columns)"/>
629 + <radiobutton id="BTN_TOP_DOWN" radiogroup="sort-options" tabstop="true" _label="~Top to bottom (sort rows)"/>
630 + <radiobutton id="BTN_LEFT_RIGHT" radiogroup="sort-options" tabstop="true" _label="L~eft to right (sort columns)"/>
631 </vbox>
632 </vbox>
633 </tabpage>
634 --- sc/uiconfig/layout/string-input.xml.old 1970-01-01 00:00:00.000000000 +0000
635 +++ sc/uiconfig/layout/string-input.xml 2009-04-06 16:42:12.000000000 +0000
636 @@ -0,0 +1,16 @@
637 +<?xml version="1.0" encoding="UTF-8"?>
638 +<!-- This is a template. i18n translation is not performed in-place;
639 + i18n translated XML files are generated from this template by
640 + transex3/layout/tralay. !-->
641 +
642 +<modaldialog sizeable="true" closeable="false" moveable="true" output-size="true" id="RID_SCDLG_STRINPUT" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container" title="Insert String">
643 + <vbox spacing="5" border="5">
644 + <fixedtext id="FT_LABEL" label="FT-LABEL"/>
645 + <edit has_border="true" id="ED_INPUT" tabstop="true"/>
646 + <dialogbuttonhbox border="5" spacing="5">
647 + <okbutton default="true" id="BTN_OK" tabstop="true"/>
648 + <cancelbutton id="BTN_CANCEL" tabstop="true"/>
649 + <helpbutton id="BTN_HELP" tabstop="true"/>
650 + </dialogbuttonhbox>
651 + </vbox>
652 +</modaldialog>
vba interoperability for OOo