Commit graph

435 commits

Author SHA1 Message Date
Kurt Zenker
9c2e4eef6c INTEGRATION: CWS xmlsec05 (1.24.138); FILE MERGED
2004/08/13 15:42:24 mt 1.24.138.2: RESYNC: (1.24-1.25); FILE MERGED
2004/07/21 09:45:58 mt 1.24.138.1: #i21596# Digital Signatutres...
2004-08-31 08:38:48 +00:00
Rüdiger Timm
780ac912ac INTEGRATION: CWS oasis2 (1.33.20); FILE MERGED
2004/07/28 09:28:58 mib 1.33.20.1: #i31910#: Copied OLE objects had wrong version
2004-08-20 07:19:53 +00:00
Oliver Bolte
99bfcb1303 INTEGRATION: CWS jmf2 (1.14.64); FILE MERGED
2004/07/29 07:14:08 ka 1.14.64.5: #i3316#: string finalization
2004/07/15 15:42:26 ka 1.14.64.4: #i3316#: changes for m47 build
2004/07/14 00:58:08 ka 1.14.64.3: RESYNC: (1.14-1.15); FILE MERGED
2004/07/13 20:07:34 ka 1.14.64.2: #i3316#: String finalization
2004/07/11 20:08:32 ka 1.14.64.1: media support
2004-08-12 08:15:24 +00:00
Oliver Bolte
6f4f8bb5e9 INTEGRATION: CWS jmf2 (1.29.64); FILE MERGED
2004/07/14 00:57:47 ka 1.29.64.2: RESYNC: (1.29-1.30); FILE MERGED
2004/07/11 20:08:32 ka 1.29.64.1: media support
2004-08-12 08:15:11 +00:00
Oliver Bolte
fc6be29372 INTEGRATION: CWS jmf2 (1.13.62); FILE MERGED
2004/07/23 23:23:58 ka 1.13.62.3: RESYNC: (1.13-1.14); FILE MERGED
2004/07/11 20:39:24 ka 1.13.62.2: media support
2004/07/11 20:09:38 ka 1.13.62.1: media support
2004-08-12 08:14:58 +00:00
Oliver Bolte
ad22d6a6ea INTEGRATION: CWS jmf2 (1.7.118); FILE MERGED
2004/07/23 23:23:50 ka 1.7.118.3: RESYNC: (1.8-1.9); FILE MERGED
2004/07/14 00:57:15 ka 1.7.118.2: RESYNC: (1.7-1.8); FILE MERGED
2004/07/11 20:09:38 ka 1.7.118.1: media support
2004-08-12 08:14:44 +00:00
Rüdiger Timm
b4a39c295c INTEGRATION: CWS impress18ea (1.97.10); FILE MERGED
2004/07/26 12:20:23 af 1.97.10.1: #i22705# Update of multi pane GUI related strings.
2004-08-04 07:53:38 +00:00
Rüdiger Timm
5bbdd9e2b3 INTEGRATION: CWS impress18ea (1.24.164); FILE MERGED
2004/07/28 15:28:40 af 1.24.164.2: #i31401# SdGlobalResourceContainer.hxx moved to source/ui/inc/tools.
2004/07/28 14:37:39 af 1.24.164.1: #i31401# Added mpResourceContainer member.
2004-08-04 07:53:24 +00:00
Jens-Heiner Rechtien
8ea241d268 INTEGRATION: CWS aw017 (1.15.60); FILE MERGED
2004/07/29 14:11:22 aw 1.15.60.1: #i25616#
2004-08-03 12:25:23 +00:00
Jens-Heiner Rechtien
2299e37164 INTEGRATION: CWS aw017 (1.33.18); FILE MERGED
2004/07/29 14:11:21 aw 1.33.18.1: #i25616#
2004-08-03 12:25:11 +00:00
Kurt Zenker
702c1a95a9 INTEGRATION: CWS os35 (1.94.64); FILE MERGED
2004/07/15 18:32:06 dr 1.94.64.2: RESYNC: (1.94-1.95); FILE MERGED
2004/06/30 12:06:29 os 1.94.64.1: #i30407# dialog titles changed to conform format menu entries
2004-08-02 11:50:41 +00:00
Kurt Zenker
2da66878c9 INTEGRATION: CWS formatpaintbrush02 (1.13.102); FILE MERGED
2004/07/30 12:51:13 iha 1.13.102.2: RESYNC: (1.13-1.14); FILE MERGED
2004/07/16 22:45:37 iha 1.13.102.1: #i20119# format paintbrush
2004-08-02 09:08:23 +00:00
Rüdiger Timm
0531ae66c3 #i10000# Adapt to changes made in CWS aw013 2004-07-15 08:00:36 +00:00
Rüdiger Timm
6c7c90796b #i10000# New Syntax: [ english_us ] -> [ en-US ] 2004-07-15 06:53:31 +00:00
Rüdiger Timm
d4f70c4371 INTEGRATION: CWS impress2 (1.94.26); FILE MERGED
2004/07/13 11:52:43 af 1.94.26.4: RESYNC: (1.94-1.95); FILE MERGED
2004/07/09 07:03:52 af 1.94.26.3: #i22705# Exchanged english and german strings of STR_LEFT_PANE_TITLE.
2004/07/07 16:52:09 af 1.94.26.2: #i22705# Added preliminary versions of strings for Multi Pane GUI.
2004/06/16 13:54:16 af 1.94.26.1: #i22705# Renamed the names of the views as displayed by the ViewTabBar.
2004-07-13 12:48:32 +00:00
Rüdiger Timm
4431525338 INTEGRATION: CWS impress2 (1.38.8); FILE MERGED
2004/07/10 10:01:19 af 1.38.8.5: #i22705# Testing in GetCurrentPage() that page is really an SdPage.
2004/07/09 07:01:21 af 1.38.8.4: #i22705# Fixed setting up a view shell pointer.
2004/07/05 08:42:58 af 1.38.8.3: #i22705# In CalcFieldValueHdl not using current view shell anymore when the document is not connected with a view shell.
2004/07/02 16:48:21 af 1.38.8.2: #i22705# Fixed access to current view shell.
2004/06/08 16:50:09 af 1.38.8.1: #i22705# Added guards against missing view shell.
2004-07-13 12:48:17 +00:00
Rüdiger Timm
71462c69b9 INTEGRATION: CWS impress2 (1.28.12); FILE MERGED
2004/06/28 07:37:30 af 1.28.12.6: #i22705# Using new PaneManager::RequestMainViewShellChange() method.
2004/05/23 13:20:28 af 1.28.12.5: #i22705# Adaption to change in ViewShellBase.
2004/05/19 18:25:38 af 1.28.12.4: RESYNC: (1.28-1.29); FILE MERGED
2004/03/02 13:20:57 af 1.28.12.3: #i22705# Replaced bool argument in ViewShellBase::RequestViewShellChange() by more specific enum CallMode.
2004/03/02 09:36:40 af 1.28.12.2: #i22705# Using panes of ViewShellBase.
2004/02/25 11:15:20 af 1.28.12.1: #i22705# Adaption to modified shell handling.
2004-07-13 12:48:02 +00:00
Rüdiger Timm
ca0e9734c8 INTEGRATION: CWS impress2 (1.12.10); FILE MERGED
2004/06/04 06:36:04 af 1.12.10.4: #i22705# Renamed the child windows of the left and righ panes.
2004/05/19 18:25:31 af 1.12.10.3: RESYNC: (1.12-1.13); FILE MERGED
2004/04/22 15:01:31 af 1.12.10.2: #i22705# Added registration of layer dialog.
2004/02/25 10:57:58 af 1.12.10.1: #i22705# Added new GUI panes.
2004-07-13 12:47:40 +00:00
Rüdiger Timm
d82a4138cc INTEGRATION: CWS impress2 (1.7.24); FILE MERGED
2004/06/18 00:15:19 af 1.7.24.3: RESYNC: (1.7-1.8); FILE MERGED
2004/06/04 06:35:17 af 1.7.24.2: #i22705# Registering interface of the TaskPaneViewShell.
2004/02/25 10:56:18 af 1.7.24.1: #i22705# Added slide sorter view shell.
2004-07-13 12:47:26 +00:00
Rüdiger Timm
c3400aadc2 INTEGRATION: CWS impress2 (1.44.16); FILE MERGED
2004/07/13 11:52:23 af 1.44.16.5: RESYNC: (1.45-1.46); FILE MERGED
2004/06/29 07:01:57 af 1.44.16.4: #i22705# Added high contrast entries for TRIANGLE_DOWN and TRIANGLE_RIGHT.  Renamed ANIMATION_INDICATOR to FADE_EFFECT_INDICATOR.
2004/06/18 00:15:12 af 1.44.16.3: RESYNC: (1.44-1.45); FILE MERGED
2004/06/10 08:03:14 af 1.44.16.2: #i22705# Added entry for the transition effect indicator.
2004/02/25 10:47:38 af 1.44.16.1: #i22705# Added preliminary entries for task panel bitmaps.
2004-07-13 12:47:09 +00:00
Rüdiger Timm
2a9bdb675f INTEGRATION: CWS impress2 (1.27.16); FILE MERGED
2004/07/13 11:50:53 af 1.27.16.4: RESYNC: (1.27-1.28); FILE MERGED
2004/07/01 16:47:32 af 1.27.16.3: #i22705# Added context menu for the layout menu in the task pane.
2004/06/28 07:36:12 af 1.27.16.2: #i22705# Modified the context menus used by the slide sorter.
2004/06/04 06:33:58 af 1.27.16.1: #i22705# Added popup menu for master pages selectors.
2004-07-13 12:46:54 +00:00
Rüdiger Timm
5241cc6605 INTEGRATION: CWS aw013 (1.32.34); FILE MERGED
2004/06/24 09:33:06 aw 1.32.34.1: #i29181#
2004-07-12 13:57:44 +00:00
Oliver Bolte
985aa70ab9 INTEGRATION: CWS docking1 (1.13.70); FILE MERGED
2004/05/03 10:48:43 cd 1.13.70.3: #i26252# Use new function to create sub toolbars
2004/05/02 00:10:22 cd 1.13.70.2: RESYNC: (1.13-1.14); FILE MERGED
2004/04/25 05:44:00 cd 1.13.70.1: #i26252# Transition of toolbar controllers
2004-07-06 11:24:44 +00:00
Hans-Joachim Lankenau
60773aaf13 INTEGRATION: CWS mergebuild (1.11.58); FILE MERGED
2004/05/18 13:55:09 hjs 1.11.58.4: RESYNC: (1.13-1.14); FILE MERGED
2004/04/20 21:49:50 hjs 1.11.58.3: RESYNC: (1.11-1.13); FILE MERGED
2003/11/11 19:22:06 ihi 1.11.58.2: en -> en-US
2003/11/10 17:40:09 ihi 1.11.58.1: #111234# Merge during build
2004-06-26 16:57:32 +00:00
Hans-Joachim Lankenau
fc06a9884b INTEGRATION: CWS mergebuild (1.26.58); FILE MERGED
2004/05/18 13:54:37 hjs 1.26.58.4: RESYNC: (1.28-1.29); FILE MERGED
2004/04/20 21:49:30 hjs 1.26.58.3: RESYNC: (1.26-1.28); FILE MERGED
2003/11/11 19:22:05 ihi 1.26.58.2: en -> en-US
2003/11/10 17:40:08 ihi 1.26.58.1: #111234# Merge during build
2004-06-26 16:57:21 +00:00
Hans-Joachim Lankenau
dc16ed8913 INTEGRATION: CWS mergebuild (1.89.54); FILE MERGED
2004/05/21 15:53:27 hjs 1.89.54.6: #i8252# fix resync problems
2004/05/18 13:54:28 hjs 1.89.54.5: RESYNC: (1.90-1.94); FILE MERGED
2004/04/20 21:49:21 hjs 1.89.54.4: RESYNC: (1.89-1.90); FILE MERGED
2004/02/23 11:36:30 ihi 1.89.54.3: Merge-While-Build update
2003/11/11 19:22:04 ihi 1.89.54.2: en -> en-US
2003/11/10 17:40:05 ihi 1.89.54.1: #111234# Merge during build
2004-06-26 16:57:08 +00:00
Hans-Joachim Lankenau
e972d022da INTEGRATION: CWS mergebuild (1.25.58); FILE MERGED
2004/04/20 21:49:05 hjs 1.25.58.3: RESYNC: (1.25-1.26); FILE MERGED
2003/11/11 19:22:03 ihi 1.25.58.2: en -> en-US
2003/11/10 17:40:04 ihi 1.25.58.1: #111234# Merge during build
2004-06-26 16:56:54 +00:00
Hans-Joachim Lankenau
bab94ba728 INTEGRATION: CWS mergebuild (1.43.58); FILE MERGED
2004/05/30 23:08:03 hjs 1.43.58.8: RESYNC: (1.44-1.45); FILE MERGED
2004/05/05 16:00:45 ihi 1.43.58.7: ISO Code update / Macro added
2004/04/29 11:10:47 hjs 1.43.58.6: #i8252# fix unmerge probs
2004/04/20 21:47:52 hjs 1.43.58.5: RESYNC: (1.43-1.44); FILE MERGED
2004/02/23 11:36:30 ihi 1.43.58.4: Merge-While-Build update
2004/02/05 18:04:22 hjs 1.43.58.3: #i8252# fix too much localizing
2003/11/11 19:22:03 ihi 1.43.58.2: en -> en-US
2003/11/10 17:40:01 ihi 1.43.58.1: #111234# Merge during build
2004-06-26 16:56:42 +00:00
Hans-Joachim Lankenau
bf180cdc4d INTEGRATION: CWS mergebuild (1.26.58); FILE MERGED
2004/04/20 21:47:45 hjs 1.26.58.3: RESYNC: (1.26-1.27); FILE MERGED
2003/11/11 19:22:02 ihi 1.26.58.2: en -> en-US
2003/11/10 17:39:59 ihi 1.26.58.1: #111234# Merge during build
2004-06-26 16:56:31 +00:00
Oliver Bolte
1ab0510258 INTEGRATION: CWS impress10ea (1.7.98); FILE MERGED
2004/05/17 15:02:09 af 1.7.98.1: #i27217# Updated the registration of view shells.
2004-06-03 10:52:00 +00:00
Kurt Zenker
7c07a08b16 INTEGRATION: CWS bmpres01 (1.44.42); FILE MERGED
2004/04/27 14:32:28 ka 1.44.42.1: using new resource structure for images
2004-05-18 23:45:31 +00:00
Kurt Zenker
4c096f0ca4 INTEGRATION: CWS bmpres01 (1.10.82); FILE MERGED
2004/04/27 14:32:28 ka 1.10.82.1: using new resource structure for images
2004-05-18 23:45:18 +00:00
Kurt Zenker
28cdaa5635 INTEGRATION: CWS bmpres01 (1.21.12); FILE MERGED
2004/04/27 20:57:25 ka 1.21.12.2: RESYNC: (1.21-1.23); FILE MERGED
2004/04/27 14:32:27 ka 1.21.12.1: using new resource structure for images
2004-05-18 23:45:05 +00:00
Jens-Heiner Rechtien
f0e14bc7ee INTEGRATION: CWS dialogdiet01 (1.35.20); FILE MERGED
2004/04/22 02:01:28 mwu 1.35.20.1: dialogdiet01 m33 sd 20040422
2004-05-10 14:43:06 +00:00
Jens-Heiner Rechtien
9be60d0469 INTEGRATION: CWS dialogdiet01 (1.28.22); FILE MERGED
2004/04/22 02:01:28 mwu 1.28.22.1: dialogdiet01 m33 sd 20040422
2004-05-10 14:42:54 +00:00
Jens-Heiner Rechtien
302bc3844b INTEGRATION: CWS aw009 (1.30.76); FILE MERGED
2004/04/26 11:46:06 aw 1.30.76.1: #116235#, #116168#
2004-05-10 13:37:00 +00:00
Jens-Heiner Rechtien
316e7ef0e0 INTEGRATION: CWS impress8ea1 (1.30.88); FILE MERGED
2004/04/21 17:36:38 cl 1.30.88.1: #i27567# dispose temporary uno model before deleting it
2004-05-10 10:54:28 +00:00
Oliver Bolte
3d2ac7a1e6 INTEGRATION: CWS os12 (1.30.16); FILE MERGED
2004/02/19 22:01:31 os 1.30.16.3: RESYNC: (1.31-1.35); FILE MERGED
2003/10/22 16:10:00 os 1.30.16.2: RESYNC: (1.30-1.31); FILE MERGED
2003/07/09 13:07:28 os 1.30.16.1: #103299# SvxAddressItem removed
2004-04-29 16:03:40 +00:00
Oliver Bolte
c24f4da117 INTEGRATION: CWS os12 (1.5.174); FILE MERGED
2004/02/19 22:01:38 os 1.5.174.2: RESYNC: (1.5-1.7); FILE MERGED
2003/07/09 13:07:28 os 1.5.174.1: #103299# SvxAddressItem removed
2004-04-29 15:15:02 +00:00
Oliver Bolte
99b678900f INTEGRATION: CWS tl01 (1.89.58); FILE MERGED
2004/04/20 13:26:48 tl 1.89.58.4: RESYNC: (1.90-1.92); FILE MERGED
2004/01/30 09:33:39 gt 1.89.58.3: RESYNC: (1.89-1.90); FILE MERGED
2004/01/29 13:09:31 gt 1.89.58.2: merge with SRC680m21
2003/10/08 12:35:47 cl 1.89.58.1: #112058# added undo for Hangul/Hanja conversion
2004-04-27 15:02:03 +00:00
Oliver Bolte
045cd51874 INTEGRATION: CWS cso001 (1.90.72); FILE MERGED
2004/03/23 12:50:55 hjs 1.90.72.1: #116006# merge
2004-04-27 10:31:31 +00:00
Christian Lippka
c072c48e6e removed fontwork bitmaps, theyre not used yet and therefore the bitmaps are missing 2004-04-05 11:59:38 +00:00
Rüdiger Timm
796ecfc857 INTEGRATION: CWS sj05 (1.89.48); FILE MERGED
2004/02/13 14:36:34 sj 1.89.48.2: RESYNC: (1.89-1.90); FILE MERGED
2004/01/23 17:19:37 cl 1.89.48.1: #i20484# adding autoshape ui
2004-04-02 13:58:46 +00:00
Rüdiger Timm
e3b436e572 INTEGRATION: CWS sj05 (1.11.52); FILE MERGED
2004/02/13 14:37:03 sj 1.11.52.2: RESYNC: (1.11-1.13); FILE MERGED
2004/01/23 17:19:41 cl 1.11.52.1: #i20484# adding autoshape ui
2004-04-02 12:23:29 +00:00
Rüdiger Timm
7f653ff207 INTEGRATION: CWS sj05 (1.12.136); FILE MERGED
2004/02/13 14:36:55 sj 1.12.136.2: RESYNC: (1.12-1.13); FILE MERGED
2004/01/23 17:19:40 cl 1.12.136.1: #i20484# adding autoshape ui
2004-04-02 12:23:16 +00:00
Rüdiger Timm
88e0c4f958 INTEGRATION: CWS sj05 (1.26.52); FILE MERGED
2004/02/13 14:36:47 sj 1.26.52.2: RESYNC: (1.26-1.28); FILE MERGED
2004/01/23 17:19:40 cl 1.26.52.1: #i20484# adding autoshape ui
2004-04-02 12:22:50 +00:00
Rüdiger Timm
8366ca6a8f INTEGRATION: CWS sj05 (1.10.228); FILE MERGED
2004/02/13 14:35:12 sj 1.10.228.2: RESYNC: (1.10-1.12); FILE MERGED
2004/01/23 17:19:37 cl 1.10.228.1: #i20484# adding autoshape ui
2004-04-02 12:22:24 +00:00
Rüdiger Timm
69cbb01eed INTEGRATION: CWS sj05 (1.20.90); FILE MERGED
2004/02/13 14:33:01 sj 1.20.90.2: RESYNC: (1.20-1.21); FILE MERGED
2004/01/23 17:19:36 cl 1.20.90.1: #i20484# adding autoshape ui
2004-04-02 12:21:52 +00:00
Rüdiger Timm
5693af3004 INTEGRATION: CWS interop12 (1.89.50); FILE MERGED
2003/12/22 11:38:53 cl 1.89.50.4: RESYNC: (1.89-1.90); FILE MERGED
2003/11/21 16:23:54 cl 1.89.50.3: #i20949# string fixes
2003/11/21 15:53:35 cl 1.89.50.2: #i20949# string review 2 for header&footer
2003/11/21 10:35:23 cl 1.89.50.1: #i20949# string review 1 for header&footer
2004-03-30 14:48:22 +00:00
Rüdiger Timm
80aa20ff40 INTEGRATION: CWS interop12 (1.31.4); FILE MERGED
2004/03/17 13:48:03 cl 1.31.4.9: #i26559# presentation paints cloned objects that do not have a page, consider that
2004/02/17 12:21:33 cl 1.31.4.8: fixed merge problems
2004/02/13 22:23:20 cl 1.31.4.7: RESYNC: (1.32-1.35); FILE MERGED
2004/02/05 15:04:46 cl 1.31.4.6: #i20949# added header&footer support for impress
2003/11/21 10:35:22 cl 1.31.4.5: #i20949# string review 1 for header&footer
2003/11/11 16:25:01 cl 1.31.4.4: #i20949# set paint info rec at SdrOutliner so app has a better clue in CalcFieldValueHdl
2003/11/05 17:05:55 cl 1.31.4.3: #i20949# added support for header&footer
2003/11/04 16:38:14 cl 1.31.4.2: #i20949# added header&footer support for impress
2003/09/19 14:38:23 cl 1.31.4.1: #111385# initial version
2004-03-30 14:47:59 +00:00