?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update ooo310-m15
[ooovba.git] / applied_patches / 0640-layout-simple-dialogs-svx.diff
blob5856dcaa050085511805383464fa1643e27d3c4a
1 --- svx/inc/srchdlg.hxx.old 2009-04-06 16:42:06.000000000 +0000
2 +++ svx/inc/srchdlg.hxx 2009-04-06 16:42:13.000000000 +0000
3 @@ -116,12 +116,19 @@ public:
4
5 // class SvxSearchDialogWrapper ------------------------------------------
6
7 +#include <sfx2/layout.hxx>
8 +#include <sfx2/layout-pre.hxx>
9 +
10 +class SvxSearchDialog;
11 class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
12 {
13 + SvxSearchDialog *dialog;
14 public:
15 SvxSearchDialogWrapper( Window*pParent, USHORT nId,
16 SfxBindings* pBindings, SfxChildWinInfo* pInfo );
17
18 + ~SvxSearchDialogWrapper ();
19 + SvxSearchDialog *getDialog ();
20 SFX_DECL_CHILDWINDOW(SvxSearchDialogWrapper);
21 };
22
23 @@ -236,7 +243,7 @@ private:
24 ULONG nModifyFlag;
25 String aStylesStr;
26 String aLayoutStr;
27 - String aCalcStr;
28 + LocalizedString aCalcStr;
29
30 SvStringsDtor aSearchStrings;
31 SvStringsDtor aReplaceStrings;
32 @@ -288,6 +295,8 @@ private:
33 #endif
34 };
35
36 +#include <sfx2/layout-post.hxx>
37 +
38 inline BOOL SvxSearchDialog::HasSearchAttributes() const
39 {
40 int bLen = aSearchAttrText.GetText().Len();
41 --- svx/source/dialog/makefile.mk.old 2009-04-06 16:41:56.000000000 +0000
42 +++ svx/source/dialog/makefile.mk 2009-04-06 16:42:13.000000000 +0000
43 @@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
44 .INCLUDE : settings.mk
45 .INCLUDE : $(PRJ)$/util$/makefile.pmk
46
47 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
48 -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
49 -.ENDIF # ENABLE_LAYOUT == TRUE
50 -
51 .IF "$(ENABLE_GTK)" != ""
52 CFLAGS+=-DENABLE_GTK
53 .ENDIF
54 --- svx/source/dialog/srchdlg.cxx.old 2009-04-06 16:42:06.000000000 +0000
55 +++ svx/source/dialog/srchdlg.cxx 2009-04-06 16:42:13.000000000 +0000
56 @@ -78,6 +78,8 @@
57
58 #include <svx/svxdlg.hxx> //CHINA001
59
60 +#include <sfx2/layout-pre.hxx>
61 +
62 using namespace com::sun::star::i18n;
63 using namespace com::sun::star;
64 using namespace comphelper;
65 @@ -110,6 +112,11 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchA
66 #define GetCheckBoxValue( rBox ) \
67 rBox.IsEnabled() ? rBox.IsChecked() : FALSE
68
69 +#if ENABLE_LAYOUT
70 +#undef SVX_RES
71 +#define SVX_RES(x) #x
72 +#endif /* ENABLE_LAYOUT */
73 +
74 struct SearchDlg_Impl
75 {
76 FixedText aSearchFormats;
77 @@ -127,7 +134,11 @@ struct SearchDlg_Impl
78 util::URL aCommand1URL;
79 util::URL aCommand2URL;
80
81 - SearchDlg_Impl( Window* pParent ) :
82 +#if ENABLE_LAYOUT
83 + SearchDlg_Impl( layout::Context* pParent ) :
84 +#else /* !ENABLE_LAYOUT */
85 + SearchDlg_Impl( Window* pParent ) :
86 +#endif /* !ENABLE_LAYOUT */
87 aSearchFormats ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
88 aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
89 bMultiLineEdit ( FALSE ),
90 @@ -317,9 +328,18 @@ void SvxJSearchOptionsDialog::SetTransli
91 pPage->SetTransliterationFlags( nSettings );
92 }
93 */ //CHINA001
94 -#ifdef INI_LIST
95 +
96 +#if ENABLE_LAYOUT
97 +#undef SfxModelessDialog
98 +#define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child)
99 +#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
100 +#define THIS_SVX_RES(x) this, #x
101 +#else /* !ENABLE_LAYOUT */
102 +#define SVX_RES_PLAIN SVX_RES
103 +#define THIS_SVX_RES SVX_RES
104 +#endif /* !ENABLE_LAYOUT */
105 +
106 #undef INI_LIST
107 -#endif
108 #define INI_LIST() \
109 aSearchText ( this, SVX_RES( FT_SEARCH ) ), \
110 aSearchLB ( this, SVX_RES( ED_SEARCH ) ), \
111 @@ -373,7 +393,7 @@ void SvxJSearchOptionsDialog::SetTransli
112 bReadOnly ( FALSE ), \
113 bConstruct ( TRUE ), \
114 nModifyFlag ( 0 ), \
115 - aCalcStr ( SVX_RES( STR_WORDCALC ) ), \
116 + aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \
117 pImpl ( NULL ), \
118 pSearchList ( NULL ), \
119 pReplaceList ( NULL ), \
120 @@ -410,6 +430,10 @@ SvxSearchDialog::SvxSearchDialog( Window
121 }
122
123 #undef INI_LIST
124 +#if ENABLE_LAYOUT
125 +#undef SVX_RES
126 +#define SVX_RES(x) ResId (x, DIALOG_MGR ())
127 +#endif
128
129 // -----------------------------------------------------------------------
130
131 @@ -433,6 +457,11 @@ SvxSearchDialog::~SvxSearchDialog()
132 }
133
134 // -----------------------------------------------------------------------
135 +#if ENABLE_LAYOUT
136 +#undef Window
137 +#define Window layout::Window
138 +#endif /* !ENABLE_LAYOUT */
139 +
140 void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
141 {
142 Point aPos(rWindow.GetPosPixel());
143 @@ -442,16 +471,22 @@ void lcl_MoveDown( Window& rWindow, sal_
144
145 void SvxSearchDialog::Construct_Impl()
146 {
147 +#if ENABLE_LAYOUT
148 + SetHelpId (SID_SEARCH_DLG);
149 +#endif /* ENABLE_LAYOUT */
150 +
151 // temporary to avoid incompatibility
152 pImpl = new SearchDlg_Impl( this );
153 +#if !ENABLE_LAYOUT
154 pImpl->aSelectionTimer.SetTimeout( 500 );
155 pImpl->aSelectionTimer.SetTimeoutHdl(
156 LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) );
157 -
158 +#endif /* !ENABLE_LAYOUT */
159 EnableControls_Impl( 0 );
160
161 // alten Text des aWordBtn's merken
162 - ( aCalcStr += sal_Unicode('#') ) += aWordBtn.GetText();
163 + aCalcStr += sal_Unicode('#');
164 + aCalcStr += aWordBtn.GetText();
165
166 aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES );
167 aStylesStr = aLayoutBtn.GetText();
168 @@ -724,6 +759,7 @@ void SvxSearchDialog::InitControls_Impl(
169 aLink = LINK( this, SvxSearchDialog, LoseFocusHdl_Impl );
170 aSearchLB.SetLoseFocusHdl( aLink );
171 aReplaceLB.SetLoseFocusHdl( aLink );
172 +
173 aSearchTmplLB.SetLoseFocusHdl( aLink );
174 aReplaceTmplLB.SetLoseFocusHdl( aLink );
175
176 @@ -921,6 +957,8 @@ void SvxSearchDialog::CalculateDelta_Imp
177 pMoreBtn->Enable();
178 }
179
180 +#undef Window
181 +
182 // -----------------------------------------------------------------------
183
184 namespace {
185 @@ -1560,7 +1598,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_I
186 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
187 if(pFact)
188 {
189 - AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( this,
190 + AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( LAYOUT_THIS_WINDOW (this),
191 pSearchItem->IsLEVRelaxed(),
192 pSearchItem->GetLEVOther(),
193 pSearchItem->GetLEVShorter(),
194 @@ -1586,7 +1624,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_I
195 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
196 if(pFact)
197 {
198 - AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS );
199 + AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS );
200 DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
201 int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
202 if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
203 @@ -1605,7 +1643,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_I
204 pArgs[0].Name = ::rtl::OUString::createFromAscii("SearchString");
205 pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText());
206 pArgs[1].Name = ::rtl::OUString::createFromAscii("ParentWindow");
207 - pArgs[1].Value <<= VCLUnoHelper::GetInterface( this );
208 + pArgs[1].Value <<= VCLUnoHelper::GetInterface( LAYOUT_THIS_WINDOW (this) );
209 if(pBtn == &aSearchComponent1PB)
210 {
211 if ( pImpl->xCommand1Dispatch.is() )
212 @@ -2128,6 +2166,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Imp
213 aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
214
215 ModifyHdl_Impl( (ComboBox*)pCtrl );
216 +
217 aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aStylesStr );
218 return 0;
219 }
220 @@ -2201,7 +2240,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Im
221 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
222 if(pFact)
223 {
224 - SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( this, aSet, RID_SVXDLG_SEARCHFORMAT );
225 + SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT );
226 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
227 aTxt.Insert( pDlg->GetText(), 0 );
228 pDlg->SetText( aTxt );
229 @@ -2278,7 +2317,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl
230 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
231 if(pFact)
232 {
233 - VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR );
234 + VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR );
235 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
236 pDlg->Execute();
237 delete pDlg;
238 @@ -2437,7 +2476,9 @@ void SvxSearchDialog::PaintAttrText_Impl
239
240 void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
241 {
242 - if ( &aSearchLB == (ComboBox*)pCtrl )
243 + if (0)
244 + ;
245 + else if ( &aSearchLB == (ComboBox*)pCtrl )
246 nModifyFlag |= MODIFY_SEARCH;
247 else if ( &aReplaceLB == (ComboBox*)pCtrl )
248 nModifyFlag |= MODIFY_REPLACE;
249 @@ -2527,25 +2568,38 @@ void SvxSearchDialog::SaveToModule_Impl(
250
251 // class SvxSearchDialogWrapper ------------------------------------------
252
253 -SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG)
254 +SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG);
255
256 // -----------------------------------------------------------------------
257
258 SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
259 SfxBindings* pBindings,
260 - SfxChildWinInfo* pInfo ) :
261 - SfxChildWindow( _pParent, nId )
262 -
263 + SfxChildWinInfo* pInfo )
264 + : SfxChildWindow( _pParent, nId )
265 + , dialog (new SvxSearchDialog (_pParent, this, *pBindings))
266 {
267 - pWindow = new SvxSearchDialog( _pParent, this, *pBindings );
268 - ( (SvxSearchDialog*)pWindow )->Initialize( pInfo );
269 + pWindow = LAYOUT_THIS_WINDOW (dialog);
270 + dialog->Initialize( pInfo );
271
272 pBindings->Update( SID_SEARCH_ITEM );
273 pBindings->Update( SID_SEARCH_OPTIONS );
274 pBindings->Update( SID_SEARCH_SEARCHSET );
275 pBindings->Update( SID_SEARCH_REPLACESET );
276 eChildAlignment = SFX_ALIGN_NOALIGNMENT;
277 - ( (SvxSearchDialog*)pWindow )->bConstruct = FALSE;
278 + dialog->bConstruct = FALSE;
279 +}
280 +
281 +SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
282 +{
283 +#if ENABLE_LAYOUT
284 + delete dialog;
285 + pWindow = 0;
286 +#endif /* ENABLE_LAYOUT */
287 +}
288 +
289 +SvxSearchDialog *SvxSearchDialogWrapper::getDialog ()
290 +{
291 + return dialog;
292 }
293
294 // -----------------------------------------------------------------------
295 --- svx/source/dialog/zoom.cxx.old 2009-04-06 16:42:12.000000000 +0000
296 +++ svx/source/dialog/zoom.cxx 2009-04-06 16:42:13.000000000 +0000
297 @@ -56,6 +56,13 @@
298
299 #include <layout/layout-pre.hxx>
300
301 +#if ENABLE_LAYOUT
302 +#undef SVX_RES
303 +#define SVX_RES(x) #x
304 +#undef SfxModalDialog
305 +#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
306 +#endif /* ENABLE_LAYOUT */
307 +
308 // static ----------------------------------------------------------------
309
310 static USHORT pRanges[] =
311 @@ -217,6 +224,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
312 bModified ( FALSE )
313
314 {
315 +#if ENABLE_LAYOUT
316 + SetHelpId (SID_ATTR_ZOOM);
317 +#endif /* ENABLE_LAYOUT */
318 Link aLink = LINK( this, SvxZoomDialog, UserHdl );
319 a100Btn.SetClickHdl( aLink );
320 aOptimalBtn.SetClickHdl( aLink );
321 --- svx/uiconfig/layout/find-and-replace.xml.old 1970-01-01 00:00:00.000000000 +0000
322 +++ svx/uiconfig/layout/find-and-replace.xml 2009-04-06 16:42:13.000000000 +0000
323 @@ -0,0 +1,111 @@
324 +<?xml version="1.0" encoding="UTF-8"?>
325 +<!-- This is a template. i18n translation is not performed in-place;
326 + i18n translated XML files are generated from this template by
327 + transex3/layout/tralay. !-->
328 +
329 +<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">
330 + <vbox spacing="5" border="5">
331 + <string id="RID_SVXSTR_SEARCH_STYLES" _text="Including Styles"/>
332 + <string id="RID_SVXSTR_SEARCH" _text="(Search)"/>
333 + <string id="RID_SVXSTR_REPLACE" _text="(Replace)"/>
334 + <string id="STR_WORDCALC" _text="~Entire cells"/>
335 + <string id="STR_MORE_BTN" _text="More ~Options"/>
336 + <string id="STR_LESS_BTN" _text="Less ~Options"/>
337 + <hbox homogeneous="false" spacing="5" border="0">
338 + <vbox spacing="5" border="0">
339 + <fixedtext id="FT_SEARCH" _label="~Search for"/>
340 + <combobox dropdown="true" id="ED_SEARCH" tabstop="true" cnt:expand="false"/>
341 + <listbox has_border="true" dropdown="true" show="false" id="LB_SEARCH" sort="true" tabstop="true"/>
342 + <fixedtext show="false" id="FT_SEARCH_ATTR" word-break="true"/>
343 + <fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
344 + <flow/>
345 + <flow/>
346 + <flow/>
347 + </vbox>
348 + <vbox cnt:expand="false" spacing="5" border="0">
349 + <min-size min-width="100" cnt:expand="false"/>
350 + <pushbutton default="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"/>
351 + <pushbutton id="BTN_SEARCH_ALL" tabstop="true" _label="Find ~All" cnt:expand="false"/>
352 + </vbox>
353 + </hbox>
354 + <hbox spacing="5" border="0">
355 + <flow/>
356 + <vbox cnt:expand="false" spacing="5" border="0">
357 + <min-size min-width="100" cnt:expand="false"/>
358 + <fixedline id="FL_SEARCH_COMMAND"/>
359 + </vbox>
360 + </hbox>
361 + <hbox homogeneous="false" spacing="5" border="0">
362 + <vbox spacing="5" border="0">
363 + <fixedtext id="FT_REPLACE" _label="Re~place with"/>
364 + <combobox dropdown="true" id="ED_REPLACE" tabstop="true" cnt:expand="false"/>
365 + <listbox has_border="true" dropdown="true" show="false" id="LB_REPLACE" sort="true" tabstop="true"/>
366 + <fixedtext show="false" id="FT_REPLACE_ATTR" word-break="true"/>
367 + <fixedtext show="false" id="FT_REPLACE_FORMATS" word-break="true"/>
368 + <fixedline show="false" id="FL_SEARCH_COMPONENT"/>
369 + <flow/>
370 + <flow/>
371 + <flow/>
372 + </vbox>
373 + <vbox cnt:expand="false" spacing="5" border="0">
374 + <min-size min-width="100" cnt:expand="false"/>
375 + <pushbutton id="BTN_REPLACE" tabstop="true" _label="~Replace" cnt:expand="false"/>
376 + <pushbutton id="BTN_REPLACE_ALL" tabstop="true" _label="Replace A~ll" cnt:expand="false"/>
377 + </vbox>
378 + </hbox>
379 + <checkbox id="CB_MATCH_CASE" tabstop="true" _label="Ma~tch case"/>
380 + <pushbutton show="false" id="BTN_COMPONENT_1" tabstop="true" cnt:expand="false"/>
381 + <checkbox id="CB_WHOLE_WORDS" tabstop="true" _label="Whole wor~ds only"/>
382 + <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
383 + <fixedline id="FL_BUTTONS"/>
384 + <hbox>
385 + <morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true"/>
386 + <dialogbuttonhbox>
387 + <helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
388 + <cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
389 + </dialogbuttonhbox>
390 + </hbox>
391 + <fixedline show="false" id="FL_OPTIONS"/>
392 + <hbox homogeneous="false" spacing="5" border="0">
393 + <vbox spacing="5" border="0">
394 + <checkbox show="false" id="CB_SELECTIONS" tabstop="true" _label="Current selection ~only"/>
395 + <checkbox show="false" id="CB_BACKWARDS" tabstop="true" _label="Bac~kwards"/>
396 + <checkbox show="false" id="CB_REGEXP" tabstop="true" _label="Regular e~xpressions"/>
397 + <hbox>
398 + <checkbox show="false" id="CB_SIMILARITY" tabstop="true" _label="S~imilarity search"/>
399 + <flow/>
400 + <pushbutton show="false" id="PB_SIMILARITY" tabstop="true" _label="~..." cnt:expand="false"/>
401 + <flow/>
402 + </hbox>
403 + <checkbox show="false" id="CB_LAYOUTS" tabstop="true" _label="Search for St~yles"/>
404 + <checkbox show="false" id="CB_JAP_MATCH_FULL_HALF_WIDTH" tabstop="true" _label="Match character width"/>
405 + <hbox>
406 + <checkbox show="false" id="CB_JAP_SOUNDS_LIKE" tabstop="true" _label="Sounds like (Japanese)"/>
407 + <flow/>
408 + <pushbutton show="false" id="PB_JAP_OPTIONS" tabstop="true" _label="..." cnt:expand="false"/>
409 + <flow/>
410 + </hbox>
411 +
412 + <fixedline show="false" id="FL_CALC"/>
413 + <hbox spacing="5" border="0">
414 + <fixedtext show="false" id="FT_CALC_SEARCHIN" _label="~Search in"/>
415 + <listbox has_border="true" dropdown="true" show="false" id="LB_CALC_SEARCHIN" tabstop="true"/>
416 + </hbox>
417 + <hbox spacing="5" border="0">
418 + <fixedtext show="false" id="FT_CALC_SEARCHDIR" _label="~Search direction"/>
419 + <vbox spacing="5" border="5">
420 + <radiobutton show="false" id="RB_CALC_ROWS" _label="Ro~ws"/>
421 + <radiobutton show="false" id="RB_CALC_COLUMNS" _label="Col~umns"/>
422 + </vbox>
423 + </hbox>
424 + <checkbox show="false" id="CB_ALL_SHEETS" _label="Search in all sheets"/>
425 + </vbox>
426 + <vbox cnt:expand="false" spacing="5" border="0">
427 + <min-size min-width="100" cnt:expand="false"/>
428 + <pushbutton show="false" id="BTN_ATTRIBUTE" tabstop="true" _label="Attri~butes..." cnt:expand="false"/>
429 + <pushbutton show="false" id="BTN_FORMAT" tabstop="true" _label="For~mat..." cnt:expand="false"/>
430 + <pushbutton show="false" id="BTN_NOFORMAT" tabstop="true" _label="~No Format" cnt:expand="false"/>
431 + </vbox>
432 + </hbox>
433 + </vbox>
434 +</sfxmodelessdialog>
435 --- svx/uiconfig/layout/layout.mk.old 2009-04-06 16:42:12.000000000 +0000
436 +++ svx/uiconfig/layout/layout.mk 1970-01-01 00:00:00.000000000 +0000
437 @@ -1,33 +0,0 @@
438 -# TODO: move to solenv/inc
439 -# copies: sc/uiconfig/layout svx/uiconfig/layout sw/uiconfig/layout
440 -
441 -TRALAY=tralay
442 -XML_DEST=$(DLLDEST)
443 -XML_LANGS=$(alllangiso)
444 -
445 -ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
446 -
447 -# Must remove the -j (no duplicate base file names) flag
448 -ZIPUPDATE=-u
449 -XML_ZIP = $(PRJNAME)-layout
450 -
451 -ALLTAR: $(XML_ZIP)
452 -
453 -$(XML_ZIP): $(ALL_XMLS)
454 -
455 -ZIP1DIR=$(XML_DEST)
456 -ZIP1TARGET=$(XML_ZIP)
457 -ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
458 -
459 -$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
460 - -$(MKDIR) $(@:d)
461 - @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
462 - $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
463 -
464 -$(XML_DEST)/%.xml: %.xml
465 - -$(MKDIR) $(@:d)
466 - $(COPY) $< $@
467 -
468 -# Don't want to overwrite filled localize.sdf with empty template
469 -template.sdf:
470 - $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
471 --- svx/uiconfig/layout/makefile.mk.old 2009-04-02 11:03:33.000000000 +0000
472 +++ svx/uiconfig/layout/makefile.mk 2009-04-06 16:42:13.000000000 +0000
473 @@ -39,7 +39,10 @@ TARGET=layout
474
475 all: ALLTAR
476
477 -XML_FILES=zoom.xml
478 +XML_FILES=\
479 + "find-and-replace.xml"\
480 + zoom.xml\
481 +#
482
483 .INCLUDE : layout.mk
484
485 @@ -48,3 +51,9 @@ all .PHONY:
486 .ENDIF # ENABLE_LAYOUT != TRUE
487
488 .INCLUDE : target.mk
489 +
490 +localize.sdf: $(PRJ)/source/dialog/localize.sdf
491 + 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-$@
492 + 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-$@
493 + echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
494 + rm -f *-$@
495 --- svx/uiconfig/layout/zoom.xml.old 2009-04-02 11:03:33.000000000 +0000
496 +++ svx/uiconfig/layout/zoom.xml 2009-04-06 16:42:13.000000000 +0000
497 @@ -7,18 +7,18 @@
498 xmlns:cnt="http://openoffice.org/2007/layout/container"
499 id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
500 help-id="SID_ATTR_ZOOM"
501 - has_border="true" sizeable="true" moveable="true">
502 + has_border="true" sizeable="true" moveable="true" closeable="true">
503 <vbox spacing="5" border="5">
504 <hbox spacing="0" border="0">
505 <vbox spacing="5" border="5">
506 <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
507 - <radiobutton radiogroup="zoom" id="BTN_OPTIMAL" _label="Optimal"/>
508 - <radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
509 - <radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" _label="Page Width"/>
510 - <radiobutton radiogroup="zoom" id="BTN_100" _label="100 %"/>
511 + <radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL" _label="Optimal"/>
512 + <radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
513 + <radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
514 + <radiobutton radiogroup="zoom-factor" id="BTN_100" _label="100 %"/>
515 <hbox cnt:expand="false" cnt:fill="true">
516 <align cnt:expand="false" cnt:fill="true">
517 - <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
518 + <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
519 </align>
520 <flow cnt:padding="10" cnt:expand="false"/>
521 <metricfield id="ED_USER" value-step="1"
522 @@ -30,11 +30,11 @@
523 </vbox>
524 <vbox spacing="5" border="5">
525 <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
526 - <radiobutton radiogroup="zoom" id="BTN_AUTOMATIC" _label="~Automatic"/>
527 - <radiobutton radiogroup="zoom" id="BTN_SINGLE" _label="~Single page"/>
528 + <radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
529 + <radiobutton radiogroup="zoom-layout" id="BTN_SINGLE" _label="~Single page"/>
530 <hbox cnt:expand="false" cnt:fill="true">
531 <align cnt:expand="false" cnt:fill="true">
532 - <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_COLUMNS" _label="~Columns"/>
533 + <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
534 </align>
535 <flow cnt:padding="10" cnt:expand="false"/>
536 <metricfield id="ED_COLUMNS" value-step="1"
537 @@ -48,7 +48,7 @@
538 <hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
539 </vbox>
540 </hbox>
541 - <fixedline cnt:padding="1" id="FL_BOTTOM"/>
542 + <fixedline cnt:padding="1" id="FL_BOTTOM"/>
543 <dialogbuttonhbox border="5" spacing="5">
544 <flow/>
545 <okbutton id="BTN_ZOOM_OK"/>
546 --- svx/util/makefile.pmk.old 2009-04-02 11:03:40.000000000 +0000
547 +++ svx/util/makefile.pmk 2009-04-06 16:42:13.000000000 +0000
548 @@ -36,10 +36,4 @@ CDEFS += -DSVX_DLLIMPLEMENTATION
549 CFLAGS+=-DENABLE_GTK
550 .ENDIF
551
552 -.IF "$(ENABLE_LAYOUT)" == "TRUE"
553 -CFLAGS+=-DENABLE_LAYOUT=1
554 -.ELSE
555 -CFLAGS+=-DENABLE_LAYOUT=0
556 -.ENDIF # ENABLE_LAYOUT == TRUE
557 -
558 VISIBILITY_HIDDEN=TRUE
vba interoperability for OOo