Commit Graph

3313 Commits

Author SHA1 Message Date
Kurt Zenker
65d6f61c78 INTEGRATION: CWS impress91 (1.17.82); FILE MERGED
2006/04/04 11:01:30 cl 1.17.82.1: #i62742# detect OOo 1.x and StarOffice 7 for build id
2006-04-26 19:44:07 +00:00
Kurt Zenker
b5b42d41b6 INTEGRATION: CWS impress91 (1.46.100); FILE MERGED
2006/04/03 12:24:56 cl 1.46.100.1: #i63107# fixe code to work with style names containing a '-'
2006-04-26 19:43:55 +00:00
Kurt Zenker
591f27ecd6 INTEGRATION: CWS impress91 (1.110.16); FILE MERGED
2006/04/04 10:53:11 cl 1.110.16.1: #i62742# override fill and line style for graphics from OOo 1.x
2006-04-26 19:43:42 +00:00
Kurt Zenker
3246b7c165 INTEGRATION: CWS impress91 (1.102.100); FILE MERGED
2006/04/04 10:50:48 cl 1.102.100.1: do not export notes and handout stuff in draw
2006-04-26 19:43:30 +00:00
Kurt Zenker
53af91e371 INTEGRATION: CWS fwk37 (1.49.74); FILE MERGED
2006/03/22 09:35:15 mav 1.49.74.1: #i58560# let the MSOLE object contain the replacement image in non-Oasis formats
2006-04-26 13:10:26 +00:00
Jens-Heiner Rechtien
5276c7b25e INTEGRATION: CWS sixtyfour05 (1.125.72); FILE MERGED
2006/04/05 09:52:07 kendy 1.125.72.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:37:49 +00:00
Jens-Heiner Rechtien
f33d9b5790 INTEGRATION: CWS sixtyfour05 (1.39.108); FILE MERGED
2006/04/05 09:52:06 kendy 1.39.108.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:37:36 +00:00
Jens-Heiner Rechtien
81591f7f07 INTEGRATION: CWS sixtyfour05 (1.23.108); FILE MERGED
2006/04/05 09:52:05 kendy 1.23.108.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:37:23 +00:00
Jens-Heiner Rechtien
0fb0f23f2d INTEGRATION: CWS sixtyfour05 (1.5.108); FILE MERGED
2006/04/05 09:52:05 kendy 1.5.108.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:37:10 +00:00
Jens-Heiner Rechtien
4c9d89f6bf INTEGRATION: CWS sixtyfour05 (1.4.108); FILE MERGED
2006/04/05 09:52:05 kendy 1.4.108.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:36:58 +00:00
Jens-Heiner Rechtien
e69967e193 INTEGRATION: CWS sixtyfour05 (1.11.106); FILE MERGED
2006/04/05 09:52:04 kendy 1.11.106.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:36:46 +00:00
Jens-Heiner Rechtien
6328ac6968 INTEGRATION: CWS sixtyfour05 (1.9.100); FILE MERGED
2006/04/12 19:14:24 pjanik 1.9.100.2: RESYNC: (1.9-1.10); FILE MERGED
2006/04/05 09:52:04 kendy 1.9.100.1: #i63935#
64bit: long -> sal_Int32 and the like
2006-04-19 12:36:33 +00:00
Vladimir Glazounov
778ea46935 INTEGRATION: CWS internatiodel (1.37.62); FILE MERGED
2006/02/10 19:30:11 er 1.37.62.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006/01/19 18:57:54 er 1.37.62.2: RESYNC: (1.37-1.39); FILE MERGED
2005/06/24 13:10:42 er 1.37.62.1: #i50205# get rid of class International
2006-04-07 13:59:15 +00:00
Vladimir Glazounov
c73d621021 INTEGRATION: CWS internatiodel (1.40.170); FILE MERGED
2006/02/10 19:30:11 er 1.40.170.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006/01/19 18:57:40 er 1.40.170.2: RESYNC: (1.40-1.42); FILE MERGED
2005/06/24 13:10:41 er 1.40.170.1: #i50205# get rid of class International
2006-04-07 13:58:08 +00:00
Vladimir Glazounov
7311fc785c INTEGRATION: CWS internatiodel (1.20.44); FILE MERGED
2006/01/19 18:46:51 er 1.20.44.2: RESYNC: (1.20-1.21); FILE MERGED
2005/06/24 13:10:40 er 1.20.44.1: #i50205# get rid of class International
2006-04-07 13:55:15 +00:00
Vladimir Glazounov
e92e08c42a INTEGRATION: CWS internatiodel (1.17.48); FILE MERGED
2006/02/10 19:30:10 er 1.17.48.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006-04-07 13:54:46 +00:00
Vladimir Glazounov
83caf74408 INTEGRATION: CWS internatiodel (1.14.70); FILE MERGED
2006/02/10 19:30:10 er 1.14.70.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006-04-07 13:54:29 +00:00
Vladimir Glazounov
5b4d9a9210 INTEGRATION: CWS internatiodel (1.102.68); FILE MERGED
2006/02/10 19:30:09 er 1.102.68.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006-04-07 13:54:10 +00:00
Vladimir Glazounov
05e17ac4bf INTEGRATION: CWS sixtyfour04 (1.34.34); FILE MERGED
2006/03/14 13:09:43 cmc 1.34.34.1: #i60372# fix scaling when exporting/importing on 64bit platforms
2006-04-07 07:12:01 +00:00
Vladimir Glazounov
73bfcd8b5d INTEGRATION: CWS sixtyfour04 (1.40.66); FILE MERGED
2006/03/14 13:09:43 cmc 1.40.66.1: #i60372# fix scaling when exporting/importing on 64bit platforms
2006-04-07 07:11:39 +00:00
Vladimir Glazounov
47784993a9 INTEGRATION: CWS sixtyfour04 (1.9.86); FILE MERGED
2006/03/14 13:09:42 cmc 1.9.86.1: #i60372# fix scaling when exporting/importing on 64bit platforms
2006-04-07 07:11:21 +00:00
Vladimir Glazounov
deff32ce76 INTEGRATION: CWS impress89 (1.19.90); FILE MERGED
2006/03/14 12:26:56 cl 1.19.90.1: #i51301# do not crash with empty viewboxes
2006-04-06 15:15:31 +00:00
Vladimir Glazounov
91d4cd81fb INTEGRATION: CWS swqbf59 (1.15.94); FILE MERGED
2006/03/21 14:06:36 ama 1.15.94.1: Fix #i61399#: Robust against wrong numbering style ("Bullet") in footnote configuration
2006-04-06 12:41:02 +00:00
Vladimir Glazounov
fe112b9cae INTEGRATION: CWS swqbf59 (1.16.96); FILE MERGED
2006/03/20 10:47:09 ama 1.16.96.1: Fix #i62524#: Memory leak when loading text field with hidden condition
2006-04-06 12:40:40 +00:00
Oliver Bolte
6d285557e3 INTEGRATION: CWS swa11y203 (1.22.88); FILE MERGED
2006/03/13 14:11:38 od 1.22.88.1: #i51726# class <XMLTextFrameContext>
	 - new method to distinguish Writer graphics/text boxes and
	   Draw graphics/text boxes -> Draw graphics/text boxes have
	   an automatic styles without a parent style.
2006-03-27 09:05:04 +00:00
Oliver Bolte
ba3f937613 INTEGRATION: CWS swa11y203 (1.66.88); FILE MERGED
2006/03/13 14:11:38 od 1.66.88.1: #i51726# class <XMLTextFrameContext>
	 - new method to distinguish Writer graphics/text boxes and
	   Draw graphics/text boxes -> Draw graphics/text boxes have
	   an automatic styles without a parent style.
2006-03-27 09:04:49 +00:00
Oliver Bolte
bdb1d18672 INTEGRATION: CWS swa11y203 (1.72.90); FILE MERGED
2006/03/14 10:25:19 od 1.72.90.2: #i51726# - consider change of return type of <SvXMLExport::GetModelType()>
2006/03/13 14:08:01 od 1.72.90.1: #i51726# <XMLShapeExport::exportShape(..)>
	 - export of shape name for text documents, only if OpenDocument
	   file format is written, exception are group shapes.
2006-03-27 09:04:25 +00:00
Oliver Bolte
3d99ce5527 INTEGRATION: CWS swa11y203 (1.120.90); FILE MERGED
2006/03/14 10:24:04 od 1.120.90.2: #i51726# - use existing method <SvtModuleOptions::ClassifyFactoryByModel(..)>
	   instead of own one.
