Commit Graph

56 Commits

Author SHA1 Message Date
d50bd55c5d Parsing master presentation objects from 'objectlist.xml'
Parsing the property values of master presentation objects.
Also new functions added to comphelper module for expanding
filepaths macro to appropriate system file paths(for
configuration files present at 'Impress.xcs')

Change-Id: If0381a12155673e85103ddb5d51c34ae53fe2ecb
2013-09-10 13:14:30 +02:00
1eecb8df22 Some cleanup and consolidation of the Impress layout work.
Also make unit test work again after Mac-app like path changes.

Change-Id: I13eae20141650e1d1d826a794d1f19baaef5f561
2013-08-26 14:47:28 +02:00
46ab418b8e Few changes to position co-ordinates of layouts.
Made appropriate changes to the position co-ordinates of layoutlist.xml.And
now diff of 'vertical layouts' comes empty.

Change-Id: Idd4ced9e7551dc95fd42e2a9767894fff121914d
2013-08-26 14:47:28 +02:00
08913f858f Adding entries to "objectlist.xml"
Few more entries are added to "objectlist.xml".Only last two magic numbers
of "sdpage.cxx" are left to be handled.They are slightly different from
rest of the entries.

Change-Id: Ic1481606a360695dc57174e5e4037169f91bd611
2013-08-26 14:47:27 +02:00
c3631606a3 Creating a new demo XML file
A small demo version of new XML file, to store the remaining of the 'magic numbers' left in the
"sdpage.cxx".

Change-Id: I2883782dbdfd5a68f707631faec2e7b1d62a00de
2013-08-26 14:47:27 +02:00
8a1ccacb59 Few name conventions changes.
Changed the name of attributes from "title-shape-relative-height" to "relative-height" & all others.

Change-Id: I3010e8faf8a9bf347a7bec366449bbba77f0a69f
2013-08-26 14:47:26 +02:00
9b7a693eed Adding vertical layouts to XML file.
The new vertical layouts and the old layouts works well on my maschine.
Also the 'vertical writing' mode seems to be working perfectly for 'vertical layouts'.
And removed the 'switch'case from the "sdpage.cxx".

Change-Id: Ic9f6af68cdeb635f79e67b959f95ac0a79c119ca
2013-08-26 14:47:26 +02:00
07dccf031f Making few changes to the parser logic.
The logical change seems to work perfectly,only few of the layouts involving
'vertical title' are left to be handled in the XML file.Also commenting out
some of the code in the switch case for temporary reference.It will
be deleted in the subsequent commit.

Change-Id: I491e414dec3dbd01d8566f23ab31096daa7bbfa8
2013-08-26 14:47:26 +02:00
6671f931bb Few changes to the logic of parsing
This changes are pushed for quick reference as there are some more changes
that are left to be done.

Change-Id: I8c79fa7730dcab9250bebe6bd84f49a8664e338d
2013-08-26 14:47:24 +02:00
7885ead7ee Temporarily adding new methods to "drawdoc.cxx".
Adding new methods to "SdDrawDocument" class to set the vector "layoutlist"
from the constructor of "SdDrawDocument" and use it in "CalcAutoLayoutRectangles".
Build got failed in-between,so authentication of it's working is left to be done.

Change-Id: Ia614ab0e1d45022d770e61d27b0ae6c74dc71bf8
2013-08-26 14:47:24 +02:00
a1f2fb388e Added few more new samples to "layoutlist.xml"
New samples are added to "layoutlist.xml" and corresponding changes are made in the "sdpage.cxx".
Few changes are still left to be made in the values,which will be done in the next commit.

Change-Id: Ia388f416906f4416ec596ae4631a51940e6ccf93
2013-08-26 14:47:23 +02:00
84bfb880e1 Changed the logic of parsing
Have added a vector list of XNode to store the parse XML and referring it instead of XML eveytime.
Need to make scope level changes for vector and parseXml() in the next commit.

Change-Id: I2f270fc18058772fbf30a2a44e564c8290c316c4
2013-08-26 14:47:23 +02:00
ac5b9651a4 Solved the identation problem related to "layoutlist.xml".
Have added a 'if' conditional statement to know whether layout's child is a empty 'text' node or 'presobj' node.And proceed with rest of the
things ,if it is a 'presobj' node.Also the xml files are indented.

Change-Id: I676e710b86b1f50dbd861f2cb180bf9be839b867
2013-08-26 14:47:22 +02:00
da5bca5b53 Adding new Slide Layouts Samples to "layoutlist.xml".
Have added new "Slide Layouts" samples.So commented out the code related to existing slide layouts in "sdpage.cxx" and also added some code
for XML parsing of the new layouts.

Change-Id: I8f5fdcab5f2eb41e37fa522a7801b388cbfefed5
2013-08-26 14:47:21 +02:00
2fd74b3b15 Working version of XML parser from configuration file path
Added some changes in the "getRootElement" and new "layoutlist.xml" is added for "unit-test" module.
XML parser works perfectly in the installation,only the failure of "unit-test" is left to be solved.
Some refactoring related to "layoutlist.xml" will be updated soon.

Change-Id: If7ed3af40e9b6df26e20881728181eb6c82936d8
2013-08-26 14:47:21 +02:00
4a281debd2 Changing the XML parser with configuration file path
Updating the "getRootElement" function.So "layoutlist.xml" can be read from actual configuration path.

Change-Id: Iee636d32e629e935e46a18572646659780ae20e3
2013-08-26 14:47:21 +02:00
837e2808f7 re-base on ALv2 code. Includes:
Patches contributed by Armin Le-Grand
    #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
    http://svn.apache.org/viewvc?view=revision&revision=1293316
    #118485# - Styles for OLEs are not saved.
    http://svn.apache.org/viewvc?view=revision&revision=1182166

    Patches contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1172128
    http://svn.apache.org/viewvc?view=revision&revision=1172133

    Patch contributed by Ariel Constenla-Haile
    i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
    contextmenu  - CWS contextmenu1
    http://svn.apache.org/viewvc?view=revision&revision=1182915

    Patch contributed by Zhang Jian Fang
    #118876#, Add check if the OutlinerParaObject is created successfully
    http://svn.apache.org/viewvc?view=revision&revision=1243381

restore a re-based rdbedit.
2012-11-28 12:48:36 +00:00
8c49149d32 remove unused module-description xml files
Change-Id: I531e47538f308ee43e0fe8d7db59f525e45942c3
2012-08-22 23:27:34 +02:00
b0b7d169a0 Bug fix: now the darken and lighten effects work in the right way.
Edited the effects.xml and changed effect direction to counterclockwise.
2012-07-15 11:51:47 +02:00
7c76284e0e Don't copy over files under version control
scp2 handles the case where the OGL transitions are not built just fine
2011-01-31 09:21:10 +01:00
d25c3b2dc3 merge transogl-transitions-sd.diff and transogl-more-transitions.diff 2010-12-04 06:12:47 -06:00
7f5ebf8bae MS interop: support for cutblack slidetransition added
Adds CUTBLACK slide transition to ppt import and slideshow
2010-10-26 16:25:58 +02:00
57060ba91a CWS-TOOLING: integrate CWS transogl03redux
2009-02-09 13:59:40 +0100 thb  r267511 : #i96946# Added seemingly missing change for the color space selection for the slide textures
2009-02-04 10:47:12 +0100 cmc  r267353 : #i96946# integrate ogltrans work
2009-02-19 13:21:10 +00:00
5d06990ec5 CWS-TOOLING: integrate CWS impress147
2008-12-16 15:51:15 +0100 wg  r265553 : i96805
2008-12-03 12:32:33 +0100 wg  r264766 : 96805
2008-12-03 11:40:11 +0100 wg  r264761 : 96805
2008-11-20 15:39:56 +0100 cl  r264062 : migrated cws from cvs to svn
2008-11-19 14:16:40 +0100 cl  r263992 : CWS-TOOLING: rebase CWS impress147 to trunk@263288 (milestone: DEV300:m35)
2009-01-06 08:40:41 +00:00
e4b26b2bd0 INTEGRATION: CWS transogl02 (1.1.2); FILE ADDED
2008/01/07 20:35:54 radekdoulik 1.1.2.1: 2008-01-07  Radek Doulik  <rodo@novell.com>

	* build/src680-m241/sd/xml/makefile.mk: new file, when building
	with opengl copy transitions-ogl to transitions-ogl.xml so that it
	is delivered, otherwise delete transitions-ogl.xml

	* build/src680-m241/sd/prj/build.lst: added xml/ directory

	* build/src680-m241/sd/source/core/TransitionPreset.cxx
	(importTransitionPresetList): load transitions-ogl.xml as well as
	transitions.xml
	(importTransitionsFile): new helper method
2008-01-29 07:34:14 +00:00
a36687de32 INTEGRATION: CWS pathfinder02 (1.7.632); FILE MERGED
2007/07/23 14:28:43 cl 1.7.632.1: #i79248# made replace the default for additive attribute and changed namespace to smil
2007-08-01 10:08:50 +00:00
fd712b9684 INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 09:51:16 af 1.1.984.1: #i57552# Only supported service is DrawingDocumentDrawView.
2006-03-21 16:51:08 +00:00
2424c4f9ec INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 15:40:04 af 1.1.984.2: #i57552# Changed implementation name.
2006/02/06 09:48:23 af 1.1.984.1: #i57552# Only supported service is DrawingDocumentDrawView.
2006-03-21 16:50:37 +00:00
ee91caea50 INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 15:39:20 af 1.1.984.2: #i57552# Changed implementation name.
2006/02/06 09:47:42 af 1.1.984.1: #i57552# Only supported service is DrawingDocumentDrawView.
2006-03-21 16:50:17 +00:00
787bbba323 INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 15:37:14 af 1.1.984.2: #i57552# Changed implementation name.
2006/02/06 09:46:53 af 1.1.984.1: #i57552# Only supported service is DrawingDocumentDrawView.
2006-03-21 16:49:59 +00:00
811cc144b5 INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 15:36:21 af 1.1.984.2: #i57552# Changed implementation name.
2006/02/06 09:46:14 af 1.1.984.1: #i57552# Only supported service is DrawingDocumentDrawView.
2006-03-21 16:49:43 +00:00
ad98cf86b6 INTEGRATION: CWS viewswitch (1.1.984); FILE MERGED
2006/02/06 15:35:52 af 1.1.984.1: #i57552# Changed implementation name.
2006-03-21 16:49:22 +00:00
93d4626d58 INTEGRATION: CWS effectmigration01 (1.4.20); FILE MERGED
2005/03/11 09:47:40 dbo 1.4.20.2: #i39513# fixed vertical wipe-in, wipe-out
2005/03/10 16:20:01 cl 1.4.20.1: #i44578# added EffectMigration for better effect export to OOo 1.x
2005-03-29 13:20:13 +00:00
e6c06e9311 INTEGRATION: CWS sj16 (1.5.14); FILE MERGED
2005/03/18 14:02:45 sj 1.5.14.1: #i41534# :importFromSvgD(): skipping tags in svg:d element (unknown)!
2005-03-23 12:24:26 +00:00
a480d844d0 INTEGRATION: CWS impress35 (1.3.24); FILE MERGED
2005/02/15 16:10:52 cl 1.3.24.1: #i42570# added some missing effects that match effects from last version
2005-03-01 16:36:03 +00:00
b701231c81 INTEGRATION: CWS impress31 (1.2.72); FILE MERGED
2005/01/28 14:17:53 cl 1.2.72.1: #i41527# support hsl colors
2005-02-17 08:47:55 +00:00
0fc51fa7f8 INTEGRATION: CWS impress30 (1.2.60); FILE MERGED
2005/01/19 15:20:47 bm 1.2.60.2: #i40657# some spiralWipe effects corrected
2005/01/18 15:23:16 bm 1.2.60.1: #i40657# subtype swapped for snake-wipe-top-lef
2005-01-28 14:43:50 +00:00
73a8fc18dd INTEGRATION: CWS impress29 (1.2.44); FILE MERGED
2005/01/18 15:42:01 cl 1.2.44.1: #i37784# changed to absolute intervals for iterate containers
2005-01-25 14:20:31 +00:00
f3ee625fcd INTEGRATION: CWS presentationengine01 (1.1.2); FILE ADDED
2004/11/21 23:47:08 thb 1.1.2.11: #i10000# Merge error, corrected presentation namespace
2004/11/07 01:42:03 thb 1.1.2.10: #i36228# Swapped uncover left-down and left-up (was wrong before)
2004/11/05 11:19:51 dbo 1.1.2.9: #i36255# fixing also slide transitions
2004/10/04 19:21:11 thb 1.1.2.8: #i34946# Added missing subtypes for slide transitions, corrected various transition mappings
2004/09/27 14:40:02 cl 1.1.2.7: we will do the zoom and rotate in later
2004/09/26 19:02:05 cl 1.1.2.6: changes to the new xml smil spec
2004/09/02 09:16:38 cl 1.1.2.5: updated presets
2004/08/31 18:57:09 cl 1.1.2.4: added missing transition types and subtypes
2004/08/26 14:35:47 cl 1.1.2.3: commented empty presets
2004/08/19 14:12:00 bm 1.1.2.2: preliminary version of transitions
2004/08/19 10:45:14 cl 1.1.2.1: new helper for transition presets
2004-11-26 19:37:54 +00:00
2b33ce0318 INTEGRATION: CWS presentationengine01 (1.1.2); FILE ADDED
2004/11/04 14:47:21 dbo 1.1.2.11: #i36255# fixing waterfallWipe
2004/11/03 15:41:06 cl 1.1.2.10: #i36249# ooo-entrance-wipe property fixed
2004/10/07 13:46:37 cl 1.1.2.9: fixed missing property from venetian blinds
2004/09/23 17:04:29 cl 1.1.2.8: final smil xml spec changes
2004/09/12 22:52:49 cl 1.1.2.7: added text only effects ui support
2004/09/09 18:53:11 cl 1.1.2.6: updated effects, now again with properties
2004/09/07 21:49:14 cl 1.1.2.5: fixed preset naming
2004/09/02 09:16:38 cl 1.1.2.4: updated presets
2004/08/29 23:00:27 cl 1.1.2.3: removed wrong group-id attributes
2004/07/28 11:17:41 cl 1.1.2.2: #i31376# added strings for translation
2004/05/04 14:37:53 cl 1.1.2.1: added initial smil ui
2004-11-26 19:37:41 +00:00
728cdf17e1 INTEGRATION: CWS uaa02 (1.2.6); FILE MERGED
2003/04/14 15:56:25 af 1.2.6.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:08:45 +00:00
669ca4a9bb INTEGRATION: CWS uaa02 (1.2.6); FILE MERGED
2003/04/14 15:56:24 af 1.2.6.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:08:33 +00:00
e972c48d8c INTEGRATION: CWS uaa02 (1.1.112); FILE MERGED
2003/04/14 15:56:23 af 1.1.112.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:08:23 +00:00
7978af16a6 INTEGRATION: CWS uaa02 (1.1.112); FILE MERGED
2003/04/14 15:56:22 af 1.1.112.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:08:02 +00:00
c80a947189 INTEGRATION: CWS uaa02 (1.1.112); FILE MERGED
2003/04/14 15:56:21 af 1.1.112.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:07:52 +00:00
3d40bbf982 INTEGRATION: CWS uaa02 (1.1.112); FILE MERGED
2003/04/14 15:56:19 af 1.1.112.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:07:42 +00:00
c4c5bbdc1b INTEGRATION: CWS uaa02 (1.1.112); FILE MERGED
2003/04/14 15:56:18 af 1.1.112.1: #108113# Removed drafts from the namespace names.
2003-04-24 16:07:32 +00:00
2c32696a04 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 09:58:12 +00:00
7477a56de2 #100516# Initial revision. 2002-06-20 08:28:21 +00:00
03a027ca6e #95585# new view component descriptions 2002-01-29 15:17:53 +00:00