diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:44 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:44 +0200 |
| commit | a8a23a035808fa496807a50fc5bfaaaa57d5f423 (patch) | |
| tree | ee1d41cd1ff2a4f11ae0ae8b79a893f9fd0df524 /vbahelper | |
| parent | 27828d6293f0840d563b45f1eda0b730c72ea58f (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit a8e9467402e81429f9dbaab22b8ca3f21529a876 (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:26 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit b1766315d62b509af5ee2da5760c4e8535a5f3f7
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 20:05:34 2010 +0200
Kill the migration wizard for good.
Extends default-no-startup-wizard.diff and desktop-disable-startup-registration.diff.
desktop/source/app/app.cxx | 34 +-
desktop/source/migration/makefile.mk | 6 -
desktop/source/migration/pages.cxx | 673 --------------------
desktop/source/migration/pages.hxx | 214 -------
desktop/source/migration/wizard.cxx | 654 -------------------
desktop/source/migration/wizard.hrc | 99 ---
desktop/source/migration/wizard.hxx | 106 ---
desktop/source/migration/wizard.src | 424 ------------
desktop/source/splash/firststart.cxx | 156 -----
desktop/source/splash/firststart.hxx | 90 ---
desktop/source/splash/makefile.mk | 5 +-
desktop/source/splash/services_spl.cxx | 5 -
desktop/util/makefile.mk | 3 +-
13 files changed, 5 insertions(+), 2464 deletions(-)
commit b88f97260d8aafa1d30d404ab57a30d061980664
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 19:21:36 2010 +0200
kde4-buildfix-connectivity.diff: Fix KDE4 build.
connectivity/source/drivers/kab/makefile.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 6415b3fe7292bfd0c75bc52bacfd0cb51aeec19c
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:28:33 2010 +0200
filled-tab-editeng.diff: Filled tab wasn't filled in shapes
n#564454
.../drawinglayer/primitive2d/textprimitive2d.hxx | 8 +++-
.../source/primitive2d/textprimitive2d.cxx | 12 ++++-
drawinglayer/source/processor2d/vclprocessor2d.cxx | 41 ++++++++++++++++---
editeng/inc/editeng/editeng.hxx | 8 ++++
editeng/inc/editeng/outliner.hxx | 15 +++++++
editeng/source/editeng/editeng.cxx | 8 ++++
editeng/source/editeng/impedit3.cxx | 19 +++++++++
editeng/source/outliner/outleeng.cxx | 9 ++++
editeng/source/outliner/outleeng.hxx | 8 ++++
editeng/source/outliner/outliner.cxx | 15 +++++++-
svx/source/svdraw/svdotextdecomposition.cxx | 4 +-
11 files changed, 134 insertions(+), 13 deletions(-)
commit 150b71f82c682889427a3df2accee6cc44d85ccb
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 14:42:40 2010 +0200
win32-dont-attempt-restart.diff: Don't attempt to restart OOo after crash
n#524250
Don't attempt to restart soffice.bin immediately if it crashes. At
such a restart, if the document recovery dialog is cancelled, an
empty Writer document is opened even if the user was editing some
other kind of document. Some customers are annoyed by this. And the
automatic restart doesn't work on Linux anyway, so for consistency
it doesn't hurt if we force it not to work on Windows, either.
desktop/win32/source/officeloader/officeloader.cxx | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
commit c6eb9605babcd5621b77a3c12a977fed3a84c742
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:50:57 2010 +0200
toolbar-decorations-svx-undo-redo.diff: Update "Undo" and "Redo" widgets.
svx/source/tbxctrls/lboxctrl.cxx | 5 +----
svx/source/tbxctrls/lboxctrl.src | 13 +++----------
2 files changed, 4 insertions(+), 14 deletions(-)
commit 41e00d403cbcea258168bf1a7650db28fd15c6a9
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:49:46 2010 +0200
toolbar-decorations-svx-tables-columns.diff: "New table" widget rework.
And a small update of the "Columns" widget.
svx/source/tbxctrls/layctrl.cxx | 488 +++++++++++++++++---------------------
1 files changed, 218 insertions(+), 270 deletions(-)
commit 46ea2f6cb38536aa1b1a259af2145a581e19f6e8
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 14 11:47:49 2010 +0200
toolbar-decorations-svx.diff: Improved toolbar popups.
svx/source/tbxctrls/linectrl.cxx | 4 ++--
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
commit eac35923bff62f414c5a48bb951f826fc9598eb7
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 12:57:42 2010 +0200
win32-force-version-fix.diff: force WINVER when using non-std win api
connectivity/source/drivers/ado/ADriver.cxx | 2 ++
.../deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 ++
desktop/win32/source/setup/setup.cpp | 1 +
fpicker/source/win32/filepicker/FileOpenDlg.cxx | 2 ++
4 files changed, 7 insertions(+), 0 deletions(-)
commit 26a938fd832bdb7f758e352f1e47e8496771de18
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:43:45 2010 +0200
cjk-character-units-fix.diff: add a new unit 'character unit'
i#356101
.../schema/org/openoffice/Office/Writer.xcs | 24 ++++++++++----------
1 files changed, 12 insertions(+), 12 deletions(-)
commit 19ab9349f211ca712aa2b6b777be55830b804340
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:40:56 2010 +0200
cjk-character-units-ui.diff: add a new unit 'character unit'
.../schema/org/openoffice/Office/Writer.xcs | 12 +++++++++
sfx2/inc/sfx2/sfxsids.hrc | 1 +
sfx2/sdi/sfx.sdi | 27 ++++++++++++++++++++
svx/source/dialog/ruler.hrc | 3 +-
svx/source/dialog/ruler.src | 12 +++++++++
svx/source/dialog/sdstring.src | 2 +
svx/source/dialog/svxruler.cxx | 11 ++++++-
7 files changed, 65 insertions(+), 3 deletions(-)
commit 258524d43e52170947e94d2af5cd36ba02f31416
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:37:50 2010 +0200
cjk-character-units-imp.diff: add a new unit 'character unit'
svx/inc/dlgutil.hxx | 1 +
svx/source/dialog/dlgutil.cxx | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 0 deletions(-)
commit 72832ea6fb8fa69b3cfbbcadab8f49a803448b4e
Merge: 1445d9d7 b47d587
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:08 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 1445d9d7744618b41e0b09eef274613cc0cfd57b
Merge: 09877be faf3732
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:02 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit b47d58784ee1d6592f721e9fa0a66a4d801e95cc (tag: refs/tags/ooo/OOO330_m7)
Merge: 1c5054b 5fba505
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit 1c5054b57b89575e686b6f59da89abdd24012cd4
Merge: 1843c8d 8ace426
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:51:23 2010 +0200
CWS-TOOLING: integrate CWS fwk154
commit 1843c8d96d714f34d713a8ca1a3a1848f9c9310d
Merge: be6516c 5be137f
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:43:02 2010 +0200
CWS-TOOLING: integrate CWS fwk153
commit be6516cfa383d391a5c1620076c72f7d5dfbd15e
Merge: faf3732 be3b926
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:26:29 2010 +0200
CWS-TOOLING: integrate CWS sb130
commit faf3732ff2f34712f6e974aa46f132cd734d22a5 (tag: refs/tags/ooo/OOO330_m6)
Author: obo <obo@openoffice.org>
Date: Fri Aug 27 13:01:02 2010 +0200
masterfix OOO330: #i10000# solve merge problem / WaE
desktop/source/app/app.cxx | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
commit be3b92624ef45dbeab7c96393199a3eeaff144da
Author: sb <sb@openoffice.org>
Date: Thu Aug 26 17:11:05 2010 +0200
sb130: #i113096# previous configmgr::Components::removeExtensionXcuFile changes were still not good
configmgr/source/components.cxx | 24 +++++++++++++-----------
configmgr/source/modifications.cxx | 21 +++++++++++++++++++++
configmgr/source/modifications.hxx | 2 ++
3 files changed, 36 insertions(+), 11 deletions(-)
commit d85fe96f67e46d1b65257509c09b8453cd9b8510
Author: sb <sb@openoffice.org>
Date: Thu Aug 26 13:28:53 2010 +0200
sb130: #i113096# UniversalContentBroker::changesOccurred is now also called for removed items
ucb/source/core/ucb.cxx | 127 +++++++++++++++++++++++++++-------------------
ucb/source/core/ucb.hxx | 6 --
2 files changed, 74 insertions(+), 59 deletions(-)
commit f6b87d8f5b9ad9cc5a49e35ff0c567a3b8083bc3
Author: sb <sb@openoffice.org>
Date: Thu Aug 26 13:26:56 2010 +0200
sb130: #i113096# previous change contained an error in configmgr::Components::removeExtensionXcuFile
configmgr/source/components.cxx | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 864045890b84b8307b673b39bad1540d102a6414
Merge: 505336a dffbec9
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:07:19 2010 +0200
CWS-TOOLING: integrate CWS fwk152
commit 5fba505261c17ecd9bd2c877cff47fd941045f25
Merge: cde29b4 45ba31b
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Wed Aug 25 16:07:39 2010 +0200
fs33a: merge after pulling OOO330.m5's changes
commit 505336af510bead37a4777f230c2d004a3e9b176
Merge: cb033b9 4aa0a02
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:19:19 2010 +0200
CWS-TOOLING: integrate CWS sw33bf08
commit cde29b4edf7669ed8f48bc6e81f5513cf09780a8
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Aug 25 13:29:38 2010 +0200
fs33a: when all panels claim to be invisible, make the first one visible
sfx2/source/dialog/taskpane.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit cb033b9acb08fb718d7eaffa2b093b395b971cf9
Merge: 45ba31b 68c3203
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 8ace426a170164f6e90792de26213ea0eaab7efb
Merge: e087040 836a0fa
Author: Dirk Voelzke <dv@openoffice.org>
Date: Wed Aug 25 10:35:59 2010 +0200
fwk154: merged heads
commit 836a0fa49c8198c185a14a3b3690621294644c80
Author: Dirk Voelzke <dv@openoffice.org>
Date: Wed Aug 25 08:25:36 2010 +0200
fwk154#i114083# fixed some file properies for the Oracle Open Office executables
desktop/util/verinfo.rc | 8 ++++----
desktop/win32/source/applauncher/ooo/verinfo.rc | 4 ++--
desktop/win32/source/applauncher/verinfo.rc | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
commit 46cc97b7825b74b9d6f718cb4e7645ce1278a05a
Author: Juergen Schmidt <jsc@openoffice.org>
Date: Tue Aug 24 17:53:12 2010 +0200
fwk154: i114090: adapt listener code to reflect changes in config mgr, notification of change events
(transplanted from 7c0cad639e0b6d74f4be88f5877270f1a8b9fa53)
ucb/source/core/ucb.cxx | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
commit 9f2a658025c92f5d9dac1d717e0517fba8589d69
Merge: 8325f6b 45ba31b
Author: sb <sb@openoffice.org>
Date: Wed Aug 25 14:21:49 2010 +0200
sb130: merged in OOO330_m5
commit 8325f6b22551883c99c5b11cff50d454ad394a60
Author: sb <sb@openoffice.org>
Date: Wed Aug 25 14:08:27 2010 +0200
sb130: #i113096# fixed TODO in configmgr::Broadcaster::send (to ease debugging)
configmgr/source/broadcaster.cxx | 63 +++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 21 deletions(-)
commit e087040c0d686ca1f03b95a432567a700d420bfe
Author: Juergen Schmidt <jsc@openoffice.org>
Date: Tue Aug 24 17:53:12 2010 +0200
fwk154: i114090: adapt listener code to reflect changes in config mgr, notification of change events
ucb/source/core/ucb.cxx | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
commit f4e7b133d8836e97f4a58e360405238866535cb9
Author: Carsten Driesner <cd@openoffice.org>
Date: Mon Aug 23 13:43:42 2010 +0200
fwk154: #i114014# Use correct compare statement
uui/source/iahndl-authentication.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 7e963509b1786bcabac7560e5d962359d56418a7
Author: Carsten Driesner <cd@openoffice.org>
Date: Mon Aug 23 12:46:11 2010 +0200
fwk154: #i114014# Fix problem with check box 'Remember Password' in login dialog
uui/source/iahndl-authentication.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5be137f8b856bc67fd6fb99a11eaee3faf1400a4
Merge: 2914220 a3652f2
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Wed Aug 18 16:48:00 2010 +0200
fwk153: merge
commit 29142204d1d7a495c7477c9f4cc842150a636aee
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Wed Aug 18 16:43:38 2010 +0200
fwk153: #i113674# replace backing component if there is one
framework/inc/classes/framelistanalyzer.hxx | 25 +++++++++----------------
framework/prj/d.lst | 1 +
framework/util/makefile.mk | 2 +-
sfx2/source/view/viewfrm.cxx | 21 ++++++++++++++++++++-
4 files changed, 31 insertions(+), 18 deletions(-)
commit 45ba31b194bc51b16d8f0892e432b2b77fce144d (tag: refs/tags/ooo/OOO330_m5)
Merge: ce2c621 ad4d380
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 13:23:34 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl05
commit ce2c62170340cfe0870f58b3b557c33f9441f2bd
Merge: d939031 a6f18d1
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:43:13 2010 +0200
CWS-TOOLING: integrate CWS mav56
commit d939031546d7472e09a1a096d78e1e3dbbb94e42
Merge: 6e0e29c 16a891e
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:39:06 2010 +0200
CWS-TOOLING: integrate CWS fwk151
commit 6e0e29c23afae5d6715405b89a0d498b89cd9d5e
Merge: 05d4c10 0517fd2
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit a3652f203372976692c4bd02e51d0b86448ec51b
Merge: cee18c6 27e0667
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Aug 18 11:00:57 2010 +0200
fwk153: Merge changes
commit cee18c6b582e045958a70cee8222a83598f4c437
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Aug 18 10:52:09 2010 +0200
fwk153: #i110127# Provide one instance of module accelerator manager in module ui configuration manager implementation.
.../moduleuiconfigurationmanager.hxx | 1 +
.../accelerators/acceleratorconfiguration.cxx | 5 +-
.../moduleuiconfigurationmanager.cxx | 78 +++++++++++---------
3 files changed, 47 insertions(+), 37 deletions(-)
commit 4aa0a027c7994cad5529534a32b9a903f01907b1
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Tue Aug 17 16:46:36 2010 +0200
cws sw33bf08: #i113584#, #i113587# transliteration fixed
editeng/source/editeng/impedit.hxx | 3 +
editeng/source/editeng/impedit4.cxx | 369 +++++++++++++++++++++++++++++------
2 files changed, 312 insertions(+), 60 deletions(-)
commit 27e066791da4927b97824eef67cca7be9c4a0f91
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Tue Aug 17 10:13:38 2010 +0200
fwk153: #i113914# set the new storage for duplicate libraries also
sfx2/source/doc/objstor.cxx | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
commit 68c320362696d9d9f9cb7d6ea9ad5dbc864e64c7
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 17:59:32 2010 +0200
mib18: wae
basic/source/classes/sb.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit 5660ff9f62ff81029d74ede7784446604e7c18c0
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 17:51:00 2010 +0200
mib18: wae
basic/source/runtime/step0.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ad4d380dd22ccf85b0d0b4a6276ce27a2a9fed41
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Fri Aug 13 15:57:34 2010 +0200
ooo33gsl05: #i113810# fix on behalf of aw
svx/source/svdraw/svdmrkv.cxx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit aaef5c3019e8fa0b2cf6a5d57e6842a9a2138d12
Merge: bc81a57 ae170eb
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 15:03:20 2010 +0200
mib18: merge
commit ae170eb18ad3f57a6f5e1b6ab3ad5459a8ae70f0
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Fri Aug 13 14:48:18 2010 +0200
mib18: #163278# handle the internal VBA types correctly
basic/source/classes/sbunoobj.cxx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
commit bc81a57e8f35a06f6b607fb575d5d4c54d8a3929
Merge: 43ebc93 a768f39
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 13:43:38 2010 +0200
mib18: merge
commit 284f9a97eb9bc3c5835ec409bba8e8e646d3387b
Merge: a768f39 7883aa8
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Fri Aug 13 13:38:18 2010 +0200
mib18: merging
commit 7883aa8d17c9bae21b87a8d29a3c241e82dda8d2
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Fri Aug 13 13:28:45 2010 +0200
mib18: #163225# support long strings in basic
basic/inc/basic/sbxvar.hxx | 12 +++--
basic/source/classes/sbunoobj.cxx | 2 +-
basic/source/sbx/sbxbool.cxx | 18 +++---
basic/source/sbx/sbxbyte.cxx | 10 ++--
basic/source/sbx/sbxchar.cxx | 15 +++---
basic/source/sbx/sbxconv.hxx | 16 +++---
basic/source/sbx/sbxcurr.cxx | 26 +++++-----
basic/source/sbx/sbxdate.cxx | 12 +++--
basic/source/sbx/sbxdbl.cxx | 10 ++--
basic/source/sbx/sbxdec.cxx | 20 ++++----
basic/source/sbx/sbxdec.hxx | 4 +-
basic/source/sbx/sbxint.cxx | 38 ++++++-------
basic/source/sbx/sbxlng.cxx | 10 ++--
basic/source/sbx/sbxres.cxx | 2 +-
basic/source/sbx/sbxres.hxx | 2 +-
basic/source/sbx/sbxscan.cxx | 37 +++++++------
basic/source/sbx/sbxsng.cxx | 10 ++--
basic/source/sbx/sbxstr.cxx | 50 ++++++++---------
basic/source/sbx/sbxuint.cxx | 10 ++--
basic/source/sbx/sbxulng.cxx | 10 ++--
basic/source/sbx/sbxvalue.cxx | 105 ++++++++++++++++++++-----------------
basic/source/sbx/sbxvar.cxx | 40 +++++++-------
22 files changed, 235 insertions(+), 224 deletions(-)
commit a768f3921b60caae5af40b305540a47aaedad275
Author: Michael Brauer <mib@openoffice.org>
Date: Fri Aug 13 12:52:17 2010 +0200
mib18: #163285#: Set correct error code in Collection.item and Collection.remove
basic/source/classes/sb.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit a026803287e286be2ee4d4b0ab90fd30874a21bb
Merge: 0cc2927 05d4c10
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 13 12:04:35 2010 +0200
fs33a: merge after pulling OOO330.m4's change sets
commit 43ebc93ff5555b07895fdd9171ab12c310ebba87
Merge: 4aea598 05d4c10
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 4aea598fb6ddfcfc883101be59ce5e3185d186e0
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 13 08:01:31 2010 +0200
mib18: #163254# Set right name and parent for copied object class members
basic/source/classes/sb.cxx | 4 ++++
basic/source/comp/sbcomp.cxx | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
commit 0517fd2d63228abe568e1fd9d564e30ed648d8b9
Merge: 23779a7 645d925
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit 8d6235484043a008c49394555faf6b393bbb2617
Merge: 17a07b3 05d4c10
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Thu Aug 12 16:23:40 2010 +0200
merge with OOO330m4
commit 893a7cbe2b494d34603e642c8d4ac6a06cb82349
Author: Michael Stahl <mst@openoffice.org>
Date: Thu Aug 12 16:13:11 2010 +0200
sw33bf08: #i108078#: ::sfx2::createBaseURI(): decode content of expand URI
sfx2/source/doc/DocumentMetadataAccess.cxx | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
commit 567d3a2e14870f56155aa22823f3fd536dda6c71
Author: Michael Stahl <mst@openoffice.org>
Date: Thu Aug 12 15:05:09 2010 +0200
sw33bf08: #i108078#: ::sfx2::createBaseURI():
manually expand vnd.sun.star.expand: URIs before calling makeAbsolute().
sfx2/source/doc/DocumentMetadataAccess.cxx | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
commit 5433c06f77017f4594937ce51aaa9e9579fddc8f
Author: sb <sb@openoffice.org>
Date: Thu Aug 12 10:22:02 2010 +0200
sb130: #i113096# introduced com.sun.star.configuration.XUpdate.removeExtensionXcuFile
configmgr/source/README | 1 +
configmgr/source/access.cxx | 23 +++-
configmgr/source/additions.hxx | 43 ++++++
configmgr/source/components.cxx | 136 ++++++++++++++++---
configmgr/source/components.hxx | 15 ++-
configmgr/source/data.cxx | 44 +++++++
configmgr/source/data.hxx | 23 +++-
configmgr/source/update.cxx | 17 +++
configmgr/source/xcdparser.cxx | 2 +-
configmgr/source/xcuparser.cxx | 30 +++--
configmgr/source/xcuparser.hxx | 6 +-
.../registry/configuration/dp_configuration.cxx | 26 +++-
12 files changed, 308 insertions(+), 58 deletions(-)
commit dffbec9fe51bd0d6bfc885c1061f5d62312e78a1
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Thu Aug 12 10:00:50 2010 +0200
fwk152: #i10000# fix warning
desktop/source/app/appfirststart.cxx | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit 753d301aaa33b87d5ce4eb607d8802bbe09b8e13
Author: Andreas Bregas <ab@openoffice.org>
Date: Thu Aug 12 08:40:35 2010 +0200
mib18: #163254# Fixed instantiation of class modules for object members
basic/source/classes/sb.cxx | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
commit 4cd6f4efe3ae774d9e8fca45e4a398eed5117aa9
Merge: 2419889 c778391
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 14:25:35 2010 +0200
mib18: Merge
commit 2419889e37a924cef564e363e4931a26cb15e48f
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 14:18:10 2010 +0200
mib18: #163237# Changed error handling in StepSET
basic/source/runtime/step0.cxx | 229 ++++++++++++++++++++--------------------
1 files changed, 114 insertions(+), 115 deletions(-)
commit c7783913a83b91b5ad8af3585ed8015eeff0afcb
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 11 11:11:45 2010 +0200
mib18: unx compiler warnings
basic/source/comp/exprgen.cxx | 4 ++--
basic/source/comp/makefile.mk | 33 ++++++++++-----------------------
2 files changed, 12 insertions(+), 25 deletions(-)
commit bfa03a95f4b47a4763537ee4fcc9340138134573
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Wed Aug 11 09:10:07 2010 +0200
mib18: #163215# handle the closed dialog correctly
vbahelper/source/msforms/vbauserform.cxx | 47 +++++++++++++++++++-----------
1 files changed, 30 insertions(+), 17 deletions(-)
commit 645d92535faaac02c1524abc1893dc1207acd1f5
Merge: 17a07b3 23779a7
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit 6f1d21b2d2d239cd6253e7b8b36b2adf6571bfac
Merge: d888d60 02fd7e0
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 08:28:57 2010 +0200
mib18: Merge
commit d888d6060dbe2077fa571f33f53419098f00917c
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 08:24:45 2010 +0200
mib18: #163121# Fixed back chain handling for new declare implementation
basic/source/comp/dim.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 02fd7e0a01b3c2e59a819d9dc21f402cb693c6a3
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 18:14:58 2010 +0200
mib18: #163259# implementation of global symbol Excel
oovbaapi/ooo/vba/excel/XGlobals.idl | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 505e80d4570a778f1654cafcb0ba56dc4a27c000
Merge: 4966169 ae27c05
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:57:47 2010 +0200
heads merged
commit 4966169f06ab743d8cf714e92282a80db54f3b5a
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:55:52 2010 +0200
mib18: #163120# adding the entrypoint for symbol Debug
oovbaapi/ooo/vba/excel/XGlobals.idl | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 0cc2927a54d1c34e766e4c591a23fad5335a6893
Merge: e1145c7 17a07b3
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit a6f18d15186ba525739f3cd50ae50f1b3be2ac9d
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Tue Aug 10 11:05:20 2010 +0200
mav56: #163253# tread invalid path segments correctly
ucb/source/ucp/package/makefile.mk | 1 +
ucb/source/ucp/package/pkguri.cxx | 36 ++++++++++++++++++++----------------
2 files changed, 21 insertions(+), 16 deletions(-)
commit ae27c058ca364ca50cc27057e2c63b7f5b84c39d
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 10:27:30 2010 +0200
mib18: #163246# add VBA symbol Worksheet.ProtectScenarios
oovbaapi/ooo/vba/excel/XWorksheet.idl | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 8d3a12bd55459ba99e802457a4112f290cd28ac1
Author: Andreas Bregas <ab@openoffice.org>
Date: Mon Aug 9 15:50:34 2010 +0200
mib18: #163059# Ignore introspection based COM object members
basic/source/classes/sbunoobj.cxx | 14 ++++++++++++--
basic/source/inc/sbunoobj.hxx | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
commit 42e3cc5745faad62d49ddae49581114ea81b46af
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Mon Aug 9 10:47:38 2010 +0200
fwk152: #i108004# check the URLs correctly
framework/source/loadenv/loadenv.cxx | 3 +-
sfx2/inc/sfx2/docfile.hxx | 1 -
sfx2/source/doc/docfile.cxx | 47 ----------------------------------
sfx2/source/doc/doctemplates.cxx | 2 +-
sfx2/source/doc/objmisc.cxx | 2 +-
sfx2/source/doc/objstor.cxx | 2 +-
sfx2/source/doc/sfxbasemodel.cxx | 3 +-
7 files changed, 7 insertions(+), 53 deletions(-)
commit e50f8b059ea9f4e96e64a931caeb909cf4628bff
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 11:14:17 2010 +0200
mib18: #163175# Implement DoEvents empty
basic/source/runtime/methods1.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit 9134fb31919cd977801d2813e60bc3396c8910ec
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:35:51 2010 +0200
mib18: #163121# Declare Rework
basic/source/comp/codegen.cxx | 4 ++
basic/source/comp/dim.cxx | 61 +++++++++++++++++++++++++++-
basic/source/comp/exprgen.cxx | 69 ++++++++-----------------------
basic/source/comp/exprtree.cxx | 10 ----
basic/source/inc/expr.hxx | 3 -
basic/source/inc/symtbl.hxx | 3 +-
scripting/source/basprov/basmodnode.cxx | 14 +++++-
scripting/source/basprov/basprov.cxx | 2 +-
8 files changed, 96 insertions(+), 70 deletions(-)
commit e0ad6117f46c86d22777247ef90ad10b30e6f442
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Thu Aug 5 11:53:41 2010 +0200
fwk152: #i112452# let restart functionality restart quickstarter as well
desktop/inc/app.hxx | 3 +
desktop/source/app/app.cxx | 7 ++
desktop/source/app/appfirststart.cxx | 104 ++++++++++++++------
desktop/win32/source/officeloader/officeloader.cxx | 1 +
officecfg/registry/schema/org/openoffice/Setup.xcs | 9 ++-
5 files changed, 94 insertions(+), 30 deletions(-)
commit d542107ff02c7cec79307f3e32ec79617a7e03e2
Author: Andreas Bregas <ab@openoffice.org>
Date: Thu Aug 5 11:52:07 2010 +0200
mib18: #163025# Changed RunInit handling for class modules to get right order
basic/inc/basic/sbmod.hxx | 4 +-
basic/source/classes/sb.cxx | 93 ++++++++++++++++++++++++++++++++++++-
basic/source/comp/codegen.cxx | 8 ++-
basic/source/comp/dim.cxx | 3 +
basic/source/inc/parser.hxx | 5 +-
basic/source/inc/sbintern.hxx | 6 ++
basic/source/runtime/methods1.cxx | 2 -
7 files changed, 112 insertions(+), 9 deletions(-)
commit c65fa07ac8376999ef4fb293c9749abfbf4b689f
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 18:13:02 2010 +0200
mib18: #162938# add VBA symbol Worksheet.AutoFilterMode
oovbaapi/ooo/vba/excel/XWorksheet.idl | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 16a891edfe85a583dfd6c22363e24cb32a1ef795
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Aug 4 13:56:16 2010 +0200
fwk151: #i110127# Better formatting
.../accelerators/acceleratorconfiguration.cxx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
commit 263df111b29b5c3915f2e0ab26980315fc1915fd
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:56:54 2010 +0200
mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters
vbahelper/inc/vbahelper/vbahelper.hxx | 7 +++++++
vbahelper/source/vbahelper/vbahelper.cxx | 24 ++++++++++++++++++++++++
2 files changed, 31 insertions(+), 0 deletions(-)
commit 23779a786395825ac8a5733b3803b560667522dd
Merge: 4c2f072 45fdc25
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 02d554112d9c0174e21b7ea7e4aea15fe564afa9
Author: Michael Stahl <mst@openoffice.org>
Date: Thu Jul 29 14:57:46 2010 +0200
sw33bf08: #i113461#: SvxAutoCorrect::AutoCorrect(): apply patch by dtardon:
do not freeze after erasing non-breaking space inserted by French AutoCorrection
editeng/source/misc/svxacorr.cxx | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
commit 4c2f072bffe60d64d124882d52492b1f76759271
Merge: d3a5cd9 3d785d8
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Thu Jul 29 13:55:23 2010 +0200
jl154: Local merge
commit 3d785d8443fcdb531570d827186b1161640350f4
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 28 16:27:07 2010 +0200
jl154 #i113463# some comments and rollback even when runtime exception is thrown
.../deployment/manager/dp_extensionmanager.cxx | 8 +++++++
.../deployment/registry/package/dp_package.cxx | 22 +++++--------------
2 files changed, 14 insertions(+), 16 deletions(-)
commit 9951e7b7804b3643b9bf7e837e5cd0f09373a8fc
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Jul 28 13:54:38 2010 +0200
fwk152: #i113249# Fix broken HTML clipboard
editeng/source/editeng/eehtml.cxx | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
commit 827100404f29853108a0a1fb8c329c2bb0410de4
Author: sb <sb@openoffice.org>
Date: Wed Jul 28 13:01:55 2010 +0200
fwk152: #i113454# accept broken .xcs files containing empty <oor:component-scheme>
configmgr/source/xcsparser.cxx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
commit 528c08bd8d648cf1c2f9f4e38642146d3ee69dd0
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 28 12:19:34 2010 +0200
jl154 #i113463# processPackage_ in dp_configuration.cxx threw an IOException when revoking xcs files
.../registry/configuration/dp_configuration.cxx | 62 ++++++++------------
1 files changed, 25 insertions(+), 37 deletions(-)
commit 556bd4d205fa74157f378d0a8baf57dacd08bfaa
Author: Carsten Driesner <cd@openoffice.org>
Date: Tue Jul 27 18:11:00 2010 +0200
fwk151: Fixed problems that configuration changes notifications were not correctly sent/processed
configmgr/source/rootaccess.cxx | 5 ++-
.../accelerators/acceleratorconfiguration.cxx | 21 +++++++------------
2 files changed, 11 insertions(+), 15 deletions(-)
commit df6cd526ceedb45436c0393696ec39a0a59e0fc6
Author: Carsten Driesner <cd@openoffice.org>
Date: Tue Jul 27 18:11:00 2010 +0200
fwk151: Fixed problems that configuration changes notifications were not correctly sent/processed
configmgr/source/rootaccess.cxx | 5 ++-
.../accelerators/acceleratorconfiguration.cxx | 21 +++++++------------
2 files changed, 11 insertions(+), 15 deletions(-)
commit f6a6db31e407119be5820361cc815f2cd380c6be
Author: Joachim Lingner <jl@openoffice.org>
Date: Tue Jul 27 14:38:42 2010 +0200
jl154 #i113463# unopkg sync fails on solaris, when there was one extension removed
desktop/source/deployment/registry/dp_registry.cxx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
commit d3a5cd9a9d49e332a3eb10a296b1dc908d5571a8
Author: Dirk Voelzke <dv@openoffice.org>
Date: Fri Jul 23 09:25:32 2010 +0200
jl154:#i133370# Remove 'disable' from popup menu for shared extensions
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit 01016b92b2e1c8136ad1f14e6163746c8562c081
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 22 14:10:02 2010 +0200
jl154 #i162868# unopkg sync now removes the folder when it does no contain a folder
desktop/source/app/app.cxx | 42 +++++++++------------------
desktop/source/app/userinstall.cxx | 6 +---
desktop/source/app/userinstall.hxx | 2 -
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 5 ++-
4 files changed, 19 insertions(+), 36 deletions(-)
commit 41e84bd96a082ea50217ce5956db7936f1f9d024
Merge: 4798dbf 78b22b2
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Thu Jul 22 10:44:04 2010 +0200
jl154: Local branch merge
commit 78b22b28d6d257eb1ce844f0d6082179dc3cd809
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 21 13:29:14 2010 +0200
jl154 #i162868# unopkg sync removes share/prereg/bundled, changing registerExtensions
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 21 +++++
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 105 ++++++++++++++++++++++++++
desktop/source/pkgchk/unopkg/unopkg_shared.h | 6 ++
3 files changed, 132 insertions(+), 0 deletions(-)
commit 126beccbacfefd5ec47eb66a4a214c82649d056b
Author: Joachim Lingner <jl@openoffice.org>
Date: Tue Jul 20 14:54:39 2010 +0200
jl154 #i113285# fixing deadlock when starting OOo by the testtool
desktop/source/app/app.cxx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 4798dbf7ec2e0aeec525200302f6566e9c62dab0
Merge: c04bc96 ac74bf3
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit c04bc96760bcb53af09c810a8f3251af4e24d174
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 11:11:50 2010 +0200
jl154 #162868# undoing: removing registration data folder if the last extension was removed, which was instroduced with eaf4b98ce57a
desktop/source/deployment/manager/dp_manager.cxx | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
commit 5eb244a5af091bcf3e887eb6f2cac669724a65e9
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 15:38:43 2010 +0200
jl154 #162868# fix warnings caused by 990df1d5ff27
desktop/source/app/app.cxx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
commit 11a2edf653a11f4eba4cb1f94f90dc3ce1efa617
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 14 15:17:57 2010 +0200
jl154 #162868# removing registration data folder if the last extension was removed
desktop/source/deployment/manager/dp_manager.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit 503c30df49250eee4c34b82d3388b2a8e20816a3
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Jul 14 14:09:08 2010 +0200
jl154: #162868# Added sync code to improve startup time with bundled extensions
desktop/source/app/app.cxx | 220 ++++++++++++++++++++++++++++++++++++
desktop/source/app/userinstall.cxx | 6 +-
desktop/source/app/userinstall.hxx | 2 +
3 files changed, 227 insertions(+), 1 deletions(-)
commit 8f3373241dad0ca73602043cd28156a4d6f2b039
Merge: 31eb0af 34ebae2
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 15:58:30 2010 +0200
merge
commit 34ebae2afba0a7d0ae01432a23f14077633a1cf8
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Jul 12 14:04:55 2010 +0200
jl154 #162868# OOo Improvement dialog will now show at the second start
.../openoffice/Office/OOoImprovement/Settings.xcs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 31eb0af3b1bbd5a885a487958642b110b3699e07
Merge: b58863e 78243f6
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 11:10:49 2010 +0200
merge
commit 78243f60f3094a3c03a2a70d3c8caa354d4bfb5f
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Jul 12 10:26:26 2010 +0200
jl154 #162868# additional private sub-command for unopkg for use in setup
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit b58863e8ddc923fa737d064b873b8099a24a8c51
Author: Carsten Driesner <cd@openoffice.org>
Date: Wed Jul 7 13:51:44 2010 +0200
jl154: #i112449# Fix flicker on restart. Backing window won't get created if restart is required
desktop/source/app/app.cxx | 266 ++++++++++++++++++++++----------------------
1 files changed, 133 insertions(+), 133 deletions(-)
commit e1145c70eb055c594b25bda5a662e65ae750f78f
Merge: 83c6697 b171344
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit fe7bdecd4ea546c98207ee1e8e2a0eb401f8d356
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Jul 5 15:46:50 2010 +0200
jl154 #i112934# replace old license headers introduced by CWS jl152
.../source/deployment/manager/dp_properties.cxx | 2 +-
.../source/deployment/manager/dp_properties.hxx | 5 +----
.../configuration/dp_configurationbackenddb.cxx | 5 +----
.../configuration/dp_configurationbackenddb.hxx | 5 +----
.../registry/executable/dp_executablebackenddb.cxx | 5 +----
.../registry/executable/dp_executablebackenddb.hxx | 5 +----
.../deployment/registry/help/dp_helpbackenddb.cxx | 5 +----
.../deployment/registry/help/dp_helpbackenddb.hxx | 5 +----
.../registry/script/dp_scriptbackenddb.cxx | 5 +----
.../registry/script/dp_scriptbackenddb.hxx | 5 +----
desktop/source/migration/services/cexportsoo3.cxx | 5 +----
.../migration/services/oo3extensionmigration.cxx | 7 ++-----
.../migration/services/oo3extensionmigration.hxx | 7 ++-----
13 files changed, 15 insertions(+), 51 deletions(-)
commit 69ce56e3b6b9167c23893953f978fe1b26a432ec
Merge: 3a9f321 bf0cf88
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 2 15:07:01 2010 +0200
jl154 merging heads
commit bf0cf886073fbd6ee87104d90fb1d1ffd5b35a97
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 2 14:21:42 2010 +0200
jl154 #i112883# prevent extension synchronization at OOo startup
desktop/source/deployment/misc/dp_misc.cxx | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 3a9f321158f3f06e728c20664532ba60dea096a1
Author: sb <sb@openoffice.org>
Date: Thu Jul 1 13:01:22 2010 +0200
jl154: #i112673# ensure that client-facing PID remains the same across internal OOo restart on Mac OS X
desktop/source/app/app.cxx | 109 +++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 27 deletions(-)
commit b08fd7366c62a91f21ae4e19859bc696be13c152
Merge: b589c0d 871f924
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
commit b171344789c6eb81bbaf96002b981b5e919d9a05
Merge: a53bfcb 303dee0
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Sun Jun 20 00:48:29 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 303dee093f9c39c809d5629a7b7f5fc45e4e086d
Merge: 9c0446d a53bfcb
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 23:37:32 2010 +0200
fs33a: merged CWS unoawt2, implicit rebase to m83
commit 9c0446d131784e9a351dc30f15dcab7ba37e4b3d
Merge: f91e396 d63595b
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Thu Jun 17 11:47:25 2010 +0200
fs33a: merge after pulling latest changes from DEV300 (m81)
commit f91e396e38e97c16c7e4228cbc2fc8a053e66fe8
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Apr 27 12:34:19 2010 +0200
fs33a: #111181# ImplSign: proper check whether the doc can be signed (only bail out if the document is no new)
sfx2/source/doc/objserv.cxx | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
Notes
Notes:
split repo tag: libs-core_OOO_BUILD_3_2_98_1
Diffstat (limited to 'vbahelper')
96 files changed, 861 insertions, 817 deletions
diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/vbahelper/inc/vbahelper/helperdecl.hxx index 0b51c6242226..f6614add6b63 100644 --- a/vbahelper/inc/vbahelper/helperdecl.hxx +++ b/vbahelper/inc/vbahelper/helperdecl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl vba_service_class_() : baseT() {} template <typename PostProcessFuncT> /** Ctor to pass a post processing function/functor. - + @tpl PostProcessDefaultT let your compiler deduce this @param postProcessFunc function/functor that gets the yet unacquired ImplT_ pointer returning a diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index 79bb44ce30a4..cfbe9e761e19 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ #include <vbahelper/vbadllapi.h> #include <memory> namespace css = ::com::sun::star; -namespace ooo +namespace ooo { - namespace vba + namespace vba { VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell ) diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx index 6902bc7b5042..4ba494f83b32 100644 --- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx +++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ protected: public: // XHelperInterface ( parent is itself ) virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; } - + virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException); virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index 5bd58b44adaf..27ffa25eeb6a 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX #define OOVBAAPI_VBA_COLLECTION_IMPL_HXX @@ -162,12 +162,12 @@ private: typename XNamedVec::iterator mIt; public: XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {} - + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException) { return ( mIt != mXNamedVec.end() ); } - + virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if ( hasMoreElements() ) @@ -184,7 +184,7 @@ public: // XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); } - // XNameAcess + // XNameAcess virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if ( !hasByName(aName) ) @@ -200,7 +200,7 @@ public: for ( ; it != it_end; ++it, ++pString ) { - css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW ); *pString = xName->getName(); } return sNames; @@ -211,7 +211,7 @@ public: typename XNamedVec::iterator it_end = mXNamedVec.end(); for ( ; cachePos != it_end; ++cachePos ) { - css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW ); if ( aName.equals( xName->getName() ) ) break; } @@ -219,12 +219,12 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); } + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); } virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException ) { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); - + return css::uno::makeAny( mXNamedVec[ Index ] ); } @@ -248,9 +248,9 @@ protected: { if ( !m_xNameAccess.is() ) throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() ); - - return createCollectionObject( m_xNameAccess->getByName( sIndex ) ); - } + + return createCollectionObject( m_xNameAccess->getByName( sIndex ) ); + } virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) { @@ -258,13 +258,13 @@ protected: throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() ); if ( nIndex <= 0 ) { - throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "index is 0 or negative" ) ), + throw css::lang::IndexOutOfBoundsException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "index is 0 or negative" ) ), css::uno::Reference< css::uno::XInterface >() ); } // need to adjust for vba index ( for which first element is 1 ) - return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) ); + return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) ); } virtual void UpdateCollectionIndex( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) @@ -287,7 +287,7 @@ public: if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING ) { sal_Int32 nIndex = 0; - + if ( ( Index1 >>= nIndex ) != sal_True ) { rtl::OUString message; @@ -296,12 +296,12 @@ public: throw css::lang::IndexOutOfBoundsException( message, css::uno::Reference< css::uno::XInterface >() ); } - return getItemByIntIndex( nIndex ); + return getItemByIntIndex( nIndex ); } rtl::OUString aStringSheet; Index1 >>= aStringSheet; - return getItemByStringIndex( aStringSheet ); + return getItemByStringIndex( aStringSheet ); } // XDefaultMethod ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) @@ -310,7 +310,7 @@ public: return sName; } // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0; // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0; @@ -320,7 +320,7 @@ public: return ( m_xIndexAccess->getCount() > 0 ); } virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0; - + }; typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE; diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx index 79c3fa551073..70bd56565603 100644 --- a/vbahelper/inc/vbahelper/vbadialogbase.hxx +++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/vbahelper/inc/vbahelper/vbadialogsbase.hxx index 408a156ac3bc..63aff5bac665 100644 --- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx +++ b/vbahelper/inc/vbahelper/vbadialogsbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE protected: css::uno::Reference< css::frame::XModel > m_xModel; public: - VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} + VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} virtual ~VbaDialogsBase() {} // XCollection diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/vbahelper/inc/vbahelper/vbadllapi.h index 1768802c5176..dfdf6ae6fd4d 100644 --- a/vbahelper/inc/vbahelper/vbadllapi.h +++ b/vbahelper/inc/vbahelper/vbadllapi.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx index 2588b7da1720..b68eb0681557 100644 --- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ protected: css::uno::Reference< css::frame::XModel > mxModel; protected: virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); public: - VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ); - VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); + VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); virtual ~VbaDocumentBase() {} // Attributes @@ -62,7 +62,7 @@ public: virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException); virtual void SAL_CALL Save() throw (css::uno::RuntimeException); virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); - + // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx index 36bc0a4963ee..82f9ead18d41 100644 --- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx index 89d355db71f9..b0dd184c1a28 100755 --- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef VBAHELPER_VBAEVENTSHELPERBASE_HXX #define VBAHELPER_VBAEVENTSHELPERBASE_HXX @@ -60,7 +60,7 @@ public: protected: // ------------------------------------------------------------------------ - + enum EventHandlerType { EVENTHANDLER_GLOBAL, EVENTHANDLER_DOCUMENT }; struct EventHandlerInfo { @@ -104,7 +104,7 @@ protected: inline EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} }; typedef ::std::deque< EventQueueEntry > EventQueue; - + /** Derived classes return whether event processing is enabled. Throws if the instance is in an invalid state. */ virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0; diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/vbahelper/inc/vbahelper/vbafontbase.hxx index d1272c9dcf48..c49be459d51a 100644 --- a/vbahelper/inc/vbahelper/vbafontbase.hxx +++ b/vbahelper/inc/vbahelper/vbafontbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxFont; css::uno::Reference< css::container::XIndexAccess > mxPalette; bool mbFormControl; - + public: VbaFontBase( const css::uno::Reference< ov::XHelperInterface >& xParent, diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx index 61aaa1d65657..1394a7c749f9 100644 --- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx +++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE { protected: rtl::OUString msDocCtxName; - + bool hasServiceName( const rtl::OUString& serviceName ); void init( const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs ); diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index a1eca84bbdf8..77c5338442c8 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,11 +49,11 @@ #include "vbaaccesshelper.hxx" namespace css = ::com::sun::star; -namespace ooo +namespace ooo { - namespace vba + namespace vba { - template < class T > + template < class T > css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException) { if ( args.getLength() < ( nPos + 1) ) @@ -83,13 +83,20 @@ namespace ooo VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 ); VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& ); VBAHELPER_DLLPUBLIC css::uno::Any XLRGBToOORGB( const css::uno::Any& ); - // provide a NULL object that can be passed as variant so that - // the object when passed to IsNull will return true. aNULL + // provide a NULL object that can be passed as variant so that + // the object when passed to IsNull will return true. aNULL // contains an empty object reference VBAHELPER_DLLPUBLIC const css::uno::Any& aNULL(); VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, sal_Bool bSelection ); VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges, SfxViewShell* ); + /** Extracts a boolean value from the passed Any, which may contain sal_Bool or an integer or floating-point value. + Returns false, if the Any is empty or contains an incompatible type. */ + VBAHELPER_DLLPUBLIC bool extractBoolFromAny( bool& rbValue, const css::uno::Any& rAny ); + /** Extracts a boolean value from the passed Any, which may contain sal_Bool or an integer or floating-point value. + Throws, if the Any is empty or contains an incompatible type. */ + VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException); + VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException ); VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic ) VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical); @@ -111,9 +118,9 @@ private: public: Millimeter(); - + Millimeter(double mm); - + void set(double mm); void setInPoints(double points) ; void setInHundredthsOfOneMillimeter(double hmm); @@ -148,21 +155,21 @@ protected: css::uno::Reference< css::drawing::XShape > xShape; public: ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ); - + double getHeight(); void setHeight(double _fheight) throw ( css::script::BasicErrorException ); - + double getWidth(); void setWidth(double _fWidth) throw ( css::script::BasicErrorException ); - + double getLeft(); - + void setLeft(double _fLeft); double getTop(); - + void setTop(double _fTop); }; @@ -208,7 +215,7 @@ public: class VBAHELPER_DLLPUBLIC ContainerUtilities { -public: +public: static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator); static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix ); diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index b095b5cd2823..315d28d09336 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ // use this class when you have an a object like // interface XAnInterface which contains XHelperInterface in its inheritance hierarchy // interface XAnInterface -// { +// { // interface XHelperInterface; // [attribute, string] name; // } // or // interface XAnInterface : XHelperInterface; -// { +// { // [attribute, string] name; // } // @@ -54,10 +54,10 @@ // { // public: // AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {} -// // implement XAnInterface methods only, no need to implement the XHelperInterface +// // implement XAnInterface methods only, no need to implement the XHelperInterface // // methods -// virtual void setName( const OUString& ); -// virtual OUString getName(); +// virtual void setName( const OUString& ); +// virtual OUString getName(); // } // const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) ); @@ -65,7 +65,7 @@ const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba. template< typename Ifc1 > class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1 { -protected: +protected: css::uno::WeakReference< ov::XHelperInterface > mxParent; css::uno::Reference< css::uno::XComponentContext > mxContext; public: @@ -81,8 +81,8 @@ public: return 0x53756E4F; } virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; } - - virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { + + virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { // The application could certainly be passed around in the context - seems // to make sense css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW ); @@ -91,18 +91,18 @@ public: // XServiceInfo Methods virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) { return getServiceImplName(); } - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) + { css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames(); const rtl::OUString* pStart = sServices.getConstArray(); const rtl::OUString* pEnd = pStart + sServices.getLength(); for ( ; pStart != pEnd ; ++pStart ) if ( (*pStart).equals( ServiceName ) ) return sal_True; - return sal_False; + return sal_False; } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) - { + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) + { css::uno::Sequence< rtl::OUString > aNames = getServiceNames(); return aNames; } diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx index 09ad2f91d654..f602f5120083 100644 --- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx +++ b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE; -class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE +class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE { protected: css::uno::Reference< css::frame::XModel > mxModel; @@ -43,11 +43,11 @@ protected: sal_Int32 mnOrientLandscape; sal_Int32 mnOrientPortrait; - VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, - const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); + VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, + const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); public: virtual ~VbaPageSetupBase(){} - + // Attribute virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException); virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx index 1efef8f8c05e..29c8e381230f 100644 --- a/vbahelper/inc/vbahelper/vbapropvalue.hxx +++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,15 +33,15 @@ typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE; -class VBAHELPER_DLLPUBLIC PropListener +class VBAHELPER_DLLPUBLIC PropListener { public: virtual void setValueEvent( const css::uno::Any& value ) = 0; - virtual css::uno::Any getValueEvent() = 0; + virtual css::uno::Any getValueEvent() = 0; }; -class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE +class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE { PropListener* m_pListener; public: diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx index 87c640db203a..8fc259046d61 100644 --- a/vbahelper/inc/vbahelper/vbashape.hxx +++ b/vbahelper/inc/vbahelper/vbashape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx index a4cc35958ef2..d1bc1e576e2f 100644 --- a/vbahelper/inc/vbahelper/vbashaperange.hxx +++ b/vbahelper/inc/vbahelper/vbashaperange.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) throw (css::uno::RuntimeException); //XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); }; diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx index 18e123a9c7f6..80c99592f876 100644 --- a/vbahelper/inc/vbahelper/vbashapes.hxx +++ b/vbahelper/inc/vbahelper/vbashapes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE; class VBAHELPER_DLLPUBLIC ScVbaShapes : public ScVbaShapes_BASE { -private: +private: css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage; sal_Int32 m_nNewShapeCount; @@ -58,7 +58,7 @@ protected: css::uno::Any AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException); //TODO helperapi using a writer document //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument ); - + public: ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx index 91bc4525b973..75b3c9718610 100644 --- a/vbahelper/inc/vbahelper/vbatextframe.hxx +++ b/vbahelper/inc/vbahelper/vbatextframe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ typedef InheritedHelperInterfaceImpl1< ov::msforms::XTextFrame > VbaTextFrame_BA class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE { -protected: +protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx index f42c2a19854e..fa7943d2c69b 100644 --- a/vbahelper/inc/vbahelper/vbawindowbase.hxx +++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE; class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE -{ -protected: +{ +protected: css::uno::Reference< css::frame::XModel > m_xModel; public: VbaWindowBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 8e6cf29e8ec5..22d99f24ea51 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,24 +50,24 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, + return component_writeInfoHelper( pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl ); } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index 21693128c899..ed93d0b6e740 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, con } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -45,20 +45,20 @@ ScVbaButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -rtl::OUString& +rtl::OUString& ScVbaButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx index 1c65c293f76c..e52964f71d62 100644 --- a/vbahelper/source/msforms/vbabutton.hxx +++ b/vbahelper/source/msforms/vbabutton.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index e9ea64f772b6..15175f0e0f04 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xPar } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -47,26 +47,26 @@ ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCheckbox::getValue() throw (css::uno::RuntimeException) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; if( nValue != 0 ) nValue = -1; -// return uno::makeAny( nValue ); +// return uno::makeAny( nValue ); // I must be missing something MSO says value should be -1 if selected, 0 if not // selected - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); } -void SAL_CALL +void SAL_CALL ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) { sal_Int16 nValue = 0; @@ -83,14 +83,14 @@ ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcept } m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) ); } -rtl::OUString& +rtl::OUString& ScVbaCheckbox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaCheckbox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index 34d0828e0c66..d3922d84a91f 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 0b5f1af30bb7..4dfbf2908ab3 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,13 +51,13 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, // Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in // the drop down -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaComboBox::getValue() throw (uno::RuntimeException) { return m_xProps->getPropertyValue( sSourceName ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nIndex = 0; @@ -73,7 +73,7 @@ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExcepti } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaComboBox::getListIndex() throw (uno::RuntimeException) { uno::Sequence< rtl::OUString > sItems; @@ -91,16 +91,16 @@ ScVbaComboBox::getListIndex() throw (uno::RuntimeException) OSL_TRACE("getListIndex returning %d", index ); return uno::makeAny( index ); } - - } - } + + } + } OSL_TRACE("getListIndex returning %d", -1 ); return uno::makeAny( sal_Int32( -1 ) ); } // Value, [write]e.g. setValue sets the value in the drop down, and if the value is one // of the values in the list then the selection is also set -void SAL_CALL +void SAL_CALL ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { m_xProps->setPropertyValue( sSourceName, _value ); @@ -108,7 +108,7 @@ ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) // see Value -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaComboBox::getText() throw (uno::RuntimeException) { rtl::OUString result; @@ -116,26 +116,26 @@ ScVbaComboBox::getText() throw (uno::RuntimeException) return result; } -void SAL_CALL +void SAL_CALL ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) { setValue( uno::makeAny( _text ) ); // seems the same } // Methods -void SAL_CALL +void SAL_CALL ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) { mpListHelper->AddItem( pvargItem, pvargIndex ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException) { mpListHelper->removeItem( index ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::Clear( ) throw (uno::RuntimeException) { mpListHelper->Clear(); @@ -153,21 +153,21 @@ ScVbaComboBox::getListCount() throw (uno::RuntimeException) { return mpListHelper->getListCount(); } - -uno::Any SAL_CALL + +uno::Any SAL_CALL ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) { return mpListHelper->List( pvargIndex, pvarColumn ); } -rtl::OUString& +rtl::OUString& ScVbaComboBox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaComboBox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 28215d16dcd7..e7e86a00fdf2 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; class ScVbaComboBox : public ComboBoxImpl_BASE -{ +{ std::auto_ptr< ListControlHelper > mpListHelper; - rtl::OUString sSourceName; + rtl::OUString sSourceName; rtl::OUString msDftPropName; bool mbDialogType; - + public: ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false ); diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 82b68bbd5be7..7485073321b1 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,15 +65,15 @@ using namespace com::sun::star; using namespace ooo::vba; -uno::Reference< css::awt::XWindowPeer > +uno::Reference< css::awt::XWindowPeer > ScVbaControl::getWindowPeer() throw (uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ); uno::Reference< awt::XControlModel > xControlModel; uno::Reference< css::awt::XWindowPeer > xWinPeer; - if ( !xControlShape.is() ) - { + if ( !xControlShape.is() ) + { // would seem to be a Userform control uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW ); xWinPeer = xControl->getPeer(); @@ -134,7 +134,7 @@ ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, c setGeometryHelper( pGeomHelper ); uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW ); xComponent->addEventListener( m_xEventListener ); - + //init m_xProps uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ; uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ; @@ -153,7 +153,7 @@ ScVbaControl::~ScVbaControl() } } -void +void ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper ) { mpGeometryHelper.reset( pHelper ); @@ -249,7 +249,7 @@ ScVbaControl::getObject() throw (uno::RuntimeException) return xRet; } -void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW ); xWin->setFocus(); @@ -271,7 +271,7 @@ void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width setHeight( nHeight ); } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaControl::getControlSource() throw (uno::RuntimeException) { // #FIXME I *hate* having these upstream differences @@ -294,7 +294,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException) } catch( uno::Exception& ) { - } + } } return sControlSource; #else @@ -302,7 +302,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException) #endif } -void SAL_CALL +void SAL_CALL ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException) { #ifdef VBA_OOBUILD_HACK @@ -313,7 +313,7 @@ ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno #endif } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaControl::getRowSource() throw (uno::RuntimeException) { #ifdef VBA_OOBUILD_HACK @@ -334,7 +334,7 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException) } catch( uno::Exception& ) { - } + } } return sRowSource; #else @@ -342,7 +342,7 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException) #endif } -void SAL_CALL +void SAL_CALL ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException) { #ifdef VBA_OOBUILD_HACK @@ -353,7 +353,7 @@ ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::Runtim #endif } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaControl::getName() throw (uno::RuntimeException) { rtl::OUString sName; @@ -370,7 +370,7 @@ ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) ); } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaControl::getControlTipText() throw (css::uno::RuntimeException) { rtl::OUString sName; @@ -379,7 +379,7 @@ ScVbaControl::getControlTipText() throw (css::uno::RuntimeException) return sName; } -void SAL_CALL +void SAL_CALL ScVbaControl::setControlTipText( const rtl::OUString& rsToolTip ) throw (css::uno::RuntimeException) { m_xProps->setPropertyValue @@ -454,9 +454,9 @@ ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XCo ScVbaControl* pControl = NULL; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) ) - pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); + pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) ) - pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); + pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) ); else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) ) pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true ); else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) ) @@ -493,14 +493,14 @@ ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XCo return pControl; } -rtl::OUString& +rtl::OUString& ScVbaControl::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaControl::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -524,25 +524,25 @@ public: virtual uno::Reference< msforms::XControl > SAL_CALL createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException); }; -uno::Reference< msforms::XControl > SAL_CALL +uno::Reference< msforms::XControl > SAL_CALL ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException) { uno::Reference< msforms::XControl > xControlToReturn; - if ( xControlShape.is() ) + if ( xControlShape.is() ) { ScVbaControlFactory controlFactory( m_xCtx, xControlShape, xDocOwner ); xControlToReturn.set( controlFactory.createControl( xDocOwner ) ); } return xControlToReturn; - + } -uno::Reference< msforms::XControl > SAL_CALL +uno::Reference< msforms::XControl > SAL_CALL ControlProviderImpl::createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException) { uno::Reference< msforms::XControl > xControlToReturn; - if ( xControl.is() && xDialog.is() ) - { - + if ( xControl.is() && xDialog.is() ) + { + ScVbaControlFactory controlFactory( m_xCtx, xControl, xDocOwner ); xControlToReturn.set( controlFactory.createControl( xDialog->getModel() ) ); ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xControlToReturn.get() ); diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 992fbd94a8c5..d2631c761e51 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,10 +59,10 @@ protected: virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException); public: - ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper ); virtual ~ScVbaControl(); - // This class will own the helper, so make sure it is allocated from + // This class will own the helper, so make sure it is allocated from // the heap void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper ); // XControl @@ -103,7 +103,7 @@ public: class ScVbaControlFactory { public: - ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent ) throw ( css::uno::RuntimeException ); private: diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 8d01687ef905..78c8b25885b5 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ private: msNames[ nIndex ] = getControlName( xCtrl ); mControls.push_back( xCtrl ); mIndices[ msNames[ nIndex ] ] = nIndex; - } + } } public: @@ -78,7 +78,7 @@ public: { mxDialog.set( xDialog, uno::UNO_QUERY_THROW ); uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls(); - + msNames.realloc( sXControls.getLength() ); for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i ) SetArrayElementTo( sXControls[ i ], i ); @@ -89,7 +89,7 @@ public: // in this case the wrapper should work in dummy mode } } - + static rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl ) { if ( !xCtrl.is() ) @@ -107,37 +107,37 @@ public: { return awt::XControl::static_type(0); } - - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( mControls.size() > 0 ); } - - // XNameAcess + + // XNameAcess virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return getByIndex( mIndices[ aName ] ); } - + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return msNames; } - + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException) { ControlIndexMap::iterator it = mIndices.find( aName ); return it != mIndices.end(); } - + // XElementAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mControls.size(); } - + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) ) @@ -221,7 +221,7 @@ ScVbaControls::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( xVBAControl ); } -void SAL_CALL +void SAL_CALL ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) { uno::Reference< container::XEnumeration > xEnum( createEnumeration() ); @@ -229,7 +229,7 @@ ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) { uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW ); xControl->setLeft( xControl->getLeft() + cx ); - xControl->setTop( xControl->getTop() + cy ); + xControl->setTop( xControl->getTop() + cy ); } } @@ -311,7 +311,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return aResult; @@ -366,7 +366,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex ) { // throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ), // uno::Reference< uno::XInterface >(), - // uno::makeAny( e ) ); + // uno::makeAny( e ) ); } } @@ -376,14 +376,14 @@ ScVbaControls::getElementType() throw (uno::RuntimeException) { return ooo::vba::msforms::XControl::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaControls::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaControls::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx index a72506609531..a050415c9b90 100644 --- a/vbahelper/source/msforms/vbacontrols.hxx +++ b/vbahelper/source/msforms/vbacontrols.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ class ScVbaControls : public ControlsImpl_BASE protected: virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); - + public: - ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xDialog ); // XControls virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException); @@ -58,7 +58,7 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + }; #endif //SC_VBA_OLEOBJECTS_HXX diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx index c470ee0097e4..3c202f1e5800 100644 --- a/vbahelper/source/msforms/vbaframe.cxx +++ b/vbahelper/source/msforms/vbaframe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaFrame::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -45,34 +45,34 @@ ScVbaFrame::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaFrame::getValue() throw (css::uno::RuntimeException) { return uno::makeAny( getCaption() ); } -void SAL_CALL +void SAL_CALL ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { rtl::OUString sCaption; _value >>= sCaption; - setCaption( sCaption ); + setCaption( sCaption ); } -rtl::OUString& +rtl::OUString& ScVbaFrame::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaFrame::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx index 567e58b57272..c55a41bf0828 100644 --- a/vbahelper/source/msforms/vbaframe.hxx +++ b/vbahelper/source/msforms/vbaframe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index 508f97824f51..bb49ad7b3dbb 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const { } -rtl::OUString& +rtl::OUString& ScVbaImage::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaImage::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx index 52012fc1fee3..c51b85dfdcd7 100644 --- a/vbahelper/source/msforms/vbaimage.hxx +++ b/vbahelper/source/msforms/vbaimage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx index 9bf7a7e001bf..5fb6ebeabb44 100644 --- a/vbahelper/source/msforms/vbalabel.cxx +++ b/vbahelper/source/msforms/vbalabel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ ScVbaLabel::ScVbaLabel( const css::uno::Reference< XHelperInterface >& xParent, } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaLabel::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -45,34 +45,34 @@ ScVbaLabel::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaLabel::getValue() throw (css::uno::RuntimeException) { return uno::makeAny( getCaption() ); } -void SAL_CALL +void SAL_CALL ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { rtl::OUString sCaption; _value >>= sCaption; - setCaption( sCaption ); + setCaption( sCaption ); } -rtl::OUString& +rtl::OUString& ScVbaLabel::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaLabel::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx index af3bc074c54d..fd6b1c199f7f 100644 --- a/vbahelper/source/msforms/vbalabel.hxx +++ b/vbahelper/source/msforms/vbalabel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 17f8c8341588..8538fc29bc5d 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,16 +45,16 @@ ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, c } // Attributes -void SAL_CALL +void SAL_CALL ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int32 nIndex = 0; _value >>= nIndex; uno::Reference< XPropValue > xPropVal( Selected( nIndex ), uno::UNO_QUERY_THROW ); - xPropVal->setValue( uno::makeAny( sal_True ) ); + xPropVal->setValue( uno::makeAny( sal_True ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaListBox::getListIndex() throw (uno::RuntimeException) { uno::Sequence< sal_Int16 > sSelection; @@ -64,7 +64,7 @@ ScVbaListBox::getListIndex() throw (uno::RuntimeException) return uno::Any( sSelection[ 0 ] ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaListBox::getValue() throw (uno::RuntimeException) { uno::Sequence< sal_Int16 > sSelection; @@ -76,15 +76,15 @@ ScVbaListBox::getValue() throw (uno::RuntimeException) "Attribute use invalid." ), uno::Reference< uno::XInterface >() ); uno::Any aRet; if ( sSelection.getLength() ) - aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); + aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); return aRet; } -void SAL_CALL +void SAL_CALL ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { if( getMultiSelect() ) - { + { throw uno::RuntimeException( rtl::OUString::createFromAscii( "Attribute use invalid." ), uno::Reference< uno::XInterface >() ); } @@ -99,7 +99,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { if( sList[i].equals( sValue ) ) { - nValue = i; + nValue = i; break; } } @@ -109,11 +109,11 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) uno::Sequence< sal_Int16 > nSelectedIndices(1); nSelectedIndices[ 0 ] = nValue; - m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); - m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); + m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); + m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaListBox::getText() throw (uno::RuntimeException) { rtl::OUString result; @@ -121,13 +121,13 @@ ScVbaListBox::getText() throw (uno::RuntimeException) return result; } -void SAL_CALL +void SAL_CALL ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) { setValue( uno::makeAny( _text ) ); // seems the same } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException) { sal_Bool bMultiSelect = sal_False; @@ -135,20 +135,20 @@ ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException) return bMultiSelect; } -void SAL_CALL +void SAL_CALL ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException) { m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) ); } -css::uno::Any SAL_CALL +css::uno::Any SAL_CALL ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException) { uno::Sequence< rtl::OUString > sList; m_xProps->getPropertyValue( ITEMS ) >>= sList; sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() ); // no choice but to do a horror cast as internally - // the indices are but sal_Int16 + // the indices are but sal_Int16 sal_Int16 nIndex = static_cast< sal_Int16 >( index ); if( nIndex < 0 || nIndex >= nLength ) throw uno::RuntimeException( rtl::OUString::createFromAscii( @@ -158,19 +158,19 @@ ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException) } // Methods -void SAL_CALL +void SAL_CALL ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) { mpListHelper->AddItem( pvargItem, pvargIndex ); } -void SAL_CALL +void SAL_CALL ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException) { mpListHelper->removeItem( index ); } -void SAL_CALL +void SAL_CALL ScVbaListBox::Clear( ) throw (uno::RuntimeException) { mpListHelper->Clear(); @@ -180,7 +180,7 @@ ScVbaListBox::Clear( ) throw (uno::RuntimeException) // to set the selected state of particular entries in the Listbox // ListBox1.Selected( 3 ) = false //PropListener -void +void ScVbaListBox::setValueEvent( const uno::Any& value ) { sal_Bool bValue = sal_False; @@ -231,14 +231,14 @@ ScVbaListBox::setValueEvent( const uno::Any& value ) // to determine the selected state of particular entries in the Listbox // msgbox ListBox1.Selected( 3 ) -css::uno::Any +css::uno::Any ScVbaListBox::getValueEvent() { uno::Sequence< sal_Int16 > nList; m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList; sal_Int32 nLength = nList.getLength(); sal_Int32 nIndex = m_nIndex; - + for( sal_Int32 i = 0; i < nLength; i++ ) { if( nList[i] == nIndex ) @@ -261,20 +261,20 @@ ScVbaListBox::getListCount() throw (uno::RuntimeException) return mpListHelper->getListCount(); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) { return mpListHelper->List( pvargIndex, pvarColumn ); } -rtl::OUString& +rtl::OUString& ScVbaListBox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaListBox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 3d0797e2b7b2..01c53d1b0f53 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE; class ScVbaListBox : public ListBoxImpl_BASE ,public PropListener -{ +{ std::auto_ptr< ListControlHelper > mpListHelper; - rtl::OUString sSourceName; + rtl::OUString sSourceName; rtl::OUString msDftPropName; sal_Int16 m_nIndex; - + public: ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); @@ -72,10 +72,10 @@ public: // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); } - + //XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); //PropListener virtual void setValueEvent( const css::uno::Any& value ); diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index 76763b42039e..36683ae6f74a 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -6,7 +6,7 @@ using namespace ooo::vba; const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ); -void SAL_CALL +void SAL_CALL ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) { if ( pvargItem.hasValue() ) @@ -21,13 +21,13 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde rtl::OUString sString = getAnyAsString( pvargItem ); - // if no index specified or item is to be appended to end of + // if no index specified or item is to be appended to end of // list just realloc the array and set the last item if ( nIndex == sList.getLength() ) { sal_Int32 nOldSize = sList.getLength(); sList.realloc( nOldSize + 1 ); - sList[ nOldSize ] = sString; + sList[ nOldSize ] = sString; } else { @@ -41,10 +41,10 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde const rtl::OUString* pEndString = sList.getArray() + sList.getLength(); // insert the new element sVec.push_back( sString ); - // copy elements + // copy elements for ( ; pString != pEndString; ++pString ) sVec.push_back( *pString ); - + sList.realloc( sList.getLength() + 1 ); // point at first element to be overwritten @@ -52,16 +52,16 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde pEndString = sList.getArray() + sList.getLength(); std::vector< rtl::OUString >::iterator it = sVec.begin(); for ( ; pString != pEndString; ++pString, ++it) - *pString = *it; + *pString = *it; // } m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) ); - + } } -void SAL_CALL +void SAL_CALL ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException) { sal_Int32 nIndex = 0; @@ -90,7 +90,7 @@ ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeExcept } } -void SAL_CALL +void SAL_CALL ListControlHelper::Clear( ) throw (uno::RuntimeException) { // urk, setValue doesn't seem to work !! @@ -113,7 +113,7 @@ ListControlHelper::getListCount() throw (uno::RuntimeException) return sList.getLength(); } -uno::Any SAL_CALL +uno::Any SAL_CALL ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) { uno::Sequence< rtl::OUString > sList; @@ -126,12 +126,12 @@ ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColum pvargIndex >>= nIndex; if( nIndex < 0 || nIndex >= nLength ) throw uno::RuntimeException( rtl::OUString::createFromAscii( - "Bad row Index" ), uno::Reference< uno::XInterface >() ); + "Bad row Index" ), uno::Reference< uno::XInterface >() ); aRet <<= sList[ nIndex ]; } else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad throw uno::RuntimeException( rtl::OUString::createFromAscii( - "Bad column Index" ), uno::Reference< uno::XInterface >() ); + "Bad column Index" ), uno::Reference< uno::XInterface >() ); else // List() ( e.g. no args ) { uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength ); @@ -139,7 +139,7 @@ ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColum { sReturnArray[ i ].realloc( 10 ); sReturnArray[ i ][ 0 ] = sList[ i ]; - } + } aRet = uno::makeAny( sReturnArray ); } return aRet; diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx index d56729da17e6..6b332ab9d814 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx @@ -11,7 +11,7 @@ public: ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){} virtual ~ListControlHelper() {} virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index b6587c9b2367..4cdf220aa675 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public: return ( mnPages > 0 ); } }; -uno::Reference< container::XIndexAccess > +uno::Reference< container::XIndexAccess > ScVbaMultiPage::getPages( sal_Int32 nPages ) { return new PagesImpl( nPages ); @@ -76,7 +76,7 @@ ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xP } // Attributes -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) { sal_Int32 nValue = 0; @@ -84,7 +84,7 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) return nValue; } -void SAL_CALL +void SAL_CALL ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException) { // track change in dialog ( dialog value is 1 based, 0 is a special value ) @@ -93,14 +93,14 @@ ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno: } -rtl::OUString& +rtl::OUString& ScVbaMultiPage::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") ); return sImplName; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) { sal_Int32 nValue = 0; @@ -111,7 +111,7 @@ ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) return xColl->Item( uno::makeAny( index ), uno::Any() ); } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaMultiPage::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index 4a54525cf95f..75c0da0bb17f 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx index dd52a66a65cf..95e2e715b4ee 100644 --- a/vbahelper/source/msforms/vbapages.cxx +++ b/vbahelper/source/msforms/vbapages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,33 +33,33 @@ ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const { } -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaPages::getElementType() throw (uno::RuntimeException) { - // return msforms::XPage::static_type(0); - return uno::XInterface::static_type(0); + // return msforms::XPage::static_type(0); + return uno::XInterface::static_type(0); } -uno::Any +uno::Any ScVbaPages::createCollectionObject( const css::uno::Any& aSource ) { return aSource; } -rtl::OUString& +rtl::OUString& ScVbaPages::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") ); return sImplName; } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaPages::createEnumeration() throw (uno::RuntimeException) { return uno::Reference< container::XEnumeration >(); } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaPages::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx index 4bc743b1ee96..7914f5bd6ff3 100644 --- a/vbahelper/source/msforms/vbapages.hxx +++ b/vbahelper/source/msforms/vbapages.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <cppuhelper/implbase1.hxx> #include <vbahelper/vbacollectionimpl.hxx> -typedef CollTestImplHelper< +typedef CollTestImplHelper< ov::msforms::XPages > ScVbaPages_BASE; class ScVbaPages : public ScVbaPages_BASE diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 716cdcc61583..3ffe96d5c6f8 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,26 +38,26 @@ ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface > } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaProgressBar::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SVALUE, _value ); } -rtl::OUString& +rtl::OUString& ScVbaProgressBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaProgressBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx index 13980f522ef4..a4d4270f9675 100644 --- a/vbahelper/source/msforms/vbaprogressbar.hxx +++ b/vbahelper/source/msforms/vbaprogressbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index 94d12c5823ba..3853f380d9cd 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xP } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -46,27 +46,27 @@ ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaRadioButton::getValue() throw (css::uno::RuntimeException) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; if( nValue != 0 ) nValue = -1; -// return uno::makeAny( nValue ); +// return uno::makeAny( nValue ); // I must be missing something MSO says value should be -1 if selected, 0 if not // selected - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); } -void SAL_CALL +void SAL_CALL ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nValue = 0; @@ -84,14 +84,14 @@ ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExceptio m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) ); } -rtl::OUString& +rtl::OUString& ScVbaRadioButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaRadioButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index a0de21ae5d0e..576cde670954 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index f208f5acdcf9..1c37e61bb9dc 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,19 +43,19 @@ ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaScrollBar::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SCROLLVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SCROLLVALUE, _value ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getMax() throw (uno::RuntimeException) { sal_Int32 nMax = 0; @@ -63,13 +63,13 @@ ScVbaScrollBar::getMax() throw (uno::RuntimeException) return nMax; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getMin() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -77,19 +77,19 @@ ScVbaScrollBar::getMin() throw (uno::RuntimeException) return nVal; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException) { m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -97,7 +97,7 @@ ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) return nVal; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) { sal_Int32 nSmallChange = 0; @@ -105,20 +105,20 @@ ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) return nSmallChange; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException) { m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) ); } -rtl::OUString& +rtl::OUString& ScVbaScrollBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaScrollBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx index 8b4e122c0422..8543fe081bf0 100644 --- a/vbahelper/source/msforms/vbascrollbar.hxx +++ b/vbahelper/source/msforms/vbascrollbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index d536e0c41340..fbb7961aaf73 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,19 +41,19 @@ ScVbaSpinButton::ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterfa } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaSpinButton::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SPINVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SPINVALUE, _value ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaSpinButton::getMax() throw (uno::RuntimeException) { sal_Int32 nMax = 0; @@ -61,13 +61,13 @@ ScVbaSpinButton::getMax() throw (uno::RuntimeException) return nMax; } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaSpinButton::getMin() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -75,20 +75,20 @@ ScVbaSpinButton::getMin() throw (uno::RuntimeException) return nVal; } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); } -rtl::OUString& +rtl::OUString& ScVbaSpinButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaSpinButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx index 1c600a0aa156..cd6aaf7ce24d 100644 --- a/vbahelper/source/msforms/vbaspinbutton.hxx +++ b/vbahelper/source/msforms/vbaspinbutton.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index ed2fc70164ac..227338d7f659 100755 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ uno::Any SAL_CALL VbaSystemAXControl::getValue( const ::rtl::OUString& aProperty } //---------------------------------------------------------- -rtl::OUString& +rtl::OUString& VbaSystemAXControl::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "VbaSystemAXControl" ) ); @@ -87,7 +87,7 @@ VbaSystemAXControl::getServiceImplName() } //---------------------------------------------------------- -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > VbaSystemAXControl::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index bffe5b99c4f1..5bc23f44b279 100755 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx index 2d83d41d77c3..730f24c96152 100644 --- a/vbahelper/source/msforms/vbatextbox.cxx +++ b/vbahelper/source/msforms/vbatextbox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParen } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaTextBox::getValue() throw (css::uno::RuntimeException) { return uno::makeAny( getText() ); } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) { rtl::OUString sVal = getAnyAsString( _value ); @@ -53,7 +53,7 @@ ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcepti } //getString() will cause some imfo lose. -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaTextBox::getText() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -64,7 +64,7 @@ ScVbaTextBox::getText() throw (css::uno::RuntimeException) return sString; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) { if ( !mbDialog ) @@ -73,10 +73,10 @@ ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeExce xTextRange->setString( _text ); } else - m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); + m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -87,7 +87,7 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) return nMaxLength; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException) { uno::Any aValue( _maxlength ); @@ -95,7 +95,7 @@ ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeExcep (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -106,7 +106,7 @@ ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) return bRet; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException) { uno::Any aValue( _multiline ); @@ -114,14 +114,14 @@ ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeExcept (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue); } -rtl::OUString& +rtl::OUString& ScVbaTextBox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaTextBox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index 0553e047488e..58d22f45e994 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 071651ff8a36..d16fab90e4db 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ ScVbaToggleButton::~ScVbaToggleButton() } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -54,13 +54,13 @@ ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaToggleButton::getValue() throw (uno::RuntimeException) { sal_Int16 nState = 0; @@ -68,7 +68,7 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException) return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) ); } -void SAL_CALL +void SAL_CALL ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nState = 0; @@ -79,14 +79,14 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExcepti m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) ); } -rtl::OUString& +rtl::OUString& ScVbaToggleButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaToggleButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx index bfdd68d09642..8950a1ff0993 100644 --- a/vbahelper/source/msforms/vbatogglebutton.hxx +++ b/vbahelper/source/msforms/vbatogglebutton.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 2a4cecfc2338..33e357b00c19 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace ::com::sun::star; // some little notes // XDialog implementation has the following interesting bits // a Controls property ( which is an array of the container controls ) -// each item in the controls array is a XControl, where the model is +// each item in the controls array is a XControl, where the model is // basically a property bag // additionally the XDialog instance has itself a model // this model has a ControlModels ( array of models ) property @@ -59,7 +59,7 @@ ScVbaUserForm::~ScVbaUserForm() { } -void SAL_CALL +void SAL_CALL ScVbaUserForm::Show( ) throw (uno::RuntimeException) { OSL_TRACE("ScVbaUserForm::Show( )"); @@ -75,7 +75,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW ); m_xDialog = NULL; xComp->dispose(); - mbDispose = false; + mbDispose = false; } catch( uno::Exception& ) { @@ -83,7 +83,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) } } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException) { rtl::OUString sCaption; @@ -96,7 +96,7 @@ ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun:: m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) ); } -void SAL_CALL +void SAL_CALL ScVbaUserForm::Hide( ) throw (uno::RuntimeException) { mbDispose = false; // hide not dispose @@ -104,13 +104,13 @@ ScVbaUserForm::Hide( ) throw (uno::RuntimeException) m_xDialog->endExecute(); } -void SAL_CALL +void SAL_CALL ScVbaUserForm::RePaint( ) throw (uno::RuntimeException) { // do nothing } -void SAL_CALL +void SAL_CALL ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) { mbDispose = true; @@ -118,14 +118,14 @@ ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) m_xDialog->endExecute(); } -rtl::OUString& +rtl::OUString& ScVbaUserForm::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaUserForm::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -137,52 +137,65 @@ ScVbaUserForm::getServiceNames() return aServiceNames; } -uno::Reference< beans::XIntrospectionAccess > SAL_CALL +uno::Reference< beans::XIntrospectionAccess > SAL_CALL ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException) { return uno::Reference< beans::XIntrospectionAccess >(); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw uno::RuntimeException(); // unsupported operation } -void SAL_CALL +void SAL_CALL ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { uno::Any aObject = getValue( aPropertyName ); - // The Object *must* support XDefaultProperty here because getValue will - // only return properties that are Objects ( e.g. controls ) - // e.g. Userform1.aControl = something - // 'aControl' has to support XDefaultProperty to make sense here - uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW ); - rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName(); - uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) ); - uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( aDfltPropName, aValue ); -} - -uno::Any SAL_CALL + + // in case the dialog is already closed the VBA implementation should not throw exceptions + if ( aObject.hasValue() ) + { + // The Object *must* support XDefaultProperty here because getValue will + // only return properties that are Objects ( e.g. controls ) + // e.g. Userform1.aControl = something + // 'aControl' has to support XDefaultProperty to make sense here + uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW ); + rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName(); + uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) ); + uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW ); + xPropSet->setPropertyValue( aDfltPropName, aValue ); + } +} + +uno::Any SAL_CALL ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW ); - uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW ); - uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName ); - ScVbaControlFactory aFac( mxContext, xControl, m_xModel ); - uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) ); - ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() ); - pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) ); - return uno::makeAny( xVBAControl ); + uno::Any aResult; + + // in case the dialog is already closed the VBA implementation should not throw exceptions + if ( m_xDialog.is() ) + { + uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW ); + uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW ); + uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName ); + ScVbaControlFactory aFac( mxContext, xControl, m_xModel ); + uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) ); + ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() ); + pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) ); + aResult = uno::makeAny( xVBAControl ); + } + + return aResult; } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) { return sal_False; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) { // if the dialog already closed we should do nothing, but the VBA will call methods of the Controls objects @@ -194,14 +207,14 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xControls ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY ); OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() ); if ( xControl.is() ) { - uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW ); sal_Bool bRes = xNameAccess->hasByName( aName ); OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes ); return bRes; diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index 71e8b4f62aa9..463a3cba3b36 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 326c150edade..57e303893e68 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "vbahelper/vbaapplicationbase.hxx" #include <com/sun/star/container/XIndexAccess.hpp> @@ -240,7 +240,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: return; } else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){ - xLayoutManager->hideElement( url ); + xLayoutManager->hideElement( url ); return; } } @@ -254,7 +254,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW ); - + return xWindow->isEnabled(); } @@ -323,7 +323,7 @@ void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const u // get the next element as a UNO Any uno::Any aComponentHelper = xEnum->nextElement(); uno::Reference <frame::XModel> xDocModel( aComponentHelper, uno::UNO_QUERY_THROW ); - + // get the name of the sheet from its XNamed interface ::rtl::OUString aName = xDocModel->getURL(); @@ -337,11 +337,11 @@ void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const u } else { - aMacroDocumentModel = getCurrentDocument(); + aMacroDocumentModel = getCurrentDocument(); sMacro_only_Name = MacroName.copy(0); } - + VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( aMacroDocumentModel ), sMacro_only_Name ); if( aMacroInfo.IsResolved() ) { @@ -461,7 +461,7 @@ VbaApplicationBase::getServiceImplName() return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> VbaApplicationBase::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -488,7 +488,7 @@ void VbaApplicationBase::Quit() throw (uno::RuntimeException) { SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() ); if ( pMod ) - { + { StarBASIC* pBasic = dynamic_cast< StarBASIC* >( pMod->GetParent() ); if ( pBasic ) pBasic->QuitAndExitApplication(); diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index c5924e4b7efd..99c25b136506 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ ScVbaColorFormat::setColorFormat( sal_Int16 _ntype ) } // Attribute -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaColorFormat::getRGB() throw (uno::RuntimeException) { sal_Int32 nRGB = 0; @@ -95,7 +95,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException) return nRGB; } -void SAL_CALL +void SAL_CALL ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) { sal_Int32 nRGB = XLRGBToOORGB( _rgb ); @@ -121,17 +121,17 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) m_pFillFormat->setForeColorAndInternalStyle(nRGB); } break; - default: + default: throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() ); } } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) { sal_Int32 nColor = getRGB(); // #TODO I guess the number of elements is determined by the correct scheme - // the implementation here seems to be a rehash of color index ( which seems to be a + // the implementation here seems to be a rehash of color index ( which seems to be a // different thing ) - I would guess we need to know/import etc. the correct color scheme // or at least find out a little more sal_Int32 i = 0; @@ -143,8 +143,8 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) if( i == 56 ) // this is most likely an error condition --i; - return i; - // #TODO figure out what craziness is this, + return i; + // #TODO figure out what craziness is this, // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors /* if( i == 56 ) @@ -156,7 +156,7 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) */ } -void SAL_CALL +void SAL_CALL ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException) { // the table is 0 based diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 01ca5a047e44..d7771dd73a66 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ struct MsoColorIndizes const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443; static sal_Int32 getColorIndex( sal_Int32 nIndex ); - + }; class ScVbaColorFormat : public ScVbaColorFormat_BASE diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 1e8d21d53583..dfda6756a32a 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,8 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "vbacommandbar.hxx" -#include "vbacommandbarcontrols.hxx" +#include "vbacommandbar.hxx" +#include "vbacommandbarcontrols.hxx" #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop.hpp> @@ -44,7 +44,7 @@ ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > x ::rtl::OUString SAL_CALL ScVbaCommandBar::getName() throw ( uno::RuntimeException ) { - // This will get a "NULL length string" when Name is not set. + // This will get a "NULL length string" when Name is not set. uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ); rtl::OUString sName; @@ -59,32 +59,32 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") ); else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Menu Bar") ); - return sName; + return sName; } } // Toolbar name uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState(); if( xNameAccess->hasByName( m_sResourceUrl ) ) { - uno::Sequence< beans::PropertyValue > aToolBar; + uno::Sequence< beans::PropertyValue > aToolBar; xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar; getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ) ) >>= sName; } } return sName; } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) ); - + pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBar::getVisible() throw (uno::RuntimeException) { - // menu bar is allways visible in OOo + // menu bar is allways visible in OOo if( m_bIsMenu ) return sal_True; @@ -94,7 +94,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException) uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState(); if( xNameAccess->hasByName( m_sResourceUrl ) ) { - uno::Sequence< beans::PropertyValue > aToolBar; + uno::Sequence< beans::PropertyValue > aToolBar; xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar; getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ) >>= bVisible; } @@ -104,7 +104,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException) } return bVisible; } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) { try @@ -127,7 +127,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBar::getEnabled() throw (uno::RuntimeException) { // emulated with Visible @@ -141,7 +141,7 @@ ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) setVisible( _enabled ); } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { pCBarHelper->removeSettings( m_sResourceUrl ); @@ -151,7 +151,7 @@ ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeExce xNameContainer->removeByName( m_sResourceUrl ); } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< awt::XMenu > xMenu; @@ -178,20 +178,20 @@ ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeExceptio return nType; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // alwayse fail to find control return uno::makeAny( uno::Reference< XCommandBarControl > () ); } -rtl::OUString& +rtl::OUString& ScVbaCommandBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index bcb5a11e9691..30599517b7c0 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ public: // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); - + private: ::rtl::OUString maName; sal_Int32 mnType; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index 3f9c7ddeae89..1b2d01367db4 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException ) return sCaption; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) { rtl::OUString sCaption = _caption.replace('&','~'); @@ -65,7 +65,7 @@ ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno ApplyChange(); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) { rtl::OUString sCommandURL; @@ -73,11 +73,11 @@ ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) return sCommandURL; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException) { // get the current model - uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); + uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true ); if ( aResolvedMacro.IsResolved() ) { @@ -88,7 +88,7 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) { sal_Bool bVisible = sal_True; @@ -97,7 +97,7 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) aValue >>= bVisible; return bVisible; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) { uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") ); @@ -108,7 +108,7 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) { sal_Bool bEnabled = sal_True; @@ -122,7 +122,7 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) { // emulated with Visible bEnabled = getVisible(); - } + } return bEnabled; } @@ -138,7 +138,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep { // emulated with Visible setVisible( _enabled ); - } + } } ::sal_Bool SAL_CALL @@ -157,7 +157,7 @@ ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::Runt } } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { if( m_xCurrentSettings.is() ) @@ -169,7 +169,7 @@ ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::Runt } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) { // only Popup Menu has controls @@ -177,13 +177,13 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu; if( !xSubMenu.is() ) throw uno::RuntimeException(); - + uno::Reference< awt::XMenu > xMenu; if( m_xParentMenu.is() ) { sal_Int16 nItemId = m_xParentMenu->getItemId( sal::static_int_cast< sal_Int16 >( m_nPosition ) ); xMenu.set( m_xParentMenu->getPopupMenu( nItemId ), uno::UNO_QUERY ); - } + } uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) ); if( aIndex.hasValue() ) @@ -193,14 +193,14 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE return uno::makeAny( xCommandBarControls ); } -rtl::OUString& +rtl::OUString& ScVbaCommandBarControl::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarControl::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -221,13 +221,13 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp m_xParentMenu = xMenu; } -rtl::OUString& +rtl::OUString& ScVbaCommandBarPopup::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarPopup::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -248,13 +248,13 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe m_xParentMenu = xMenu; } -rtl::OUString& +rtl::OUString& ScVbaCommandBarButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index a165f8e1cccd..d07366f02ac9 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ private: public: ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException); ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException); - + // Attributes virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 634b4a0e9395..c479d451eaa6 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource ) } // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException) { sal_Int32 nPosition = -1; @@ -141,7 +141,7 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex* rtl::OUString sName; aIndex >>= sName; nPosition = VbaCommandBarHelper::findControlByName( m_xIndexAccess, sName, m_bIsMenu ); - } + } else { aIndex >>= nPosition; @@ -151,11 +151,11 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex* { throw uno::RuntimeException(); } - - return createCollectionObject( uno::makeAny( nPosition ) ); + + return createCollectionObject( uno::makeAny( nPosition ) ); } -uno::Reference< XCommandBarControl > SAL_CALL +uno::Reference< XCommandBarControl > SAL_CALL ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException) { // Parameter is not supported @@ -165,7 +165,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un sal_Int32 nType = office::MsoControlType::msoControlButton; sal_Int32 nPosition = 0; sal_Bool bTemporary = sal_True; - + if( Type.hasValue() ) { Type >>= nType; @@ -187,7 +187,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un if( Temporary.hasValue() ) Temporary >>= bTemporary; - + uno::Any aSubMenu; if( nType == office::MsoControlType::msoControlPopup ) { @@ -196,7 +196,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un aSubMenu <<= xSCF->createInstanceWithContext( mxContext ); } - // create control + // create control uno::Sequence< beans::PropertyValue > aProps; rtl::OUString sHelpUrl; sal_uInt16 nItemType = 0; @@ -217,7 +217,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); - // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. + // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. ScVbaCommandBarControl* pNewCommandBarControl = NULL; if( nType == office::MsoControlType::msoControlPopup ) pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() ); @@ -226,15 +226,15 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un return uno::Reference< XCommandBarControl >( pNewCommandBarControl ); } - + // XHelperInterface -rtl::OUString& +rtl::OUString& ScVbaCommandBarControls::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarControls::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx index 0b35773660d1..08c5f57b7fb9 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - // Methods - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); + // Methods + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 385b220d201c..9b73bb6f5986 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "vbacommandbarhelper.hxx" +#include "vbacommandbarhelper.hxx" #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> @@ -119,7 +119,7 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException) } uno::Reference< lang::XMultiServiceFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - + css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))), uno::UNO_QUERY_THROW ); m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW ); @@ -148,7 +148,7 @@ void VbaCommandBarHelper::removeSettings( const rtl::OUString& sResourceUrl ) th m_xDocCfgMgr->removeSettings( sResourceUrl ); else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) ) m_xAppCfgMgr->removeSettings( sResourceUrl ); - + // persistChanges(); } @@ -182,7 +182,7 @@ sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException) { - uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); + uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW ); uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW ); return xLayoutManager; @@ -221,7 +221,7 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< return sResourceUrl; } } - + // the customize toolbars creating during importing, shoud found there. static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) ); sResourceUrl = sToolbarPrefix.concat( sName ); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index 1fa41d7141b3..2643656f7b07 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; static const char ITEM_DESCRIPTOR_ISVISIBLE[] = "IsVisible"; static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; -static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; +static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 9d6cd9e2eea7..db077be164ec 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ public: if( hasMoreElements() ) { rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] ); - if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) + if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) { uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl ); uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) ); @@ -92,7 +92,7 @@ ScVbaCommandBars::~ScVbaCommandBars() } // XEnumerationAccess -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaCommandBars::getElementType() throw ( uno::RuntimeException ) { return XCommandBar::static_type( 0 ); @@ -113,7 +113,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) rtl::OUString sBarName; sal_Bool bMenu = sal_False; uno::Any aRet; - + if( aSource >>= sBarName ) { // some built-in command bars @@ -162,7 +162,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) } // XCommandBars -uno::Reference< XCommandBar > SAL_CALL +uno::Reference< XCommandBar > SAL_CALL ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { // FIXME: only support to add Toolbar @@ -182,19 +182,19 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio else { sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom1") ); - } + } sal_Bool bTemporary = sal_False; if( Temporary.hasValue() ) Temporary >>= bTemporary; - + sResourceUrl = VbaCommandBarHelper::generateCustomURL(); uno::Reference< container::XIndexAccess > xBarSettings( m_pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW ); uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) ); xCBar->setName( sName ); return xCBar; } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaCommandBars::getCount() throw(css::uno::RuntimeException) { // Filter out all toolbars from the window collection @@ -216,7 +216,7 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th { if( aIndex.getValueTypeClass() == uno::TypeClass_STRING ) { - return createCollectionObject( aIndex ); + return createCollectionObject( aIndex ); } // hardcode if "aIndex = 1" that would return "main menu". @@ -229,20 +229,20 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" ); else if( m_pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") ) aSource <<= rtl::OUString::createFromAscii( "Menu Bar" ); - if( aSource.hasValue() ) + if( aSource.hasValue() ) return createCollectionObject( aSource ); } return uno::Any(); } // XHelperInterface -rtl::OUString& +rtl::OUString& ScVbaCommandBars::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBars::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx index 92ed1438d269..5709fd354e24 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.hxx +++ b/vbahelper/source/vbahelper/vbacommandbars.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index e093e32c7443..ec7ecae9f4f0 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,5 +44,5 @@ VbaDialogBase::Show() throw(uno::RuntimeException) uno::Reference< XInterface > () ); dispatchRequests( m_xModel, aURL ); } -} +} diff --git a/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx index 2e02c35ac674..f595d9e99116 100644 --- a/vbahelper/source/vbahelper/vbadialogsbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 65f7f4bcfbeb..0eba699a074b 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "vbahelper/vbadocumentbase.hxx" #include "vbahelper/helperdecl.hxx" @@ -47,12 +47,12 @@ VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& { } -VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ) : VbaDocumentBase_BASE( xParent, xContext ), mxModel( xModel ) -{ +VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ) : VbaDocumentBase_BASE( xParent, xContext ), mxModel( xModel ) +{ } VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) : VbaDocumentBase_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) + uno::Reference< uno::XComponentContext> const & xContext ) : VbaDocumentBase_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) { } @@ -74,7 +74,7 @@ VbaDocumentBase::getName() throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW ); xProps->getPropertyValue(sTitle ) >>= sName; sal_Int32 pos = 0; - sName = sName.getToken(0,' ',pos); + sName = sName.getToken(0,' ',pos); } return sName; } @@ -114,24 +114,24 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, if( bSaveChanges ) { if( xStorable->isReadonly() ) - { - throw uno::RuntimeException(::rtl::OUString( + { + throw uno::RuntimeException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ), uno::Reference< XInterface >() ); } if( bFileName ) - xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); + xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); else xStorable->store(); - } + } else - xModifiable->setModified( false ); + xModifiable->setModified( false ); uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY ); if( xCloseable.is() ) // use close(boolean DeliverOwnership) - + // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may // assume ownership if they object the closure by throwing a CloseVetoException // Here we give up ownership. To be on the safe side, catch possible veto exception anyway. @@ -159,7 +159,7 @@ VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeExcepti xProt->protect( rtl::OUString() ); } -void +void VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException) { rtl::OUString rPassword; @@ -176,8 +176,8 @@ VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeExcep xProt->unprotect( rtl::OUString() ); } } - -void + +void VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException) { uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW ); @@ -199,12 +199,12 @@ VbaDocumentBase::Save() throw (uno::RuntimeException) dispatchRequests(xModel,url); } -void +void VbaDocumentBase::Activate() throw (uno::RuntimeException) { uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); xFrame->activate(); -} +} uno::Any SAL_CALL VbaDocumentBase::getVBProject() throw (uno::RuntimeException) @@ -232,7 +232,7 @@ VbaDocumentBase::getServiceImplName() return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > VbaDocumentBase::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 2d4175b90939..61cdb52ca3d6 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,13 +97,13 @@ public: m_it = m_documents.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + { return m_it != m_documents.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { if ( !hasMoreElements() ) { throw container::NoSuchElementException(); @@ -116,9 +116,9 @@ public: // a very similar one is used in vbawindow ( SelectedSheetsEnumAccess ) // Maybe a template base class that does all of the operations on the hashmap // and vector only, and the sub-class does everything else -// => ctor, createEnumeration & factory method need be defined ( to be called +// => ctor, createEnumeration & factory method need be defined ( to be called // by getByIndex, getByName ) -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > DocumentsAccessImpl_BASE; @@ -129,7 +129,7 @@ class DocumentsAccessImpl : public DocumentsAccessImpl_BASE Documents m_documents; NameIndexHash namesToIndices; VbaDocumentsBase::DOCUMENT_TYPE meDocType; -public: +public: DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) :m_xContext( xContext ), meDocType( eDocType ) { uno::Reference< container::XEnumeration > xEnum = new DocumentsEnumImpl( m_xContext ); @@ -137,7 +137,7 @@ public: while( xEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY ); - if ( xServiceInfo.is() + if ( xServiceInfo.is() && ( ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) { @@ -147,61 +147,61 @@ public: namesToIndices[ aURL.GetLastName() ] = nIndex++; } } - + } - + //XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - return new DocumentsEnumImpl( m_xContext, m_documents ); + return new DocumentsEnumImpl( m_xContext, m_documents ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) + { return m_documents.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) - { - if ( Index < 0 - || static_cast< Documents::size_type >(Index) >= m_documents.size() ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + { + if ( Index < 0 + || static_cast< Documents::size_type >(Index) >= m_documents.size() ) throw lang::IndexOutOfBoundsException(); return makeAny( m_documents[ Index ] ); // returns xspreadsheetdoc } //XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) - { - return frame::XModel::static_type(0); + { + return frame::XModel::static_type(0); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + { return (m_documents.size() > 0); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) throw container::NoSuchElementException(); return makeAny( m_documents[ it->second ] ); - + } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) - { + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + { uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); ::rtl::OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) - *pString = it->first; - return names; + *pString = it->first; + return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); } @@ -231,8 +231,8 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( sURL , - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, - uno::Sequence< beans::PropertyValue >(0) ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, + uno::Sequence< beans::PropertyValue >(0) ); return uno::makeAny( xComponent ); } @@ -280,7 +280,7 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly sProps[ sProps.getLength() - 1 ].Value <<= uno::makeAny( document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN ); sal_Int32 nIndex = sProps.getLength() - 1; - + if ( ReadOnly.hasValue() ) { sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly; diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 16a8671df601..ee6eccbdd621 100755 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -73,16 +73,16 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un a queue. First element in the queue is the next event to be processed. */ EventQueue aEventQueue; aEventQueue.push_back( EventQueueEntry( nEventId, rArgs ) ); - + /* bEnabled will track if event processing is enabled. Every event handler may disable handling of other events. */ bool bEnabled = true; - + /* bCancel will contain the current Cancel value. It is possible that multiple events will try to modify the Cancel value. Every event handler receives the Cancel value of the previous event handler. */ bool bCancel = false; - + /* bSuccess will change to true if at least one event handler has been executed successfully. */ bool bSuccess = false; diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx index dc474dd158bc..db2ceba788b0 100644 --- a/vbahelper/source/vbahelper/vbafillformat.cxx +++ b/vbahelper/source/vbahelper/vbafillformat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css } // Attributes -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaFillFormat::getVisible() throw (uno::RuntimeException) { drawing::FillStyle nFillStyle; @@ -92,7 +92,7 @@ ScVbaFillFormat::getVisible() throw (uno::RuntimeException) return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { drawing::FillStyle aFillStyle; @@ -110,7 +110,7 @@ ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } } -double SAL_CALL +double SAL_CALL ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) { sal_Int16 nTransparence = 0; @@ -121,7 +121,7 @@ ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) return dTransparence; } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) { sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 ); @@ -130,13 +130,13 @@ ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeExce // Methods -void SAL_CALL +void SAL_CALL ScVbaFillFormat::Solid() throw (uno::RuntimeException) { setFillStyle( drawing::FillStyle_SOLID ); } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException) { if( style == office::MsoGradientStyle::msoGradientHorizontal ) @@ -161,7 +161,7 @@ ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) thro } } -uno::Reference< msforms::XColorFormat > SAL_CALL +uno::Reference< msforms::XColorFormat > SAL_CALL ScVbaFillFormat::BackColor() throw (uno::RuntimeException) { if( !m_xColorFormat.is() ) @@ -169,7 +169,7 @@ ScVbaFillFormat::BackColor() throw (uno::RuntimeException) return m_xColorFormat; } -uno::Reference< msforms::XColorFormat > SAL_CALL +uno::Reference< msforms::XColorFormat > SAL_CALL ScVbaFillFormat::ForeColor() throw (uno::RuntimeException) { if( !m_xColorFormat.is() ) diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx index 31f4dccb5a38..cff28053b6b8 100644 --- a/vbahelper/source/vbahelper/vbafillformat.hxx +++ b/vbahelper/source/vbahelper/vbafillformat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index 065414343bd1..9b931a54620e 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExcept // not supported in form controls if( mbFormControl ) return; - + sal_Bool bValue = sal_False; aValue >>= bValue; sal_Int16 nValue = NORMAL; diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index e0df37583df5..0388d145f2fa 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ rtl::OUString sApplication( RTL_CONSTASCII_USTRINGPARAM("Application") ); // special key to return the Application rtl::OUString sAppService( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Application") ); -VbaGlobalsBase::VbaGlobalsBase( -const uno::Reference< ov::XHelperInterface >& xParent, +VbaGlobalsBase::VbaGlobalsBase( +const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName ) : Globals_BASE( xParent, xContext ), msDocCtxName( sDocCtxName ) { @@ -53,8 +53,8 @@ const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& s ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( sApplication, uno::Any() ), - ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), + ::cppu::ContextEntry_Init( sApplication, uno::Any() ), + ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), ::cppu::ContextEntry_Init( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.lang.theServiceManager" ) ), aSrvMgr ) }; // don't pass a delegate, this seems to introduce yet another cyclic dependency ( and @@ -93,12 +93,12 @@ VbaGlobalsBase::init( const uno::Sequence< beans::PropertyValue >& aInitArgs ) uno::Reference< XHelperInterface > xParent( aInitArgs[ nIndex ].Value, uno::UNO_QUERY ); mxParent = xParent; } - else + else xNameContainer->replaceByName( aInitArgs[ nIndex ].Name, aInitArgs[ nIndex ].Value ); } } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xReturn; @@ -113,10 +113,10 @@ VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw return xReturn; } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) { - + uno::Reference< uno::XInterface > xReturn; if ( aServiceSpecifier.equals( sAppService ) ) { @@ -129,10 +129,10 @@ VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpec return xReturn; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< ::rtl::OUString > SAL_CALL VbaGlobalsBase::getAvailableServiceNames( ) throw (uno::RuntimeException) { - static const rtl::OUString names[] = { + static const rtl::OUString names[] = { // common ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.msforms.UserForm" ) ), }; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 7cd82dff9536..cf1981fa8ffc 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #ifndef OOVBA_DLLIMPLEMENTATION #define OOVBA_DLLIMPLEMENTATION -#endif +#endif #include <vbahelper/vbahelper.hxx> #include <sfx2/app.hxx> @@ -190,7 +190,7 @@ implnCopy() pViewShell->CopyToClip(NULL,false,false,true); } -void +void implnCut() { ScTabViewShell* pViewShell = getCurrentBestViewShell(); @@ -203,23 +203,23 @@ void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction, sal_Bool bAsLink(sal_False), bOtherDoc(sal_False); InsCellCmd eMoveMode = INS_NONE; - if ( !pTabViewShell ) + if ( !pTabViewShell ) // none active, try next best pTabViewShell = getCurrentBestViewShell(); if ( pTabViewShell ) { - ScViewData* pView = pTabViewShell->GetViewData(); + ScViewData* pView = pTabViewShell->GetViewData(); Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; if ( pView && pWin ) { if ( bAsLink && bOtherDoc ) pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK - else + else { ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); - ScDocument* pDoc = NULL; + ScDocument* pDoc = NULL; if ( pOwnClip ) - pDoc = pOwnClip->GetDocument(); + pDoc = pOwnClip->GetDocument(); pTabViewShell->PasteFromClip( nFlags, pDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, eMoveMode, IDF_NONE, TRUE ); @@ -230,8 +230,8 @@ void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction, } -ScDocShell* -getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) +ScDocShell* +getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) { uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW ); ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() ); @@ -242,7 +242,7 @@ getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) } -ScTabViewShell* +ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) { ScDocShell* pDocShell = getDocShell( xModel ); @@ -251,17 +251,17 @@ getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) return NULL; } -ScTabViewShell* +ScTabViewShell* getCurrentBestViewShell() -{ +{ uno::Reference< frame::XModel > xModel = getCurrentDocument(); return getBestViewShell( xModel ); } -SfxViewFrame* +SfxViewFrame* getCurrentViewFrame() { - ScTabViewShell* pViewShell = getCurrentBestViewShell(); + ScTabViewShell* pViewShell = getCurrentBestViewShell(); if ( pViewShell ) return pViewShell->GetViewFrame(); return NULL; @@ -307,9 +307,9 @@ void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall) { pDispatcher->Execute( nSlot , nCall ); } - } + } } - + void dispatchRequests( const uno::Reference< frame::XModel>& xModel, const rtl::OUString& aUrl, const uno::Sequence< beans::PropertyValue >& sProps ) { @@ -329,7 +329,7 @@ dispatchRequests( const uno::Reference< frame::XModel>& xModel, const rtl::OUStr uno::Reference<lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager(); if ( !xServiceManager.is() ) return; - + uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ), xContext), uno::UNO_QUERY_THROW ); @@ -382,7 +382,7 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException) { OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" ); return xModel; - } + } SbxObject* p = pBasic; SbxObject* pParent = p->GetParent(); SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL; @@ -397,7 +397,7 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException) } - uno::Any aModel; + uno::Any aModel; SbxVariable *pCompVar = basicChosen->Find( sKey, SbxCLASS_OBJECT ); if ( pCompVar ) @@ -406,7 +406,7 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException) if ( sal_False == ( aModel >>= xModel ) || !xModel.is() ) { - throw uno::RuntimeException( + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the current documet context") ), uno::Reference< uno::XInterface >() ); } else @@ -419,8 +419,8 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException) else { OSL_TRACE("Failed to get %s", rtl::OUStringToOString( sKey, RTL_TEXTENCODING_UTF8 ).getStr() ); - throw uno::RuntimeException( - rtl::OUString( + throw uno::RuntimeException( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't determine the currently selected document") ), uno::Reference< uno::XInterface >() ); @@ -428,7 +428,7 @@ getCurrentDoc( const rtl::OUString& sKey ) throw (uno::RuntimeException) return xModel; } - uno::Reference< frame::XModel > + uno::Reference< frame::XModel > getCurrentDocCtx( const rtl::OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel; @@ -466,14 +466,14 @@ getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) t return xModel; } - uno::Reference< frame::XModel > + uno::Reference< frame::XModel > getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) { static const rtl::OUString sThisWordDoc( RTL_CONSTASCII_USTRINGPARAM("ThisWordDoc" ) ); uno::Reference< frame::XModel > xModel; try { - xModel = getCurrentDoc( sThisWordDoc ); + xModel = getCurrentDoc( sThisWordDoc ); } catch( uno::Exception& e ) { @@ -498,7 +498,7 @@ OORGBToXLRGB( sal_Int32 nCol ) sal_Int32 nRGB = ( nAutoBits | (nBlue << 16) | (nGreen << 8) | nRed ); return nRGB; } -sal_Int32 +sal_Int32 XLRGBToOORGB( sal_Int32 nCol ) { sal_Int32 nAutoBits = nCol; @@ -515,7 +515,7 @@ XLRGBToOORGB( sal_Int32 nCol ) sal_Int32 nRGB = ( nAutoBits | (nRed << 16) | (nGreen << 8) | nBlue ); return nRGB; } -uno::Any +uno::Any OORGBToXLRGB( const uno::Any& aCol ) { sal_Int32 nCol(0); @@ -523,7 +523,7 @@ OORGBToXLRGB( const uno::Any& aCol ) nCol = OORGBToXLRGB( nCol ); return uno::makeAny( nCol ); } -uno::Any +uno::Any XLRGBToOORGB( const uno::Any& aCol ) { sal_Int32 nCol(0); @@ -549,7 +549,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: rtl::OUString sRange( RTL_CONSTASCII_USTRINGPARAM( "-" ) ); rtl::OUString sFileName; - + if (( nFrom || nTo ) ) { if ( nFrom ) @@ -568,7 +568,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: if ( pViewFrame ) { SfxAllItemSet aArgs( SFX_APP()->GetPool() ); - + SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate ); aArgs.Put( sfxCollate, sfxCollate.Which() ); SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies ); @@ -577,7 +577,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: { SfxStringItem sfxFileName( SID_FILE_NAME, sFileName); aArgs.Put( sfxFileName, sfxFileName.Which() ); - + } if ( sRange.getLength() ) { @@ -594,10 +594,10 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: { if ( bPreview ) { - if ( !pViewFrame->GetFrame().IsInPlace() ) + if ( !pViewFrame->GetFrame().IsInPlace() ) { // #TODO is this necessary ( calc specific ) -// SC_MOD()->InputEnterHandler(); +// SC_MOD()->InputEnterHandler(); pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON ); while ( isInPrintPreview( pViewFrame ) ) Application::Yield(); @@ -606,12 +606,12 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: else pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs ); } - + } - + // #FIXME #TODO // 1 ActivePrinter ( how/can we switch a printer via API? ) - // 2 PrintToFile ( ms behaviour if this option is specified but no + // 2 PrintToFile ( ms behaviour if this option is specified but no // filename supplied 'PrToFileName' then the user will be prompted ) // 3 Need to check behaviour of Selected sheets with range ( e.g. From & To // values ) in oOO these options are mutually exclusive @@ -625,6 +625,30 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: dispatchExecute( pViewShell, SID_VIEWSHELL1 ); } +bool extractBoolFromAny( bool& rbValue, const uno::Any& rAny ) +{ + if( rAny >>= rbValue ) return true; + + sal_Int64 nSigned = 0; + if( rAny >>= nSigned ) { rbValue = nSigned != 0; return true; } + + sal_uInt64 nUnsigned = 0; + if( rAny >>= nUnsigned ) { rbValue = nUnsigned > 0; return true; } + + double fDouble = 0.0; + if( rAny >>= fDouble ) { rbValue = fDouble != 0.0; return true; } + + return false; +} + +bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException) +{ + bool bValue = false; + if( extractBoolFromAny( bValue, rAny ) ) + return bValue; + throw uno::RuntimeException(); +} + rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException ) { uno::Type aType = pvargItem.getValueType(); @@ -680,13 +704,13 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx } -rtl::OUString +rtl::OUString ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator) { return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2)); } -rtl::OUString +rtl::OUString ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix) { sal_Int32 a = _nStartSuffix; @@ -696,7 +720,7 @@ ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, if ( nLen == 0 ) return _sElementName; - while (bElementexists == true) + while (bElementexists == true) { for (sal_Int32 i = 0; i < nLen; i++) { @@ -710,17 +734,17 @@ ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, return rtl::OUString(); } -sal_Int32 +sal_Int32 ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString ) { sal_Int32 FieldLen = SearchList.getLength(); sal_Int32 retvalue = -1; - for (sal_Int32 i = 0; i < FieldLen; i++) + for (sal_Int32 i = 0; i < FieldLen; i++) { // I wonder why comparing lexicographically is done // when its a match is whats interesting? - //if (SearchList[i].compareTo(SearchString) == 0) - if ( SearchList[i].equals( SearchString ) ) + //if (SearchList[i].compareTo(SearchString) == 0) + if ( SearchList[i].equals( SearchString ) ) { retvalue = i; break; @@ -745,7 +769,7 @@ rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike ) if ( bForLike ) sResult.append(static_cast<sal_Unicode>('^')); - while (start < end) + while (start < end) { switch (*start) { @@ -822,7 +846,7 @@ double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt: } else { - fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000; + fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000; } return fConvertFactor; } @@ -855,7 +879,7 @@ ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::u sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel ) { - + sal_Int32 nPointerStyle( POINTER_ARROW ); try { @@ -875,7 +899,7 @@ sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel ) } // #FIXME this method looks wrong, shouldn't it just affect calc *or* writer -// document/frame/window(s) but not both ( and depending on what api called +// document/frame/window(s) but not both ( and depending on what api called // this ) void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite ) { @@ -922,13 +946,13 @@ void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue { uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObj ) ); - // #MAYBE #FIXME sort of a bit of a hack, + // #MAYBE #FIXME sort of a bit of a hack, uno::Reference< script::XDefaultProperty > xDflt( aObj, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet; if ( xUnoAccess.is() ) xPropSet.set( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY); - + if ( xPropSet.is() ) xPropSet->setPropertyValue( xDflt->getDefaultPropertyName(), aValue ); else @@ -1052,7 +1076,7 @@ double UserFormGeometryHelper::getLeft() { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position X!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return nResult; @@ -1078,7 +1102,7 @@ void UserFormGeometryHelper::setLeft( double nLeft ) { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } } @@ -1104,7 +1128,7 @@ double UserFormGeometryHelper::getTop() { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position Y!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return nResult; @@ -1130,7 +1154,7 @@ void UserFormGeometryHelper::setTop( double nTop ) { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } } @@ -1156,7 +1180,7 @@ double UserFormGeometryHelper::getWidth() { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get width!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return nResult; @@ -1182,7 +1206,7 @@ void UserFormGeometryHelper::setWidth( double nWidth) { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set width!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } } @@ -1208,7 +1232,7 @@ double UserFormGeometryHelper::getHeight() { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get height!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return nResult; @@ -1234,7 +1258,7 @@ void UserFormGeometryHelper::setHeight( double nHeight ) { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set height!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } } @@ -1276,11 +1300,11 @@ void UserFormGeometryHelper::setHeight( double nHeight ) ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape ) - { - if( !xShape.is() ) + { + if( !xShape.is() ) throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() ); } - + double ShapeHelper::getHeight() { return Millimeter::getInPoints(xShape->getSize().Height); @@ -1300,10 +1324,10 @@ void UserFormGeometryHelper::setHeight( double nHeight ) throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } } - - + + double ShapeHelper::getWidth() - { + { return Millimeter::getInPoints(xShape->getSize().Width); } @@ -1320,35 +1344,35 @@ void UserFormGeometryHelper::setHeight( double nHeight ) throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); } } - - + + double ShapeHelper::getLeft() { return Millimeter::getInPoints(xShape->getPosition().X); } - + void ShapeHelper::setLeft(double _fLeft) { css::awt::Point aPoint = xShape->getPosition(); aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft); xShape->setPosition(aPoint); } - + double ShapeHelper::getTop() { return Millimeter::getInPoints(xShape->getPosition().Y); } - + void ShapeHelper::setTop(double _fTop) { css::awt::Point aPoint = xShape->getPosition(); aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop); xShape->setPosition(aPoint); } - + void DebugHelper::exception( const rtl::OUString& DetailedMessage, const css::uno::Exception& ex, int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException ) { // #TODO #FIXME ( do we want to support additionalArg here ) @@ -1365,20 +1389,20 @@ void UserFormGeometryHelper::setHeight( double nHeight ) } Millimeter::Millimeter():m_nMillimeter(0) {} - + Millimeter::Millimeter(double mm):m_nMillimeter(mm) {} - + void Millimeter::set(double mm) { m_nMillimeter = mm; } - void Millimeter::setInPoints(double points) - { + void Millimeter::setInPoints(double points) + { m_nMillimeter = points * factor / 100.0; } - + void Millimeter::setInHundredthsOfOneMillimeter(double hmm) { m_nMillimeter = hmm / 100; } - + double Millimeter::get() { return m_nMillimeter; @@ -1390,14 +1414,14 @@ void UserFormGeometryHelper::setHeight( double nHeight ) double Millimeter::getInPoints() { return m_nMillimeter / factor * 100.0; - } + } sal_Int32 Millimeter::getInHundredthsOfOneMillimeter(double points) { sal_Int32 mm = static_cast<sal_Int32>(points * factor); return mm; } - + double Millimeter::getInPoints(int _hmm) { double points = double( static_cast<double>(_hmm) / factor); @@ -1420,7 +1444,7 @@ void UserFormGeometryHelper::setHeight( double nHeight ) if ( pMod ) xIf = pMod->GetUnoModule(); } - } + } return xIf; } diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index e0ea1f3e077b..6ca952fd59e7 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ using namespace ooo::vba; using namespace com::sun::star; -ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) +ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) { m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW ); m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid; @@ -98,7 +98,7 @@ ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineNam return nLineType; } -rtl::OUString +rtl::OUString ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException) { switch( nArrowheadStyle ) @@ -121,7 +121,7 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt } // Attributes -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) { sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone; @@ -141,73 +141,73 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) return nLineType; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException) { rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException) { return 0; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException) { } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -double SAL_CALL +double SAL_CALL ScVbaLineFormat::getWeight() throw (uno::RuntimeException) { sal_Int32 nLineWidth=0; @@ -216,7 +216,7 @@ ScVbaLineFormat::getWeight() throw (uno::RuntimeException) return dLineWidth; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) { if( _weight < 0 ) @@ -226,13 +226,13 @@ ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) m_nLineWeight = _weight; Millimeter aMillimeter; aMillimeter.setInPoints( _weight ); - + sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) ); setDashStyle( m_nLineDashStyle ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaLineFormat::getVisible() throw (uno::RuntimeException) { drawing::LineStyle aLineStyle; @@ -244,7 +244,7 @@ ScVbaLineFormat::getVisible() throw (uno::RuntimeException) return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { drawing::LineStyle aLineStyle; @@ -263,7 +263,7 @@ ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } } -double SAL_CALL +double SAL_CALL ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) { sal_Int16 nTransparency = 0; @@ -272,14 +272,14 @@ ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) return fTransparency / 100; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) { sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) ); } -sal_Int16 SAL_CALL +sal_Int16 SAL_CALL ScVbaLineFormat::getStyle() throw (uno::RuntimeException) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) @@ -287,7 +287,7 @@ ScVbaLineFormat::getStyle() throw (uno::RuntimeException) return 1; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) @@ -296,7 +296,7 @@ ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) //will be done with the according methods. } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) { drawing::LineStyle eLineStyle; @@ -347,7 +347,7 @@ ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) return m_nLineDashStyle; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException) { m_nLineDashStyle = _dashstyle; @@ -433,14 +433,14 @@ ScVbaLineFormat::ForeColor() throw (uno::RuntimeException) } -rtl::OUString& +rtl::OUString& ScVbaLineFormat::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaLineFormat::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index 8c95fc996e0c..948a7d368fad 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx index 0d023e502b7c..ff48f474648a 100644 --- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx +++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, +VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException): VbaPageSetupBase_BASE( xParent, xContext ) { -} +} double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException) { @@ -58,7 +58,7 @@ double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeExcepti catch( uno::Exception& ) { } - + return Millimeter::getInPoints( topMargin ); } @@ -72,7 +72,7 @@ void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::R { uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))); aValue >>= headerOn; - + if( headerOn ) { aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))); @@ -112,7 +112,7 @@ double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( bottomMargin ); } @@ -126,7 +126,7 @@ void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno { uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))); aValue >>= footerOn; - + if( footerOn ) { aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))); @@ -153,7 +153,7 @@ double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeExcep catch( uno::Exception& ) { } - + return Millimeter::getInPoints( rightMargin );; } @@ -183,7 +183,7 @@ double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeExcept catch( uno::Exception& ) { } - + return Millimeter::getInPoints( leftMargin );; } @@ -212,7 +212,7 @@ double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( headerMargin );; } @@ -241,7 +241,7 @@ double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( footerMargin );; } @@ -294,7 +294,7 @@ void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (c aValue >>= isLandscape; sal_Bool switchOrientation = sal_False; - if(( isLandscape && orientation != mnOrientLandscape ) || + if(( isLandscape && orientation != mnOrientLandscape ) || ( !isLandscape && orientation != mnOrientPortrait )) { switchOrientation = sal_True; diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx index 7ebbb62d1125..bcdf83a88c5d 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.cxx +++ b/vbahelper/source/vbahelper/vbapictureformat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ using namespace com::sun::star; ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - uno::Reference< drawing::XShape > xShape ) + uno::Reference< drawing::XShape > xShape ) throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape ) { m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW ); @@ -51,26 +51,26 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou } // Attributes -double SAL_CALL +double SAL_CALL ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException) { sal_Int16 nLuminance = 0; m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance; double fBrightness = static_cast< double >( nLuminance ); fBrightness = ( fBrightness +100 ) / 200; - return fBrightness; + return fBrightness; } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException) { checkParameterRangeInDouble( _brightness, 0.0, 1.0 ); double fLuminance = _brightness * 200 - 100; sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance ); - m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); + m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); } -double SAL_CALL +double SAL_CALL ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) { sal_Int16 nContrast = 0; @@ -80,7 +80,7 @@ ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) return fContrast; } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException) { checkParameterRangeInDouble( _contrast, 0.0, 1.0 ); @@ -91,7 +91,7 @@ ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException // Methods -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException) { double fBrightness = getBrightness(); @@ -107,7 +107,7 @@ ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeE setBrightness( fBrightness ); } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException) { double nContrast = getContrast(); diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx index e7b6ed9c1a30..49245869ad02 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.hxx +++ b/vbahelper/source/vbahelper/vbapictureformat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx index 26437a359e8d..22c87e9a6dc5 100644 --- a/vbahelper/source/vbahelper/vbapropvalue.cxx +++ b/vbahelper/source/vbahelper/vbapropvalue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,18 +27,18 @@ #include "vbahelper/vbapropvalue.hxx" using namespace com::sun::star; - + ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener ) { } -css::uno::Any SAL_CALL +css::uno::Any SAL_CALL ScVbaPropValue::getValue() throw (css::uno::RuntimeException) { return m_pListener->getValueEvent(); } -void SAL_CALL +void SAL_CALL ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException) { m_pListener->setValueEvent( _value ); diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 485ebee3ea8d..e0ec739f23b8 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ ScVbaShape::ScVbaShape( const uno::Reference< uno::XComponentContext >& xContext } ScVbaShape::~ScVbaShape() -{ +{ // dtor must never ever throw /*try { @@ -78,10 +78,10 @@ ScVbaShape::~ScVbaShape() } catch( uno::Exception& ) { - }*/ + }*/ } -void SAL_CALL +void SAL_CALL ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException ) { try @@ -92,7 +92,7 @@ ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::Runti removeShapesListener(); if ( xShape.is() ) removeShapeListener(); - } + } catch( uno::Exception& ) { } @@ -133,7 +133,7 @@ ScVbaShape::removeShapesListener() throw( uno::RuntimeException ) m_xShapes = NULL; } -sal_Int32 +sal_Int32 ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException) { rtl::OUString sShapeType; @@ -145,7 +145,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw return office::MsoShapeType::msoGroup; else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) ) return office::MsoShapeType::msoPicture; - else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) || + else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) || sShapeType.equals( rtl::OUString::createFromAscii( "FrameShape" ) ) ) return office::MsoShapeType::msoOLEControlObject; // OOo don't support office::MsoShapeType::msoComment as a Shape. @@ -161,7 +161,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw return office::MsoShapeType::msoFreeform; else if( connectorType == drawing::ConnectorType_LINE ) return office::MsoShapeType::msoLine; - else + else return office::MsoShapeType::msoAutoShape; } else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) ) @@ -176,7 +176,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaShape::getName() throw (uno::RuntimeException) { rtl::OUString sName; @@ -185,75 +185,75 @@ ScVbaShape::getName() throw (uno::RuntimeException) return sName; } -void SAL_CALL +void SAL_CALL ScVbaShape::setName( const rtl::OUString& _name ) throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW ); xNamed->setName( _name ); } -double SAL_CALL +double SAL_CALL ScVbaShape::getHeight() throw (uno::RuntimeException) { return m_pShapeHelper->getHeight(); } -void SAL_CALL +void SAL_CALL ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException) { m_pShapeHelper->setHeight( _height ); } -double SAL_CALL +double SAL_CALL ScVbaShape::getWidth() throw (uno::RuntimeException) { return m_pShapeHelper->getWidth(); } -void SAL_CALL +void SAL_CALL ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException) { m_pShapeHelper->setWidth( _width ); } -double SAL_CALL +double SAL_CALL ScVbaShape::getLeft() throw (uno::RuntimeException) { return m_pShapeHelper->getLeft(); } -void SAL_CALL +void SAL_CALL ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException) { m_pShapeHelper->setLeft( _left ); } -double SAL_CALL +double SAL_CALL ScVbaShape::getTop() throw (uno::RuntimeException) { return m_pShapeHelper->getTop(); } -void SAL_CALL +void SAL_CALL ScVbaShape::setTop( double _top ) throw (uno::RuntimeException) { return m_pShapeHelper->setTop( _top ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaShape::getVisible() throw (uno::RuntimeException) { //UNO Shapes are always visible return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException) { //UNO Shapes are always visible } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaShape::getZOrderPosition() throw (uno::RuntimeException) { sal_Int32 nZOrderPosition = 0; @@ -262,13 +262,13 @@ ScVbaShape::getZOrderPosition() throw (uno::RuntimeException) return nZOrderPosition + 1; } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaShape::getType() throw (uno::RuntimeException) { return m_nType; } -double SAL_CALL +double SAL_CALL ScVbaShape::getRotation() throw (uno::RuntimeException) { double dRotation = 0; @@ -278,14 +278,14 @@ ScVbaShape::getRotation() throw (uno::RuntimeException) return dRotation; } -void SAL_CALL +void SAL_CALL ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException) { sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) ); } -uno::Reference< msforms::XLineFormat > SAL_CALL +uno::Reference< msforms::XLineFormat > SAL_CALL ScVbaShape::getLine() throw (uno::RuntimeException) { // TODO should ongly return line @@ -305,7 +305,7 @@ ScVbaShape::getPictureFormat() throw (uno::RuntimeException) } // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaShape::TextFrame() throw (uno::RuntimeException) { uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); @@ -322,14 +322,14 @@ ScVbaShape::TextFrame() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< msforms::XTextFrame >( new VbaTextFrame( this, mxContext, m_xShape ) ) ); } -void SAL_CALL +void SAL_CALL ScVbaShape::Delete() throw (uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); m_xShapes->remove( m_xShape ); } -void SAL_CALL +void SAL_CALL ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException) { sal_Int32 nOrderPositon; @@ -363,7 +363,7 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException) } } -void SAL_CALL +void SAL_CALL ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException) { double nCurrentRotation = getRotation(); @@ -371,7 +371,7 @@ ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException) setRotation(nCurrentRotation); } -void SAL_CALL +void SAL_CALL ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException) { double nCurrentLeft = getLeft(); @@ -379,7 +379,7 @@ ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException) setLeft(nCurrentLeft); } -void SAL_CALL +void SAL_CALL ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException) { double nCurrentTop = getTop(); @@ -387,7 +387,7 @@ ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException) setTop(nCurrentTop); } -void SAL_CALL +void SAL_CALL ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException) { double nHeight = getHeight(); @@ -416,7 +416,7 @@ ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal } } -void SAL_CALL +void SAL_CALL ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException) { double nWidth = getWidth(); @@ -453,20 +453,20 @@ ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException } // This method should not be part of Shape, what we reall need to do is... -// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. +// dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. // ( e.g. the ones that really do have ShapeRange as an attribute ) -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException ) { - // perhaps we should store a reference to the Shapes Collection + // perhaps we should store a reference to the Shapes Collection // in this class // but anyway this method should not even be in this class // #TODO not sure what the parent of the Shapes collection should be - + XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec; aVec.push_back( m_xShape ); uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) ); - uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW ); + uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW ); // #FIXME for want of a better parent, setting this uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess, uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ), m_xModel ) ); if ( index.hasValue() ) @@ -474,39 +474,39 @@ ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException ) return uno::makeAny( xShapeRange ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException) { // FIXME: return sal_False; } -void SAL_CALL +void SAL_CALL ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException) { // FIXME: } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaShape::getLockAnchor() throw (uno::RuntimeException) { // FIXME: return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException) { // FIXME: } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException) { sal_Int32 nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin; text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH; m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType; - + switch( eType ) { case text::TextContentAnchorType_AT_PARAGRAPH: @@ -538,7 +538,7 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException) return nRelativeHorizontalPosition; } -void SAL_CALL +void SAL_CALL ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException) { text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH; @@ -568,13 +568,13 @@ ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalpositi m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException) { sal_Int32 nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin; text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH; m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ) ) >>= eType; - + switch( eType ) { case text::TextContentAnchorType_AT_PARAGRAPH: @@ -606,7 +606,7 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException) return nRelativeVerticalPosition; } -void SAL_CALL +void SAL_CALL ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException) { text::TextContentAnchorType eType = text::TextContentAnchorType_AT_PARAGRAPH; @@ -636,7 +636,7 @@ ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) m_xPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AnchorType") ), uno::makeAny( eType ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaShape::WrapFormat() throw (uno::RuntimeException) { uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); @@ -653,14 +653,14 @@ ScVbaShape::WrapFormat() throw (uno::RuntimeException) } -rtl::OUString& +rtl::OUString& ScVbaShape::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaShape::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index 3020cfa47eca..f6dc8ad72cb2 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,14 +60,14 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar } // Methods -void SAL_CALL +void SAL_CALL ScVbaShapeRange::Select( ) throw (uno::RuntimeException) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( getShapes() ) ); } -uno::Reference< msforms::XShape > SAL_CALL +uno::Reference< msforms::XShape > SAL_CALL ScVbaShapeRange::Group() throw (uno::RuntimeException) { uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW ); @@ -76,7 +76,7 @@ ScVbaShapeRange::Group() throw (uno::RuntimeException) return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), m_xModel, office::MsoShapeType::msoGroup ) ); } -uno::Reference< drawing::XShapes > +uno::Reference< drawing::XShapes > ScVbaShapeRange::getShapes() throw (uno::RuntimeException) { if ( !m_xShapes.is() ) @@ -92,7 +92,7 @@ ScVbaShapeRange::getShapes() throw (uno::RuntimeException) } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -103,7 +103,7 @@ ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeExcept } } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -114,7 +114,7 @@ ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) } } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -343,7 +343,7 @@ ScVbaShapeRange::getElementType() throw (uno::RuntimeException) return msforms::XShape::static_type(0); } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException) { return new VbShapeRangeEnumHelper( this, m_xIndexAccess ); @@ -353,20 +353,20 @@ uno::Any ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW ); - // #TODO #FIXME Shape parent should always be the sheet the shapes belong - // to - uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); + // #TODO #FIXME Shape parent should always be the sheet the shapes belong + // to + uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); return uno::makeAny( xVbShape ); } -rtl::OUString& +rtl::OUString& ScVbaShapeRange::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaShapeRange::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 37952ee3d3a3..f64b4aafd029 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ void ScVbaShapes::initBaseCollection() ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes ), m_nNewShapeCount(0), m_xModel( xModel ) { m_xShapes.set( xShapes, uno::UNO_QUERY_THROW ); - m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); + m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); initBaseCollection(); } @@ -115,14 +115,14 @@ ScVbaShapes::getElementType() throw (uno::RuntimeException) { return ooo::vba::msforms::XShape::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaShapes::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaShapes::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -134,12 +134,12 @@ ScVbaShapes::getServiceNames() return aServiceNames; } -css::uno::Reference< css::container::XIndexAccess > +css::uno::Reference< css::container::XIndexAccess > ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::RuntimeException) { if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE ) throw uno::RuntimeException(); - + uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext); uno::Any aConverted; aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) ); @@ -162,21 +162,21 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti sal_Int32 nIndex = 0; sIndices[ index ] >>= nIndex; // adjust for 1 based mso indexing - xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY ); - + xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY ); + } // populate map with drawing::XShapes if ( xShape.is() ) mShapes.push_back( xShape ); - } + } uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) ); return xIndexAccess; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException) { - // I don't think we need to support Array of indices for shapes + // I don't think we need to support Array of indices for shapes /* if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) { @@ -186,10 +186,10 @@ ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::R return uno::makeAny( xShapesCollection ); } */ - return ScVbaShapes_BASE::Item( Index, Index2 ); + return ScVbaShapes_BASE::Item( Index, Index2 ); } -uno::Reference< msforms::XShapeRange > SAL_CALL +uno::Reference< msforms::XShapeRange > SAL_CALL ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) { // shapes, can be an index or an array of indices @@ -208,7 +208,7 @@ ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) return new ScVbaShapeRange( getParent(), mxContext, xShapes, m_xDrawPage, m_xModel ); } -void SAL_CALL +void SAL_CALL ScVbaShapes::SelectAll() throw (uno::RuntimeException) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -217,14 +217,14 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException) xSelectSupp->select( uno::makeAny( m_xShapes ) ); } // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException - // if one of the shapes is no 'markable' e.g. a button + // if one of the shapes is no 'markable' e.g. a button // the method still works catch( lang::IllegalArgumentException& ) { } } -uno::Reference< drawing::XShape > +uno::Reference< drawing::XShape > ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xMSF( m_xModel, uno::UNO_QUERY_THROW ); @@ -232,7 +232,7 @@ ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeExcept return xShape; } -uno::Any +uno::Any ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException) { rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) ); @@ -260,11 +260,11 @@ ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWi xShape->setSize( size ); ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ); - pScVbaShape->setRange( aRange ); + pScVbaShape->setRange( aRange ); return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) ); } -uno::Any +uno::Any ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException) { rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) ); @@ -304,7 +304,7 @@ ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidt xShape->setSize(size); ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ); - pScVbaShape->setRange( aRange ); + pScVbaShape->setRange( aRange ); return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) ); } @@ -319,12 +319,12 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth ); sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX ); sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY ); - + uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW ); m_xShapes->add( xShape ); awt::Point aMovePositionIfRange( 0, 0 ); - + rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) ); setDefaultShapeProperties(xShape); setShape_NameProperty(xShape, name); @@ -471,7 +471,7 @@ rtl::OUString ScVbaShapes::createName( rtl::OUString sName ) { sal_Int32 nActNumber = 1 + m_nNewShapeCount; - m_nNewShapeCount++; + m_nNewShapeCount++; sName += rtl::OUString::valueOf( nActNumber ); return sName; } diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index de15992fe49e..18aef99e0070 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ void VbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin ) } // Attributes -sal_Bool SAL_CALL +sal_Bool SAL_CALL VbaTextFrame::getAutoSize() throw (uno::RuntimeException) { // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize. - // TextFitToSize control the text content. + // TextFitToSize control the text content. // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False. sal_Bool bAutosize = sal_False; uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) ); @@ -74,14 +74,14 @@ VbaTextFrame::getAutoSize() throw (uno::RuntimeException) return bAutosize; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException) { setAsMSObehavior(); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) ); @@ -89,13 +89,13 @@ VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginTop() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) ); @@ -103,13 +103,13 @@ VbaTextFrame::getMarginTop() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) ); @@ -117,13 +117,13 @@ VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginRight() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) ); @@ -131,7 +131,7 @@ VbaTextFrame::getMarginRight() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright ); @@ -139,7 +139,7 @@ VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL VbaTextFrame::Characters() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index 50da8451aedb..6410231930ce 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -VbaWindowBase::VbaWindowBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowBaseImpl_BASE( xParent, xContext ), m_xModel( xModel ) +VbaWindowBase::VbaWindowBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowBaseImpl_BASE( xParent, xContext ), m_xModel( xModel ) { } -VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext ) +VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext ) : WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) { @@ -46,13 +46,13 @@ VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Refer sal_Bool SAL_CALL VbaWindowBase::getVisible() throw (uno::RuntimeException) { - sal_Bool bVisible = sal_True; + sal_Bool bVisible = sal_True; uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW ); uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW ); if( xWindow2.is() ) { - bVisible = xWindow2->isVisible(); + bVisible = xWindow2->isVisible(); } return bVisible; } @@ -64,7 +64,7 @@ VbaWindowBase::setVisible(sal_Bool _visible) throw (uno::RuntimeException) uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW ); if( xWindow.is() ) { - xWindow->setVisible( _visible ); + xWindow->setVisible( _visible ); } } @@ -90,81 +90,81 @@ void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue switch( nFlag ) { case css::awt::PosSize::X: - xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X ); + xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X ); break; case css::awt::PosSize::Y: - xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y ); + xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y ); break; case css::awt::PosSize::WIDTH: - xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH ); + xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH ); break; case css::awt::PosSize::HEIGHT: - xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT ); + xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT ); break; default: break; } } -} +} -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getHeight() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Height; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException) { setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getLeft() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.X; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException) { setPosSize(m_xModel, _left, css::awt::PosSize::X); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getTop() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Y; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException) { setPosSize(m_xModel, _top, css::awt::PosSize::Y); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getWidth() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Width; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException) { setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH); } -rtl::OUString& +rtl::OUString& VbaWindowBase::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > VbaWindowBase::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; |