2006/03/13 14:06:14 od 1.120.90.1: #i51726# class <SvXMLExport>
	 - implementation of new method <_DetermineModelType()>, which
	   is used to set new member <meModelType> each time member <xModel>
	   is set.
2006-03-27 09:04:05 +00:00
Vladimir Glazounov
1545e6d22d INTEGRATION: CWS sixtyfour02 (1.20.40); FILE MERGED
2006/02/21 12:28:06 cmc 1.20.40.1: #i62331# match IMPL_CONTAINER_SORT argument of ULONG
2006-03-16 11:21:37 +00:00
Vladimir Glazounov
754bdca9f7 INTEGRATION: CWS sixtyfour02 (1.5.78); FILE MERGED
2006/02/21 12:28:06 cmc 1.5.78.1: #i62331# match IMPL_CONTAINER_SORT argument of ULONG
2006-03-16 11:20:55 +00:00
Vladimir Glazounov
9181147d64 INTEGRATION: CWS sixtyfour02 (1.36.76); FILE MERGED
2006/02/21 12:28:05 cmc 1.36.76.1: #i62331# match IMPL_CONTAINER_SORT argument of ULONG
2006-03-16 11:20:30 +00:00
Vladimir Glazounov
6c50ab1eb9 INTEGRATION: CWS sixtyfour02 (1.15.78); FILE MERGED
2006/02/21 12:28:05 cmc 1.15.78.1: #i62331# match IMPL_CONTAINER_SORT argument of ULONG
2006-03-16 11:19:55 +00:00
Vladimir Glazounov
323784fa6f INTEGRATION: CWS sixtyfour02 (1.5.78); FILE MERGED
2006/02/21 12:28:05 cmc 1.5.78.1: #i62331# match IMPL_CONTAINER_SORT argument of ULONG
2006-03-16 11:19:15 +00:00
Rüdiger Timm
c35fc87c68 INTEGRATION: CWS impress87 (1.3.82); FILE MERGED
2006/02/22 14:35:41 cl 1.3.82.1: #i59403# also convert child elements for event element
2006-03-10 15:16:52 +00:00
Rüdiger Timm
7ee071a0af INTEGRATION: CWS impress87 (1.4.82); FILE MERGED
2006/03/08 14:34:49 cl 1.4.82.2: fixed unix build problem
2006/02/22 14:35:40 cl 1.4.82.1: #i59403# also convert child elements for event element
2006-03-10 15:16:39 +00:00
Rüdiger Timm
fe669a0ec7 INTEGRATION: CWS swqbf56 (1.108.6); FILE MERGED
2006/03/02 13:28:53 od 1.108.6.2: RESYNC: (1.108-1.109); FILE MERGED
2006/03/02 12:34:10 od 1.108.6.1: #b6382898# <SdXMLShapeContext::AddShape( const char* )
	   - The Writer model (XTextDocument) no longer support service
	     com.sun.star.drawing.OLE2Shape since fix for issue i33294.
	     To handle Draw OLE objects in Writer documents it has been
	     decided to import these as OLE object convert them after
	     the import into graphic objects.
	     Thus, if service com.sun.star.drawing.OLE2Shape is requested
	     for a Writer document, use temporary service name
	     com.sun.star.drawing.temporaryForXMLImportOLE2Shape to
	     retrieve such a service from the Writer model.
	     The conversion into graphic objects is performed after the
	     intrinsic XML import.
