CWS-TOOLING: integrate CWS layoutdialogs2
2009-04-09 10:11:14 +0200 mba r270680 : defective merge sets seem to have brought config_office back 2009-04-02 18:00:52 +0200 mba r270429 : #i100503#: make tralay work without LD_LIBRARY_PATH 2009-04-01 13:27:58 +0200 mba r270320 : warning on Solaris fixed 2009-03-31 22:15:03 +0200 mba r270293 : CWS-TOOLING: rebase CWS layoutdialogs2 to trunk@270033 (milestone: DEV300:m45) 2009-03-16 13:05:08 +0100 mba r269526 : fixed some compiler warnings of the Sun compiler 2009-03-11 15:32:42 +0100 mba r269337 : some problems for ENABLE_LAYOUT fixed 2009-03-09 16:05:32 +0100 mba r269197 : merge conflict solved 2009-03-09 15:09:55 +0100 mba r269194 : merge conflict solved 2009-03-09 15:09:35 +0100 mba r269193 : merge conflict solved 2009-03-06 22:12:47 +0100 mba r269052 : compilation error fixed 2009-03-06 17:36:37 +0100 mba r269033 : integer warning fixed 2009-03-06 10:31:19 +0100 mba r268983 : CWS-TOOLING: rebase CWS layoutdialogs2 to trunk@268395 (milestone: DEV300:m42) 2009-03-03 20:03:59 +0100 jcn r268777 : Add Notes checkbox to find-and-replace dialog in anticipation of m40 resync. 2009-03-03 15:56:20 +0100 jcn r268737 : Apply layout-find-dialog-crash-fix.diff -- fixes crasher. From http://svn.gnome.org/viewvc/ooo-build?view=revision&revision=15378 2009-02-06 17:41:24 +0100 mba r267479 : arrrrgh - svx headers must be included behind the magic define 2009-02-05 19:44:42 +0100 mba r267439 : seems that msvc preprocessor is thick as a brick 2009-02-05 15:15:16 +0100 mba r267425 : pch added 2009-02-05 08:14:01 +0100 mba r267409 : double defined symbols fixed 2009-02-05 08:13:14 +0100 mba r267408 : compile Languagebox and FontListbox with ENABLE_LAYOUT 2009-02-05 08:07:35 +0100 mba r267406 : warning fixed 2009-02-05 08:06:42 +0100 mba r267405 : warnings and errors fixed 2009-01-30 15:51:52 +0100 mba r267206 : export Container class to compile code in sfx2 2009-01-30 15:51:14 +0100 mba r267205 : remove LAYOUT_EXPERIMENTAL from sfx2, everything now compiles with ENABLE_LAYOUT 2009-01-28 17:01:27 +0100 mba r267069 : fixed namespace problems in sfx2 2009-01-28 16:59:48 +0100 mba r267068 : fixed namespace problems 2009-01-24 13:57:06 +0100 mba r266877 : move svx stuff to experimental 2009-01-24 13:56:11 +0100 mba r266876 : move svx stuff to experimental 2009-01-24 13:52:09 +0100 mba r266875 : put sfx stuff into experimental 2009-01-24 13:28:08 +0100 mba r266874 : put sfx stuff into experimental 2009-01-24 13:26:38 +0100 mba r266873 : help msvc++ compiler a bit 2009-01-24 13:24:43 +0100 mba r266872 : warning removed 2009-01-24 13:23:21 +0100 mba r266871 : moved svx stuff to svx; put sfx stuff into experimental 2009-01-24 13:22:04 +0100 mba r266870 : moved svx stuff to svx 2009-01-05 16:35:34 +0100 jcn r265879 : config_office/configure: Regenerate. Fixes naive builds. 2008-12-17 16:06:25 +0100 jcn r265638 : Wordcount: minor HIG tweaks. 2008-12-17 16:06:21 +0100 jcn r265637 : Zoom: minor HIG spacing tweaks. 2008-12-17 16:06:16 +0100 jcn r265636 : Zoom: fix align-test and update zoom.xml. 2008-12-17 16:06:12 +0100 jcn r265635 : Zoom: add align-test.xml to illustrate zoom alignment bug. 2008-12-17 16:06:07 +0100 jcn r265634 : Find-and-Replace: request font-style-name="Bold", does not seem to work. 2008-12-17 16:06:03 +0100 jcn r265633 : Find-and-Replace: Add alignment for combobox labels. 2008-12-17 16:05:59 +0100 jcn r265632 : Find-and-Replace: Replace pairs of <flow> with <align>. Fixes ugly non-emptiness of more-<hbox>. 2008-12-17 16:05:56 +0100 jcn r265631 : Find-and-Replace: add nice 12pt border. 2008-12-17 16:05:51 +0100 jcn r265630 : Find-and-Replace: also add rowsep at lower fixedline. 2008-12-17 16:05:47 +0100 jcn r265629 : Find-and-Replace: Add poor man's colsep and rowsep substitute spaces. 2008-12-17 16:05:43 +0100 jcn r265628 : Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons. 2008-12-17 16:05:40 +0100 jcn r265627 : Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion. 2008-12-17 16:05:36 +0100 jcn r265626 : Find-and-Replace: use sc icon. Fixes FIND button height. 2008-12-17 16:05:31 +0100 jcn r265625 : Bugfix have empty/invisible containers not take up space. 2008-12-17 16:05:27 +0100 jcn r265624 : Find-and-replace: Fix/remove most property errors. 2008-12-17 16:05:23 +0100 jcn r265623 : Table: make x, y expand default. 2008-12-17 16:05:18 +0100 jcn r265622 : Use OSL_TRACE rather than printf. Fixes warning visibility. 2008-12-17 16:05:14 +0100 jcn r265621 : Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors. 2008-12-17 16:05:10 +0100 jcn r265620 : Junk extra <table> from boxtest. Fixes visual output. 2008-12-17 16:05:05 +0100 jcn r265619 : Eradicate PROPHELPER_SET_INFO: junk static caching. 2008-12-17 16:05:01 +0100 jcn r265618 : Update awk+sed localize generation rules. Fixes multiple (wrong) titles in Find & Replace. 2008-12-17 16:04:56 +0100 jcn r265617 : Use dash (-) instead of underscore (_) to separate language modifiers. Fixes en_GB etc. 2008-12-17 16:04:51 +0100 jcn r265616 : Add "defbutton=true" to dialogs. Fixes ENTER doing default action: n#439222. 2008-12-17 16:04:45 +0100 jcn r265615 : Michael's new table-based find and replace. 2008-12-17 16:04:40 +0100 jcn r265614 : Apply Michael's boxtest patch. 2008-12-17 16:04:36 +0100 jcn r265613 : Make sort-options experimental. Part II. Fixes crasher n-44.patch. Fixes crasher: n#442036. 2008-12-17 16:04:31 +0100 jcn r265612 : Make sort-options experimental. Part I. 2008-12-17 16:04:26 +0100 jcn r265611 : Add --enable-layout-experimental configure switch. Part II. Typo in configure.in, add set_soenv entry. 2008-12-17 16:04:21 +0100 jcn r265610 : Add --enable-layout-experimental configure switch. Default off. 2008-11-26 16:25:18 +0100 mba r264417 : fixed compiler warnings 2008-11-26 15:52:02 +0100 mba r264407 : fixed compiler warnings 2008-11-26 15:40:44 +0100 mba r264402 : fixed compiler warnings 2008-11-26 14:50:47 +0100 mba r264395 : fixed compiler warnings 2008-11-26 14:39:12 +0100 mba r264393 : fixed compiler warnings 2008-11-26 14:38:49 +0100 mba r264392 : fixed compiler warnings 2008-11-26 14:38:31 +0100 mba r264391 : fixed compiler warnings 2008-11-26 14:38:13 +0100 mba r264390 : fixed compiler warnings 2008-11-26 14:37:38 +0100 mba r264389 : fixed compiler warnings 2008-11-26 10:11:17 +0100 mba r264352 : fixed compiler warnings 2008-11-26 10:06:12 +0100 mba r264351 : fixed compiler warnings 2008-11-26 09:58:28 +0100 mba r264347 : fixed compiler warnings 2008-11-26 09:50:41 +0100 mba r264345 : fixed compiler warnings 2008-11-26 09:46:10 +0100 mba r264343 : fixed compiler warnings 2008-10-22 10:57:09 +0200 mba r262584 : fixed small error resulting from resolved merged conflicts 2008-10-22 10:56:21 +0200 mba r262583 : fixed some small errors resulting from resolved merged conflicts 2008-10-20 19:29:27 +0200 jcn r262557 : layoutdialogs2: Remove stray patches. 2008-10-20 19:29:22 +0200 jcn r262556 : layoutdialogs2: Force resize also on second show after hiding. 2008-10-20 19:29:17 +0200 jcn r262555 : layoutdialogs2: Do not trigger handlers for api calls. 2008-10-20 19:29:13 +0200 jcn r262554 : layoutdialogs2: Use disable/enable instead of hide/show for currency box. Fixes monster lisbox. 2008-10-20 19:29:09 +0200 jcn r262553 : layoutdialogs2: Use line-count instead of linecount. Fixes sizing of listboxes. 2008-10-20 19:29:04 +0200 jcn r262552 : layoutdialogs2: vcl: respect line-count also for non-dropdown listbox. 2008-10-20 19:28:59 +0200 jcn r262551 : layoutdialogs2: Update to svn:r14142 patched. 2008-10-20 19:28:51 +0200 jcn r262550 : layoutdialogs2: Manual tweaks in number-format.xml. 2008-10-20 19:28:45 +0200 jcn r262549 : layoutdialogs2: Integrate Number Format tabpage into Format Cell dialog. 2008-10-20 19:28:36 +0200 jcn r262548 : layoutdialogs2: Windows build fixes. Thanks Noel. 2008-10-20 19:28:31 +0200 jcn r262547 : layoutdialogs2: Layout Format Cells/Number Format tabpage. 2008-10-20 19:28:24 +0200 jcn r262546 : layoutdialogs2: Remove sc/uiconfig/layout/localize.sdf. 2008-10-20 19:28:20 +0200 jcn r262545 : layoutdialogs2: --enable-debug link fix 2008-10-20 19:28:16 +0200 jcn r262544 : layoutdialogs2: Add missing localize.sdf dependency. Thanks, Petr. 2008-10-20 19:28:12 +0200 jcn r262543 : layoutdialogs2: svx linx fixlet. 2008-10-20 19:28:06 +0200 jcn r262542 : layoutdialogs2: Move layout/* to layout/core, vclcompat to layout/vcl. Distribute layout headers. Fixes sfx2 layout core includes. 2008-10-20 19:27:58 +0200 jcn r262541 : layoutdialogs2: Build fix for --enable-layout. 2008-10-20 19:27:54 +0200 jcn r262540 : layoutdialogs2: Generate localize.sdf files in uiconfig. 2008-10-20 19:27:47 +0200 jcn r262539 : layoutdialogs2: Minimalize deprecated String use further by using OUString. 2008-10-20 19:27:42 +0200 jcn r262538 : layoutdialogs2: Implement LocalizedString.GetToken and use it for aCalcBtn. Fixes empty label. 2008-10-20 19:27:36 +0200 jcn r262537 : layoutdialogs2: Add layout::Sfx*Dialog wrapper. 2008-10-20 19:27:29 +0200 jcn r262536 : layoutdialogs2: Introduce Closing*Dialog wrappers fixing closing with ESC. 2008-10-20 19:27:24 +0200 jcn r262535 : layoutdialogs2: Support <sfxmodelessdialog> from sfx2. 2008-10-20 19:27:17 +0200 jcn r262534 : layoutdialogs2: Rename find-&-replace.xml to find-and-replace.xml. Fixes split build with failing solenv patch. 2008-10-20 19:27:12 +0200 jcn r262533 : layoutdialogs2: Do not build sfx2 when --disable-layout. 2008-10-20 19:27:08 +0200 jcn r262532 : layoutdialogs2: Ignore ja/ too. 2008-10-20 19:27:04 +0200 jcn r262531 : layoutdialogs2: Add destructors for VCLXButton, VCLXComboBox. 2008-10-20 19:26:58 +0200 jcn r262530 : layoutdialogs2: Make dialogs closable with ESC: wordcount, zoom, message-box, move-copy-sheet, insert-sheet. 2008-10-20 19:26:52 +0200 jcn r262529 : layoutdialogs2: Move some implementations to .cxx. 2008-10-20 19:26:47 +0200 jcn r262528 : layoutdialogs2: Fix simple editor crasher. 2008-10-20 19:26:43 +0200 jcn r262527 : layoutdialogs2: Further cleanup: remove clean & delete from wrapperGone. 2008-10-20 19:26:38 +0200 jcn r262526 : layoutdialogs2: Add reset logic to ~WindowImpl, plugs ComboBox and Dialog leaks. 2008-10-20 19:26:34 +0200 jcn r262525 : layoutdialogs2: Interesting hack: only leaks ::ComboBox and ::Dialog. 2008-10-20 19:26:29 +0200 jcn r262524 : layoutdialogs2: Build fix. 2008-10-20 19:26:24 +0200 jcn r262523 : layoutdialogs2: Find&Replace duplicate disposal workaround inside layout. 2008-10-20 19:26:19 +0200 jcn r262522 : layoutdialogs2: Revert "Terrible crasher-fix hack. Do not dispose Dialog or any FocusHandler owners." This reverts commit 5222b5b123a2e6c88494983bd875de574f365bae. 2008-10-20 19:26:14 +0200 jcn r262521 : layoutdialogs2: Terrible crasher-fix hack. Do not dispose Dialog or any FocusHandler owners. 2008-10-20 19:26:08 +0200 jcn r262520 : layoutdialogs2: Revert "ComboBox: crash down to (Dialog's) VCLXWindowImpl::DestroyOutputDevice();" This reverts commit b423129aca295e84ef5986149b6ee71eb7ba0aa3. 2008-10-20 19:26:03 +0200 jcn r262519 : layoutdialogs2: ComboBox: crash down to (Dialog's) VCLXWindowImpl::DestroyOutputDevice(); 2008-10-20 19:25:57 +0200 jcn r262518 : layoutdialogs2: Handler and debug cleanup. 2008-10-20 19:25:52 +0200 jcn r262517 : layoutdialogs2: Minimally remove FixedText workaround. 2008-10-20 19:25:47 +0200 jcn r262516 : layoutdialogs2: Preparations for FocusHdl fix. 2008-10-20 19:25:42 +0200 jcn r262515 : layoutdialogs2: Remove vclxwindows patch by using handler hackery. 2008-10-20 19:25:38 +0200 jcn r262514 : layoutdialogs2: Don't call deleted dialog. Hdler reset tweaks. Fixes Find&Replace. 2008-10-20 19:25:34 +0200 jcn r262513 : layoutdialogs2: Hdler and disposing cleanups. 2008-10-20 19:25:29 +0200 jcn r262512 : layoutdialogs2: Prevent Find&Replace window from being deleted twice. 2008-10-20 19:25:24 +0200 jcn r262511 : layoutdialogs2: Add destructor to SvxSearchDialogWrapper. Fixes second invocation crasher. 2008-10-20 19:25:19 +0200 jcn r262510 : layoutdialogs2: Make Find&Replace work (once) with minimal client code changes. 2008-10-20 19:25:13 +0200 jcn r262509 : layoutdialogs2: Add ComboBox/FixedText debug switching. 2008-10-20 19:25:08 +0200 jcn r262508 : layoutdialogs2: Add destructors resetting handlers. 2008-10-20 19:25:03 +0200 jcn r262507 : layoutdialogs2: Static cast fixes. 2008-10-20 19:24:59 +0200 jcn r262506 : layoutdialogs2: Always set button handler. Fixes pushbuttons. 2008-10-20 19:24:55 +0200 jcn r262505 : layoutdialogs2: Revert "Move FocusHandlers from Control down to ListBox, ComboBox, FixedText." This reverts commit 8bc4b991539a74373bfb1ef8792276ada8c958e4. 2008-10-20 19:24:50 +0200 jcn r262504 : layoutdialogs2: Disable Timer for ENABLE_LAYOUT. 2008-10-20 19:24:45 +0200 jcn r262503 : layoutdialogs2: Move FocusHandlers from Control down to ListBox, ComboBox, FixedText. 2008-10-20 19:24:40 +0200 jcn r262502 : layoutdialogs2: Wider small symbol. 2008-10-20 19:24:36 +0200 jcn r262501 : layoutdialogs2: Listener and SetHandler cleanup. 2008-10-20 19:24:31 +0200 jcn r262500 : layoutdialogs2: Clear mxWindow upon deletion. Fixes Find&Replace crasher. 2008-10-20 19:24:27 +0200 jcn r262499 : layoutdialogs2: Typo, fixes build. 2008-10-20 19:24:22 +0200 jcn r262498 : layoutdialogs2: Ignore .log files too. 2008-10-20 19:24:19 +0200 jcn r262497 : layoutdialogs2: By default, work around #define protected public Resource hack. 2008-10-20 19:24:15 +0200 jcn r262496 : layoutdialogs2: Sw:Find&Replace: Remove wrong static cast. Fixes crasher. 2008-10-20 19:24:10 +0200 jcn r262495 : layoutdialogs2: Find&Replace: do not vertically expand buttons, add title. 2008-10-20 19:24:06 +0200 jcn r262494 : layoutdialogs2: Find&Replace: Remove need for ResId, set help id. 2008-10-20 19:24:01 +0200 jcn r262493 : layoutdialogs2: MoreButton: redraw upon resize, fix labels, use small symbol. 2008-10-20 19:23:57 +0200 jcn r262492 : layoutdialogs2: Support setting and querying small symbol on vcl:button. 2008-10-20 19:23:52 +0200 jcn r262491 : layoutdialogs2: Support redrawing of only this, make parent optional. 2008-10-20 19:23:48 +0200 jcn r262490 : layoutdialogs2: Add Kohei's wfield patch https://bugzilla.novell.com/attachment.cgi?id=235398. Fixes n#417840. 2008-10-20 19:23:44 +0200 jcn r262489 : layoutdialogs2: Redraw [parent] upon first time visibility. Fixes weird listbox dropdown sizing in Find & Replace. 2008-10-20 19:23:39 +0200 jcn r262488 : layoutdialogs2: Add manual layouting for Find & Replace. 2008-10-20 19:23:35 +0200 jcn r262487 : layoutdialogs2: src2xml: use label instead of text for buttons. Run on Find & Replace; fixes button texts. 2008-10-20 19:23:31 +0200 jcn r262486 : layoutdialogs2: Add initial auto-translated find-&-replace-.xml. 2008-10-20 19:23:26 +0200 jcn r262485 : layoutdialogs2: layout importer: handle ModelessDialog. Fixes Find & Replace parsing error. 2008-10-20 19:23:22 +0200 jcn r262484 : layoutdialogs2: src2xml: Handle multiple widgets at same x,y. Fixes silent removal of widgets in Find & Replace dialog. 2008-10-20 19:23:18 +0200 jcn r262483 : layoutdialogs2: src2xml: Handle hide= attribute, translate to show=. 2008-10-20 19:23:14 +0200 jcn r262482 : layoutdialogs2: Only use __PRETTY_FUNCTION__ on gcc. Fixes Windows build. Thanks Tor! 2008-10-20 19:23:10 +0200 jcn r262481 : layoutdialogs2: Add two missing SAL_CALL decorations. Fixes Windows build. Thanks Tor! 2008-10-20 19:23:05 +0200 jcn r262480 : layoutdialogs2: Build fixes for layout'ed Find & Replace dialog. 2008-10-20 19:22:54 +0200 jcn r262479 : layoutdialogs2: Do not use layout::SfxTabDialog for now. 2008-10-20 19:22:47 +0200 jcn r262478 : layoutdialogs2: Crufty sizing tweaks. 2008-10-20 19:22:42 +0200 jcn r262477 : layoutdialogs2: More debugging cleanups. 2008-10-20 19:22:37 +0200 jcn r262476 : layoutdialogs2: More cleanups that result in constant manual resizing... 2008-10-20 19:22:33 +0200 jcn r262475 : layoutdialogs2: Tabdlg cleanups. 2008-10-20 19:22:28 +0200 jcn r262474 : layoutdialogs2: Add GetOptimalSize () to InPlug. Fixes auto-sizing of tabcontrol. 2008-10-20 19:22:21 +0200 jcn r262473 : layoutdialogs2: Get VCLXTabControl to resize automatically (too tall), not mousable. 2008-10-20 19:22:13 +0200 jcn r262472 : layoutdialogs2: Respect show=false property; do not show everything. 2008-10-20 19:22:09 +0200 jcn r262471 : layoutdialogs2: Add show=false on buttons. Fixes displaying everything. 2008-10-20 19:22:05 +0200 jcn r262470 : layoutdialogs2: Move some code to reduce namespace and #if hacking. 2008-10-20 19:22:00 +0200 jcn r262469 : layoutdialogs2: Cleanup, remove unneeded #defines. 2008-10-20 19:21:56 +0200 jcn r262468 : layoutdialogs2: Replace static casts with dynamic_cast, fixes layout::SfxTabDialog. Explicitly add 2 tabpages while adding tabpages, instead of relying on ResId. 2008-10-20 19:21:51 +0200 jcn r262467 : layoutdialogs2: Use cpp hacking to remove layout-tabdialog.hxx duplication. 2008-10-20 19:21:45 +0200 jcn r262466 : layoutdialogs2: Minimize diff between layout-tabdialog.hxx and tabdlg.hxx. 2008-10-20 19:21:41 +0200 jcn r262465 : layoutdialogs2: Remove copy of SfxTabDialog; use cpp logic to create both flavours. 2008-10-20 19:21:36 +0200 jcn r262464 : layoutdialogs2: Minimize diff between layout/sfxtabdialog.cxx and source/tabdlg.cxx. This enables the next step: use cpp logic instead of code duplication. 2008-10-20 19:21:31 +0200 jcn r262463 : layoutdialogs2: Hello world on layout::SfxTabDialog. 2008-10-20 19:21:24 +0200 jcn r262462 : layoutdialogs2: Nice `Compiling:' message that shows the file being compiled. 2008-10-20 19:21:20 +0200 jcn r262461 : layoutdialogs2: Use layout::SfxTabDialog for sort options. 2008-10-20 19:21:15 +0200 jcn r262460 : layoutdialogs2: Update sort options tab. 2008-10-20 19:21:10 +0200 jcn r262459 : layoutdialogs2: Add layout::SfxTabDialog. 2008-10-20 19:21:04 +0200 jcn r262458 : layoutdialogs2: Cleanup previous attempt using layout::SfxTabPage == layout::TabPage. 2008-10-20 19:20:57 +0200 jcn r262457 : layoutdialogs2: Windows 2003 compile fixes, i#92397. 2008-10-20 19:20:52 +0200 jcn r262456 : layoutdialogs2: Set default radiogroup when none provided. 2008-10-20 19:20:48 +0200 jcn r262455 : layoutdialogs2: Add radiogroup to sort-options. Fixes crasher. 2008-10-20 19:20:43 +0200 jcn r262454 : layoutdialogs2: Cleanup ParentSet fix. 2008-10-20 19:20:36 +0200 jcn r262453 : layoutdialogs2: Add debugging in ParentSet. Works standalone, not integrated. 2008-10-20 19:20:31 +0200 jcn r262452 : layoutdialogs2: Revert "Have InPlug not derive from Window, but have as member." This reverts commit 50ea26eec3fe14943f24900081ad923e72550345. 2008-10-20 19:20:25 +0200 jcn r262451 : layoutdialogs2: Have InPlug not derive from Window, but have as member. 2008-10-20 19:20:20 +0200 jcn r262450 : layoutdialogs2: Move layout plugin implementation from layout::SfxTabPage to InPlug. 2008-10-20 19:20:14 +0200 jcn r262449 : layoutdialogs2: Get all widgets to display in sfxtabpage plugin with Window::SetParent hack. 2008-10-20 19:20:09 +0200 jcn r262448 : layoutdialogs2: Two-button manual hello world with sfxtabpage plugin. 2008-10-20 19:20:03 +0200 jcn r262447 : layoutdialogs2: WIP: layout::SfxTabPage derived from SfxTabPage. 2008-10-20 19:19:55 +0200 jcn r262446 : layoutdialogs2: Always set parent after construction, fixes listbox dropdown. 2008-10-20 19:19:51 +0200 jcn r262445 : layoutdialogs2: Fix radio button crasher. 2008-10-20 19:19:47 +0200 jcn r262444 : layoutdialogs2: Implement ListBox method wrappers. Fixes filling of listbox. 2008-10-20 19:19:42 +0200 jcn r262443 : layoutdialogs2: Convert Move/Copy sheet to layout engine. 2008-10-20 19:19:35 +0200 jcn r262442 : layoutdialogs2: Also hide yes/no buttons if not used. 2008-10-20 19:19:31 +0200 jcn r262441 : layoutdialogs2: Elaborate on changing client code. 2008-10-20 19:19:26 +0200 jcn r262440 : layoutdialogs2: Implement winbits client-code compatibility for Message Boxes. 2008-10-20 19:19:21 +0200 jcn r262439 : layoutdialogs2: Add localize.sdf to toolkit uiconfig. Fixes build. 2008-10-20 19:19:17 +0200 jcn r262438 : layoutdialogs2: Do not use ti_layout twice in toolkit build.lst. Fixes build. 2008-10-20 19:19:13 +0200 jcn r262437 : layoutdialogs2: Oops, also dist toolkit-layout.zip. 2008-10-20 19:19:09 +0200 jcn r262436 : layoutdialogs2: Move layout.mk to solenv. 2008-10-20 19:19:03 +0200 jcn r262435 : layoutdialogs2: Add handy TEST file. 2008-10-20 19:18:58 +0200 jcn r262434 : layoutdialogs2: Implement MessageBox and wrappers ErrorBox, InfoBox, QueryBox, WarningBox. 2008-10-20 19:18:52 +0200 jcn r262433 : layoutdialogs2: QueryBox without image used for Delete Sheet dialog. 2008-10-20 19:18:46 +0200 jcn r262432 : layoutdialogs2: WIP QueryBox. 2008-10-20 19:18:39 +0200 jcn r262431 : layoutdialogs2: Add insert-sheet localization. 2008-10-20 19:18:34 +0200 jcn r262430 : layoutdialogs2: Run indent-region on zoom.xml, distribute it. 2008-10-20 19:18:30 +0200 jcn r262429 : layoutdialogs2: Dist xml files too. 2008-10-20 19:18:26 +0200 jcn r262428 : layoutdialogs2: Add insert-sheet.xml to workben. 2008-10-20 19:18:22 +0200 jcn r262427 : layoutdialogs2: Update layout TODO. 2008-10-20 19:18:18 +0200 jcn r262426 : layoutdialogs2: Cleanups and add comments. 2008-10-20 19:18:13 +0200 jcn r262425 : layoutdialogs2: Keep RadioButtons::RadioButton callback at HEAD of list. Fixes radiobutton grouping. 2008-10-20 19:18:07 +0200 jcn r262424 : layoutdialogs2: Remove IMPORT_RADIOGROUP cruft. 2008-10-20 19:18:02 +0200 jcn r262423 : layoutdialogs2: Have code check fire event for radio button. Fixes radio button grouping. 2008-10-20 19:17:58 +0200 jcn r262422 : layoutdialogs2: Enable IMPORT_RADIOGROUP flag. 2008-10-20 19:17:54 +0200 jcn r262421 : layoutdialogs2: Add radio groups to zoom.xml. 2008-10-20 19:17:50 +0200 jcn r262420 : layoutdialogs2: Move RadioGroup implementation to cxx file. 2008-10-20 19:17:45 +0200 jcn r262419 : layoutdialogs2: Manually set help id for insert table. 2008-10-20 19:17:41 +0200 jcn r262418 : layoutdialogs2: Cosmetic fixes for insert-sheet. 2008-10-20 19:17:37 +0200 jcn r262417 : layoutdialogs2: FindAndRemove now also skips translation prefix. Fixes setting of title etc. from nontranslated xml. 2008-10-20 19:17:32 +0200 jcn r262416 : layoutdialogs2: Manually set help id for zoom and wordcount dialogs. 2008-10-20 19:17:27 +0200 jcn r262415 : layoutdialogs2: Set help-id from xml. 2008-10-20 19:17:21 +0200 jcn r262414 : layoutdialogs2: Move -DENABLE_LAYOUT from stray makefiles to settings.mk. 2008-10-20 19:17:13 +0200 jcn r262413 : layoutdialogs2: Initial conversion of insert-sheet dialog. 2008-10-20 19:17:08 +0200 jcn r262412 : layoutdialogs2: Add wrappers for {Get,Set}{Pointer,Text}. 2008-10-20 19:17:04 +0200 jcn r262411 : layoutdialogs2: Toolkit layout dialog copy updates. 2008-10-20 19:16:59 +0200 jcn r262410 : layoutdialogs2: Cleanup #include <layout*> disaster. Fixes multiple inclusions of layout-pre, layout-post. 2008-10-20 19:16:53 +0200 jcn r262409 : layoutdialogs2: Implement Get,Set{,Smart}HelpId (). 2008-10-20 19:16:49 +0200 jcn r262408 : layoutdialogs2: Make some getters const. 2008-10-20 19:16:45 +0200 jcn r262407 : layoutdialogs2: Manual tweaks for string-input.xml. 2008-10-20 19:16:40 +0200 jcn r262406 : layoutdialogs2: Add string-input.xml. 2008-10-20 19:16:36 +0200 jcn r262405 : layoutdialogs2: Add dummy implementation for SetHelpId etc. 2008-10-20 19:16:32 +0200 jcn r262404 : layoutdialogs2: Actually say *what* file cannot be copied *where*. Sigh. 2008-10-20 19:16:27 +0200 jcn r262403 : layoutdialogs2: Thinko in macro name. Fixes compilation of strindlg.cxx. 2008-10-20 19:16:22 +0200 jcn r262402 : layoutdialogs2: Add layout includes to stringdlg and makefile. 2008-10-20 19:16:17 +0200 jcn r262401 : layoutdialogs2: Add sc/uiconfig/layout/localize.sdf 2008-10-20 19:16:13 +0200 jcn r262400 : layoutdialogs2: Oops, build sc/uiconfig/layout. 2008-10-20 19:16:09 +0200 jcn r262399 : layoutdialogs2: Have virtual destructor on Context, delete TabPage when deleting TabDialog. 2008-10-20 19:16:04 +0200 jcn r262398 : layoutdialogs2: Actually delete layout::TabPage objects when deleting SfxTabdialog. 2008-10-20 19:16:00 +0200 jcn r262397 : layoutdialogs2: Workaround for second invocation crash of sort dialog options tab. 2008-10-20 19:15:56 +0200 jcn r262396 : layoutdialogs2: Handle Reset button. 2008-10-20 19:15:51 +0200 jcn r262395 : layoutdialogs2: Also install sc xml zip file. 2008-10-20 19:15:46 +0200 jcn r262394 : layoutdialogs2: Integrate sort-options into sc. 2008-10-20 19:15:41 +0200 jcn r262393 : layoutdialogs2: Revert "Fix sfx2 compile warnings." This reverts commit 8b55d402af7bd217db35f67b02dc92f93f3ada5d. 2008-10-20 19:15:34 +0200 jcn r262392 : layoutdialogs2: Remove debuging. 2008-10-20 19:15:30 +0200 jcn r262391 : layoutdialogs2: Pass set argument to layout::TabPage. Fixes OO.o integration crasher. 2008-10-20 19:15:24 +0200 jcn r262390 : layoutdialogs2: Ignore more. 2008-10-20 19:15:20 +0200 jcn r262389 : layoutdialogs2: Oops, make just one (1) sort-options tab. 2008-10-20 19:15:15 +0200 jcn r262388 : layoutdialogs2: Revert macroconf compile warnings. 2008-10-20 19:15:09 +0200 jcn r262387 : layoutdialogs2: Fix sfx2 compile warnings. 2008-10-20 19:15:01 +0200 jcn r262386 : layoutdialogs2: Collapsed tabpage and sort-options development. 2008-10-20 19:14:51 +0200 jcn r262385 : layoutdialogs2: Make dev300/src680 install layout switchable at compile time. 2008-10-20 19:14:47 +0200 jcn r262384 : layoutdialogs2: Update README, add README. 2008-10-20 19:14:43 +0200 jcn r262383 : layoutdialogs2: Repainting, hiding stuff. 2008-10-20 19:14:38 +0200 jcn r262382 : layoutdialogs2: Add allocateArea to VCLXTabPage. 2008-10-20 19:14:34 +0200 jcn r262381 : layoutdialogs2: Revert "Use VCLXContainer as base for VCLXTabPage." This reverts commit 06a984434d0d2c356fd0cdaf96d6d613d5147b7c. 2008-10-20 19:14:30 +0200 jcn r262380 : layoutdialogs2: Use VCLXContainer as base for VCLXTabPage. 2008-10-20 19:14:26 +0200 jcn r262379 : layoutdialogs2: Revert "Derive VCLXTabPage from VBox." This reverts commit 8ab66364bdc08151ce2c982c1aa03f7881d86b84. 2008-10-20 19:14:22 +0200 jcn r262378 : layoutdialogs2: Derive VCLXTabPage from VBox. 2008-10-20 19:14:17 +0200 jcn r262377 : layoutdialogs2: More cleanups and testing. 2008-10-20 19:14:12 +0200 jcn r262376 : layoutdialogs2: Get layout tabpage to nicely select. No content visible, though. 2008-10-20 19:14:07 +0200 jcn r262375 : layoutdialogs2: Support ScTabPageSortOptions in standalone test. 2008-10-20 19:14:02 +0200 jcn r262374 : layoutdialogs2: Support tabpage creation from xml. 2008-10-20 19:13:56 +0200 jcn r262373 : layoutdialogs2: Remove most TEST_LAYOUT conditionals. 2008-10-20 19:13:52 +0200 jcn r262372 : layoutdialogs2: Remove Args effort. 2008-10-20 19:13:48 +0200 jcn r262371 : layoutdialogs2: Attempt to create ArgSet. 2008-10-20 19:13:44 +0200 jcn r262370 : layoutdialogs2: Compile more. 2008-10-20 19:13:39 +0200 jcn r262369 : layoutdialogs2: Add sortdlg. 2008-10-20 19:13:35 +0200 jcn r262368 : layoutdialogs2: Oops, ID fix. 2008-10-20 19:13:30 +0200 jcn r262367 : layoutdialogs2: Build fix. 2008-10-20 19:13:26 +0200 jcn r262366 : layoutdialogs2: Revert "Use ::Window for plugin base iso ::Control." This reverts commit 919ddaf2f52ad5e4df877a094cd1e336888d6210. 2008-10-20 19:13:21 +0200 jcn r262365 : layoutdialogs2: Plugin dialog cleanups. 2008-10-20 19:13:17 +0200 jcn r262364 : layoutdialogs2: Use ::Window for plugin base iso ::Control. 2008-10-20 19:13:12 +0200 jcn r262363 : layoutdialogs2: Use cstdio, remove cruft. 2008-10-20 19:13:07 +0200 jcn r262362 : layoutdialogs2: Remove cruft. 2008-10-20 19:13:02 +0200 jcn r262361 : layoutdialogs2: Remove sizing mess. 2008-10-20 19:12:57 +0200 jcn r262360 : layoutdialogs2: Trigger [re]draw of DialControl. 2008-10-20 19:12:53 +0200 jcn r262359 : layoutdialogs2: DialControl window behaves nicely and invisible. 2008-10-20 19:12:48 +0200 jcn r262358 : layoutdialogs2: Revert adding of setparent. 2008-10-20 19:12:43 +0200 jcn r262357 : layoutdialogs2: Add dialog::setparent to plugin. 2008-10-20 19:12:39 +0200 jcn r262356 : layoutdialogs2: Add a setProperty for VCLXPlugin. 2008-10-20 19:12:34 +0200 jcn r262355 : layoutdialogs2: Unhide plugin. 2008-10-20 19:12:30 +0200 jcn r262354 : layoutdialogs2: Revert. 2008-10-20 19:12:25 +0200 jcn r262353 : layoutdialogs2: Use window instead of control. 2008-10-20 19:12:20 +0200 jcn r262352 : layoutdialogs2: Lots of plugin settings. 2008-10-20 19:12:16 +0200 jcn r262351 : layoutdialogs2: More hacks. 2008-10-20 19:12:11 +0200 jcn r262350 : layoutdialogs2: Compile fixes. 2008-10-20 19:12:05 +0200 jcn r262349 : layoutdialogs2: Use c++ includes. 2008-10-20 19:12:00 +0200 jcn r262348 : layoutdialogs2: Junk UnoTunnel nonsense. 2008-10-20 19:11:55 +0200 jcn r262347 : layoutdialogs2: Remove more cruft. 2008-10-20 19:11:50 +0200 jcn r262346 : layoutdialogs2: Remove cruft. 2008-10-20 19:11:44 +0200 jcn r262345 : layoutdialogs2: Rename wrap to plugin. 2008-10-20 19:11:39 +0200 jcn r262344 : layoutdialogs2: All sorry tries. 2008-10-20 19:11:33 +0200 jcn r262343 : layoutdialogs2: Rename plugin to wrap. 2008-10-20 19:11:28 +0200 jcn r262342 : layoutdialogs2: Add ifdefs, no UNOTUNNEL, no crash on exit. 2008-10-20 19:11:23 +0200 jcn r262341 : layoutdialogs2: Redo all kind of Uno and XIface weirdness. 2008-10-20 19:11:17 +0200 jcn r262340 : layoutdialogs2: Remove extra UnoTunnel. 2008-10-20 19:11:12 +0200 jcn r262339 : layoutdialogs2: Plugin hello world. TODO: parenting/owning/sizing, ... etc. 2008-10-20 19:11:06 +0200 jcn r262338 : layoutdialogs2: Zoom updates. 2008-10-20 19:11:01 +0200 jcn r262337 : layoutdialogs2: Add missing controls. 2008-10-20 19:10:56 +0200 jcn r262336 : layoutdialogs2: Add .gitignore.
This commit is contained in:
Ivo Hinkelmann
parent
362ecf755c
commit
19b299cdb5
24 changed files with 442 additions and 35 deletions
|
|
@ -39,3 +39,5 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\statusbar
|
|||
..\uiconfig\scalc\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\es\*.xml
|
||||
..\uiconfig\scalc\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\fr\*.xml
|
||||
..\uiconfig\scalc\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\statusbar\*.xml
|
||||
|
||||
..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
|
||||
|
|
|
|||
|
|
@ -56,6 +56,11 @@
|
|||
#include <svx/flagsdef.hxx> //CHINA001
|
||||
#include <svx/flstitem.hxx> //CHINA001
|
||||
#include <sfx2/app.hxx> //CHINA001
|
||||
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <layout/layout-pre.hxx>
|
||||
#endif
|
||||
|
||||
//==================================================================
|
||||
|
||||
ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
|
||||
|
|
@ -72,7 +77,12 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
|
|||
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
|
||||
|
||||
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");//CHINA001
|
||||
#if LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); //CHINA001 AddTabPage( TP_NUMBER, SvxNumberFormatTabPage::Create, 0 );
|
||||
#else
|
||||
String number = rtl::OUString::createFromAscii ("Numbers");
|
||||
AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, FALSE, TAB_APPEND);
|
||||
#endif
|
||||
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
|
||||
AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001 AddTabPage( TP_FONT, SvxCharNamePage::Create, 0 );
|
||||
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@
|
|||
// MARKER(update_precomp.py): autogen include statement, do not remove
|
||||
#include "precompiled_sc.hxx"
|
||||
|
||||
#if ! ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#undef ENABLE_LAYOUT
|
||||
#endif
|
||||
|
||||
#undef SC_DLLIMPLEMENTATION
|
||||
|
||||
#include "scdlgfact.hxx"
|
||||
|
|
@ -79,6 +83,7 @@
|
|||
|
||||
// ause
|
||||
#include "editutil.hxx"
|
||||
#include <sfx2/layout.hxx>
|
||||
|
||||
IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); //add for ScColOrRowDlg
|
||||
IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);//CHINA001 add for ScImportAsciiDlg
|
||||
|
|
@ -112,6 +117,40 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); //add for ScStringInputDlg
|
|||
IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); //add for ScImportOptionsDlg
|
||||
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
|
||||
|
||||
// AbstractTabDialog_Impl begin
|
||||
void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
|
||||
{
|
||||
pDlg->SetCurPageId( nId );
|
||||
}
|
||||
|
||||
const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
|
||||
{
|
||||
return pDlg->GetOutputItemSet();
|
||||
}
|
||||
//add by CHINA001
|
||||
const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
|
||||
{
|
||||
return pDlg->GetInputRanges( pItem );
|
||||
}
|
||||
//add by CHINA001
|
||||
void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
|
||||
{
|
||||
pDlg->SetInputSet( pInSet );
|
||||
}
|
||||
//From class Window.
|
||||
void AbstractTabDialog_Impl::SetText( const XubString& rStr )
|
||||
{
|
||||
pDlg->SetText( rStr );
|
||||
}
|
||||
String AbstractTabDialog_Impl::GetText() const
|
||||
{
|
||||
return pDlg->GetText();
|
||||
}
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
namespace layout
|
||||
{
|
||||
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
|
||||
|
||||
// AbstractTabDialog_Impl begin
|
||||
void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
|
||||
|
|
@ -142,6 +181,8 @@ String AbstractTabDialog_Impl::GetText() const
|
|||
{
|
||||
return pDlg->GetText();
|
||||
}
|
||||
}
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
//add for AbstractTabDialog_Impl end
|
||||
// AbstractScImportAsciiDlg_Impl begin
|
||||
|
|
@ -1227,6 +1268,10 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
|
|||
}
|
||||
//add for ScImportOptionsDlg end
|
||||
|
||||
#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#define SfxTabDialog layout::SfxTabDialog
|
||||
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
//add for ScAttrDlg begin
|
||||
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame,
|
||||
Window* pParent,
|
||||
|
|
@ -1249,6 +1294,8 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra
|
|||
|
||||
}
|
||||
//add for ScAttrDlg end
|
||||
#undef SfxTabDialog
|
||||
#undef AbstractTabDialog_Impl
|
||||
|
||||
//add for ScHFEditDlg begin
|
||||
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame,
|
||||
|
|
@ -1378,6 +1425,10 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
|
|||
}
|
||||
//add for ScValidationDlg end
|
||||
|
||||
#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#define SfxTabDialog layout::SfxTabDialog
|
||||
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
//add for ScSortDlg begin
|
||||
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
|
||||
const SfxItemSet* pArgSet,int nId )
|
||||
|
|
@ -1396,6 +1447,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
|
|||
return new AbstractTabDialog_Impl( pDlg );
|
||||
return 0;
|
||||
}
|
||||
#undef SfxTabDialog
|
||||
#undef AbstractTabDialog_Impl
|
||||
|
||||
//add for ScSortDlg end
|
||||
//------------------ Factories for TabPages--------------------
|
||||
CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
|
||||
|
|
|
|||
|
|
@ -354,6 +354,23 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
|
|||
virtual void SetText( const XubString& rStr ); //add by CHINA001
|
||||
virtual String GetText() const; //add by CHINA001
|
||||
};
|
||||
#if ENABLE_LAYOUT
|
||||
namespace layout
|
||||
{
|
||||
//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
|
||||
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
|
||||
{
|
||||
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
|
||||
virtual void SetCurPageId( USHORT nId );
|
||||
virtual const SfxItemSet* GetOutputItemSet() const;
|
||||
virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
|
||||
virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
|
||||
//From class Window.
|
||||
virtual void SetText( const XubString& rStr ); //add by CHINA001
|
||||
virtual String GetText() const; //add by CHINA001
|
||||
};
|
||||
} // end namespace layout
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
//------------------------------------------------------------------------
|
||||
//AbstractDialogFactory_Impl implementations
|
||||
class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
|
||||
|
|
|
|||
|
|
@ -40,8 +40,9 @@
|
|||
#include "scresid.hxx"
|
||||
#include "sortdlg.hrc"
|
||||
|
||||
|
||||
//==================================================================
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <layout/layout-pre.hxx>
|
||||
#endif
|
||||
|
||||
ScSortDlg::ScSortDlg( Window* pParent,
|
||||
const SfxItemSet* pArgSet ) :
|
||||
|
|
@ -52,8 +53,15 @@ ScSortDlg::ScSortDlg( Window* pParent,
|
|||
bIsByRows ( FALSE )
|
||||
|
||||
{
|
||||
#if LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 );
|
||||
AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
|
||||
#else
|
||||
String fields = rtl::OUString::createFromAscii ("fields");
|
||||
AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
|
||||
String options = rtl::OUString::createFromAscii ("options");
|
||||
AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
|
||||
#endif
|
||||
FreeResource();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -544,6 +544,18 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
|
|||
// Sortieroptionen-Tabpage:
|
||||
//========================================================================
|
||||
|
||||
#if ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ScResId
|
||||
#define ScResId(x) #x
|
||||
#undef SfxTabPage
|
||||
#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
|
||||
ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
|
||||
const SfxItemSet& rArgSet )
|
||||
|
||||
|
|
@ -569,6 +581,11 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
|
|||
aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
|
||||
// aFtArea ( this, ScResId( FT_AREA ) ),
|
||||
//
|
||||
#if ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#undef this
|
||||
#undef ScResId
|
||||
#define ScResId(x) this, #x
|
||||
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
|
||||
aStrColLabel ( ScResId( STR_COL_LABEL ) ),
|
||||
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
|
||||
|
|
@ -579,7 +596,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
|
|||
rArgSet.Get( nWhichSort )).GetSortData() ),
|
||||
pViewData ( NULL ),
|
||||
pDoc ( NULL ),
|
||||
pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ),
|
||||
pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
|
||||
pColRes ( NULL ),
|
||||
pColWrap ( NULL )
|
||||
{
|
||||
|
|
@ -708,6 +725,9 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
|
|||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#if ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#undef SfxTabPage
|
||||
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
|
||||
Window* pParent,
|
||||
const SfxItemSet& rArgSet )
|
||||
|
|
@ -884,9 +904,11 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
|
|||
|
||||
if ( !bPosInputOk )
|
||||
{
|
||||
#if !ENABLE_LAYOUT_EXPERIMENTAL
|
||||
ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
|
||||
ScGlobal::GetRscString( STR_INVALID_TABREF )
|
||||
).Execute();
|
||||
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
aEdOutPos.GrabFocus();
|
||||
aEdOutPos.SetSelection( Selection( 0, SELECTION_MAX ) );
|
||||
theOutPos.Set(0,0,0);
|
||||
|
|
|
|||
|
|
@ -37,6 +37,15 @@ class Window;
|
|||
class SfxViewFrame;
|
||||
class SfxItemSet;
|
||||
|
||||
#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#define LAYOUT_SFX_TABDIALOG_BROKEN 1
|
||||
#endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
|
||||
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <sfx2/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
#endif
|
||||
|
||||
//==================================================================
|
||||
|
||||
class ScAttrDlg : public SfxTabDialog
|
||||
|
|
@ -54,6 +63,9 @@ private:
|
|||
DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages
|
||||
};
|
||||
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <layout/layout-post.hxx>
|
||||
#endif
|
||||
|
||||
#endif // SC_ATTRDLG_HXX
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,9 @@
|
|||
#include <vcl/field.hxx>
|
||||
#include "expftext.hxx"
|
||||
|
||||
#include <layout/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
class ScViewData;
|
||||
class ScDocument;
|
||||
class ScDocShell;
|
||||
|
|
@ -130,5 +133,7 @@ private:
|
|||
#endif
|
||||
};
|
||||
|
||||
#include <layout/layout-post.hxx>
|
||||
|
||||
#endif // SC_INSTBDLG_HXX
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@
|
|||
#include <vcl/lstbox.hxx>
|
||||
#include <vcl/fixed.hxx>
|
||||
|
||||
#include <layout/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
class ScMoveTableDlg : public ModalDialog
|
||||
|
|
@ -72,6 +75,7 @@ private:
|
|||
DECL_LINK( SelHdl, ListBox * );
|
||||
};
|
||||
|
||||
#include <layout/layout-post.hxx>
|
||||
|
||||
#endif // SC_MVTABDLG_HXX
|
||||
|
||||
|
|
|
|||
|
|
@ -33,10 +33,14 @@
|
|||
|
||||
#include <sfx2/tabdlg.hxx>
|
||||
|
||||
#ifndef _SFX_HXX
|
||||
#endif
|
||||
#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#define LAYOUT_SFX_TABDIALOG_BROKEN 1
|
||||
#endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
|
||||
|
||||
//==================================================================
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <sfx2/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
#endif
|
||||
|
||||
class ScSortDlg : public SfxTabDialog
|
||||
{
|
||||
|
|
@ -61,7 +65,8 @@ inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; }
|
|||
inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; }
|
||||
inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; }
|
||||
|
||||
#if !LAYOUT_SFX_TABDIALOG_BROKEN
|
||||
#include <layout/layout-post.hxx>
|
||||
#endif
|
||||
|
||||
#endif // SC_SORTDLG_HXX
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
#include <vcl/imagebtn.hxx>
|
||||
#include <vcl/edit.hxx>
|
||||
|
||||
#include <layout/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
class ScStringInputDlg : public ModalDialog
|
||||
|
|
@ -59,6 +62,7 @@ private:
|
|||
HelpButton aBtnHelp;
|
||||
};
|
||||
|
||||
#include <layout/layout-post.hxx>
|
||||
|
||||
#endif // SC_STRINDLG_HXX
|
||||
|
||||
|
|
|
|||
|
|
@ -132,6 +132,13 @@ class ScRangeData;
|
|||
class CollatorRessource;
|
||||
class CollatorWrapper;
|
||||
|
||||
#if ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#include <sfx2/layout.hxx>
|
||||
#include <layout/layout-pre.hxx>
|
||||
#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
#define LocalizedString String
|
||||
#endif /* !ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
|
||||
class ScTabPageSortOptions : public SfxTabPage
|
||||
{
|
||||
public:
|
||||
|
|
@ -139,6 +146,8 @@ public:
|
|||
const SfxItemSet& rArgSet );
|
||||
~ScTabPageSortOptions();
|
||||
|
||||
#undef SfxTabPage
|
||||
#define SfxTabPage ::SfxTabPage
|
||||
static SfxTabPage* Create ( Window* pParent,
|
||||
const SfxItemSet& rArgSet );
|
||||
static USHORT* GetRanges ();
|
||||
|
|
@ -177,9 +186,9 @@ private:
|
|||
|
||||
FixedText aFtAreaLabel;
|
||||
// FixedInfo aFtArea;
|
||||
String aStrRowLabel;
|
||||
String aStrColLabel;
|
||||
String aStrUndefined;
|
||||
LocalizedString aStrRowLabel;
|
||||
LocalizedString aStrColLabel;
|
||||
LocalizedString aStrUndefined;
|
||||
String aStrNoName;
|
||||
String aStrAreaLabel;
|
||||
|
||||
|
|
@ -208,7 +217,9 @@ private:
|
|||
#endif
|
||||
};
|
||||
|
||||
|
||||
#if ENABLE_LAYOUT_EXPERIMENTAL
|
||||
#include <layout/layout-post.hxx>
|
||||
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
|
||||
|
||||
#endif // SC_TPSORT_HXX
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,17 @@
|
|||
#define SC_INSTBDLG_CXX
|
||||
#include "instbdlg.hxx"
|
||||
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ScResId
|
||||
#define ScResId(x) #x
|
||||
#undef ModalDialog
|
||||
#define ModalDialog( parent, id ) Dialog( parent, "insert-sheet.xml", id )
|
||||
#undef ErrorBox
|
||||
#define ErrorBox( this, bits, message ) ErrorBox (LAYOUT_THIS_WINDOW (this), bits, message)
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
//==================================================================
|
||||
|
||||
ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
|
||||
|
|
@ -86,6 +97,10 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
|
|||
nSelTabIndex ( 0 ),
|
||||
nTableCount (nTabCount)
|
||||
{
|
||||
#if ENABLE_LAYOUT
|
||||
SetHelpId (SID_INSERT_TABLE);
|
||||
aFtPath.SetText (EMPTY_STRING);
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
Init_Impl( bFromFile );
|
||||
FreeResource();
|
||||
}
|
||||
|
|
@ -152,11 +167,16 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
|
|||
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ModalDialog
|
||||
#define ModalDialog Dialog
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
short __EXPORT ScInsertTableDlg::Execute()
|
||||
{
|
||||
// set Parent of DocumentInserter and Doc-Manager
|
||||
Window* pOldDefParent = Application::GetDefDialogParent();
|
||||
Application::SetDefDialogParent( this );
|
||||
Application::SetDefDialogParent( LAYOUT_THIS_WINDOW (this) );
|
||||
|
||||
if ( aBtnFromFile.IsChecked() )
|
||||
aBrowseTimer.Start();
|
||||
|
|
|
|||
|
|
@ -47,6 +47,15 @@
|
|||
#include "scresid.hxx"
|
||||
#include "globstr.hrc"
|
||||
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ScResId
|
||||
#define ScResId(x) #x
|
||||
#undef ModalDialog
|
||||
#define ModalDialog( parent, id ) Dialog( parent, "move-copy-sheet.xml", id )
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
//==================================================================
|
||||
|
||||
ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
|
||||
|
|
@ -66,6 +75,10 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
|
|||
nTable ( 0 ),
|
||||
bCopyTable ( FALSE )
|
||||
{
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ScResId
|
||||
SetHelpId (FID_TAB_MOVE);
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
Init();
|
||||
FreeResource();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,14 @@
|
|||
#include "scresid.hxx"
|
||||
#include "miscdlgs.hrc"
|
||||
|
||||
#include <layout/layout-pre.hxx>
|
||||
|
||||
#if ENABLE_LAYOUT
|
||||
#undef ScResId
|
||||
#define ScResId(x) #x
|
||||
#undef ModalDialog
|
||||
#define ModalDialog( parent, id ) Dialog( parent, "string-input.xml", id )
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
//==================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
|
|||
DropTargetHelper( this ),
|
||||
DragSourceHelper( this ),
|
||||
pViewData( pData ),
|
||||
nMouseClickPageId( TAB_PAGE_NOTFOUND ),
|
||||
nSelPageIdByMouse( TAB_PAGE_NOTFOUND ),
|
||||
nMouseClickPageId( TABBAR_PAGE_NOTFOUND ),
|
||||
nSelPageIdByMouse( TABBAR_PAGE_NOTFOUND ),
|
||||
bErrorShown( FALSE )
|
||||
{
|
||||
ScDocument* pDoc = pViewData->GetDocument();
|
||||
|
|
@ -159,7 +159,7 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt )
|
|||
if( rMEvt.IsLeft() && (rMEvt.GetModifier() == 0) )
|
||||
nMouseClickPageId = GetPageId( rMEvt.GetPosPixel() );
|
||||
else
|
||||
nMouseClickPageId = TAB_PAGE_NOTFOUND;
|
||||
nMouseClickPageId = TABBAR_PAGE_NOTFOUND;
|
||||
|
||||
TabBar::MouseButtonDown( rMEvt );
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
|
|||
|
||||
// mouse button down and up on same page?
|
||||
if( nMouseClickPageId != GetPageId( aPos ) )
|
||||
nMouseClickPageId = TAB_PAGE_NOTFOUND;
|
||||
nMouseClickPageId = TABBAR_PAGE_NOTFOUND;
|
||||
else if ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() )
|
||||
{
|
||||
SfxDispatcher* pDispatcher = pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
|
||||
|
|
@ -183,7 +183,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
|
|||
SfxDispatcher* pDispatcher = pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
|
||||
pDispatcher->Execute( FID_INS_TABLE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
|
||||
// forget page ID, to be really sure that the dialog is not called twice
|
||||
nMouseClickPageId = TAB_PAGE_NOTFOUND;
|
||||
nMouseClickPageId = TABBAR_PAGE_NOTFOUND;
|
||||
}
|
||||
|
||||
TabBar::MouseButtonUp( rMEvt );
|
||||
|
|
@ -195,7 +195,7 @@ void ScTabControl::Select()
|
|||
nSelPageIdByMouse = nMouseClickPageId;
|
||||
/* Reset nMouseClickPageId, so that next Select() call may invalidate
|
||||
nSelPageIdByMouse (i.e. if called from keyboard). */
|
||||
nMouseClickPageId = TAB_PAGE_NOTFOUND;
|
||||
nMouseClickPageId = TABBAR_PAGE_NOTFOUND;
|
||||
|
||||
ScModule* pScMod = SC_MOD();
|
||||
ScDocument* pDoc = pViewData->GetDocument();
|
||||
|
|
@ -368,7 +368,7 @@ void ScTabControl::ActivateView(BOOL bActivate)
|
|||
void ScTabControl::SetSheetLayoutRTL( BOOL bSheetRTL )
|
||||
{
|
||||
SetEffectiveRTL( bSheetRTL );
|
||||
nSelPageIdByMouse = TAB_PAGE_NOTFOUND;
|
||||
nSelPageIdByMouse = TABBAR_PAGE_NOTFOUND;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -550,9 +550,9 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent& rEvt )
|
|||
long ScTabControl::StartRenaming()
|
||||
{
|
||||
if ( pViewData->GetDocument()->IsDocEditable() )
|
||||
return TAB_RENAMING_YES;
|
||||
return TABBAR_RENAMING_YES;
|
||||
else
|
||||
return TAB_RENAMING_NO;
|
||||
return TABBAR_RENAMING_NO;
|
||||
}
|
||||
|
||||
long ScTabControl::AllowRenaming()
|
||||
|
|
@ -560,7 +560,7 @@ long ScTabControl::AllowRenaming()
|
|||
ScTabViewShell* pViewSh = pViewData->GetViewShell();
|
||||
DBG_ASSERT( pViewSh, "pViewData->GetViewShell()" );
|
||||
|
||||
long nRet = TAB_RENAMING_CANCEL;
|
||||
long nRet = TABBAR_RENAMING_CANCEL;
|
||||
USHORT nId = GetEditPageId();
|
||||
if ( nId )
|
||||
{
|
||||
|
|
@ -568,27 +568,27 @@ long ScTabControl::AllowRenaming()
|
|||
String aNewName = GetEditText();
|
||||
BOOL bDone = pViewSh->RenameTable( aNewName, nTab );
|
||||
if ( bDone )
|
||||
nRet = TAB_RENAMING_YES;
|
||||
nRet = TABBAR_RENAMING_YES;
|
||||
else if ( bErrorShown )
|
||||
{
|
||||
// if the error message from this TabControl is currently visible,
|
||||
// don't end edit mode now, to avoid problems when returning to
|
||||
// the other call (showing the error) - this should not happen
|
||||
DBG_ERROR("ScTabControl::AllowRenaming: nested calls");
|
||||
nRet = TAB_RENAMING_NO;
|
||||
nRet = TABBAR_RENAMING_NO;
|
||||
}
|
||||
else if ( Application::IsInModalMode() )
|
||||
{
|
||||
// #73472# don't show error message above any modal dialog
|
||||
// instead cancel renaming without error message
|
||||
nRet = TAB_RENAMING_CANCEL;
|
||||
nRet = TABBAR_RENAMING_CANCEL;
|
||||
}
|
||||
else
|
||||
{
|
||||
bErrorShown = TRUE;
|
||||
pViewSh->ErrorMessage( STR_INVALIDTABNAME );
|
||||
bErrorShown = FALSE;
|
||||
nRet = TAB_RENAMING_NO;
|
||||
nRet = TABBAR_RENAMING_NO;
|
||||
}
|
||||
}
|
||||
return nRet;
|
||||
|
|
@ -603,12 +603,12 @@ void ScTabControl::EndRenaming()
|
|||
void ScTabControl::Mirror()
|
||||
{
|
||||
TabBar::Mirror();
|
||||
if( nSelPageIdByMouse != TAB_PAGE_NOTFOUND )
|
||||
if( nSelPageIdByMouse != TABBAR_PAGE_NOTFOUND )
|
||||
{
|
||||
Rectangle aRect( GetPageRect( GetCurPageId() ) );
|
||||
if( !aRect.IsEmpty() )
|
||||
SetPointerPosPixel( aRect.Center() );
|
||||
nSelPageIdByMouse = TAB_PAGE_NOTFOUND; // only once after a Select()
|
||||
nSelPageIdByMouse = TABBAR_PAGE_NOTFOUND; // only once after a Select()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include "scitems.hxx"
|
||||
#include <sfx2/request.hxx>
|
||||
#include <basic/sbstar.hxx>
|
||||
#include <layout/layout.hxx>
|
||||
#include <svtools/languageoptions.hxx>
|
||||
#include <svtools/stritem.hxx>
|
||||
#include <svtools/whiter.hxx>
|
||||
|
|
@ -55,7 +56,6 @@
|
|||
//CHINA001 #include "mvtabdlg.hxx"
|
||||
#include "docfunc.hxx"
|
||||
|
||||
|
||||
#include "scabstdlg.hxx" //CHINA001
|
||||
|
||||
#define IS_AVAILABLE(WhichId,ppItem) \
|
||||
|
|
@ -621,11 +621,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
|
|||
{
|
||||
// wenn's nicht von Basic kommt, nochmal nachfragen:
|
||||
|
||||
bDoIt = ( RET_YES ==
|
||||
QueryBox( GetDialogParent(),
|
||||
WinBits( WB_YES_NO | WB_DEF_YES ),
|
||||
ScGlobal::GetRscString(STR_QUERY_DELTAB)
|
||||
).Execute() );
|
||||
#if ENABLE_LAYOUT
|
||||
// Using layout::QueryBox without client code modification is
|
||||
// deprecated, rather add HIG-complient buttons with verbs.
|
||||
#define QueryBox( parent, winbits, question ) layout::QueryBox (parent, question, ScGlobal::GetRscString (STR_UNDO_DELETE_TAB))
|
||||
#endif /* ENABLE_LAYOUT */
|
||||
|
||||
bDoIt = ( RET_YES ==
|
||||
QueryBox( GetDialogParent(),
|
||||
WinBits( WB_YES_NO | WB_DEF_YES ),
|
||||
ScGlobal::GetRscString(STR_QUERY_DELTAB)
|
||||
).Execute() );
|
||||
}
|
||||
if( bDoIt )
|
||||
{
|
||||
|
|
|
|||
1
sc/uiconfig/layout/delzip
Normal file
1
sc/uiconfig/layout/delzip
Normal file
|
|
@ -0,0 +1 @@
|
|||
empty
|
||||
57
sc/uiconfig/layout/insert-sheet.xml
Normal file
57
sc/uiconfig/layout/insert-sheet.xml
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- This is a template. i18n translation is not performed in-place;
|
||||
i18n translated XML files are generated from this template by
|
||||
transex3/layout/tralay. !-->
|
||||
|
||||
<modaldialog sizeable="true" closeable="true" moveable="true" output-size="true" id="RID_SCDLG_INSERT_TABLE" sv-look="true" _title="Insert Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
|
||||
<vbox spacing="5" border="5">
|
||||
<fixedline id="FL_POSITION" _text="Position"/>
|
||||
<hbox>
|
||||
<vbox cnt:padding="13" spacing="5">
|
||||
<radiobutton radiogroup="insert-sheet-position" id="RB_BEFORE" tabstop="true" _label="B~efore current sheet"/>
|
||||
<radiobutton radiogroup="insert-sheet-position" id="RB_BEHIND" tabstop="true" _label="~After current sheet"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<fixedline id="FL_TABLE" _text="Sheet"/>
|
||||
<hbox>
|
||||
<vbox cnt:padding="13" spacing="5">
|
||||
<radiobutton radiogroup="insert-sheet-source" id="RB_NEW" _label="~New sheet"/>
|
||||
<hbox>
|
||||
<vbox cnt:padding="13" spacing="5" cnt:fill="false" cnt:expand="false">
|
||||
<fixedtext id="FT_COUNT" _label="N~o. of sheets"/>
|
||||
<fixedtext id="FT_NAME" _label="Na~me"/>
|
||||
</vbox>
|
||||
<vbox>
|
||||
<hbox>
|
||||
<numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="false"/>
|
||||
</hbox>
|
||||
<edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<vbox cnt:padding="13" spacing="5">
|
||||
<radiobutton radiogroup="insert-sheet-source" id="RB_FROMFILE" _label="~From file"/>
|
||||
<hbox>
|
||||
<vbox cnt:padding="13" spacing="5">
|
||||
<hbox>
|
||||
<multilistbox auto-hscroll="true" has_border="true" id="LB_TABLES" simple-mode="true" string-item-list=" : : : : " cnt:fill="true" cnt:expand="true"/>
|
||||
<vbox cnt:fill="false" cnt:expand="false" spacing="5">
|
||||
<pushbutton id="BTN_BROWSE" _label="~Browse..." cnt:expand="false"/>
|
||||
<checkbox id="CB_LINK" _label="Lin~k" cnt:expand="false"/>
|
||||
<flow/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<fixedtext id="FT_PATH" label="FT-PATH"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<dialogbuttonhbox border="5" spacing="5">
|
||||
<okbutton defbutton="true" id="BTN_OK"/>
|
||||
<cancelbutton id="BTN_CANCEL"/>
|
||||
<helpbutton id="BTN_HELP"/>
|
||||
</dialogbuttonhbox>
|
||||
</vbox>
|
||||
</modaldialog>
|
||||
67
sc/uiconfig/layout/makefile.mk
Normal file
67
sc/uiconfig/layout/makefile.mk
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
#*************************************************************************
|
||||
#
|
||||
# OpenOffice.org - a multi-platform office productivity suite
|
||||
#
|
||||
# $RCSfile$
|
||||
#
|
||||
# $Revision$
|
||||
#
|
||||
# last change: $Author$ $Date$
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
#
|
||||
#
|
||||
# GNU Lesser General Public License Version 2.1
|
||||
# =============================================
|
||||
# Copyright 2005 by Sun Microsystems, Inc.
|
||||
# 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License version 2.1, as published by the Free Software Foundation.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
|
||||
# MA 02110-1301 USA
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
PRJ=../..
|
||||
PRJNAME=sc
|
||||
TARGET=layout
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
.IF "$(ENABLE_LAYOUT)" == "TRUE"
|
||||
|
||||
all: ALLTAR
|
||||
|
||||
XML_FILES=\
|
||||
insert-sheet.xml\
|
||||
move-copy-sheet.xml\
|
||||
sort-options.xml\
|
||||
string-input.xml\
|
||||
|
||||
#
|
||||
|
||||
.INCLUDE : layout.mk
|
||||
|
||||
.ELSE # ENABLE_LAYOUT != TRUE
|
||||
all .PHONY:
|
||||
.ENDIF # ENABLE_LAYOUT != TRUE
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf
|
||||
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-$@
|
||||
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-$@
|
||||
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-$@
|
||||
echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
|
||||
rm -f *-$@
|
||||
21
sc/uiconfig/layout/move-copy-sheet.xml
Normal file
21
sc/uiconfig/layout/move-copy-sheet.xml
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- This is a template. i18n translation is not performed in-place;
|
||||
i18n translated XML files are generated from this template by
|
||||
transex3/layout/tralay. !-->
|
||||
|
||||
<modaldialog sizeable="true" closeable="true" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
|
||||
<vbox spacing="5" border="5">
|
||||
<string id="STR_NEWDOC" _text="- new document -"/>
|
||||
<fixedtext id="FT_DEST" _label="To ~document"/>
|
||||
<listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
|
||||
<fixedtext id="FT_INSERT" _label="~Insert before"/>
|
||||
<listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
|
||||
<checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
|
||||
<dialogbuttonhbox border="5" spacing="5">
|
||||
<flow/>
|
||||
<cancelbutton id="BTN_CANCEL" tabstop="true"/>
|
||||
<helpbutton id="BTN_HELP" tabstop="true"/>
|
||||
<okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
|
||||
</dialogbuttonhbox>
|
||||
</vbox>
|
||||
</modaldialog>
|
||||
40
sc/uiconfig/layout/sort-options.xml
Normal file
40
sc/uiconfig/layout/sort-options.xml
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- This is a template. i18n translation is not performed in-place;
|
||||
i18n translated XML files are generated from this template by
|
||||
transex3/layout/tralay. !-->
|
||||
|
||||
<tabpage help-id="HID_SCPAGE_SORT_OPTIONS"
|
||||
id="RID_SCPAGE_SORT_OPTIONS"
|
||||
sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container"
|
||||
optimumsize="true"
|
||||
sizeable="true" moveable="true">
|
||||
<vbox spacing="4" border="5">
|
||||
<string id="STR_COL_LABEL" _text="Range contains column la~bels"/>
|
||||
<string id="STR_ROW_LABEL" _text="Range contains ~row labels"/>
|
||||
<string id="SCSTR_UNDEFINED" _text="- undefined -"/>
|
||||
<vbox spacing="4" border="5">
|
||||
<checkbox id="BTN_CASESENSITIVE" tabstop="true" _label="Case ~sensitive"/>
|
||||
<checkbox id="BTN_LABEL" tabstop="true"/>
|
||||
<checkbox id="BTN_FORMATS" tabstop="true" _label="Include ~formats"/>
|
||||
<checkbox id="BTN_NATURALSORT" tabstop="true" _label="Enable ~natural sort"/>
|
||||
<checkbox id="BTN_COPYRESULT" tabstop="true" _label="~Copy sort results to:"/>
|
||||
<hbox>
|
||||
<listbox has_border="true" dropdown="true" id="LB_OUTAREA" tabstop="true"/>
|
||||
<edit has_border="true" disable="true" id="ED_OUTAREA" tabstop="true"/>
|
||||
</hbox>
|
||||
<checkbox id="BTN_SORT_USER" tabstop="true" _label="Custom sort ~order"/>
|
||||
<listbox has_border="true" disable="true" dropdown="true" id="LB_SORT_USER" tabstop="true"/>
|
||||
<hbox>
|
||||
<fixedtext id="FT_LANGUAGE" _label="~Language"/>
|
||||
<fixedtext id="FT_ALGORITHM" _label="O~ptions"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<svxlanguagebox has_border="true" dropdown="true" id="LB_LANGUAGE" sort="true" tabstop="true" _string-item-list="Default"/>
|
||||
<listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
|
||||
</hbox>
|
||||
<fixedline id="FL_DIRECTION" _text="Direction"/>
|
||||
<radiobutton id="BTN_TOP_DOWN" radiogroup="sort-options" tabstop="true" _label="~Top to bottom (sort rows)"/>
|
||||
<radiobutton id="BTN_LEFT_RIGHT" radiogroup="sort-options" tabstop="true" _label="L~eft to right (sort columns)"/>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</tabpage>
|
||||
16
sc/uiconfig/layout/string-input.xml
Normal file
16
sc/uiconfig/layout/string-input.xml
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- This is a template. i18n translation is not performed in-place;
|
||||
i18n translated XML files are generated from this template by
|
||||
transex3/layout/tralay. !-->
|
||||
|
||||
<modaldialog sizeable="true" closeable="false" moveable="true" output-size="true" id="RID_SCDLG_STRINPUT" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container" title="Insert String">
|
||||
<vbox spacing="5" border="5">
|
||||
<fixedtext id="FT_LABEL" label="FT-LABEL"/>
|
||||
<edit has_border="true" id="ED_INPUT" tabstop="true"/>
|
||||
<dialogbuttonhbox border="5" spacing="5">
|
||||
<okbutton defbutton="true" id="BTN_OK" tabstop="true"/>
|
||||
<cancelbutton id="BTN_CANCEL" tabstop="true"/>
|
||||
<helpbutton id="BTN_HELP" tabstop="true"/>
|
||||
</dialogbuttonhbox>
|
||||
</vbox>
|
||||
</modaldialog>
|
||||
|
|
@ -232,6 +232,10 @@ SHL8STDLIBS= \
|
|||
$(CPPULIB) \
|
||||
$(SALLIB)
|
||||
|
||||
.IF "$(ENABLE_LAYOUT)" == "TRUE"
|
||||
SHL8STDLIBS+=$(TKLIB)
|
||||
.ENDIF # ENABLE_LAYOUT == TRUE
|
||||
|
||||
SHL8LIBS= $(SLB)$/scui.lib
|
||||
LIB8TARGET = $(SLB)$/scui.lib
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue