From 7599f68cee9141cd16ca7697872b5f83c6ae9ad9 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 22 Apr 2009 11:01:27 +0000 Subject: CWS-TOOLING: integrate CWS dba32a 2009-04-16 13:08:19 +0200 oj r270882 : #i14538# set property at control 2009-04-16 13:04:28 +0200 oj r270881 : #i98557# remove binary string for SRB 2009-04-15 13:19:10 +0200 oj r270838 : #i96782# use type set at view 2009-04-14 14:53:20 +0200 oj r270778 : #i96782# set initialize size for custom shape 2009-04-06 14:19:14 +0200 oj r270546 : #i88432# correct pos when < 0 while resizing 2009-04-06 13:36:13 +0200 oj r270541 : #i96782# handle toolbar and menubar differently 2009-04-06 13:33:54 +0200 oj r270540 : #i96782# handle toolbar and menubar differently 2009-04-06 12:28:23 +0200 oj r270534 : #i96782# handle toolbar and menubar differently 2009-04-06 12:27:44 +0200 oj r270533 : #i96782# handle toolbar and menubar differently 2009-04-06 12:24:32 +0200 oj r270532 : #i96782# handle toolbar and menubar differently 2009-04-06 12:15:15 +0200 oj r270531 : do not initialze when field is empty 2009-04-06 10:06:08 +0200 oj r270528 : #i96782# clean up of menubar and remove duplicates 2009-04-06 09:47:49 +0200 oj r270527 : #i96519# adjust help text dynamic 2009-04-03 13:43:20 +0200 oj r270482 : do not need to remove section from observer they are already disposed 2009-04-03 13:27:28 +0200 fs r270479 : #i97356# 2009-04-02 11:30:39 +0200 fs r270386 : UNX line ends 2009-04-02 10:54:51 +0200 fs r270379 : UNX line ends 2009-04-02 10:39:57 +0200 fs r270378 : UNX line ends 2009-04-02 10:37:24 +0200 fs r270377 : why did this survive the rebase? was removed on trunk ... 2009-03-31 13:31:12 +0200 fs r270277 : component_foo should be public 2009-03-28 00:21:01 +0100 fs r270176 : manuallly merged the changes which happened in CWS before resync to m45, where the directory had been moved from reportdesign/registry to reportbuilder/registry 2009-03-27 23:01:20 +0100 fs r270174 : CWS-TOOLING: rebase CWS dba32a to trunk@270033 (milestone: DEV300:m45) 2009-03-11 12:23:35 +0100 fs r269310 : #i99958# ensure the ControlModelLock doesn't release twice 2009-03-06 09:07:32 +0100 fs r268970 : ignore output paths in SVN's status 2009-03-06 09:07:08 +0100 fs r268969 : ignore output paths in SVN's status 2009-03-04 11:28:02 +0100 oj r268800 : copy and paste error, check correct end now 2009-03-03 15:49:11 +0100 fs r268736 : #i10000# those merges were lost during the rebase (m38->m42) 2009-03-03 13:25:27 +0100 lla r268720 : #i99652# fix wrong refactoring 2009-02-27 11:12:56 +0100 fs r268566 : beautified 2009-02-27 10:53:47 +0100 fs r268561 : doFormListening(false) only when actually isFormListening() (found during complex test case XMLFormSettings with assertions) 2009-02-26 20:55:31 +0100 fs r268546 : #i96530# set the Label property of the bound control, if we didn't create a dedicated label control 2009-02-26 11:53:09 +0100 fs r268494 : #i10000# 2009-02-26 11:27:50 +0100 fs r268493 : #i10000# 2009-02-26 11:17:08 +0100 fs r268490 : reportdesign depends on REPORTBUILDER, not REPORTDESIGN 2009-02-25 11:39:48 +0100 fs r268422 : #i10000# post-resync: INFO_ESCAPE_DATETIME got lost during rebase 2009-02-24 23:24:10 +0100 fs r268411 : CWS-TOOLING: rebase CWS dba32a to trunk@268395 (milestone: DEV300:m42) 2009-02-20 15:09:48 +0100 fs r268324 : respect ImplicitCatalog/SchemaRestriction in all necessary places 2009-02-20 13:48:10 +0100 oj r268318 : order of initialize corrected 2009-02-14 15:07:52 +0100 fs r267759 : #i98975# when an image does not have a bitmap, but a text, draw this (as placeholder) 2009-02-14 15:02:40 +0100 fs r267758 : consolidated and removed some duplicate code 2009-02-14 13:52:23 +0100 fs r267756 : #i10000# 2009-02-13 22:08:34 +0100 fs r267750 : #i100000# 2009-02-13 22:07:25 +0100 fs r267749 : #i10000# 2009-02-13 21:55:36 +0100 fs r267747 : #i10000# 2009-02-13 21:54:27 +0100 fs r267746 : use const_cast 2009-02-13 21:29:10 +0100 fs r267745 : #i10000# 2009-02-13 21:27:39 +0100 fs r267744 : #i10000# 2009-02-13 20:59:13 +0100 fs r267742 : #i10000# 2009-02-13 13:21:30 +0100 fs r267717 : better diagnostics 2009-02-13 13:17:24 +0100 fs r267715 : #i58313# support Catalog/SchemaRestriction settings, which are applied in getTables when 'all catalogs/schemas' are to be retrieved 2009-02-13 13:16:14 +0100 fs r267714 : filter out some more known global settings 2009-02-13 12:39:43 +0100 fs r267713 : #i58313# ImplicitCatalog/SchemaRestriction 2009-02-13 12:36:50 +0100 fs r267712 : when exporting data source settings, allow for properties which have a VOID default value, but are currently not VOID 2009-02-13 12:35:57 +0100 fs r267711 : implement XSet, to allow inserting properties which have a default value of VOID 2009-02-13 12:35:03 +0100 fs r267710 : +addVoidProperty 2009-02-13 10:20:08 +0100 fs r267697 : removed unused variable 2009-02-13 09:46:46 +0100 fs r267695 : refactored the table filtering code, to have a better base for introducing additional low level filters 2009-02-10 09:23:07 +0100 lla r267537 : #i10000# wrong line feed, double named variable 2009-02-09 12:13:08 +0100 oj r267508 : #i98605# notify hanlder 2009-02-09 11:50:34 +0100 oj r267507 : #i98926# solve refcount problem 2009-02-09 11:50:05 +0100 oj r267506 : #i98971# fix for simple html 2009-02-09 11:49:24 +0100 oj r267505 : #i98971# fix for simple html 2009-02-09 11:47:27 +0100 oj r267504 : invoke on copy 2009-02-09 09:51:00 +0100 fs r267500 : #i98316# 2009-02-09 09:46:10 +0100 fs r267499 : setCurrentSelection: don't reset the current form when we de-select everything 2009-02-09 09:43:45 +0100 fs r267498 : #i98316# 2009-02-08 21:25:18 +0100 fs r267496 : #i98272# introduce late ctor for cloning 2009-02-07 21:08:39 +0100 fs r267485 : #i98272# when copy-constructing a FmFormPageImpl, use the XCloneable of the forms collection, instead of XPersistObject (which is incompletely implemented) 2009-02-07 21:07:26 +0100 fs r267484 : removed obsolete include guards 2009-02-07 21:05:22 +0100 fs r267483 : #i98272# implement XCloneable 2009-02-06 15:02:48 +0100 lla r267467 : #i96523# add XImageControl 2009-02-06 14:41:38 +0100 oj r267463 : #i98926# late init when connection disposed but only when asked for 2009-02-06 13:49:57 +0100 lla r267457 : #i92860# bigint in forms doesn't allow input of values > 1, fixed 2009-02-06 13:03:55 +0100 oj r267455 : ImageScaleMode 2009-02-05 14:48:19 +0100 lla r267424 : #i89335# dropdown listboxes are 14 instead of 7 lines high 2009-02-05 13:40:00 +0100 oj r267423 : #i96945# insert new prop Opaque 2009-02-05 13:39:19 +0100 oj r267422 : #i96945# insert layer handling for hell and heaven 2009-02-05 13:29:32 +0100 lla r267420 : #i89335# add is null, is not null, is not like filter condition 2009-02-04 12:23:02 +0100 oj r267364 : #i98821# load table font settings 2009-02-04 10:05:27 +0100 oj r267351 : #i98821# load table font settings 2009-02-04 09:23:22 +0100 fs r267350 : checking persistency of UI settings in database documents - for the moment, capture table formattings (which is issue 98821) 2009-02-04 09:22:15 +0100 fs r267349 : moved some methods which are of wider interest from DatabaseDocument to FileHelper resp. TestCase 2009-02-04 08:56:27 +0100 oj r267347 : #i97586# UcbStreamHelper::CreateStream doesn't check all streamModes use different method 2009-02-04 08:23:26 +0100 oj r267346 : #i98701# check key size is >= 3 and some redesign 2009-02-03 23:29:24 +0100 fs r267345 : return the component (controller), not the frame 2009-02-03 23:28:53 +0100 fs r267344 : openExisting returns a controller now, not the frame (this was a bug) 2009-02-03 23:28:25 +0100 fs r267343 : openElement: properly return the component in the table/query case 2009-02-02 12:48:17 +0100 oj r267261 : #i96013# fix for relative path 2009-02-02 10:33:28 +0100 lla r267253 : #i98557# cleanups and consolidation 2009-02-02 09:37:23 +0100 lla r267250 : #i88432# resize will no longer move components to other sections 2009-02-02 09:08:24 +0100 oj r267245 : #i97475# write 0x1A at the end of the file 2009-01-30 19:39:20 +0100 lla r267230 : #i10000# unused parameters 2009-01-30 09:51:09 +0100 fs r267181 : onsolete 2009-01-30 09:49:27 +0100 fs r267180 : onsolete 2009-01-29 14:28:22 +0100 oj r267139 : #i96825# import cell style 2009-01-29 14:23:12 +0100 oj r267137 : #i98601# export imagescalehandler 2009-01-29 14:19:57 +0100 lla r267135 : #i98601# add ImageScaleMode 2009-01-29 13:21:08 +0100 oj r267124 : #i98601# impl ScaleMode 2009-01-29 13:20:56 +0100 oj r267123 : #i98601# impl ScaleMode 2009-01-29 08:46:40 +0100 oj r267095 : new property: ScaleMode 2009-01-29 08:45:23 +0100 oj r267094 : new ScaleMode from UnControlImageModel 2009-01-29 08:28:12 +0100 oj r267093 : #i87930# close all sub forms/reports when the desktop is going to be terminated and no db frame exists 2009-01-28 19:54:34 +0100 lla r267082 : #i98557# pictures in report wizard 2009-01-28 15:06:25 +0100 oj r267060 : #i87930# close all sub forms/reports when the desktop is going to be terminated and no db frame exists 2009-01-28 11:38:41 +0100 lla r267046 : #i76783# handle binary fields in forms 2009-01-28 09:24:43 +0100 lla r267025 : #i10000# 2009-01-28 08:40:04 +0100 fs r267024 : #i10000# 2009-01-28 08:04:43 +0100 oj r267023 : #i93456# use resource strings for function names 2009-01-27 13:26:05 +0100 oj r266988 : check data field is type field or expression 2009-01-27 13:07:17 +0100 oj r266985 : check data field length 2009-01-27 11:48:19 +0100 oj r266974 : #i96823# return dll string as column name when no alias exists 2009-01-27 09:53:11 +0100 fs r266958 : display the message of a caught exception 2009-01-27 09:44:13 +0100 fs r266957 : #i58313# when retrieving all tables, just set an empty table type filter - the connection will care for translating this, by respecting the TableTypeFilterMode setting 2009-01-27 09:36:09 +0100 fs r266956 : #i58313# getTables: per JDBC spec, is not a valid table type filter. Translate it to 'null'. 2009-01-26 11:24:49 +0100 lla r266912 : #i97865# cleanups (AddField viewable in remote mode) 2009-01-26 07:49:27 +0100 lla r266897 : #i97865# AddField opens in remote case 2009-01-26 07:48:58 +0100 lla r266896 : #i97865# AddField opens in remote case 2009-01-26 07:48:42 +0100 lla r266895 : #i97865# AddField opens in remote case 2009-01-23 15:04:40 +0100 fs r266825 : consolidate the usage of OSQLMessageBox with MessageType==Warning into OSQLWarningBox 2009-01-23 10:47:33 +0100 fs r266787 : +supportsUserAdministration 2009-01-23 10:47:11 +0100 fs r266784 : use DatabaseMetaData.supportsUserAdministration 2009-01-23 07:55:59 +0100 lla r266767 : #i10000# fix gcc compiler failures 2009-01-21 15:08:55 +0100 lla r266673 : #i97265# Labels in HC (IsDark) with other color (viewable) 2009-01-19 14:58:54 +0100 lla r266504 : #i96523# last problems with FormatKey and '0' values fixed 2009-01-19 14:58:00 +0100 lla r266503 : #i96519# AddField help text 2009-01-19 11:59:02 +0100 fs r266485 : #i96523# for formatted field models, init them with TreatAsNumber = false 2009-01-16 10:31:49 +0100 lla r266405 : #i96793# add shrink to popup menu 2009-01-16 09:21:44 +0100 lla r266401 : #i96519# AddField contains a help text 2009-01-15 11:21:49 +0100 lla r266357 : #i96523# problem with XVclWindowPeer not fixed now 2009-01-15 09:19:20 +0100 lla r266335 : #i96523# more crashes fixed. 2009-01-14 13:08:34 +0100 lla r266291 : #i96523# problems with crashes fixed 2009-01-13 10:54:24 +0100 lla r266199 : #i96523# show datasource in formattedfields new files 2009-01-13 10:52:39 +0100 lla r266198 : #i96523# show datasource in formattedfields 2009-01-13 09:41:50 +0100 lla r266197 : #i96526# handling none existance default.otr 2009-01-12 12:55:49 +0100 fs r266151 : don't expect the control model to be a BoundComponent before adding as modify listener 2009-01-12 12:51:33 +0100 fs r266149 : #i88458# let the ImageControl be an XModifyBroadcaster, so the forms runtime can notice when the user changes the control content while it does not have the focus 2009-01-09 13:41:22 +0100 fs r266080 : doc 2009-01-09 13:14:14 +0100 fs r266077 : #i97377# SetModified when order is changed via DnD 2009-01-07 09:55:40 +0100 oj r265951 : merge from master 2009-01-07 09:55:24 +0100 oj r265950 : removed observer 2009-01-07 09:55:06 +0100 oj r265949 : merge from master 2009-01-07 07:29:11 +0100 oj r265945 : shadow var changed 2009-01-06 07:25:57 +0100 oj r265893 : CWS-TOOLING: rebase CWS dba32a to trunk@265758 (milestone: DEV300:m38) 2009-01-05 13:18:22 +0100 oj r265865 : convert to unix le 2009-01-05 09:13:52 +0100 lla r265857 : #i79423# lc_ sc_ permutation fix 2009-01-02 19:40:59 +0100 lla r265847 : #i79423# section shrink icons 2008-12-22 11:37:57 +0100 lla r265749 : #i97484# move component to negative Y-position 2008-12-22 11:37:05 +0100 lla r265748 : #i97484# move component to negative Y-position 2008-12-22 11:35:33 +0100 lla r265747 : #i97484# move component to negative Y-position 2008-12-22 11:25:07 +0100 lla r265745 : #i96757# changes via property browser was not undoable 2008-12-18 15:10:38 +0100 fs r265694 : corrected an condition in doFormListening, which otherwise leads to uncommitable grid columns in documents which are loaded from disc (not in documents which are newly created) 2008-12-18 14:54:39 +0100 fs r265692 : Hide Columns text slightly changed 2008-12-18 13:44:15 +0100 fs r265683 : #i94068# properly display erros happening during a form operation - at least once, and at most once 2008-12-18 11:28:29 +0100 fs r265677 : document the new InputRequired property 2008-12-18 11:04:15 +0100 fs r265676 : #i96530# createControlLabelPair: don't actually create a label for a checkbox 2008-12-18 10:35:53 +0100 fs r265674 : #i95226# when a column is replaced, and it's the selected column, update the selection 2008-12-18 10:34:42 +0100 fs r265673 : #i95226# refactoring of the implReplaced method 2008-12-18 10:34:28 +0100 fs r265672 : #i95226# when replacing a grid column, update the property browser 2008-12-18 10:33:17 +0100 fs r265671 : when an element is removed, remove it from m_aCurrentSelection, too (if necessary) 2008-12-18 10:31:57 +0100 fs r265670 : Hide Columns text slightly changed 2008-12-18 10:15:56 +0100 lla r265669 : #i14538# do not allow to press finish button twice 2008-12-18 08:56:33 +0100 lla r265665 : #i10000# build depend=t problem hacked. 2008-12-17 20:59:10 +0100 fs r265656 : #i89821# don't let a MultiLineEdit select all text when it receives the focus 2008-12-17 12:10:54 +0100 fs r265594 : #i97356# 2008-12-17 12:06:29 +0100 fs r265593 : #i97355# Print -> Printable 2008-12-17 11:59:31 +0100 fs r265591 : #i97350# combo boxes comment on list selection (as list boxes already do) 2008-12-16 09:53:57 +0100 lla r265527 : #i96526# handling none existance default.otr 2008-12-15 14:48:39 +0100 lla r265500 : #i79423# reparing, was wrong implemented 2008-12-12 15:08:33 +0100 lla r265424 : #i10000# remove wrong carridge returns 2008-12-12 15:07:55 +0100 lla r265423 : #i10000# remove wrong carridge returns 2008-12-12 15:06:41 +0100 lla r265422 : #i10000# remove wrong carridge returns 2008-12-12 10:23:13 +0100 lla r265395 : #i95234# reset DragDelta 2008-12-12 10:11:02 +0100 lla r265393 : #i79423# pre versions of shrink buttons 2008-12-11 15:32:13 +0100 fs r265318 : prevent a deadlock during complex.dbaccess.DatabaseDocument test 2008-12-11 15:30:06 +0100 fs r265316 : prevent a deadlock during complex.dbaccess.DatabaseDocument test 2008-12-11 15:07:05 +0100 fs r265307 : removed superfluous text 2008-12-11 12:29:54 +0100 lla r265282 : #i96757# cleanup second try 2008-12-11 12:09:15 +0100 lla r265278 : #i96757# cleanup 2008-12-11 12:07:56 +0100 lla r265277 : #i95234# 2008-12-10 14:04:39 +0100 lla r265183 : #i93472# D&D fixes 2008-12-10 12:29:33 +0100 lla r265168 : #i94067# add (APP|SYS)FONT to XUnitConversion 2008-12-10 12:15:02 +0100 lla r265166 : #i94067# add APPFONT, SYSFONT to MeasureUnit 2008-12-10 11:52:10 +0100 lla r265163 : #i94067# add comments 2008-12-06 20:33:05 +0100 fs r264935 : #i10000# precompiled header 2008-12-05 09:29:26 +0100 fs r264889 : #i10000# 2008-12-05 09:07:31 +0100 fs r264888 : #i10000# 2008-12-04 13:25:46 +0100 fs r264838 : CWS-TOOLING: rebase CWS dba32a to trunk@264807 (milestone: DEV300:m37) 2008-12-03 23:49:13 +0100 fs r264808 : merge changes from trunk, to be able to do a rebase 2008-12-03 17:13:09 +0100 lla r264801 : #i91041# update documentation 2008-12-03 16:57:04 +0100 lla r264799 : #i94067# allow convert(Point|Size)ToLogic as pixel also 2008-12-02 12:36:32 +0100 lla r264687 : #i96782# bring toolbar objects to menu structure 2008-12-02 10:32:44 +0100 lla r264667 : #i86255# make property work 2008-12-02 09:22:47 +0100 lla r264659 : #i79423# add section shrink toolbar 2008-12-02 07:41:22 +0100 lla r264657 : #i86255# add check box for Escape DateTime property 2008-12-02 07:37:17 +0100 lla r264656 : #i79423# new shrink buttons 2008-11-26 11:55:28 +0100 fs r264362 : #i96541# FillPropertySet: do not only catch UnknownPropertyException when setting the Char/ParaAutoStyleName, but also care for the other exceptions which can be thrown by XPropertySet::setPropertyValue. This is actually not the real fix for #i96541#, but only a follow-up. The root cause of the issue was fixed in CWS dba301b, but this here was another (potential) bug which popped up during investigations. 2008-11-25 09:04:40 +0100 lla r264273 : #i82083# new toolbox in GroupsSorting dialog 2008-11-25 08:56:08 +0100 lla r264272 : #i94729# change token strings into string list, move class out of function 2008-11-24 15:52:22 +0100 fs r264251 : #i96532# do not set AppendTableAlias, NameLengthLimit, etc., if the OXMLDataSourceInstance is used for elements at which those attributes never appear 2008-11-24 15:51:45 +0100 fs r264249 : #i96532# do not set AppendTableAlias, NameLengthLimit, etc., if the OXMLDataSourceInstance is used for elements at which those attributes never appear 2008-11-24 15:45:21 +0100 fs r264244 : #i96532# the API default for ParamNameSubst is false 2008-11-24 15:45:04 +0100 fs r264243 : #i96532# do not set AppendTableAlias, NameLengthLimit, etc., if the OXMLDataSourceInstance is used for elements at which those attributes never appear 2008-11-24 15:44:14 +0100 fs r264241 : #i96532# slight refactoring of exporting properties which have a XML default different from the API default 2008-11-24 10:50:01 +0100 lla r264216 : #i82083# icons for new toolbox 2008-11-24 09:38:45 +0100 lla r264205 : #i82083# new toolbox in GroupsSorting dialog 2008-11-24 09:32:20 +0100 lla r264201 : #i96501# cleanup assertions 2008-11-24 09:12:55 +0100 lla r264198 : #i83082# enhancement for toolboxes, better HC comfort 2008-11-24 08:46:43 +0100 lla r264197 : #i96501# fix problem with negative positions 2008-11-21 11:44:47 +0100 fs r264118 : #i57042# introduce a counter for suspending change notifications of a given property, so recursive calls are possible 2008-11-21 11:02:17 +0100 fs r264116 : #i96388# don't call ExecuteContextMenuAction when no action was chosen by the user 2008-11-21 10:36:53 +0100 fs r264114 : #i47384# assertion was wrong 2008-11-14 12:33:15 +0100 fs r263673 : #i47318# XRowSetChangeBroadcaster/Listener, to be able to listen for changes in an XRowSetSupplier's RowSet 2008-11-14 12:30:29 +0100 fs r263672 : #i47318# more refactoring - BoundControlModels now listen at the XRowSetSupplier for changes in the supplied RowSet, to properly revoke/register old/new listeners at the RowSet - replaced ::osl::Mutex in various places with a ControlModelLock 2008-11-14 12:20:55 +0100 fs r263671 : when BUILD_TYPE includes QADEVOOO, the BUILD_QADEVOOO needs to bet set, too 2008-11-14 12:19:21 +0100 fs r263670 : oops, this was not intended to be committed 2008-11-12 11:08:10 +0100 fs r263579 : #i96096# new ctors taking UNO_QUERY_THROW 2008-11-12 09:15:54 +0100 fs r263576 : no need to load the complete dialog just to get a string which the dialog itself loads from resource 2008-11-10 17:55:45 +0100 fs r263535 : spelling in comment 2008-11-10 15:51:14 +0100 fs r263523 : #i47318# various refactorings 1. don't forward syntetic XLoadListener events from the grid control to the grid columns. Instead, forward GridColumn::XChild::setParent to the base class, which then can add itself as load listener 2. removed various occurances of XMultiServiceFactory, instead use the ::comphelper::ComponentContext 3. in O(Bound)ControlModel, have a mechanism to lock the instance (using ControlModelLock) and fire property changes when the last lock dies. 2008-11-10 12:49:24 +0100 oj r263513 : #i94729# change token strings into string list 2008-11-10 12:13:15 +0100 oj r263512 : #i95222# export chart:title style as well 2008-11-10 08:55:25 +0100 oj r263507 : #i93471# show the correct tabpage when selecting a different object 2008-11-07 23:38:29 +0100 fs r263490 : #i95977# for the event input controls, add a component extending their functionality so they're reset when the users presses DEL 2008-11-07 23:35:39 +0100 fs r263489 : during #i95977#: When a VCL Window is deleted from within VCL code, the respective WindowPeer was never disposed. Corrected this. 2008-11-07 14:57:07 +0100 fs r263420 : #i95963# human-readable display names for event bindings 2008-11-06 10:34:52 +0100 fs r263366 : #i95865# don't use library names containing InvalidZipEntryFileNames - workaround until i95409 is fixed 2008-11-06 10:33:28 +0100 fs r263365 : #i95865# copied the following change from CWS odfmetadata2 (not yet integrated) into CWS dba31d - comphelper/inc/comphelper/storagehelper.hxx, comphelper/source/misc/storagehelper.cxx: + add function IsValidZipEntryFileName (moved from module package) --- dbaccess/source/filter/xml/xmlColumn.cxx | 43 +- dbaccess/source/filter/xml/xmlColumn.hxx | 10 +- dbaccess/source/filter/xml/xmlDataSource.cxx | 19 +- dbaccess/source/filter/xml/xmlDataSource.hxx | 10 +- dbaccess/source/filter/xml/xmlDatabase.cxx | 2 +- dbaccess/source/filter/xml/xmlEnums.hxx | 3 +- dbaccess/source/filter/xml/xmlExport.cxx | 452 +++++++++++---------- dbaccess/source/filter/xml/xmlExport.hxx | 20 +- .../source/filter/xml/xmlHierarchyCollection.cxx | 4 +- .../source/filter/xml/xmlHierarchyCollection.hxx | 9 +- dbaccess/source/filter/xml/xmlStyleImport.cxx | 29 +- dbaccess/source/filter/xml/xmlStyleImport.hxx | 6 +- dbaccess/source/filter/xml/xmlTable.cxx | 2 +- dbaccess/source/filter/xml/xmlfilter.cxx | 24 +- dbaccess/source/filter/xml/xmlfilter.hxx | 2 + 15 files changed, 369 insertions(+), 266 deletions(-) (limited to 'dbaccess/source/filter') diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 3405f137a28d..c9670d98317a 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -66,6 +66,7 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include #endif +#include #ifndef DBA_XMLSTYLEIMPORT_HXX #include "xmlStyleImport.hxx" #endif @@ -87,9 +88,11 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport ,const ::rtl::OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer + ,const Reference< XPropertySet >& _xTable ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_xParentContainer(_xParentContainer) + ,m_xTable(_xTable) ,m_bHidden(sal_False) { DBG_CTOR(OXMLColumn,NULL); @@ -132,9 +135,11 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport case XML_TOK_COLUMN_VISIBLE: m_bHidden = sValue.equalsAscii("false"); break; + case XML_TOK_DEFAULT_CELL_STYLE_NAME: + m_sCellStyleName = sValue; + break; } } - OSL_ENSURE(m_sName.getLength(),"Invalid column name of length: ZERO"); } // ----------------------------------------------------------------------------- @@ -160,6 +165,11 @@ void OXMLColumn::EndElement() if ( m_aDefaultValue.hasValue() ) xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue); + Reference xAppend(m_xParentContainer,UNO_QUERY); + if ( xAppend.is() ) + xAppend->appendByDescriptor(xProp); + m_xParentContainer->getByName(m_sName) >>= xProp; + if ( m_sStyleName.getLength() ) { const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); @@ -171,10 +181,35 @@ void OXMLColumn::EndElement() pAutoStyle->FillPropertySet(xProp); } } + } // if ( m_sStyleName.getLength() ) + if ( m_sCellStyleName.getLength() ) + { + const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); + if ( pAutoStyles ) + { + OTableStyleContext* pAutoStyle = PTR_CAST(OTableStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_CELL,m_sCellStyleName)); + if ( pAutoStyle ) + { + pAutoStyle->FillPropertySet(xProp); + // we also have to do this on the table to import text-properties + pAutoStyle->FillPropertySet(m_xTable); + } + } + } + + } + } // if ( xFac.is() && m_sName.getLength() ) + else if ( m_sCellStyleName.getLength() ) + { + const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); + if ( pAutoStyles ) + { + OTableStyleContext* pAutoStyle = PTR_CAST(OTableStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_CELL,m_sCellStyleName)); + if ( pAutoStyle ) + { + // we also have to do this on the table to import text-properties + pAutoStyle->FillPropertySet(m_xTable); } - Reference xAppend(m_xParentContainer,UNO_QUERY); - if ( xAppend.is() ) - xAppend->appendByDescriptor(xProp); } } } diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index af436a3cc54e..bab8d7660120 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -30,13 +30,9 @@ #ifndef DBA_XMLCOLUMN_HXX #define DBA_XMLCOLUMN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif - +#include namespace dbaxml { @@ -44,8 +40,11 @@ namespace dbaxml class OXMLColumn : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; + ::rtl::OUString m_sName; ::rtl::OUString m_sStyleName; + ::rtl::OUString m_sCellStyleName; ::rtl::OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; sal_Bool m_bHidden; @@ -58,6 +57,7 @@ namespace dbaxml ,const ::rtl::OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable ); virtual ~OXMLColumn(); virtual void EndElement(); diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 169ebdb2ab65..5ec715764073 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -82,9 +82,8 @@ DBG_NAME(OXMLDataSource) OXMLDataSource::OXMLDataSource( ODBFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, - const Reference< XAttributeList > & _xAttrList,bool _bAsDataSource ) : + const Reference< XAttributeList > & _xAttrList, const UsedFor _eUsedFor ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) - ,m_bAsDataSource(_bAsDataSource) { DBG_CTOR(OXMLDataSource,NULL); @@ -95,7 +94,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, Reference xDataSource = rImport.getDataSource(); PropertyValue aProperty; - bool bParameter_name_substitution = false; + bool bFoundParamNameSubstitution = false; bool bFoundTableNameLengthLimited = false; bool bFoundAppendTableAliasName = false; bool bFoundSuppressVersionColumns = false; @@ -169,7 +168,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, case XML_TOK_PARAMETER_NAME_SUBSTITUTION: aProperty.Name = INFO_PARAMETERNAMESUBST; aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False); - bParameter_name_substitution = true; + bFoundParamNameSubstitution = true; break; case XML_TOK_IGNORE_DRIVER_PRIVILEGES: aProperty.Name = INFO_IGNOREDRIVER_PRIV; @@ -207,25 +206,25 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, } if ( rImport.isNewFormat() ) { - if ( !bFoundTableNameLengthLimited ) + if ( !bFoundTableNameLengthLimited && ( _eUsedFor == eAppSettings ) ) { aProperty.Name = INFO_ALLOWLONGTABLENAMES; aProperty.Value <<= sal_True; rImport.addInfo(aProperty); } - if ( !bParameter_name_substitution ) + if ( !bFoundParamNameSubstitution && ( _eUsedFor == eDriverSettings ) ) { aProperty.Name = INFO_PARAMETERNAMESUBST; aProperty.Value <<= sal_True; rImport.addInfo(aProperty); } - if ( !bFoundAppendTableAliasName ) + if ( !bFoundAppendTableAliasName && ( _eUsedFor == eAppSettings ) ) { aProperty.Name = INFO_APPEND_TABLE_ALIAS; aProperty.Value <<= sal_True; rImport.addInfo(aProperty); } - if ( !bFoundSuppressVersionColumns ) + if ( !bFoundSuppressVersionColumns && ( _eUsedFor == eAppSettings ) ) { try { @@ -285,7 +284,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext( break; case XML_TOK_DRIVER_SETTINGS: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName, xAttrList,false); + pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName, xAttrList, OXMLDataSource::eDriverSettings ); break; case XML_TOK_JAVA_CLASSPATH: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -293,7 +292,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext( break; case XML_TOK_APPLICATION_CONNECTION_SETTINGS: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName, xAttrList,false); + pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName, xAttrList, OXMLDataSource::eAppSettings ); break; } diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index e5b73a8c3056..5475efc67b07 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -43,15 +43,19 @@ namespace dbaxml class ODBFilter; class OXMLDataSource : public SvXMLImportContext { - bool m_bAsDataSource; - ODBFilter& GetOwnImport(); public: + enum UsedFor + { + eDataSource, + eDriverSettings, + eAppSettings + }; OXMLDataSource( ODBFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - bool _bAsDataSource = true); + const UsedFor _eUsedFor = eDataSource ); virtual ~OXMLDataSource(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index c75625fcfbe9..3f3f183ba038 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -106,7 +106,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { case XML_TOK_DATASOURCE: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName,xAttrList ); + pContext = new OXMLDataSource( GetOwnImport(), nPrefix, rLocalName, xAttrList, OXMLDataSource::eDataSource ); break; case XML_TOK_FORMS: { diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 7e4321e9f7cf..0bb680eca477 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -166,7 +166,8 @@ namespace dbaxml XML_TOK_COLUMN_VISIBILITY, XML_TOK_COLUMN_DEFAULT_VALUE, XML_TOK_COLUMN_TYPE_NAME, - XML_TOK_COLUMN_VISIBLE + XML_TOK_COLUMN_VISIBLE, + XML_TOK_DEFAULT_CELL_STYLE_NAME }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index decfe6ac1b4e..efd744df1428 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -88,9 +88,9 @@ #ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_ #include #endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif +#include + #ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ #include #endif @@ -107,6 +107,8 @@ #include #include +#include + namespace dbaxml { using namespace comphelper; @@ -222,6 +224,7 @@ namespace dbaxml return s_sTypeInteger; default: + OSL_ENSURE( false, "lcl_implGetPropertyXMLType: unsupported value type!" ); return s_sTypeDouble; } } @@ -318,19 +321,17 @@ IMPLEMENT_SERVICE_INFO1_STATIC( ODBExport, "com.sun.star.comp.sdb.DBExportFilter // ----------------------------------------------------------------------------- void ODBExport::exportDataSource() { - Reference xProp(getDataSource()); - if ( xProp.is() ) + try { + Reference xProp( getDataSource(), UNO_SET_THROW ); + sal_Bool bAutoIncrementEnabled = sal_True; TStringPair aAutoIncrement; Reference< XPropertySet > xDataSourceSettings; OSL_VERIFY( xProp->getPropertyValue( PROPERTY_SETTINGS ) >>= xDataSourceSettings ); - Reference< XPropertyState > xSettingsState( xDataSourceSettings, UNO_QUERY ); - Reference< XPropertySetInfo > xSettingsInfo; - if ( xDataSourceSettings.is() ) - xSettingsInfo = xDataSourceSettings->getPropertySetInfo(); - OSL_ENSURE( xSettingsState.is() && xSettingsInfo.is(), "ODBExport::exportDataSource: invalid Setting property of the data source!" ); + Reference< XPropertyState > xSettingsState( xDataSourceSettings, UNO_QUERY_THROW ); + Reference< XPropertySetInfo > xSettingsInfo( xDataSourceSettings->getPropertySetInfo(), UNO_SET_THROW ); TDelimiter aDelimiter; xSettingsState->getPropertyDefault( INFO_TEXTDELIMITER ) >>= aDelimiter.sText; @@ -339,6 +340,7 @@ void ODBExport::exportDataSource() xSettingsState->getPropertyDefault( INFO_THOUSANDSDELIMITER ) >>= aDelimiter.sThousand; static ::rtl::OUString s_sTrue(::xmloff::token::GetXMLToken( XML_TRUE )); + static ::rtl::OUString s_sFalse(::xmloff::token::GetXMLToken( XML_FALSE )); // loop through the properties, and export only those which are not defaulted TSettingsMap aSettingsMap; Sequence< Property > aProperties = xSettingsInfo->getProperties(); @@ -346,14 +348,6 @@ void ODBExport::exportDataSource() const Property* pPropertiesEnd = pProperties + aProperties.getLength(); for ( ; pProperties != pPropertiesEnd; ++pProperties ) { - // for properties which are not REMOVEABLE, we care for their state, and - // only export them if they're not DEFAULTed - if ( ( pProperties->Attributes & PropertyAttribute::REMOVEABLE ) == 0 ) - { - PropertyState ePropertyState = xSettingsState->getPropertyState( pProperties->Name ); - if ( PropertyState_DEFAULT_VALUE == ePropertyState ) - continue; - } ::rtl::OUString sValue; Any aValue = xDataSourceSettings->getPropertyValue( pProperties->Name ); switch ( aValue.getValueTypeClass() ) @@ -379,146 +373,144 @@ void ODBExport::exportDataSource() } ::xmloff::token::XMLTokenEnum eToken = XML_TOKEN_INVALID; - if ( pProperties->Name == INFO_JDBCDRIVERCLASS ) - eToken = XML_JAVA_DRIVER_CLASS; - else if ( pProperties->Name == INFO_TEXTFILEHEADER ) + + struct PropertyMap { - if ( sValue == s_sTrue ) - continue; - eToken = XML_IS_FIRST_ROW_HEADER_LINE; - } - else if ( pProperties->Name == INFO_SHOWDELETEDROWS ) + const ::rtl::OUString sPropertyName; + const XMLTokenEnum eAttributeToken; + const ::boost::optional< ::rtl::OUString > aXMLDefault; + + PropertyMap( const ::rtl::OUString& _rPropertyName, const XMLTokenEnum _eToken ) + :sPropertyName( _rPropertyName ) + ,eAttributeToken( _eToken ) + ,aXMLDefault() + { + } + + PropertyMap( const ::rtl::OUString& _rPropertyName, const XMLTokenEnum _eToken, const ::rtl::OUString& _rDefault ) + :sPropertyName( _rPropertyName ) + ,eAttributeToken( _eToken ) + ,aXMLDefault( _rDefault ) + { + } + }; + + PropertyMap aTokens[] = { - if ( sValue != s_sTrue ) - continue; - eToken = XML_SHOW_DELETED; - } - else if ( pProperties->Name == INFO_ALLOWLONGTABLENAMES ) + PropertyMap( INFO_JDBCDRIVERCLASS, XML_JAVA_DRIVER_CLASS ), + PropertyMap( INFO_TEXTFILEHEADER, XML_IS_FIRST_ROW_HEADER_LINE, s_sTrue ), + PropertyMap( INFO_SHOWDELETEDROWS, XML_SHOW_DELETED, s_sFalse ), + PropertyMap( INFO_ALLOWLONGTABLENAMES, XML_IS_TABLE_NAME_LENGTH_LIMITED, s_sTrue ), + PropertyMap( INFO_ADDITIONALOPTIONS, XML_SYSTEM_DRIVER_SETTINGS ), + PropertyMap( PROPERTY_ENABLESQL92CHECK, XML_ENABLE_SQL92_CHECK, s_sFalse ), + PropertyMap( INFO_APPEND_TABLE_ALIAS, XML_APPEND_TABLE_ALIAS_NAME, s_sTrue ), + PropertyMap( INFO_PARAMETERNAMESUBST, XML_PARAMETER_NAME_SUBSTITUTION, s_sTrue ), + PropertyMap( INFO_IGNOREDRIVER_PRIV, XML_IGNORE_DRIVER_PRIVILEGES, s_sTrue ), + PropertyMap( INFO_USECATALOG, XML_USE_CATALOG, s_sFalse ), + PropertyMap( PROPERTY_SUPPRESSVERSIONCL,XML_SUPPRESS_VERSION_COLUMNS, s_sTrue ), + PropertyMap( INFO_CONN_LDAP_BASEDN, XML_BASE_DN ), + PropertyMap( INFO_CONN_LDAP_ROWCOUNT, XML_MAX_ROW_COUNT ) + }; + + bool bIsXMLDefault = false; + for ( size_t i=0; i < sizeof( aTokens ) / sizeof( aTokens[0] ); ++i ) { - if ( sValue == s_sTrue ) - continue; - eToken = XML_IS_TABLE_NAME_LENGTH_LIMITED; + if ( pProperties->Name == aTokens[i].sPropertyName ) + { + eToken = aTokens[i].eAttributeToken; + + if ( !!aTokens[i].aXMLDefault + && ( sValue == *aTokens[i].aXMLDefault ) + ) + { + bIsXMLDefault = true; + } + break; + } } - else if ( pProperties->Name == INFO_ADDITIONALOPTIONS ) - eToken = XML_SYSTEM_DRIVER_SETTINGS; - else if ( pProperties->Name == PROPERTY_ENABLESQL92CHECK ) + + if ( bIsXMLDefault ) + // the property has the value which is specified as default in the XML schema -> no need to write it + continue; + + if ( eToken == XML_TOKEN_INVALID ) { - if ( sValue != s_sTrue ) + // for properties which are not REMOVEABLE, we care for their state, and + // only export them if they're not DEFAULTed + if ( ( pProperties->Attributes & PropertyAttribute::REMOVEABLE ) == 0 ) + { + PropertyState ePropertyState = xSettingsState->getPropertyState( pProperties->Name ); + if ( PropertyState_DEFAULT_VALUE == ePropertyState ) + continue; + } + + // special handlings + if ( pProperties->Name == PROPERTY_BOOLEANCOMPARISONMODE ) + { + sal_Int32 nValue = 0; + aValue >>= nValue; + if ( sValue.equalsAscii("0") ) + sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer")); + else if ( sValue.equalsAscii("1") ) + sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean")); + else if ( sValue.equalsAscii("2") ) + sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean")); + else if ( sValue.equalsAscii("3") ) + sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero")); + if ( sValue.equalsAscii("equal-integer") ) + continue; + eToken = XML_BOOLEAN_COMPARISON_MODE; + } + else if ( pProperties->Name == INFO_AUTORETRIEVEENABLED ) + { + aValue >>= bAutoIncrementEnabled; continue; - eToken = XML_ENABLE_SQL92_CHECK; - } - else if ( pProperties->Name == INFO_APPEND_TABLE_ALIAS ) - { - if ( sValue == s_sTrue ) + } + else if ( pProperties->Name == INFO_AUTORETRIEVEVALUE ) + { + aAutoIncrement.first = sValue; continue; - eToken = XML_APPEND_TABLE_ALIAS_NAME; - } - else if ( pProperties->Name == INFO_PARAMETERNAMESUBST ) - { - if ( sValue == s_sTrue ) + } + else if ( pProperties->Name == PROPERTY_AUTOINCREMENTCREATION ) + { + aAutoIncrement.second = sValue; continue; - eToken = XML_PARAMETER_NAME_SUBSTITUTION; - } - else if ( pProperties->Name == INFO_IGNOREDRIVER_PRIV ) - { - if ( sValue == s_sTrue ) + } + else if ( pProperties->Name == INFO_TEXTDELIMITER ) + { + aDelimiter.sText = sValue; + aDelimiter.bUsed = true; continue; - eToken = XML_IGNORE_DRIVER_PRIVILEGES; - } - else if ( pProperties->Name == PROPERTY_BOOLEANCOMPARISONMODE ) - { - sal_Int32 nValue = 0; - aValue >>= nValue; - if ( sValue.equalsAscii("0") ) - sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer")); - else if ( sValue.equalsAscii("1") ) - sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean")); - else if ( sValue.equalsAscii("2") ) - sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean")); - else if ( sValue.equalsAscii("3") ) - sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero")); - if ( sValue.equalsAscii("equal-integer") ) + } + else if ( pProperties->Name == INFO_FIELDDELIMITER ) + { + aDelimiter.sField = sValue; + aDelimiter.bUsed = true; continue; - eToken = XML_BOOLEAN_COMPARISON_MODE; - } - else if ( pProperties->Name == INFO_USECATALOG ) - { - if ( sValue != s_sTrue ) + } + else if ( pProperties->Name == INFO_DECIMALDELIMITER ) + { + aDelimiter.sDecimal = sValue; + aDelimiter.bUsed = true; continue; - eToken = XML_USE_CATALOG; - } - else if ( pProperties->Name == PROPERTY_SUPPRESSVERSIONCL ) - { - if ( sValue == s_sTrue ) + } + else if ( pProperties->Name == INFO_THOUSANDSDELIMITER ) + { + aDelimiter.sThousand = sValue; + aDelimiter.bUsed = true; continue; - eToken = XML_SUPPRESS_VERSION_COLUMNS; - } - else if ( pProperties->Name == INFO_CONN_LDAP_BASEDN ) - eToken = XML_BASE_DN; - else if ( pProperties->Name == INFO_CONN_LDAP_ROWCOUNT ) - eToken = XML_MAX_ROW_COUNT; - else if ( pProperties->Name == INFO_AUTORETRIEVEENABLED ) - { - aValue >>= bAutoIncrementEnabled; - // special handling - continue; - } - else if ( pProperties->Name == INFO_AUTORETRIEVEVALUE ) - { - aAutoIncrement.first = sValue; - // special handling - continue; - } - else if ( pProperties->Name == PROPERTY_AUTOINCREMENTCREATION ) - { - aAutoIncrement.second = sValue; - // special handling - continue; - } - else if ( pProperties->Name == INFO_TEXTDELIMITER ) - { - aDelimiter.sText = sValue; - aDelimiter.bUsed = true; - // special handling - continue; - } - else if ( pProperties->Name == INFO_FIELDDELIMITER ) - { - aDelimiter.sField = sValue; - aDelimiter.bUsed = true; - // special handling - continue; - } - else if ( pProperties->Name == INFO_DECIMALDELIMITER ) - { - aDelimiter.sDecimal = sValue; - aDelimiter.bUsed = true; - // special handling - continue; - } - else if ( pProperties->Name == INFO_THOUSANDSDELIMITER ) - { - aDelimiter.sThousand = sValue; - aDelimiter.bUsed = true; - // special handling - continue; - } - else if ( pProperties->Name == INFO_CHARSET ) - { - m_sCharSet = sValue; - // special handling - continue; - } - else - { - m_aDataSourceSettings.push_back( makeAny( PropertyValue( - pProperties->Name, - -1, - aValue, - PropertyState_DIRECT_VALUE - ) ) ); - // special handling - continue; + } + else if ( pProperties->Name == INFO_CHARSET ) + { + m_sCharSet = sValue; + continue; + } + else + { + m_aDataSourceSettings.push_back( TypedPropertyValue( + pProperties->Name, pProperties->Type, aValue ) ); + continue; + } } aSettingsMap.insert(TSettingsMap::value_type(eToken,sValue)); @@ -534,6 +526,10 @@ void ODBExport::exportDataSource() exportDriverSettings(aSettingsMap); exportApplicationConnectionSettings(aSettingsMap); } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } } // ----------------------------------------------------------------------------- void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettings) @@ -700,84 +696,83 @@ void ODBExport::exportConnectionData() // ----------------------------------------------------------------------------- void ODBExport::exportDataSourceSettings() { - if ( !m_aDataSourceSettings.empty() ) + if ( m_aDataSourceSettings.empty() ) + return; + + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, sal_True, sal_True); + ::std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin(); + ::std::vector< TypedPropertyValue >::iterator aEnd = m_aDataSourceSettings.end(); + for ( ; aIter != aEnd; ++aIter ) { - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, sal_True, sal_True); - PropertyValue aValue; - ::std::vector< Any>::iterator aIter = m_aDataSourceSettings.begin(); - ::std::vector< Any>::iterator aEnd = m_aDataSourceSettings.end(); - for (; aIter != aEnd; ++aIter) - { - *aIter >>= aValue; - sal_Bool bIsSequence = TypeClass_SEQUENCE == aValue.Value.getValueTypeClass(); + sal_Bool bIsSequence = TypeClass_SEQUENCE == aIter->Type.getTypeClass(); - Type aSimpleType; - if ( bIsSequence ) - aSimpleType = ::comphelper::getSequenceElementType(aValue.Value.getValueType()); - else - aSimpleType = aValue.Value.getValueType(); + Type aSimpleType; + if ( bIsSequence ) + aSimpleType = ::comphelper::getSequenceElementType( aIter->Value.getValueType() ); + else + aSimpleType = aIter->Type; - AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE); - AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME,aValue.Name); - ::rtl::OUString sTypeName = lcl_implGetPropertyXMLType(aSimpleType); - if ( bIsSequence && aSimpleType.getTypeClass() == TypeClass_ANY ) - { - Sequence aSeq; - aValue.Value >>= aSeq; - if ( aSeq.getLength() ) - sTypeName = lcl_implGetPropertyXMLType(aSeq[0].getValueType()); - } + AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE ); + AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, aIter->Name ); - AddAttribute(XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE,sTypeName); + ::rtl::OUString sTypeName = lcl_implGetPropertyXMLType( aSimpleType ); + if ( bIsSequence && aSimpleType.getTypeClass() == TypeClass_ANY ) + { + Sequence aSeq; + aIter->Value >>= aSeq; + if ( aSeq.getLength() ) + sTypeName = lcl_implGetPropertyXMLType(aSeq[0].getValueType()); + } - SvXMLElementExport aDataSourceSetting(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, sal_True, sal_True); + AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, sTypeName ); - if ( !bIsSequence ) + SvXMLElementExport aDataSourceSetting( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, sal_True, sal_True ); + + if ( !bIsSequence ) + { + SvXMLElementExport aDataValue( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False ); + // (no whitespace inside the tag) + Characters( implConvertAny( aIter->Value ) ); + } + else + { + // the not-that-simple case, we need to iterate through the sequence elements + ::std::auto_ptr pSequenceIterator; + switch (aSimpleType.getTypeClass()) { - SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False); - // (no whitespace inside the tag) - Characters(implConvertAny(aValue.Value)); + case TypeClass_STRING: + pSequenceIterator.reset( new OSequenceIterator< ::rtl::OUString >( aIter->Value ) ); + break; + case TypeClass_DOUBLE: + pSequenceIterator.reset( new OSequenceIterator< double >( aIter->Value ) ); + break; + case TypeClass_BOOLEAN: + pSequenceIterator.reset( new OSequenceIterator< sal_Bool >( aIter->Value ) ); + break; + case TypeClass_BYTE: + pSequenceIterator.reset( new OSequenceIterator< sal_Int8 >( aIter->Value ) ); + break; + case TypeClass_SHORT: + pSequenceIterator.reset( new OSequenceIterator< sal_Int16 >( aIter->Value ) ); + break; + case TypeClass_LONG: + pSequenceIterator.reset( new OSequenceIterator< sal_Int32 >( aIter->Value ) ); + break; + case TypeClass_ANY: + pSequenceIterator.reset( new OSequenceIterator< Any >( aIter->Value ) ); + break; + default: + OSL_ENSURE(sal_False, "unsupported sequence type !"); + break; } - else + if ( pSequenceIterator.get() ) { - // the not-that-simple case, we need to iterate through the sequence elements - ::std::auto_ptr pSequenceIterator; - switch (aSimpleType.getTypeClass()) + ::rtl::OUString sCurrent; + while (pSequenceIterator->hasMoreElements()) { - case TypeClass_STRING: - pSequenceIterator.reset(new OSequenceIterator< ::rtl::OUString >(aValue.Value)); - break; - case TypeClass_DOUBLE: - pSequenceIterator.reset(new OSequenceIterator< double >(aValue.Value)); - break; - case TypeClass_BOOLEAN: - pSequenceIterator.reset(new OSequenceIterator< sal_Bool >(aValue.Value)); - break; - case TypeClass_BYTE: - pSequenceIterator.reset(new OSequenceIterator< sal_Int8 >(aValue.Value)); - break; - case TypeClass_SHORT: - pSequenceIterator.reset(new OSequenceIterator< sal_Int16 >(aValue.Value)); - break; - case TypeClass_LONG: - pSequenceIterator.reset(new OSequenceIterator< sal_Int32 >(aValue.Value)); - break; - case TypeClass_ANY: - pSequenceIterator.reset(new OSequenceIterator< Any >(aValue.Value)); - break; - default: - OSL_ENSURE(sal_False, "unsupported sequence type !"); - break; - } - if ( pSequenceIterator.get() ) - { - ::rtl::OUString sCurrent; - while (pSequenceIterator->hasMoreElements()) - { - SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False); - // (no whitespace inside the tag) - Characters(implConvertAny(pSequenceIterator->nextElement())); - } + SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False); + // (no whitespace inside the tag) + Characters(implConvertAny(pSequenceIterator->nextElement())); } } } @@ -1015,7 +1010,21 @@ void ODBExport::exportColumns(const Reference& _xColSup) { Reference xNameAccess( _xColSup->getColumns(), UNO_SET_THROW ); if ( !xNameAccess->hasElements() ) + { + Reference< XPropertySet > xComponent(_xColSup,UNO_QUERY); + TTableColumnMap::iterator aFind = m_aTableDummyColumns.find(xComponent); + if ( aFind != m_aTableDummyColumns.end() ) + { + SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); + SvXMLAttributeList* pAtt = new SvXMLAttributeList; + Reference xAtt = pAtt; + exportStyleName(aFind->second.get(),*pAtt); + AddAttributeList(xAtt); + SvXMLElementExport aColumn(*this,XML_NAMESPACE_DB, XML_COLUMN, sal_True, sal_True); + + } return; + } SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); @@ -1166,8 +1175,21 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,aFont.Family,aFont.Pitch,aFont.CharSet ); m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp); - ::comphelper::mem_fun1_t aMemFunc(&ODBExport::exportAutoStyle); - exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc); + if ( !m_aCurrentPropertyStates.empty() && !xCollection->hasElements() ) + { + Reference< XDataDescriptorFactory> xFac(xCollection,UNO_QUERY); + if ( xFac.is() ) + { + Reference< XPropertySet> xColumn = xFac->createDataDescriptor(); + m_aTableDummyColumns.insert(TTableColumnMap::value_type(Reference< XPropertySet>(_xProp),xColumn)); + exportAutoStyle(xColumn.get()); + } + } + else + { + ::comphelper::mem_fun1_t aMemFunc(&ODBExport::exportAutoStyle); + exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc); + } } catch(Exception&) { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index e11f9b244cfd..ae10a9a20709 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -130,15 +130,31 @@ class ODBExport : public SvXMLExport TDelimiter() : bUsed( false ) { } }; - typedef ::std::map< Reference ,::rtl::OUString > TPropertyStyleMap; + typedef ::std::map< Reference ,::rtl::OUString > TPropertyStyleMap; + typedef ::std::map< Reference ,Reference > TTableColumnMap; + + struct TypedPropertyValue + { + ::rtl::OUString Name; + ::com::sun::star::uno::Type Type; + ::com::sun::star::uno::Any Value; + + TypedPropertyValue( const ::rtl::OUString& _name, const ::com::sun::star::uno::Type& _type, const ::com::sun::star::uno::Any& _value ) + :Name( _name ) + ,Type( _type ) + ,Value( _value ) + { + } + }; ::std::auto_ptr< TStringPair > m_aAutoIncrement; ::std::auto_ptr< TDelimiter > m_aDelimiter; - ::std::vector< Any> m_aDataSourceSettings; + ::std::vector< TypedPropertyValue > m_aDataSourceSettings; ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; TPropertyStyleMap m_aAutoStyleNames; TPropertyStyleMap m_aCellAutoStyleNames; TPropertyStyleMap m_aRowAutoStyleNames; + TTableColumnMap m_aTableDummyColumns; ::rtl::OUString m_sCharSet; UniReference < SvXMLExportPropertyMapper> m_xExportHelper; UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 03487a1d9060..892b50bd610f 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -146,9 +146,11 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName ,const Reference< XNameAccess >& _xContainer + ,const Reference< XPropertySet >& _xTable ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_xContainer(_xContainer) + ,m_xTable(_xTable) { DBG_CTOR(OXMLHierarchyCollection,NULL); } @@ -179,7 +181,7 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( break; case XML_TOK_COLUMN: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer); + pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable); break; // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 35c93809a67d..23eb19d1a57c 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -30,15 +30,10 @@ #ifndef DBA_XMLHIERARCHYCOLLECTION_HXX #define DBA_XMLHIERARCHYCOLLECTION_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif +#include namespace dbaxml @@ -48,6 +43,7 @@ namespace dbaxml { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; ::rtl::OUString m_sName; ::rtl::OUString m_sCollectionServiceName; ::rtl::OUString m_sComponentServiceName; @@ -67,6 +63,7 @@ namespace dbaxml ,sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable ); virtual ~OXMLHierarchyCollection(); diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 35bf7934cc44..a373bb4c79c8 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -214,8 +214,9 @@ OTableStylesContext::OTableStylesContext( SvXMLImport& rImport, const Reference< XAttributeList > & xAttrList, const sal_Bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), + sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))), m_nNumberFormatIndex(-1), bAutoStyles(bTempAutoStyles) { @@ -251,6 +252,13 @@ UniReference < SvXMLImportPropertyMapper > { switch( nFamily ) { + case XML_STYLE_FAMILY_TABLE_TABLE: + { + if ( !m_xTableImpPropMapper.is() ) + m_xTableImpPropMapper = new SvXMLImportPropertyMapper( const_cast(this)->GetOwnImport().GetTableStylesPropertySetMapper(), const_cast(GetImport()) ); + xMapper = m_xTableImpPropMapper; + } + break; case XML_STYLE_FAMILY_TABLE_COLUMN: { if ( !m_xColumnImpPropMapper.is() ) @@ -258,11 +266,11 @@ UniReference < SvXMLImportPropertyMapper > xMapper = m_xColumnImpPropMapper; } break; - case XML_STYLE_FAMILY_TABLE_TABLE: + case XML_STYLE_FAMILY_TABLE_CELL: { - if ( !m_xTableImpPropMapper.is() ) - m_xTableImpPropMapper = new SvXMLImportPropertyMapper( const_cast(this)->GetOwnImport().GetTableStylesPropertySetMapper(), const_cast(GetImport()) ); - xMapper = m_xTableImpPropMapper; + if ( !m_xCellImpPropMapper.is() ) + m_xCellImpPropMapper = new SvXMLImportPropertyMapper( const_cast(this)->GetOwnImport().GetCellStylesPropertySetMapper(), const_cast(GetImport()) ); + xMapper = m_xCellImpPropMapper; } break; } @@ -282,8 +290,9 @@ SvXMLStyleContext *OTableStylesContext::CreateStyleStyleChildContext( { switch( nFamily ) { - case XML_STYLE_FAMILY_TABLE_COLUMN: case XML_STYLE_FAMILY_TABLE_TABLE: + case XML_STYLE_FAMILY_TABLE_COLUMN: + case XML_STYLE_FAMILY_TABLE_CELL: pStyle = new OTableStyleContext( GetOwnImport(), nPrefix, rLocalName, xAttrList, *this, nFamily ); break; @@ -308,12 +317,16 @@ Reference < XNameContainer > { switch( nFamily ) { + case XML_STYLE_FAMILY_TABLE_TABLE: + sServiceName = sTableStyleServiceName; + break; case XML_STYLE_FAMILY_TABLE_COLUMN: sServiceName = sColumnStyleServiceName; break; - case XML_STYLE_FAMILY_TABLE_TABLE: - sServiceName = sTableStyleServiceName; + case XML_STYLE_FAMILY_TABLE_CELL: + sServiceName = sCellStyleServiceName; break; + } } return sServiceName; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index e8dfe4eedac6..95be65774e6d 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -111,14 +111,16 @@ namespace dbaxml class OTableStylesContext : public SvXMLStylesContext { - const ::rtl::OUString sColumnStyleServiceName; const ::rtl::OUString sTableStyleServiceName; + const ::rtl::OUString sColumnStyleServiceName; + const ::rtl::OUString sCellStyleServiceName; sal_Int32 m_nNumberFormatIndex; sal_Int32 nMasterPageNameIndex; sal_Bool bAutoStyles : 1; - mutable UniReference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; mutable UniReference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; + mutable UniReference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; + mutable UniReference < SvXMLImportPropertyMapper > m_xCellImpPropMapper; ODBFilter& GetOwnImport(); diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index fb85eecbb91a..86f4304b6eb5 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -184,7 +184,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( { xColumns = xColumnsSup->getColumns(); } - pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName ,xColumns); + pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName ,xColumns,m_xTable); } break; } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 128ad71ffc21..5e9374dcce77 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -753,13 +753,14 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, - { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, - { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, - { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE}, - { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, - { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, + { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, + { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, + { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE }, + { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, + { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, + { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -807,6 +808,15 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMappe return m_xColumnStylesPropertySetMapper; } // ----------------------------------------------------------------------------- +UniReference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const +{ + if ( !m_xCellStylesPropertySetMapper.is() ) + { + m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylesPropertySetMapper(); + } + return m_xCellStylesPropertySetMapper; +} +// ----------------------------------------------------------------------------- void ODBFilter::setPropertyInfo() { Reference xDataSource(getDataSource()); diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 4805e242055d..744770305469 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -129,6 +129,7 @@ private: mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; Reference m_xDataSource; sal_Int32 m_nPreviewMode; bool m_bNewFormat; @@ -188,6 +189,7 @@ public: UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; + UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; /** add a Info to the sequence which will be appened to the data source @param _rInfo The property to append. -- cgit