2006-03-06 12:41:58 +00:00
Kurt Zenker
97de922739 INTEGRATION: CWS impress88 (1.42.78); FILE MERGED
2006/02/21 13:48:39 cl 1.42.78.1: #i62385# do not delete default attributes for page shapes
2006-02-27 15:35:16 +00:00
Kurt Zenker
dba45d1a2a INTEGRATION: CWS impress88 (1.108.4); FILE MERGED
2006/02/21 13:48:39 cl 1.108.4.1: #i62385# do not delete default attributes for page shapes
2006-02-27 15:35:02 +00:00
Rüdiger Timm
16abdc0d8b INTEGRATION: CWS impress84 (1.107.60); FILE MERGED
2006/02/01 13:34:54 cl 1.107.60.2: #i32217# remove default attributes from newly created non placeholder shapes
2006/01/31 09:36:16 cl 1.107.60.1: #i32217# remove default attributes from newly created non placeholder shapes
2006-02-09 13:03:11 +00:00
Jens-Heiner Rechtien
91ee939678 INTEGRATION: CWS impress82 (1.91.42); FILE MERGED
2006/01/17 15:36:28 cl 1.91.42.1: #130231# release open contexts if there was an exception during import
2006-01-24 13:41:47 +00:00
Oliver Bolte
0763e527f1 INTEGRATION: CWS sch13 (1.79.62); FILE MERGED
2005/12/20 11:03:41 bm 1.79.62.3: #i58457#, #i59288#, #i58458# Undo changes for these issues.

Files created with SO8 and saved with PP2 will get corrupted due to a missing
working fileformat versioning.  When a file is created with OOo 2.0 and loaded
with a version containing these fixes and saved again, the files will get
corrupted, because the OLE objects are just copied as they are (saved with OOo
2.0), but the parent document is re-saved with the new version.  As OLE objects
have no own meta information, they inherit it from their parent which in this
case (the default) is wrong.
2005/12/19 15:13:51 bm 1.79.62.2: #i59288# adapt axis properties for percent charts
2005/12/15 14:57:34 bm 1.79.62.1: #i58457# write correct column repeat count
2006-01-20 10:40:22 +00:00
Oliver Bolte
2d9e3b797b INTEGRATION: CWS gcc41 (1.14.58); FILE MERGED
2005/12/07 15:27:23 pmladek 1.14.58.1: #i58967#
Removed extra qualification to fix build with gcc-4.1
2006-01-19 17:08:06 +00:00
Oliver Bolte
9c176ffc0f INTEGRATION: CWS gcc41 (1.6.28); FILE MERGED
2005/12/07 15:27:23 pmladek 1.6.28.1: #i58967#
Removed extra qualification to fix build with gcc-4.1
2006-01-19 17:07:52 +00:00
Oliver Bolte
003a19eb18 INTEGRATION: CWS gcc41 (1.3.56); FILE MERGED
2005/12/07 15:27:22 pmladek 1.3.56.1: #i58967#
Removed extra qualification to fix build with gcc-4.1
2006-01-19 17:07:31 +00:00
Oliver Bolte
5220442ef4 INTEGRATION: CWS impress81 (1.33.64); FILE MERGED
2005/12/29 14:57:38 cl 1.33.64.1: #120711# check if numbering rule exists
2006-01-16 14:07:00 +00:00
Oliver Bolte
29a686ffc9 INTEGRATION: CWS impress81 (1.4.64); FILE MERGED
2005/12/29 14:56:52 cl 1.4.64.1: #120711# check if numbering rule exists
2006-01-16 14:06:42 +00:00
Jens-Heiner Rechtien
c09bda5cb8 INTEGRATION: CWS urgentfix01 (1.19.52); FILE MERGED
2005/11/17 17:04:26 flr 1.19.52.1: #i45472# and #i55551#: master-page-name problem
2005-11-17 16:37:18 +00:00
Rüdiger Timm
d477d61f26 INTEGRATION: CWS knumber (1.95.44); FILE MERGED
2005/11/14 08:58:49 flr 1.95.44.1: #i52127# implement first step of numbered-paragraph
2005-11-14 08:12:56 +00:00
Rüdiger Timm
f18f2a0bef INTEGRATION: CWS knumber (1.6.42); FILE MERGED
2005/11/14 08:58:53 flr 1.6.42.1: #i52127# implement first step of numbered-paragraph
2005-11-14 08:10:47 +00:00
Rüdiger Timm
ebe09eceaf INTEGRATION: CWS knumber (1.52.42); FILE MERGED
2005/11/14 08:58:53 flr 1.52.42.1: #i52127# implement first step of numbered-paragraph
2005-11-14 08:10:32 +00:00