diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
| commit | e71dd58cbb6cbcf4d032db73982239badeeabf22 (patch) | |
| tree | b21dfedc3f13ef0ba966efd13da05ff38523e698 /ucbhelper | |
| parent | Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3) (diff) | |
| download | core-e71dd58cbb6cbcf4d032db73982239badeeabf22.tar.gz core-e71dd58cbb6cbcf4d032db73982239badeeabf22.zip | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 0fce58acaa20c2e3cd99690e41da991380a0a1a9 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:20 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Jan 18 16:25:52 2011 +0200
Avoid GetHelpText() call which can be quite heavy
GetHelpText() can cause a quite heavy sequence of file and directory
lookups. See fdo#33088. As its return value here was just passed on to
ShowHelpStatusText() which doesn't do anything at all, it was
completely unnecessary. The GetHelpText() calls here caused the
noticeable slowdown in highlighting menu items on Windows with lots of
localised help files for some bundled extensions.
Signed-off-by: Caolan McNamara <caolanm@redhat.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
Signed-off-by: fstrba@novell.com
vcl/source/window/menu.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 3c2e3b6efc81c5e34c56f0f11723ed848801be35
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Tue Jan 18 13:11:00 2011 +0100
do not mix unrelated X11 Visuals (fdo#33108)
Do not assume that there is just one generic Visual, as today's XServers are
ARGB-capable and cases of both the default depth and 32bit visuals can happen.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
Signed-off-by: Radek Doulik <rodo@novell.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
vcl/unx/inc/salgdi.h | 2 +-
vcl/unx/source/gdi/salgdi.cxx | 17 ++++++++---------
vcl/unx/source/gdi/salgdi3.cxx | 8 --------
3 files changed, 9 insertions(+), 18 deletions(-)
commit 1c9c9180b4105626e9242e5499b67180abf4a53c
Author: Andre Fischer <andre.f.fischer@oracle.com>
Date: Tue Jan 18 10:41:22 2011 +0100
calc65: #i116318# Fixed the painting of axial gradients.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
(cherry picked from commit ea29f32bd5bc1a937a747bd5a1f5b37f570ed25f)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Radek Doulik <rodo@novell.com>
cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
commit 94ba0c5b10f8089dc549e9fc4f3085622cff65c4
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Wed Nov 3 15:17:33 2010 +0100
use sane scrollbar sizes when drawing
bnc#619772 leads to a crash because maximum = minimum = 0, and this
strange (but for whatever reason needed) '- mnVisibleSize' hack
makes maximum be -1, eventually leading to a crash
vcl/unx/kde4/KDESalGraphics.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 4831d49751fd5aa81901cfc0402311ff2d700056
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Diffstat (limited to 'ucbhelper')
72 files changed, 994 insertions, 994 deletions
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx b/ucbhelper/inc/pch/precompiled_ucbhelper.cxx index 9c38231bc246..0d3dd43fc13c 100644 --- a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx +++ b/ucbhelper/inc/pch/precompiled_ucbhelper.cxx @@ -2,7 +2,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/ucbhelper/inc/pch/precompiled_ucbhelper.hxx b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx index 9a4ed394a76b..1166a6f31358 100644 --- a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx +++ b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/activedatasink.hxx b/ucbhelper/inc/ucbhelper/activedatasink.hxx index 6a0b47fdba70..0c12bf0d3daf 100644 --- a/ucbhelper/inc/ucbhelper/activedatasink.hxx +++ b/ucbhelper/inc/ucbhelper/activedatasink.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx index 200a2e2ad60a..9b6148921ffc 100644 --- a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx +++ b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx index 0facae0f02b7..078f1817f505 100644 --- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx +++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx index 0ad13bf76ad4..f4737f22c3e3 100644 --- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx +++ b/ucbhelper/inc/ucbhelper/commandenvironment.hxx @@ -2,7 +2,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 @@ -54,8 +54,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment : public cppu::OWeakObject, CommandEnvironment_Impl* m_pImpl; private: - UCBHELPER_DLLPRIVATE CommandEnvironment( const CommandEnvironment& ); // n.i. - UCBHELPER_DLLPRIVATE CommandEnvironment& operator=( const CommandEnvironment& ); // n.i. + UCBHELPER_DLLPRIVATE CommandEnvironment( const CommandEnvironment& ); // n.i. + UCBHELPER_DLLPRIVATE CommandEnvironment& operator=( const CommandEnvironment& ); // n.i. public: /** diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx index 90c05d17d19e..2cd7ee3ed982 100644 --- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx +++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx @@ -2,7 +2,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 @@ -58,7 +58,7 @@ class CommandEnvironmentProxy : public cppu::OWeakObject, CommandEnvironmentProxy_Impl* m_pImpl; private: - CommandEnvironmentProxy( const CommandEnvironmentProxy& ); // n.i. + CommandEnvironmentProxy( const CommandEnvironmentProxy& ); // n.i. CommandEnvironmentProxy& operator=( const CommandEnvironmentProxy& ); // n.i. public: @@ -69,7 +69,7 @@ public: */ CommandEnvironmentProxy( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + com::sun::star::ucb::XCommandEnvironment >& rxEnv ); /** * Destructor. */ diff --git a/ucbhelper/inc/ucbhelper/configurationkeys.hxx b/ucbhelper/inc/ucbhelper/configurationkeys.hxx index d99f5788c1d3..e0bfef91fc46 100644 --- a/ucbhelper/inc/ucbhelper/configurationkeys.hxx +++ b/ucbhelper/inc/ucbhelper/configurationkeys.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx index f290134dfae1..39833ebd2ea0 100644 --- a/ucbhelper/inc/ucbhelper/content.hxx +++ b/ucbhelper/inc/ucbhelper/content.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx index f21597cccc84..c7fdd53a361d 100644 --- a/ucbhelper/inc/ucbhelper/contentbroker.hxx +++ b/ucbhelper/inc/ucbhelper/contentbroker.hxx @@ -2,7 +2,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,26 +60,26 @@ class ContentBroker_Impl; */ class UCBHELPER_DLLPUBLIC ContentBroker { - ContentBroker_Impl* m_pImpl; + ContentBroker_Impl* m_pImpl; // The "one and only" Broker. - static ContentBroker* m_pTheBroker; + static ContentBroker* m_pTheBroker; private: - UCBHELPER_DLLPRIVATE ContentBroker( const ContentBroker& ); // n.i. - UCBHELPER_DLLPRIVATE ContentBroker& operator=( const ContentBroker& ); // n.i. + UCBHELPER_DLLPRIVATE ContentBroker( const ContentBroker& ); // n.i. + UCBHELPER_DLLPRIVATE ContentBroker& operator=( const ContentBroker& ); // n.i. /** Constructor. * * @param rxSMgr is a Service Manager. - * @param rArguments are the arguments to pass to the - * com.sun.star.ucb.UniversalContentBroker service when creating it. - * Currently, this must be a sequence containing exactly two + * @param rArguments are the arguments to pass to the + * com.sun.star.ucb.UniversalContentBroker service when creating it. + * Currently, this must be a sequence containing exactly two * strings, a primary and a secondary configuration key. * Refer to http://ucb.openoffice.org/docs/ucb-configuration.html * for more information on UCB configuration. */ UCBHELPER_DLLPRIVATE ContentBroker( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, + ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ); @@ -90,7 +90,7 @@ private: * the new UCB. */ UCBHELPER_DLLPRIVATE ContentBroker( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, + ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, const ContentProviderDataList & rData ); protected: @@ -101,20 +101,20 @@ protected: public: /** Initialize "the one and only" Broker. This method must be called - * exactly once, before the Broker is used in any way. + * exactly once, before the Broker is used in any way. * - * @param rSMgr is a factory to create services needed in the Broker's - * implementation. + * @param rSMgr is a factory to create services needed in the Broker's + * implementation. * - * @param rArguments are the arguments to pass to the - * com.sun.star.ucb.UniversalContentBroker service when creating + * @param rArguments are the arguments to pass to the + * com.sun.star.ucb.UniversalContentBroker service when creating * it. Currently, this must be a sequence containing exactly two * strings, a primary and a secondary configuration key. * Refer to http://ucb.openoffice.org/docs/ucb-configuration.html * for more information on UCB configuration. * - * @return True if creation and possible configuration of the Broker - * was successful. + * @return True if creation and possible configuration of the Broker + * was successful. */ static sal_Bool initialize( const::com::sun::star::uno::Reference< @@ -123,16 +123,16 @@ public: ::com::sun::star::uno::Any >& rArguments ); /** Initialize "the one and only" Broker. This method must be called - * exactly once, before the Broker is used in any way. + * exactly once, before the Broker is used in any way. * - * @param rSMgr is a factory to create services needed in the Broker's - * implementation. + * @param rSMgr is a factory to create services needed in the Broker's + * implementation. * * @param rData are the data for the for the content providers for * the UCB to initialize. * - * @return True if creation and possible configuration of the Broker - * was successful. + * @return True if creation and possible configuration of the Broker + * was successful. */ static sal_Bool initialize( const::com::sun::star::uno::Reference< @@ -140,7 +140,7 @@ public: const ContentProviderDataList & rData ); /** Deinitialize "the one and only" Broker. Once this method has been - * called, the Broker must not be used any longer. + * called, the Broker must not be used any longer. */ static void deinitialize(); diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx index fdeb3a307979..f5711af7a64d 100644 --- a/ucbhelper/inc/ucbhelper/contenthelper.hxx +++ b/ucbhelper/inc/ucbhelper/contenthelper.hxx @@ -2,7 +2,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 @@ -77,16 +77,16 @@ class ContentProviderImplHelper; * * Features of the base class implementation: * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo ) - * - all required interfaces for service com::sun::star::ucb::Content + * - all required interfaces for service com::sun::star::ucb::Content * - all required listener containers * ( XComponent, XPropertiesChangeNotifier, XPropertySetInfoChangeNotifier, * XCommandInfoChangeNotifier ) - * - XPropertyContainer implementation ( persistence is implemented using + * - XPropertyContainer implementation ( persistence is implemented using * service com.sun.star.ucb.Store ) * - complete XPropertySetInfo implementation ( including Additioanl Core * Properties supplied via XPropertyContainer interface ) * -> protected method: getPropertySetInfo - * - complete XCommandInfo implementation + * - complete XCommandInfo implementation * -> protected method: getCommandInfo */ class UCBHELPER_DLLPUBLIC ContentImplHelper : @@ -108,14 +108,14 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper : ucbhelper_impl::ContentImplHelper_Impl* m_pImpl; protected: - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xIdentifier; rtl::Reference< ContentProviderImplHelper > m_xProvider; - sal_uInt32 m_nCommandId; + sal_uInt32 m_nCommandId; private: /** @@ -130,7 +130,7 @@ private: * @param xEnv is an environment to use for example, for interactions. * @return a sequence containing the property meta data. */ - UCBHELPER_DLLPRIVATE + UCBHELPER_DLLPRIVATE virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0; @@ -142,7 +142,7 @@ private: * @param xEnv is an environment to use for example, for interactions. * @return a sequence containing the command meta data. */ - UCBHELPER_DLLPRIVATE + UCBHELPER_DLLPRIVATE virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0; @@ -161,7 +161,7 @@ private: protected: /** - * This method returns complete meta data for the properties ( including + * This method returns complete meta data for the properties ( including * Additional Core Properties supplied via XPropertyContainer interface ) * supported by the content. To implement the required command * "getPropertySetInfo" simply return the return value of this method. @@ -178,7 +178,7 @@ protected: sal_Bool bCache = sal_True ); /** - * This method returns complete meta data for the commands supported by + * This method returns complete meta data for the commands supported by * the content. To implement the required command "getCommandInfo" simply * return the return value of this method. * @@ -238,15 +238,15 @@ protected: const com::sun::star::ucb::ContentEvent& evt ) const; /** - * Use this method to announce the insertion of this content at - * the end of your implementation of the command "insert". The + * Use this method to announce the insertion of this content at + * the end of your implementation of the command "insert". The * implementation of is method propagates a ContentEvent( INSERTED ). */ void inserted(); /** - * Use this method to announce the destruction of this content at - * the end of your implementation of the command "delete". The + * Use this method to announce the destruction of this content at + * the end of your implementation of the command "delete". The * implementation of is method propagates a ContentEvent( DELETED ) * and a ContentEvent( REMOVED ) at the parent of the deleted content, * if a parent exists. @@ -254,7 +254,7 @@ protected: void deleted(); /** - * Use this method to change the identity of a content. The implementation + * Use this method to change the identity of a content. The implementation * of this method will replace the content identifier of the content and * propagate the appropriate ContentEvent( EXCHANGED ). * @@ -265,8 +265,8 @@ protected: com::sun::star::ucb::XContentIdentifier >& rNewId ); /** - * Use this method to get access to the Additional Core Properties of - * the content ( added using content's XPropertyContainer interface ). + * Use this method to get access to the Additional Core Properties of + * the content ( added using content's XPropertyContainer interface ). * If you supply your own XPropertyContainer implementation, this method * will always return an empty propertyset. * @@ -275,12 +275,12 @@ protected: * @return the implementation of the service * com.sun.star.ucb.PersistentPropertySet. */ - com::sun::star::uno::Reference< + com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > getAdditionalPropertySet( sal_Bool bCreate ); /** - * This method renames the propertyset containing the Additional Core + * This method renames the propertyset containing the Additional Core * Properties of the content. * * @param rOldKey is the old key of the propertyset. @@ -294,7 +294,7 @@ protected: sal_Bool bRecursive ); /** - * This method copies the propertyset containing the Additional Core + * This method copies the propertyset containing the Additional Core * Properties of the content. * * @param rSourceKey is the key of the source propertyset. @@ -308,7 +308,7 @@ protected: sal_Bool bRecursive ); /** - * This method removes the propertyset containing the Additional Core + * This method removes the propertyset containing the Additional Core * Properties of the content. * * @param bRecursive is a flag indicating whether propertysets for diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx index daf43ed6512f..414db18c6f36 100644 --- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx +++ b/ucbhelper/inc/ucbhelper/contentidentifier.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx index 507ca271668d..f32989ef9cdb 100644 --- a/ucbhelper/inc/ucbhelper/contentinfo.hxx +++ b/ucbhelper/inc/ucbhelper/contentinfo.hxx @@ -2,7 +2,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 @@ class PropertySetInfo : public com::sun::star::lang::XTypeProvider, public com::sun::star::beans::XPropertySetInfo { - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > + com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; com::sun::star::uno::Sequence< com::sun::star::beans::Property >* m_pProps; - osl::Mutex m_aMutex; - ContentImplHelper* m_pContent; + osl::Mutex m_aMutex; + ContentImplHelper* m_pContent; private: sal_Bool queryProperty( const rtl::OUString& rName, @@ -120,14 +120,14 @@ class CommandProcessorInfo : public com::sun::star::lang::XTypeProvider, public com::sun::star::ucb::XCommandInfo { - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > + com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >* m_pCommands; - osl::Mutex m_aMutex; - ContentImplHelper* m_pContent; + osl::Mutex m_aMutex; + ContentImplHelper* m_pContent; private: sal_Bool queryCommand( const rtl::OUString& rName, diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx index 14bfb177545f..94ecfd232ea4 100644 --- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx +++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx index ab0d445e76a9..e124734dee2f 100644 --- a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx +++ b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx index 5bd3a008ace2..18bb6c10a21e 100644 --- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx +++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx @@ -2,7 +2,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 @@ -506,7 +506,7 @@ public: throw( com::sun::star::uno::RuntimeException ); // XInteractionSupplyAuthentication2 - virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default ) + virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setUseSystemCredentials( ::sal_Bool UseSystemCredentials ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -627,7 +627,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( m_bCanSetPassword( bCanSetPassword ), m_bCanSetAccount( bCanSetAccount ), m_bCanUseSystemCredentials( bCanUseSystemCredentials ), - m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ), + m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ), m_bUseSystemCredentials( bDefaultUseSystemCredentials & bCanUseSystemCredentials ) { } diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx index f4ad20251415..542890da3649 100644 --- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx +++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx @@ -2,7 +2,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,7 +50,7 @@ namespace ucbhelper{ /** @short it wraps any other interaction handler and intercept its handle() requests. - + @descr This class can be used as: - instance if special interactions must be supressed only @@ -61,28 +61,28 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper //------------------------------------------- // types public: - + struct InterceptedRequest { //----------------------------------- /** @short marks an Handle as invalid. */ static const sal_Int32 INVALID_HANDLE = -1; - + //----------------------------------- /** @short contains the interaction request, which should be intercepted. */ ::com::sun::star::uno::Any Request; - + //----------------------------------- /** @short specify the fix continuation, which must be selected, if the interaction could be intercepted successfully. */ ::com::sun::star::uno::Type Continuation; - + //----------------------------------- /** @short specify, if both interactions must have the same type or can be derived from. - + @descr Interaction base on exceptions - and exceptions are real types. So they can be checked in its type. These parameter "MatchExact" influence the type-check in the following way: @@ -90,24 +90,24 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper if it supports exactly the same type ... or FALSE => derived exceptions will be intercepted too. - + @attention This parameter does not influence the check of the continuation type! The continuation must be matched exactly everytimes ... */ sal_Bool MatchExact; - + //----------------------------------- /** @short its an unique identifier, which must be managed by the outside code. - + @descr If there is a derived class, which overwrites the InterceptedInteraction::intercepted() method, it will be called with a reference to an InterceptedRequest struct. Then it can use the handle to react without checking the request type again. */ sal_Int32 Handle; - + //----------------------------------- /** @short default ctor. - + @descr Such constructed object cant be used realy. Might it will crash if its used! Dont forget to initialize all(!) members ... @@ -117,17 +117,17 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper MatchExact = sal_False; Handle = INVALID_HANDLE; } - + //----------------------------------- /** @short initialize this instance. - + @param nHandle used to identify every intercepted request - + @param aRequest must contain an exception object, which can be checked in its uno-type against the later handled interaction. - + @param aContinuation must contain a continuation object, which is used in its uno-type to locate the same continuation @@ -148,12 +148,12 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper MatchExact = bMatchExact; } }; - + //--------------------------------------- /** @short represent the different states, which can occure as result of an interception. - - @see impl_interceptRequest() + + @see impl_interceptRequest() */ enum EInterceptionState { @@ -166,26 +166,26 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper /** the request could be intercepted and the specified continuation could be selected successfully. */ E_INTERCEPTED }; - + //------------------------------------------- // member protected: - + //--------------------------------------- /** @short reference to the intercepted interaction handler. - + @descr NULL is allowed for this member! All interaction will be aborted then ... expecting th handle() was overwritten by a derived class. */ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInterceptedHandler; - + //--------------------------------------- /** @short these list contains the requests, which should be intercepted. */ - ::std::vector< InterceptedRequest > m_lInterceptions; - + ::std::vector< InterceptedRequest > m_lInterceptions; + //------------------------------------------- // native interface public: @@ -194,14 +194,14 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper /** @short initialize a new instance with default values. */ InterceptedInteraction(); - + //--------------------------------------- /** @short initialize a new instance with real values. - + @param xInterceptedHandler the outside interaction handler, which should be intercepted here. - + @param lInterceptions the list of intercepted requests. */ @@ -215,82 +215,82 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper @attention If such interaction handler isnt set here, all incoming requests will be aborted ... if the right continuation is available! - + @param xInterceptedHandler the outside interaction handler, which should be intercepted here. - */ + */ void setInterceptedHandler(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler); - + //--------------------------------------- /** @short set a new list of intercepted interactions. @attention If the interface method handle() will be overwritten by a derived class, the functionality behind these static list cant be used. - + @param lInterceptions the list of intercepted requests. - */ + */ void setInterceptions(const ::std::vector< InterceptedRequest >& lInterceptions); - + //--------------------------------------- /** @short extract a requested continuation from te list of available ones. - + @param lContinuations the list of available continuations. - + @param aType is used to locate the right continuation, by checking its interface type. - + @return A valid reference to the continuation, if it could be located ... or an empty reference otherwhise. */ static ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > extractContinuation( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations, const ::com::sun::star::uno::Type& aType ); - + //------------------------------------------- // useable for derived classes protected: - + //--------------------------------------- /** @short can be overwritten by a derived class to handle interceptions outside. - + @descr This base implementation checks, if the request could be intercepted successfully. Then this method intercepted() is called. The default implementation returns "NOT_INTERCEPTED" everytimes. So the method impl_interceptRequest() uses the right continuation automaticly. - + If this method was overwritten and something different "NO_INTERCEPTED" is returned, the method impl_interceptRequest() will return immediatly with the result, which is returned by this intercepted() method. Then the continuations must be selected inside the intercepted() call! - + @param rRequest it points to the intercepted request (means the item of the set interception list). e.g. its "Handle" member can be used to identify it and react very easy, without the need to check the type of the exception ... - + @param xOrgRequest points to the original interaction, which was intercepted. It provides access to the exception and the list of possible continuations. - + @return The result of this operation. Note: If E_NOT_INTERCEPTED is returned the default handling of the base class will be used automaticly for this request! */ virtual EInterceptionState intercepted(const InterceptedRequest& rRequest , const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest); - + //------------------------------------------- // uno interface public: - + //--------------------------------------- /** @short implements the default handling of this class .... or can be overwritten by any derived class. @@ -304,39 +304,39 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper If this method was overwritten by a derived implementation -> the new implementation has to do everything by itself. Of course it can access all members/helpers and work with it. - But the default implementation isnt used automaticly then. - + But the default implementation isnt used automaticly then. + @param xRequest the interaction request, which should be intercepted. - */ + */ virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) throw(::com::sun::star::uno::RuntimeException); - + //------------------------------------------- // helper private: - + //--------------------------------------- /** @short implements the default handling: - intercept or forward to internal handler. */ UCBHELPER_DLLPRIVATE void impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest); - + //--------------------------------------- /** @short implements the interception of requests. - + @descr The incoming request will be analyzed, if it match any request of the m_lIntercepions list. If an interception could be found, its continuation will be searched and selected. - + The method return the state of that operation. But it doesnt call the intercepted and here set interaction handler. That has to be done in the outside method. - + @param xRequest the interaction request, which should be intercepted. - + @return A identifier, which inidicates if the request was intercepted, the continuation was found and selected ... or not. */ diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 302be2132f05..e6d6553b6504 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -2,7 +2,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,8 +39,8 @@ //========================================================================= -#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) ) -#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > ) +#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) ) +#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > ) //========================================================================= // @@ -48,12 +48,12 @@ // //========================================================================= -#define XINTERFACE_DECL() \ - virtual com::sun::star::uno::Any SAL_CALL \ +#define XINTERFACE_DECL() \ + virtual com::sun::star::uno::Any SAL_CALL \ queryInterface( const com::sun::star::uno::Type & rType ) \ throw( com::sun::star::uno::RuntimeException ); \ - virtual void SAL_CALL \ - acquire() \ + virtual void SAL_CALL \ + acquire() \ throw(); \ virtual void SAL_CALL \ release() \ @@ -65,20 +65,20 @@ // //========================================================================= -#define XINTERFACE_COMMON_IMPL( Class ) \ +#define XINTERFACE_COMMON_IMPL( Class ) \ void SAL_CALL Class::acquire() \ throw() \ { \ - OWeakObject::acquire(); \ + OWeakObject::acquire(); \ } \ \ void SAL_CALL Class::release() \ throw() \ { \ - OWeakObject::release(); \ + OWeakObject::release(); \ } -#define QUERYINTERFACE_IMPL_START( Class ) \ +#define QUERYINTERFACE_IMPL_START( Class ) \ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ const com::sun::star::uno::Type & rType ) \ throw( com::sun::star::uno::RuntimeException ) \ @@ -87,7 +87,7 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ #define QUERYINTERFACE_IMPL_END \ ); \ - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ } //========================================================================= @@ -97,14 +97,14 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ //========================================================================= // 1 interface implemented -#define XINTERFACE_IMPL_1( Class, Ifc1 ) \ +#define XINTERFACE_IMPL_1( Class, Ifc1 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ SAL_STATIC_CAST( Ifc1*, this ) \ QUERYINTERFACE_IMPL_END // 2 interfaces implemented -#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \ +#define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ SAL_STATIC_CAST( Ifc1*, this ), \ @@ -112,7 +112,7 @@ QUERYINTERFACE_IMPL_START( Class ) \ QUERYINTERFACE_IMPL_END // 3 interfaces implemented -#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \ +#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ SAL_STATIC_CAST( Ifc1*, this ), \ @@ -121,7 +121,7 @@ QUERYINTERFACE_IMPL_START( Class ) \ QUERYINTERFACE_IMPL_END // 4 interfaces implemented -#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \ +#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ SAL_STATIC_CAST( Ifc1*, this ), \ @@ -131,7 +131,7 @@ QUERYINTERFACE_IMPL_START( Class ) \ QUERYINTERFACE_IMPL_END // 5 interfaces implemented -#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 ) \ +#define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ SAL_STATIC_CAST( Ifc1*, this ), \ @@ -142,168 +142,168 @@ QUERYINTERFACE_IMPL_START( Class ) \ QUERYINTERFACE_IMPL_END // 6 interfaces implemented -#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \ +#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ) \ QUERYINTERFACE_IMPL_END // 7 interfaces implemented -#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 ) \ +#define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ) \ QUERYINTERFACE_IMPL_END // 8 interfaces implemented -#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 ) \ +#define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ) \ QUERYINTERFACE_IMPL_END // 9 interfaces implemented -#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ +#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ) \ QUERYINTERFACE_IMPL_END // 10 interfaces implemented -#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \ +#define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ) \ QUERYINTERFACE_IMPL_END // 11 interfaces implemented -#define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \ +#define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ), \ + SAL_STATIC_CAST( I11*, this ) \ QUERYINTERFACE_IMPL_END // 12 interfaces implemented -#define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \ +#define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ), \ + SAL_STATIC_CAST( I11*, this ), \ + SAL_STATIC_CAST( I12*, this ) \ QUERYINTERFACE_IMPL_END // 13 interfaces implemented #define XINTERFACE_IMPL_13( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ), \ + SAL_STATIC_CAST( I11*, this ), \ + SAL_STATIC_CAST( I12*, this ), \ + SAL_STATIC_CAST( I13*, this ) \ QUERYINTERFACE_IMPL_END // 14 interfaces implemented -#define XINTERFACE_IMPL_14( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \ +#define XINTERFACE_IMPL_14( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ), \ - SAL_STATIC_CAST( I14*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ), \ + SAL_STATIC_CAST( I11*, this ), \ + SAL_STATIC_CAST( I12*, this ), \ + SAL_STATIC_CAST( I13*, this ), \ + SAL_STATIC_CAST( I14*, this ) \ QUERYINTERFACE_IMPL_END // 15 interfaces implemented -#define XINTERFACE_IMPL_15( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \ +#define XINTERFACE_IMPL_15( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ), \ - SAL_STATIC_CAST( I14*, this ), \ - SAL_STATIC_CAST( I15*, this ) \ + SAL_STATIC_CAST( I1*, this ), \ + SAL_STATIC_CAST( I2*, this ), \ + SAL_STATIC_CAST( I3*, this ), \ + SAL_STATIC_CAST( I4*, this ), \ + SAL_STATIC_CAST( I5*, this ), \ + SAL_STATIC_CAST( I6*, this ), \ + SAL_STATIC_CAST( I7*, this ), \ + SAL_STATIC_CAST( I8*, this ), \ + SAL_STATIC_CAST( I9*, this ), \ + SAL_STATIC_CAST( I10*, this ), \ + SAL_STATIC_CAST( I11*, this ), \ + SAL_STATIC_CAST( I12*, this ), \ + SAL_STATIC_CAST( I13*, this ), \ + SAL_STATIC_CAST( I14*, this ), \ + SAL_STATIC_CAST( I15*, this ) \ QUERYINTERFACE_IMPL_END //========================================================================= @@ -312,12 +312,12 @@ QUERYINTERFACE_IMPL_END // //========================================================================= -#define XTYPEPROVIDER_DECL() \ +#define XTYPEPROVIDER_DECL() \ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \ getImplementationId() \ - throw( com::sun::star::uno::RuntimeException ); \ + throw( com::sun::star::uno::RuntimeException ); \ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \ - getTypes() \ + getTypes() \ throw( com::sun::star::uno::RuntimeException ); //========================================================================= @@ -326,7 +326,7 @@ QUERYINTERFACE_IMPL_END // //========================================================================= -#define XTYPEPROVIDER_COMMON_IMPL( Class ) \ +#define XTYPEPROVIDER_COMMON_IMPL( Class ) \ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \ Class::getImplementationId() \ throw( com::sun::star::uno::RuntimeException ) \ @@ -344,12 +344,12 @@ Class::getImplementationId() \ return (*pId).getImplementationId(); \ } -#define GETTYPES_IMPL_START( Class ) \ +#define GETTYPES_IMPL_START( Class ) \ com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \ Class::getTypes() \ throw( com::sun::star::uno::RuntimeException ) \ { \ - static cppu::OTypeCollection* pCollection = NULL; \ + static cppu::OTypeCollection* pCollection = NULL; \ if ( !pCollection ) \ { \ osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); \ @@ -357,7 +357,7 @@ Class::getTypes() \ { \ static cppu::OTypeCollection collection( -#define GETTYPES_IMPL_END \ +#define GETTYPES_IMPL_END \ ); \ pCollection = &collection; \ } \ @@ -372,213 +372,213 @@ Class::getTypes() \ //========================================================================= // 1 interface supported -#define XTYPEPROVIDER_IMPL_1( Class, I1 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ) \ +#define XTYPEPROVIDER_IMPL_1( Class, I1 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ) \ GETTYPES_IMPL_END // 2 interfaces supported -#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ) \ +#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ) \ GETTYPES_IMPL_END // 3 interfaces supported -#define XTYPEPROVIDER_IMPL_3( Class, I1,I2,I3 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ) \ +#define XTYPEPROVIDER_IMPL_3( Class, I1,I2,I3 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ) \ GETTYPES_IMPL_END // 4 interfaces supported -#define XTYPEPROVIDER_IMPL_4( Class, I1,I2,I3,I4 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ) \ +#define XTYPEPROVIDER_IMPL_4( Class, I1,I2,I3,I4 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ) \ GETTYPES_IMPL_END // 5 interfaces supported -#define XTYPEPROVIDER_IMPL_5( Class, I1,I2,I3,I4,I5 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ) \ +#define XTYPEPROVIDER_IMPL_5( Class, I1,I2,I3,I4,I5 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ) \ GETTYPES_IMPL_END // 6 interfaces supported -#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ) \ +#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ) \ GETTYPES_IMPL_END // 7 interfaces supported -#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ) \ +#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ) \ GETTYPES_IMPL_END // 8 interfaces supported -#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ) \ +#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ) \ GETTYPES_IMPL_END // 9 interfaces supported -#define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ) \ +#define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ) \ GETTYPES_IMPL_END // 10 interfaces supported -#define XTYPEPROVIDER_IMPL_10( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ) \ +#define XTYPEPROVIDER_IMPL_10( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ) \ GETTYPES_IMPL_END // 11 interfaces supported -#define XTYPEPROVIDER_IMPL_11( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ), \ - CPPU_TYPE_REF( I11 ) \ +#define XTYPEPROVIDER_IMPL_11( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ), \ + CPPU_TYPE_REF( I11 ) \ GETTYPES_IMPL_END // 12 interfaces supported -#define XTYPEPROVIDER_IMPL_12( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ), \ - CPPU_TYPE_REF( I11 ), \ - CPPU_TYPE_REF( I12 ) \ +#define XTYPEPROVIDER_IMPL_12( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ), \ + CPPU_TYPE_REF( I11 ), \ + CPPU_TYPE_REF( I12 ) \ GETTYPES_IMPL_END // 13 interfaces supported -#define XTYPEPROVIDER_IMPL_13( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ), \ - CPPU_TYPE_REF( I11 ), \ - CPPU_TYPE_REF( I12 ), \ - CPPU_TYPE_REF( I13 ) \ +#define XTYPEPROVIDER_IMPL_13( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ), \ + CPPU_TYPE_REF( I11 ), \ + CPPU_TYPE_REF( I12 ), \ + CPPU_TYPE_REF( I13 ) \ GETTYPES_IMPL_END // 14 interfaces supported -#define XTYPEPROVIDER_IMPL_14( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ), \ - CPPU_TYPE_REF( I11 ), \ - CPPU_TYPE_REF( I12 ), \ - CPPU_TYPE_REF( I13 ), \ - CPPU_TYPE_REF( I14 ) \ +#define XTYPEPROVIDER_IMPL_14( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ), \ + CPPU_TYPE_REF( I11 ), \ + CPPU_TYPE_REF( I12 ), \ + CPPU_TYPE_REF( I13 ), \ + CPPU_TYPE_REF( I14 ) \ GETTYPES_IMPL_END // 15 interfaces supported -#define XTYPEPROVIDER_IMPL_15( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \ -XTYPEPROVIDER_COMMON_IMPL( Class ) \ -GETTYPES_IMPL_START( Class ) \ - CPPU_TYPE_REF( I1 ), \ - CPPU_TYPE_REF( I2 ), \ - CPPU_TYPE_REF( I3 ), \ - CPPU_TYPE_REF( I4 ), \ - CPPU_TYPE_REF( I5 ), \ - CPPU_TYPE_REF( I6 ), \ - CPPU_TYPE_REF( I7 ), \ - CPPU_TYPE_REF( I8 ), \ - CPPU_TYPE_REF( I9 ), \ - CPPU_TYPE_REF( I10 ), \ - CPPU_TYPE_REF( I11 ), \ - CPPU_TYPE_REF( I12 ), \ - CPPU_TYPE_REF( I13 ), \ - CPPU_TYPE_REF( I14 ), \ - CPPU_TYPE_REF( I15 ) \ +#define XTYPEPROVIDER_IMPL_15( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \ +XTYPEPROVIDER_COMMON_IMPL( Class ) \ +GETTYPES_IMPL_START( Class ) \ + CPPU_TYPE_REF( I1 ), \ + CPPU_TYPE_REF( I2 ), \ + CPPU_TYPE_REF( I3 ), \ + CPPU_TYPE_REF( I4 ), \ + CPPU_TYPE_REF( I5 ), \ + CPPU_TYPE_REF( I6 ), \ + CPPU_TYPE_REF( I7 ), \ + CPPU_TYPE_REF( I8 ), \ + CPPU_TYPE_REF( I9 ), \ + CPPU_TYPE_REF( I10 ), \ + CPPU_TYPE_REF( I11 ), \ + CPPU_TYPE_REF( I12 ), \ + CPPU_TYPE_REF( I13 ), \ + CPPU_TYPE_REF( I14 ), \ + CPPU_TYPE_REF( I15 ) \ GETTYPES_IMPL_END //========================================================================= @@ -587,24 +587,24 @@ GETTYPES_IMPL_END // //========================================================================= -#define XSERVICEINFO_NOFACTORY_DECL() \ - virtual rtl::OUString SAL_CALL \ +#define XSERVICEINFO_NOFACTORY_DECL() \ + virtual rtl::OUString SAL_CALL \ getImplementationName() \ throw( com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const rtl::OUString& ServiceName ) \ + supportsService( const rtl::OUString& ServiceName ) \ throw( com::sun::star::uno::RuntimeException ); \ virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL \ getSupportedServiceNames() \ throw( com::sun::star::uno::RuntimeException ); \ \ - static rtl::OUString \ + static rtl::OUString \ getImplementationName_Static(); \ static com::sun::star::uno::Sequence< rtl::OUString > \ getSupportedServiceNames_Static(); -#define XSERVICEINFO_DECL() \ - XSERVICEINFO_NOFACTORY_DECL() \ +#define XSERVICEINFO_DECL() \ + XSERVICEINFO_NOFACTORY_DECL() \ \ static com::sun::star::uno::Reference< \ com::sun::star::lang::XSingleServiceFactory > \ @@ -617,25 +617,25 @@ GETTYPES_IMPL_END // //========================================================================= -#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -rtl::OUString SAL_CALL Class::getImplementationName() \ - throw( com::sun::star::uno::RuntimeException ) \ +#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +rtl::OUString SAL_CALL Class::getImplementationName() \ + throw( com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ \ -rtl::OUString Class::getImplementationName_Static() \ +rtl::OUString Class::getImplementationName_Static() \ { \ return ImplName; \ } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const rtl::OUString& ServiceName ) \ +Class::supportsService( const rtl::OUString& ServiceName ) \ throw( com::sun::star::uno::RuntimeException ) \ { \ com::sun::star::uno::Sequence< rtl::OUString > aSNL = \ getSupportedServiceNames(); \ - const rtl::OUString* pArray = aSNL.getArray(); \ + const rtl::OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -652,9 +652,9 @@ Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ -static com::sun::star::uno::Reference< \ - com::sun::star::uno::XInterface > SAL_CALL \ +#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ +static com::sun::star::uno::Reference< \ + com::sun::star::uno::XInterface > SAL_CALL \ Class##_CreateInstance( const com::sun::star::uno::Reference< \ com::sun::star::lang::XMultiServiceFactory> & rSMgr ) \ throw( com::sun::star::uno::Exception ) \ @@ -671,30 +671,30 @@ Class##_CreateInstance( const com::sun::star::uno::Reference< \ // //========================================================================= -#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ +#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ com::sun::star::uno::Reference< \ - com::sun::star::lang::XSingleServiceFactory > \ -Class::createServiceFactory( const com::sun::star::uno::Reference< \ + com::sun::star::lang::XSingleServiceFactory > \ +Class::createServiceFactory( const com::sun::star::uno::Reference< \ com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ) \ { \ - return com::sun::star::uno::Reference< \ + return com::sun::star::uno::Reference< \ com::sun::star::lang::XSingleServiceFactory >( \ - cppu::createOneInstanceFactory( \ + cppu::createOneInstanceFactory( \ rxServiceMgr, \ Class::getImplementationName_Static(), \ Class##_CreateInstance, \ Class::getSupportedServiceNames_Static() ) ); \ } -#define SINGLE_SERVICE_FACTORY_IMPL( Class ) \ -com::sun::star::uno::Reference< \ - com::sun::star::lang::XSingleServiceFactory > \ -Class::createServiceFactory( const com::sun::star::uno::Reference< \ +#define SINGLE_SERVICE_FACTORY_IMPL( Class ) \ +com::sun::star::uno::Reference< \ + com::sun::star::lang::XSingleServiceFactory > \ +Class::createServiceFactory( const com::sun::star::uno::Reference< \ com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ) \ { \ - return com::sun::star::uno::Reference< \ + return com::sun::star::uno::Reference< \ com::sun::star::lang::XSingleServiceFactory >( \ - cppu::createSingleFactory( \ + cppu::createSingleFactory( \ rxServiceMgr, \ Class::getImplementationName_Static(), \ Class##_CreateInstance, \ @@ -704,15 +704,15 @@ Class::createServiceFactory( const com::sun::star::uno::Reference< \ // Service without service factory. // Own implementation of getSupportedServiceNames_Static(). -#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ com::sun::star::uno::Sequence< rtl::OUString > \ Class::getSupportedServiceNames_Static() // 1 service name -#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ com::sun::star::uno::Sequence< rtl::OUString > \ Class::getSupportedServiceNames_Static() \ @@ -725,17 +725,17 @@ Class::getSupportedServiceNames_Static() \ // Service with service factory. // Own implementation of getSupportedServiceNames_Static(). -#define XSERVICEINFO_IMPL_0( Class, ImplName ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ +#define XSERVICEINFO_IMPL_0( Class, ImplName ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ com::sun::star::uno::Sequence< rtl::OUString > \ Class::getSupportedServiceNames_Static() // 1 service name -#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ +#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \ +XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ +XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ com::sun::star::uno::Sequence< rtl::OUString > \ Class::getSupportedServiceNames_Static() \ diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx index 50aa9b91c77e..fe9d9f3d1137 100644 --- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx +++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx @@ -2,7 +2,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 @@ -72,10 +72,10 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet : m_xSMgr; com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_xTypeConverter; - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; PropertyValues* m_pValues; - sal_Bool m_bWasNull; - sal_Bool m_bTriedToGetTypeConverter; + sal_Bool m_bWasNull; + sal_Bool m_bTriedToGetTypeConverter; private: UCBHELPER_DLLPRIVATE const com::sun::star::uno::Reference< @@ -407,10 +407,10 @@ public: } /** - * This method tries to append all property values contained in a + * This method tries to append all property values contained in a * property set to the value set. * - * @param rSet is a property set containing the property values. + * @param rSet is a property set containing the property values. */ void appendPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rSet ); @@ -418,10 +418,10 @@ public: /** This method tries to append a single property value contained in a * property set to the value set. * - * @param rSet is a property set containing the property values. - * @param rProperty is the property for that the value shall be obtained - * from the given property set. - * @return False, if the property value cannot be obtained from the + * @param rSet is a property set containing the property values. + * @param rProperty is the property for that the value shall be obtained + * from the given property set. + * @return False, if the property value cannot be obtained from the * given property pet. True, otherwise. */ sal_Bool appendPropertySetValue( diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx index 3219a79fab73..5aaaf48260ea 100644 --- a/ucbhelper/inc/ucbhelper/providerhelper.hxx +++ b/ucbhelper/inc/ucbhelper/providerhelper.hxx @@ -2,7 +2,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 @@ -86,7 +86,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject, protected: osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr; private: UCBHELPER_DLLPRIVATE void removeContent( ContentImplHelper* pContent ); @@ -99,8 +99,8 @@ private: protected: /** - * This method returns a content with the given id, if it already exists. - * Use this method in your "queryContent" implementation to ensure unique + * This method returns a content with the given id, if it already exists. + * Use this method in your "queryContent" implementation to ensure unique * objects. * * @param Identifier is the content identifier, for that an existing @@ -113,7 +113,7 @@ protected: ::com::sun::star::ucb::XContentIdentifier >& Identifier ); /** - * This method returns a content with the given URL, if it already exists. + * This method returns a content with the given URL, if it already exists. * * @param rURL is the URL ( content identifier string ), for that an * existing content object is requested. @@ -124,21 +124,21 @@ protected: queryExistingContent( const ::rtl::OUString& rURL ); /** - * This method registers a newly created content instance with the + * This method registers a newly created content instance with the * content provider. It should be called directly after creating a new * content instance. The provider can reuse a registered instance upon * subsedent requests for content instances with an idententifier - * of a registered instance. - * Note that the provider does not hold a hard reference on the - * registered instance. If last external reference is gone, the provider + * of a registered instance. + * Note that the provider does not hold a hard reference on the + * registered instance. If last external reference is gone, the provider * will remove the instance from its inventory of known instances. * Nothing will happen in case an already registered instance shall * be registered more than once. * * @param the content instance that is to be registered. */ - void registerNewContent( - const com::sun::star::uno::Reference< + void registerNewContent( + const com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > & xContent ); public: @@ -183,15 +183,15 @@ public: ////////////////////////////////////////////////////////////////////// /** - * This method returns a content with the requested id. + * This method returns a content with the requested id. * - * The implementation should: + * The implementation should: * - * - Check, whether the Identifier is valid ( URL syntax ). - * - Use queryExistingContent(...) to determine, whether there exists - * already a content with the given id. - * - Return the possibly existing content.Create and return a new - * content, otherwise + * - Check, whether the Identifier is valid ( URL syntax ). + * - Use queryExistingContent(...) to determine, whether there exists + * already a content with the given id. + * - Return the possibly existing content.Create and return a new + * content, otherwise */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL @@ -211,7 +211,7 @@ public: ////////////////////////////////////////////////////////////////////// /** - * This method returns a mutex, which protects the content list of the + * This method returns a mutex, which protects the content list of the * provider. So you can prevent modifications of that list easyly. * * @return the mutex. @@ -219,7 +219,7 @@ public: osl::Mutex& getContentListMutex() { return m_aMutex; } /** - * This method fills a list with all contents existing at calling time. + * This method fills a list with all contents existing at calling time. * Note: You may prevent modifications of the content list at any time * by acquiring the content list mutex of the provider. * @@ -228,7 +228,7 @@ public: void queryExistingContents( ContentRefList& rContents ); /** - * This method returns the propertyset containing the Additional Core + * This method returns the propertyset containing the Additional Core * Properties of a content. * * @param rKey is the key for the propertyset. @@ -241,7 +241,7 @@ public: getAdditionalPropertySet( const ::rtl::OUString& rKey, sal_Bool bCreate ); /** - * This method renames the propertyset containing the Additional Core + * This method renames the propertyset containing the Additional Core * Properties of a content. * * @param rOldKey is the old key of the propertyset. @@ -255,7 +255,7 @@ public: sal_Bool bRecursive ); /** - * This method copies the propertyset containing the Additional Core + * This method copies the propertyset containing the Additional Core * Properties of a content. * * @param rSourceKey is the key of the source propertyset. @@ -269,7 +269,7 @@ public: sal_Bool bRecursive ); /** - * This method removes the propertyset containing the Additional Core + * This method removes the propertyset containing the Additional Core * Properties of a content. * * @param rKey is the key of the propertyset. diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx index 98ebbff7941a..d18489e71b8a 100644 --- a/ucbhelper/inc/ucbhelper/proxydecider.hxx +++ b/ucbhelper/inc/ucbhelper/proxydecider.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx index 093bf8f8a552..3f1857c77c87 100644 --- a/ucbhelper/inc/ucbhelper/resultset.hxx +++ b/ucbhelper/inc/ucbhelper/resultset.hxx @@ -2,7 +2,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,7 +51,7 @@ namespace ucbhelper { //========================================================================= -#define RESULTSET_SERVICE_NAME "com.sun.star.ucb.ContentResultSet" +#define RESULTSET_SERVICE_NAME "com.sun.star.ucb.ContentResultSet" //========================================================================= diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx index e670a76b34b5..2a49029d2c75 100644 --- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx +++ b/ucbhelper/inc/ucbhelper/resultsethelper.hxx @@ -2,7 +2,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,7 +60,7 @@ namespace ucbhelper { * * Features of the base class implementation: * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo ) - * - all required interfaces for service com::sun::star::ucb::DynamicResultSet + * - all required interfaces for service com::sun::star::ucb::DynamicResultSet */ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : public cppu::OWeakObject, @@ -69,20 +69,20 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : public com::sun::star::ucb::XDynamicResultSet { cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; - sal_Bool m_bStatic; - sal_Bool m_bInitDone; + sal_Bool m_bStatic; + sal_Bool m_bInitDone; protected: - osl::Mutex m_aMutex; - com::sun::star::ucb::OpenCommandArgument2 m_aCommand; + osl::Mutex m_aMutex; + com::sun::star::ucb::OpenCommandArgument2 m_aCommand; com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + com::sun::star::lang::XMultiServiceFactory > m_xSMgr; // Resultset #1 com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > m_xResultSet1; + com::sun::star::sdbc::XResultSet > m_xResultSet1; // Resultset #2 com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > m_xResultSet2; + com::sun::star::sdbc::XResultSet > m_xResultSet2; // Resultset changes listener. com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > m_xListener; diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx index ceb01b4cf6a1..f0bcd5b8d672 100644 --- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx +++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx @@ -2,7 +2,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 @@ #include "ucbhelper/ucbhelperdllapi.h" namespace com { namespace sun { namespace star { - namespace lang { class XMultiServiceFactory; } + namespace lang { class XMultiServiceFactory; } namespace beans { struct Property; } } } } @@ -88,10 +88,10 @@ struct ResultSetColumnData ::rtl::OUString schemaName; /** @see ResultSetMetaData::getPrecision */ - sal_Int32 precision; + sal_Int32 precision; /** @see ResultSetMetaData::getScale */ - sal_Int32 scale; + sal_Int32 scale; /** @see ResultSetMetaData::getTableName */ ::rtl::OUString tableName; @@ -103,13 +103,13 @@ struct ResultSetColumnData ::rtl::OUString columnTypeName; /** @see ResultSetMetaData::isReadOnly */ - sal_Bool isReadOnly; + sal_Bool isReadOnly; /** @see ResultSetMetaData::isWritable */ - sal_Bool isWritable; + sal_Bool isWritable; /** @see ResultSetMetaData::isDefinitelyWritable */ - sal_Bool isDefinitelyWritable; + sal_Bool isDefinitelyWritable; /** @see ResultSetMetaData::getColumnServiceName */ ::rtl::OUString columnServiceName; @@ -156,16 +156,16 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr; ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property > m_aProps; + ::com::sun::star::beans::Property > m_aProps; sal_Bool m_bReadOnly; public: /** - * Constructor. + * Constructor. * - * @param rxSMgr is a Servive Manager. - * @param rProps is a sequence of properties (partially) describing the + * @param rxSMgr is a Servive Manager. + * @param rProps is a sequence of properties (partially) describing the * columns of a resultset. * @param bReadOnly is used to specify whether the whole(!) resultset * is read-only. @@ -178,17 +178,17 @@ public: sal_Bool bReadOnly = sal_True ); /** - * Constructor. + * Constructor. * - * @param rxSMgr is a Servive Manager. - * @param rProps is a sequence of properties (partially) describing the + * @param rxSMgr is a Servive Manager. + * @param rProps is a sequence of properties (partially) describing the * columns of a resultset. - * @param rColumnData contains additional meta data for the columns of - * a resultset, which override the default values returned by the - * appropriate methods of this class. The length of rColumnData - * must be the same as length of rProps. - * rColumnData[ 0 ] corresponds to data in rProps[ 0 ], - * rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ... + * @param rColumnData contains additional meta data for the columns of + * a resultset, which override the default values returned by the + * appropriate methods of this class. The length of rColumnData + * must be the same as length of rProps. + * rColumnData[ 0 ] corresponds to data in rProps[ 0 ], + * rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ... */ ResultSetMetaData( const ::com::sun::star::uno::Reference< @@ -198,7 +198,7 @@ public: const std::vector< ResultSetColumnData >& rColumnData ); /** - * Destructor. + * Destructor. */ virtual ~ResultSetMetaData(); @@ -213,30 +213,30 @@ public: /** * Returns the number of columns of the resultset. * - * @return the length of the property sequence. + * @return the length of the property sequence. */ virtual sal_Int32 SAL_CALL getColumnCount() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Checks whether column is automatically numbered, which makes it - * read-only. + * Checks whether column is automatically numbered, which makes it + * read-only. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if column is automatically numbered. + * @return true, if column is automatically numbered. */ virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Checks whether column is case sensitive. + * Checks whether column is case sensitive. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if column is case sensitive. + * @return true, if column is case sensitive. */ virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) @@ -244,35 +244,35 @@ public: ::com::sun::star::uno::RuntimeException ); /** * Checks whether the value stored in column can be used in a - * WHERE clause. + * WHERE clause. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if the column is searchable. + * @return true, if the column is searchable. */ virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Checks whether column is a cash value. + * Checks whether column is a cash value. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if the column is a cash value. + * @return true, if the column is a cash value. */ virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Checks whether a NULL can be stored in column. + * Checks whether a NULL can be stored in column. * - * @see com::sun::star::sdbc::ColumnValue + * @see com::sun::star::sdbc::ColumnValue * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return ::com::sun::star::sdbc::ColumnValue::NULLABLE, if a NULL + * @return ::com::sun::star::sdbc::ColumnValue::NULLABLE, if a NULL * can be stored in the column. */ virtual sal_Int32 SAL_CALL @@ -280,100 +280,100 @@ public: throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Checks whether the value stored in column is a signed number. + * Checks whether the value stored in column is a signed number. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if the value stored in column is a signed number. + * @return true, if the value stored in column is a signed number. */ virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the normal maximum width in characters for column. + * Gets the normal maximum width in characters for column. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the normal maximum width in characters for column. + * @return the normal maximum width in characters for column. */ virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the suggested column title for column, to be used in print- - * outs and displays. + * Gets the suggested column title for column, to be used in print- + * outs and displays. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the column label. + * @return the column label. */ virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the name of column. + * Gets the name of column. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the name of the property that corresponds to column. + * @return the name of the property that corresponds to column. */ virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the schema name for the table from which column of this - * result set was derived. - * Because this feature is not widely supported, the return value - * for many DBMSs will be an empty string. + * Gets the schema name for the table from which column of this + * result set was derived. + * Because this feature is not widely supported, the return value + * for many DBMSs will be an empty string. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the schema name of column or an empty string. + * @return the schema name of column or an empty string. */ virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * For number types, getprecision gets the number of decimal digits - * in column. - * For character types, it gets the maximum length in characters for - * column. - * For binary types, it gets the maximum length in bytes for column. + * For number types, getprecision gets the number of decimal digits + * in column. + * For character types, it gets the maximum length in characters for + * column. + * For binary types, it gets the maximum length in bytes for column. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the precision for the column. + * @return the precision for the column. */ virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the number of digits to the right of the decimal point for - * values in column. + * Gets the number of digits to the right of the decimal point for + * values in column. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the scale of the column. + * @return the scale of the column. */ virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the name of the table from which column of this result set - * was derived or "" if there is none (for example, for a join). - * Because this feature is not widely supported, the return value - * for many DBMSs will be an empty string. + * Gets the name of the table from which column of this result set + * was derived or "" if there is none (for example, for a join). + * Because this feature is not widely supported, the return value + * for many DBMSs will be an empty string. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the table name for column or an empty string. + * @return the table name for column or an empty string. */ virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) @@ -381,27 +381,27 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::rtl::OUString SAL_CALL /** - * Gets the catalog name for the table from which column of this - * result set was derived. - * Because this feature is not widely supported, the return value - * for many DBMSs will be an empty string. + * Gets the catalog name for the table from which column of this + * result set was derived. + * Because this feature is not widely supported, the return value + * for many DBMSs will be an empty string. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the catalog name for column or an empty string. + * @return the catalog name for column or an empty string. */ getCatalogName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the JDBC type for the value stored in column. ... The STRUCT - * and DISTINCT type codes are always returned for structured and - * distinct types, regardless of whether the value will be mapped - * according to the standard mapping or be a custom mapping. + * Gets the JDBC type for the value stored in column. ... The STRUCT + * and DISTINCT type codes are always returned for structured and + * distinct types, regardless of whether the value will be mapped + * according to the standard mapping or be a custom mapping. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the type of the property that corresponds to column - mapped + * @return the type of the property that corresponds to column - mapped * from UNO-Type to SQL-Type. */ virtual sal_Int32 SAL_CALL @@ -409,14 +409,14 @@ public: throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** - * Gets the type name used by this particular data source for the - * values stored in column. If the type code for the type of value - * stored in column is STRUCT, DISTINCT or JAVA_OBJECT, this method - * returns a fully-qualified SQL type name. + * Gets the type name used by this particular data source for the + * values stored in column. If the type code for the type of value + * stored in column is STRUCT, DISTINCT or JAVA_OBJECT, this method + * returns a fully-qualified SQL type name. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the column type name. + * @return the column type name. */ virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) @@ -427,7 +427,7 @@ public: * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if the column is definetely not writable. + * @return true, if the column is definetely not writable. */ virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) @@ -438,7 +438,7 @@ public: * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if it is possible for a write to succeed. + * @return true, if it is possible for a write to succeed. */ virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) @@ -449,7 +449,7 @@ public: * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return true, if a write on the column will definetely succeed. + * @return true, if a write on the column will definetely succeed. */ virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) @@ -457,13 +457,13 @@ public: ::com::sun::star::uno::RuntimeException ); /** * Returns the fully-qualified name of the service whose instances - * are manufactured if the method + * are manufactured if the method * com::sun::star::sdbc::ResultSet::getObject is called to retrieve a * value from the column. * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return the service name for column or an empty string, if no service + * @return the service name for column or an empty string, if no service * is applicable. */ virtual ::rtl::OUString SAL_CALL diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx index 026cd7f7e991..535fb1af2471 100644 --- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx @@ -2,7 +2,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 @@ -114,7 +114,7 @@ public: * @param rPassword contains a password, if available (for instance from * a previous try). * @param rAccount contains an account, if applicable. - * @param bAllowPersistentStoring specifies if the credentials should + * @param bAllowPersistentStoring specifies if the credentials should * be stored in the passowrd container persistently * @param bAllowUseSystemCredntials specifies if requesting client is * able to obtain and use system credentials for authentication @@ -179,7 +179,7 @@ public: * @param eAccountType specifies whether an account is applicable and modifiable. * @param rAccount contains an account, if applicable. - * @param bAllowPersistentStoring specifies if the credentials should + * @param bAllowPersistentStoring specifies if the credentials should * be stored in the passowrd container persistently * @param bAllowUseSystemCredntials specifies if requesting client is * able to obtain and use system credentials for authentication diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx index c770c8e7c21a..710b21ed4a44 100644 --- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx index 6797818ca8e8..39f583f07513 100644 --- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx index e96f36431298..e00194d59d51 100644 --- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx index 8c2bff929d56..a17010ee02bd 100644 --- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx +++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx @@ -2,7 +2,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/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h index 28712c5543c5..f40591b0f0f0 100644 --- a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h +++ b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h @@ -2,7 +2,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 @@ -28,16 +28,16 @@ #ifndef INCLUDED_UCBHELPERDLLAPI_H #define INCLUDED_UCBHELPERDLLAPI_H - + #include "sal/types.h" - + #if defined(UCBHELPER_DLLIMPLEMENTATION) #define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_UCBHELPERDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx index 5cdfa4f3df59..73b81a3fc26b 100644 --- a/ucbhelper/source/client/activedatasink.cxx +++ b/ucbhelper/source/client/activedatasink.cxx @@ -2,7 +2,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/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index aa90802a16e7..93d7d1f341d1 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -2,7 +2,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/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx index 16c72aa833e5..54897429b508 100644 --- a/ucbhelper/source/client/commandenvironment.cxx +++ b/ucbhelper/source/client/commandenvironment.cxx @@ -2,7 +2,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 @@ struct CommandEnvironment_Impl Reference< XProgressHandler > m_xProgressHandler; CommandEnvironment_Impl( - const Reference< XInteractionHandler >& rxInteractionHandler, + const Reference< XInteractionHandler >& rxInteractionHandler, const Reference< XProgressHandler >& rxProgressHandler ) : m_xInteractionHandler( rxInteractionHandler ), m_xProgressHandler( rxProgressHandler ) {} @@ -79,7 +79,7 @@ struct CommandEnvironment_Impl //========================================================================= CommandEnvironment::CommandEnvironment( - const Reference< XInteractionHandler >& rxInteractionHandler, + const Reference< XInteractionHandler >& rxInteractionHandler, const Reference< XProgressHandler >& rxProgressHandler ) { m_pImpl = new CommandEnvironment_Impl( rxInteractionHandler, diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 1da9dc9b8a2b..6f5c7b08dae2 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -2,7 +2,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/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx index cc5f6f8280e0..283872b14776 100644 --- a/ucbhelper/source/client/contentbroker.cxx +++ b/ucbhelper/source/client/contentbroker.cxx @@ -2,7 +2,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 @@ -258,10 +258,10 @@ ContentBroker* ContentBroker::get() ContentBroker_Impl::~ContentBroker_Impl() { - Reference< XComponent > xComponent( m_xProvider, UNO_QUERY ); + Reference< XComponent > xComponent( m_xProvider, UNO_QUERY ); if ( xComponent.is() ) { - m_xIdFac = 0; + m_xIdFac = 0; m_xProvider = 0; m_xProviderMgr = 0; diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx index 514772363ca9..41c75e45284a 100644 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ b/ucbhelper/source/client/fileidentifierconverter.cxx @@ -2,7 +2,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/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index 0556e181c48b..cf70bc1053e3 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -2,7 +2,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 @@ -63,7 +63,7 @@ void InterceptedInteraction::setInterceptedHandler(const css::uno::Reference< cs -----------------------------------------------*/ void InterceptedInteraction::setInterceptions(const ::std::vector< InterceptedRequest >& lInterceptions) { - m_lInterceptions = lInterceptions; + m_lInterceptions = lInterceptions; } /*----------------------------------------------- @@ -84,18 +84,18 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio const css::uno::Type& aType ) { const css::uno::Reference< css::task::XInteractionContinuation >* pContinuations = lContinuations.getConstArray(); - + sal_Int32 c = lContinuations.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { css::uno::Reference< css::uno::XInterface > xCheck(pContinuations[i], css::uno::UNO_QUERY); if (xCheck->queryInterface(aType).hasValue()) return pContinuations[i]; } - - return css::uno::Reference< css::task::XInteractionContinuation >(); + + return css::uno::Reference< css::task::XInteractionContinuation >(); } /*----------------------------------------------- @@ -113,7 +113,7 @@ void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::tas void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) { EInterceptionState eState = impl_interceptRequest(xRequest); - + switch(eState) { case E_NOT_INTERCEPTED: @@ -124,7 +124,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref m_xInterceptedHandler->handle(xRequest); } break; - + case E_NO_CONTINUATION_FOUND: { // Runtime error! The defined continuation could not be located @@ -133,7 +133,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!"); } break; - + case E_INTERCEPTED: break; } @@ -147,7 +147,7 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep css::uno::Any aRequest = xRequest->getRequest(); css::uno::Type aRequestType = aRequest.getValueType(); css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations = xRequest->getContinuations(); - + // check against the list of static requests sal_Int32 nHandle = 0; ::std::vector< InterceptedRequest >::const_iterator pIt; @@ -156,15 +156,15 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep ++pIt ) { const InterceptedRequest& rInterception = *pIt; - css::uno::Type aInterceptedType = rInterception.Request.getValueType(); - + css::uno::Type aInterceptedType = rInterception.Request.getValueType(); + // check the request sal_Bool bMatch = sal_False; if (rInterception.MatchExact) bMatch = aInterceptedType.equals(aRequestType); else bMatch = aInterceptedType.isAssignableFrom(aRequestType); // dont change intercepted and request type here -> it will check the wrong direction! - + // intercepted ... // Call they might existing derived class, so they can handle that by its own. // If its not interested on that (may be its not overwritten and the default implementation @@ -176,10 +176,10 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep break; return eState; } - - ++nHandle; + + ++nHandle; } - + if (pIt != m_lInterceptions.end()) // => can be true only if bMatch=TRUE! { // match -> search required continuation @@ -190,12 +190,12 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep xContinuation->select(); return E_INTERCEPTED; } - + // Can be reached only, if the request does not support the given continuation! // => RuntimeError!? return E_NO_CONTINUATION_FOUND; } - + return E_NOT_INTERCEPTED; } diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 8c26104a07b6..2862dba331bd 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -2,7 +2,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 @@ -93,7 +93,7 @@ class HostnameCache typedef std::pair< rtl::OUString, rtl::OUString > HostListEntry; std::list< HostListEntry > m_aHostList; - sal_uInt32 m_nCapacity; + sal_uInt32 m_nCapacity; public: explicit HostnameCache( sal_uInt32 nCapacity ) @@ -110,7 +110,7 @@ public: { if ( (*it).first == rKey ) { - rValue = (*it).second; + rValue = (*it).second; return true; } it++; @@ -123,7 +123,7 @@ public: if ( m_aHostList.size() == m_nCapacity ) m_aHostList.resize( m_nCapacity / 2 ); - m_aHostList.push_front( HostListEntry( rKey, rValue ) ); + m_aHostList.push_front( HostListEntry( rKey, rValue ) ); } }; @@ -556,7 +556,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // This might be quite expensive (DNS lookup). const osl::SocketAddr aAddr( aHost, nPort ); aFullyQualifiedHost = aAddr.getHostname().toAsciiLowerCase(); - m_aHostnames.put( aHost, aFullyQualifiedHost ); + m_aHostnames.put( aHost, aFullyQualifiedHost ); } // Error resolving name? -> fallback. diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 36694413d0fa..925dc2988cd2 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -2,7 +2,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/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx index 533e5f6080e1..89486c0a28e0 100644 --- a/ucbhelper/source/provider/commandenvironmentproxy.cxx +++ b/ucbhelper/source/provider/commandenvironmentproxy.cxx @@ -2,7 +2,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 @@ -61,7 +61,7 @@ namespace ucbhelper struct CommandEnvironmentProxy_Impl { - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; Reference< XCommandEnvironment > m_xEnv; Reference< XInteractionHandler > m_xInteractionHandler; Reference< XProgressHandler > m_xProgressHandler; @@ -69,7 +69,7 @@ struct CommandEnvironmentProxy_Impl sal_Bool m_bGotProgressHandler; CommandEnvironmentProxy_Impl( - const Reference< XCommandEnvironment >& rxEnv ) + const Reference< XCommandEnvironment >& rxEnv ) : m_xEnv( rxEnv ), m_bGotInteractionHandler( sal_False ), m_bGotProgressHandler( sal_False ) {} }; diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx index 2b858d614c78..a7b6dbade894 100644 --- a/ucbhelper/source/provider/configureucb.cxx +++ b/ucbhelper/source/provider/configureucb.cxx @@ -2,7 +2,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/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index d95d48b40d44..c527ee5558f6 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -2,7 +2,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 @@ -148,13 +148,13 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar struct ContentImplHelper_Impl { - rtl::Reference< ::ucbhelper::PropertySetInfo > m_xPropSetInfo; + rtl::Reference< ::ucbhelper::PropertySetInfo > m_xPropSetInfo; rtl::Reference< ::ucbhelper::CommandProcessorInfo > m_xCommandsInfo; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; cppu::OInterfaceContainerHelper* m_pContentEventListeners; cppu::OInterfaceContainerHelper* m_pPropSetChangeListeners; cppu::OInterfaceContainerHelper* m_pCommandChangeListeners; - PropertyChangeListeners* m_pPropertyChangeListeners; + PropertyChangeListeners* m_pPropertyChangeListeners; ContentImplHelper_Impl() : m_pDisposeEventListeners( 0 ), @@ -190,7 +190,7 @@ namespace ucbhelper { ContentImplHelper::ContentImplHelper( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const rtl::Reference< ContentProviderImplHelper >& rxProvider, - const uno::Reference< + const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) : m_pImpl( new ContentImplHelper_Impl ), m_xSMgr( rxSMgr ), @@ -224,7 +224,7 @@ void SAL_CALL ContentImplHelper::release() { // #144882# - Call to OWeakObject::release may destroy m_xProvider. // Prevent this. - rtl::Reference< ContentProviderImplHelper > xKeepProviderAlive( + rtl::Reference< ContentProviderImplHelper > xKeepProviderAlive( m_xProvider ); { @@ -322,7 +322,7 @@ void SAL_CALL ContentImplHelper::dispose() m_pImpl->m_pPropSetChangeListeners->getLength() ) { lang::EventObject aEvt; - aEvt.Source + aEvt.Source = static_cast< beans::XPropertySetInfoChangeNotifier * >( this ); m_pImpl->m_pPropSetChangeListeners->disposeAndClear( aEvt ); } @@ -338,7 +338,7 @@ void SAL_CALL ContentImplHelper::dispose() if ( m_pImpl->m_pPropertyChangeListeners ) { lang::EventObject aEvt; - aEvt.Source + aEvt.Source = static_cast< beans::XPropertiesChangeNotifier * >( this ); m_pImpl->m_pPropertyChangeListeners->disposeAndClear( aEvt ); } @@ -378,7 +378,7 @@ void SAL_CALL ContentImplHelper::removeEventListener( //========================================================================= // virtual -uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL +uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL ContentImplHelper::getIdentifier() throw( uno::RuntimeException ) { @@ -540,8 +540,8 @@ void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener( // virtual void SAL_CALL ContentImplHelper::addProperty( - const rtl::OUString& Name, - sal_Int16 Attributes, + const rtl::OUString& Name, + sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, beans::IllegalTypeException, @@ -574,15 +574,15 @@ void SAL_CALL ContentImplHelper::addProperty( uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet( getAdditionalPropertySet( sal_True ) ); - OSL_ENSURE( xSet.is(), + OSL_ENSURE( xSet.is(), "ContentImplHelper::addProperty - No property set!" ); if ( xSet.is() ) { - uno::Reference< beans::XPropertyContainer > xContainer( + uno::Reference< beans::XPropertyContainer > xContainer( xSet, uno::UNO_QUERY ); - OSL_ENSURE( + OSL_ENSURE( xContainer.is(), "ContentImplHelper::addProperty - No property container!" ); @@ -653,7 +653,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) // XCommandProcessor commands! uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv; - beans::Property aProp + beans::Property aProp = getPropertySetInfo( xEnv )->getPropertyByName( Name ); if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) ) @@ -677,10 +677,10 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) getAdditionalPropertySet( sal_False ) ); if ( xSet.is() ) { - uno::Reference< beans::XPropertyContainer > xContainer( + uno::Reference< beans::XPropertyContainer > xContainer( xSet, uno::UNO_QUERY ); - OSL_ENSURE( + OSL_ENSURE( xContainer.is(), "ContentImplHelper::removeProperty - No property container!" ); @@ -698,7 +698,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) } catch ( beans::NotRemoveableException const & ) { - OSL_ENSURE( + OSL_ENSURE( sal_False, "ContentImplHelper::removeProperty - Unremoveable!" ); throw; @@ -711,7 +711,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) if ( xSet->getPropertySetInfo()->getProperties().getLength() == 0 ) { // Remove empty propertyset from registry. - uno::Reference< com::sun::star::ucb::XPropertySetRegistry > + uno::Reference< com::sun::star::ucb::XPropertySetRegistry > xReg = xSet->getRegistry(); if ( xReg.is() ) { @@ -865,7 +865,7 @@ void ContentImplHelper::notifyPropertiesChange( { // First, notify listeners interested in changes of every property. cppu::OInterfaceContainerHelper* pAllPropsContainer - = m_pImpl->m_pPropertyChangeListeners->getContainer( + = m_pImpl->m_pPropertyChangeListeners->getContainer( rtl::OUString() ); if ( pAllPropsContainer ) { @@ -966,7 +966,7 @@ void ContentImplHelper::notifyCommandInfoChange( return; // Notify event listeners. - cppu::OInterfaceIteratorHelper aIter( + cppu::OInterfaceIteratorHelper aIter( *m_pImpl->m_pCommandChangeListeners ); while ( aIter.hasMoreElements() ) { @@ -979,7 +979,7 @@ void ContentImplHelper::notifyCommandInfoChange( } //========================================================================= -void ContentImplHelper::notifyContentEvent( +void ContentImplHelper::notifyContentEvent( const com::sun::star::ucb::ContentEvent& evt ) const { if ( !m_pImpl->m_pContentEventListeners ) @@ -990,8 +990,8 @@ void ContentImplHelper::notifyContentEvent( while ( aIter.hasMoreElements() ) { // Propagate event. - uno::Reference< - com::sun::star::ucb::XContentEventListener > xListener( + uno::Reference< + com::sun::star::ucb::XContentEventListener > xListener( aIter.next(), uno::UNO_QUERY ); if ( xListener.is() ) xListener->contentEvent( evt ); @@ -1012,11 +1012,11 @@ void ContentImplHelper::inserted() if ( xParent.is() ) { - com::sun::star::ucb::ContentEvent aEvt( + com::sun::star::ucb::ContentEvent aEvt( static_cast< cppu::OWeakObject * >( xParent.get() ), // Source - com::sun::star::ucb::ContentAction::INSERTED, // Action - this, // Content - xParent->getIdentifier() ); // Id + com::sun::star::ucb::ContentAction::INSERTED, // Action + this, // Content + xParent->getIdentifier() ); // Id xParent->notifyContentEvent( aEvt ); } } @@ -1032,16 +1032,16 @@ void ContentImplHelper::deleted() if ( xParent.is() ) { // Let parent notify "REMOVED" event. - com::sun::star::ucb::ContentEvent aEvt( + com::sun::star::ucb::ContentEvent aEvt( static_cast< cppu::OWeakObject * >( xParent.get() ), com::sun::star::ucb::ContentAction::REMOVED, this, - xParent->getIdentifier() ); + xParent->getIdentifier() ); xParent->notifyContentEvent( aEvt ); } // Notify "DELETED" event. - com::sun::star::ucb::ContentEvent aEvt1( + com::sun::star::ucb::ContentEvent aEvt1( static_cast< cppu::OWeakObject * >( this ), com::sun::star::ucb::ContentAction::DELETED, this, @@ -1069,7 +1069,7 @@ sal_Bool ContentImplHelper::exchange( return sal_False; } - uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId + uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId = getIdentifier(); // Re-insert at provider. @@ -1080,7 +1080,7 @@ sal_Bool ContentImplHelper::exchange( aGuard.clear(); // Notify "EXCHANGED" event. - com::sun::star::ucb::ContentEvent aEvt( + com::sun::star::ucb::ContentEvent aEvt( static_cast< cppu::OWeakObject * >( this ), com::sun::star::ucb::ContentAction::EXCHANGED, this, @@ -1090,9 +1090,9 @@ sal_Bool ContentImplHelper::exchange( } //========================================================================= -uno::Reference< com::sun::star::ucb::XCommandInfo > +uno::Reference< com::sun::star::ucb::XCommandInfo > ContentImplHelper::getCommandInfo( - const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, + const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, sal_Bool bCache ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1103,14 +1103,14 @@ ContentImplHelper::getCommandInfo( else if ( !bCache ) m_pImpl->m_xCommandsInfo->reset(); - return uno::Reference< com::sun::star::ucb::XCommandInfo >( + return uno::Reference< com::sun::star::ucb::XCommandInfo >( m_pImpl->m_xCommandsInfo.get() ); } //========================================================================= -uno::Reference< beans::XPropertySetInfo > +uno::Reference< beans::XPropertySetInfo > ContentImplHelper::getPropertySetInfo( - const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, + const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, sal_Bool bCache ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 16bef11bd5a5..7ab0507299a4 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -2,7 +2,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 @@ -58,9 +58,9 @@ namespace ucbhelper struct ContentIdentifier_Impl { Reference< XMultiServiceFactory > m_xSMgr; - OUString m_aContentId; - OUString m_aProviderScheme; - osl::Mutex m_aMutex; + OUString m_aContentId; + OUString m_aProviderScheme; + osl::Mutex m_aMutex; ContentIdentifier_Impl( const Reference< XMultiServiceFactory >& rSMgr, const OUString& rURL ); diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index d7d982364b14..00a683412413 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -2,7 +2,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 @@ -129,7 +129,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() // Get info for additional properties. ////////////////////////////////////////////////////////////// - uno::Reference< com::sun::star::ucb::XPersistentPropertySet > + uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet ( m_pContent->getAdditionalPropertySet( sal_False ) ); if ( xSet.is() ) @@ -148,7 +148,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() m_pProps->realloc( nPos + nAddProps ); beans::Property* pProps = m_pProps->getArray(); - const beans::Property* pAddProps + const beans::Property* pAddProps = rAddProps.getConstArray(); for ( sal_Int32 n = 0; n < nAddProps; ++n, ++nPos ) @@ -163,7 +163,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() //========================================================================= // virtual -beans::Property SAL_CALL PropertySetInfo::getPropertyByName( +beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const rtl::OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { @@ -176,7 +176,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( //========================================================================= // virtual -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const rtl::OUString& Name ) throw( uno::RuntimeException ) { @@ -273,7 +273,7 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo, //========================================================================= // virtual -uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL +uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() throw( uno::RuntimeException ) { @@ -290,8 +290,8 @@ CommandProcessorInfo::getCommands() { uno::Sequence< com::sun::star::ucb::CommandInfo > aCmds = m_pContent->getCommands( m_xEnv ); - m_pCommands - = new uno::Sequence< com::sun::star::ucb::CommandInfo >( + m_pCommands + = new uno::Sequence< com::sun::star::ucb::CommandInfo >( aCmds ); } catch ( uno::RuntimeException const & ) @@ -300,8 +300,8 @@ CommandProcessorInfo::getCommands() } catch ( uno::Exception const & ) { - m_pCommands - = new uno::Sequence< com::sun::star::ucb::CommandInfo >( + m_pCommands + = new uno::Sequence< com::sun::star::ucb::CommandInfo >( 0 ); } } @@ -311,10 +311,10 @@ CommandProcessorInfo::getCommands() //========================================================================= // virtual -com::sun::star::ucb::CommandInfo SAL_CALL +com::sun::star::ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByName( const rtl::OUString& Name ) - throw( com::sun::star::ucb::UnsupportedCommandException, + throw( com::sun::star::ucb::UnsupportedCommandException, uno::RuntimeException ) { com::sun::star::ucb::CommandInfo aInfo; @@ -326,9 +326,9 @@ CommandProcessorInfo::getCommandInfoByName( //========================================================================= // virtual -com::sun::star::ucb::CommandInfo SAL_CALL +com::sun::star::ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) - throw( com::sun::star::ucb::UnsupportedCommandException, + throw( com::sun::star::ucb::UnsupportedCommandException, uno::RuntimeException ) { com::sun::star::ucb::CommandInfo aInfo; @@ -340,7 +340,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) //========================================================================= // virtual -sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( +sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( const rtl::OUString& Name ) throw( uno::RuntimeException ) { @@ -372,7 +372,7 @@ void CommandProcessorInfo::reset() //========================================================================= -sal_Bool CommandProcessorInfo::queryCommand( +sal_Bool CommandProcessorInfo::queryCommand( const rtl::OUString& rName, com::sun::star::ucb::CommandInfo& rCommand ) { @@ -380,7 +380,7 @@ sal_Bool CommandProcessorInfo::queryCommand( getCommands(); - const com::sun::star::ucb::CommandInfo* pCommands + const com::sun::star::ucb::CommandInfo* pCommands = m_pCommands->getConstArray(); sal_Int32 nCount = m_pCommands->getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -397,7 +397,7 @@ sal_Bool CommandProcessorInfo::queryCommand( } //========================================================================= -sal_Bool CommandProcessorInfo::queryCommand( +sal_Bool CommandProcessorInfo::queryCommand( sal_Int32 nHandle, com::sun::star::ucb::CommandInfo& rCommand ) { @@ -405,7 +405,7 @@ sal_Bool CommandProcessorInfo::queryCommand( getCommands(); - const com::sun::star::ucb::CommandInfo* pCommands + const com::sun::star::ucb::CommandInfo* pCommands = m_pCommands->getConstArray(); sal_Int32 nCount = m_pCommands->getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx index 84a010fde6d9..e7c861b38566 100644 --- a/ucbhelper/source/provider/handleinteractionrequest.cxx +++ b/ucbhelper/source/provider/handleinteractionrequest.cxx @@ -2,7 +2,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/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 18cd2435c7f2..b2fb85e09520 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -2,7 +2,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 @@ -909,10 +909,10 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount( // //========================================================================= -// virtual -::sal_Bool SAL_CALL -InteractionSupplyAuthentication::canUseSystemCredentials( - ::sal_Bool& Default ) +// virtual +::sal_Bool SAL_CALL +InteractionSupplyAuthentication::canUseSystemCredentials( + ::sal_Bool& Default ) throw ( uno::RuntimeException ) { Default = m_bDefaultUseSystemCredentials; @@ -921,7 +921,7 @@ InteractionSupplyAuthentication::canUseSystemCredentials( //========================================================================= // virtual -void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( +void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( ::sal_Bool UseSystemCredentials ) throw ( uno::RuntimeException ) { diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index ab479372dc9f..b427f46c28ac 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -2,7 +2,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,55 +67,55 @@ namespace ucbhelper_impl // //========================================================================= -const sal_uInt32 NO_VALUE_SET = 0x00000000; -const sal_uInt32 STRING_VALUE_SET = 0x00000001; -const sal_uInt32 BOOLEAN_VALUE_SET = 0x00000002; -const sal_uInt32 BYTE_VALUE_SET = 0x00000004; -const sal_uInt32 SHORT_VALUE_SET = 0x00000008; -const sal_uInt32 INT_VALUE_SET = 0x00000010; -const sal_uInt32 LONG_VALUE_SET = 0x00000020; -const sal_uInt32 FLOAT_VALUE_SET = 0x00000040; -const sal_uInt32 DOUBLE_VALUE_SET = 0x00000080; -const sal_uInt32 BYTES_VALUE_SET = 0x00000100; -const sal_uInt32 DATE_VALUE_SET = 0x00000200; -const sal_uInt32 TIME_VALUE_SET = 0x00000400; -const sal_uInt32 TIMESTAMP_VALUE_SET = 0x00000800; -const sal_uInt32 BINARYSTREAM_VALUE_SET = 0x00001000; -const sal_uInt32 CHARACTERSTREAM_VALUE_SET = 0x00002000; -const sal_uInt32 REF_VALUE_SET = 0x00004000; -const sal_uInt32 BLOB_VALUE_SET = 0x00008000; -const sal_uInt32 CLOB_VALUE_SET = 0x00010000; -const sal_uInt32 ARRAY_VALUE_SET = 0x00020000; -const sal_uInt32 OBJECT_VALUE_SET = 0x00040000; +const sal_uInt32 NO_VALUE_SET = 0x00000000; +const sal_uInt32 STRING_VALUE_SET = 0x00000001; +const sal_uInt32 BOOLEAN_VALUE_SET = 0x00000002; +const sal_uInt32 BYTE_VALUE_SET = 0x00000004; +const sal_uInt32 SHORT_VALUE_SET = 0x00000008; +const sal_uInt32 INT_VALUE_SET = 0x00000010; +const sal_uInt32 LONG_VALUE_SET = 0x00000020; +const sal_uInt32 FLOAT_VALUE_SET = 0x00000040; +const sal_uInt32 DOUBLE_VALUE_SET = 0x00000080; +const sal_uInt32 BYTES_VALUE_SET = 0x00000100; +const sal_uInt32 DATE_VALUE_SET = 0x00000200; +const sal_uInt32 TIME_VALUE_SET = 0x00000400; +const sal_uInt32 TIMESTAMP_VALUE_SET = 0x00000800; +const sal_uInt32 BINARYSTREAM_VALUE_SET = 0x00001000; +const sal_uInt32 CHARACTERSTREAM_VALUE_SET = 0x00002000; +const sal_uInt32 REF_VALUE_SET = 0x00004000; +const sal_uInt32 BLOB_VALUE_SET = 0x00008000; +const sal_uInt32 CLOB_VALUE_SET = 0x00010000; +const sal_uInt32 ARRAY_VALUE_SET = 0x00020000; +const sal_uInt32 OBJECT_VALUE_SET = 0x00040000; struct PropertyValue { ::rtl::OUString sPropertyName; - sal_uInt32 nPropsSet; + sal_uInt32 nPropsSet; sal_uInt32 nOrigValue; - OUString aString; // getString - sal_Bool bBoolean; // getBoolean - sal_Int8 nByte; // getByte - sal_Int16 nShort; // getShort - sal_Int32 nInt; // getInt - sal_Int64 nLong; // getLong - float nFloat; // getFloat - double nDouble; // getDouble - - Sequence< sal_Int8 > aBytes; // getBytes - Date aDate; // getDate - Time aTime; // getTime - DateTime aTimestamp; // getTimestamp - Reference< XInputStream > xBinaryStream; // getBinaryStream - Reference< XInputStream > xCharacterStream; // getCharacterStream - Reference< XRef > xRef; // getRef - Reference< XBlob > xBlob; // getBlob - Reference< XClob > xClob; // getClob - Reference< XArray > xArray; // getArray - Any aObject; // getObject + OUString aString; // getString + sal_Bool bBoolean; // getBoolean + sal_Int8 nByte; // getByte + sal_Int16 nShort; // getShort + sal_Int32 nInt; // getInt + sal_Int64 nLong; // getLong + float nFloat; // getFloat + double nDouble; // getDouble + + Sequence< sal_Int8 > aBytes; // getBytes + Date aDate; // getDate + Time aTime; // getTime + DateTime aTimestamp; // getTimestamp + Reference< XInputStream > xBinaryStream; // getBinaryStream + Reference< XInputStream > xCharacterStream; // getCharacterStream + Reference< XRef > xRef; // getRef + Reference< XBlob > xBlob; // getBlob + Reference< XClob > xClob; // getClob + Reference< XArray > xArray; // getArray + Any aObject; // getObject inline PropertyValue() : nPropsSet( NO_VALUE_SET ), nOrigValue( NO_VALUE_SET ), @@ -157,12 +157,12 @@ class PropertyValues : public PropertyValuesVector {}; \ osl::MutexGuard aGuard( m_aMutex ); \ \ - _type_ aValue = _type_(); /* default ctor */ \ + _type_ aValue = _type_(); /* default ctor */ \ \ - m_bWasNull = sal_True; \ + m_bWasNull = sal_True; \ \ - if ( ( columnIndex < 1 ) \ - || ( columnIndex > sal_Int32( m_pValues->size() ) ) ) \ + if ( ( columnIndex < 1 ) \ + || ( columnIndex > sal_Int32( m_pValues->size() ) ) ) \ { \ OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" ); \ } \ @@ -171,13 +171,13 @@ class PropertyValues : public PropertyValuesVector {}; ucbhelper_impl::PropertyValue& rValue \ = (*m_pValues)[ columnIndex - 1 ]; \ \ - if ( rValue.nOrigValue != NO_VALUE_SET ) \ + if ( rValue.nOrigValue != NO_VALUE_SET ) \ { \ - if ( rValue.nPropsSet & _type_name_ ) \ + if ( rValue.nPropsSet & _type_name_ ) \ { \ - /* Values is present natively... */ \ + /* Values is present natively... */ \ aValue = rValue._member_name_; \ - m_bWasNull = sal_False; \ + m_bWasNull = sal_False; \ } \ else \ { \ @@ -188,37 +188,37 @@ class PropertyValues : public PropertyValuesVector {}; } \ \ if ( rValue.nPropsSet & OBJECT_VALUE_SET ) \ - { \ + { \ /* Value is available as Any. */ \ \ - if ( rValue.aObject.hasValue() ) \ + if ( rValue.aObject.hasValue() ) \ { \ /* Try to convert into native value. */ \ if ( rValue.aObject >>= aValue ) \ { \ - rValue._member_name_ = aValue; \ - rValue.nPropsSet |= _type_name_; \ - m_bWasNull = sal_False; \ + rValue._member_name_ = aValue; \ + rValue.nPropsSet |= _type_name_; \ + m_bWasNull = sal_False; \ } \ else \ { \ /* Last chance. Try type converter service... */ \ \ Reference< XTypeConverter > xConverter \ - = getTypeConverter(); \ + = getTypeConverter(); \ if ( xConverter.is() ) \ { \ try \ { \ Any aConvAny = xConverter->convertTo( \ - rValue.aObject, \ - _cppu_type_ ); \ + rValue.aObject, \ + _cppu_type_ ); \ \ if ( aConvAny >>= aValue ) \ - { \ - rValue._member_name_ = aValue; \ + { \ + rValue._member_name_ = aValue; \ rValue.nPropsSet |= _type_name_; \ - m_bWasNull = sal_False; \ + m_bWasNull = sal_False; \ } \ } \ catch ( IllegalArgumentException ) \ @@ -232,24 +232,24 @@ class PropertyValues : public PropertyValuesVector {}; } \ } \ } \ - } \ + } \ } \ return aValue; -#define GETVALUE_IMPL( _type_, _type_name_, _member_name_ ) \ - GETVALUE_IMPL_TYPE( _type_, \ - _type_name_, \ +#define GETVALUE_IMPL( _type_, _type_name_, _member_name_ ) \ + GETVALUE_IMPL_TYPE( _type_, \ + _type_name_, \ _member_name_, \ getCppuType( static_cast< const _type_ * >( 0 ) ) ) -#define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ ) \ +#define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ ) \ \ - osl::MutexGuard aGuard( m_aMutex ); \ + osl::MutexGuard aGuard( m_aMutex ); \ \ ucbhelper_impl::PropertyValue aNewValue; \ aNewValue.sPropertyName = _prop_name_; \ - aNewValue.nPropsSet = _type_name_; \ - aNewValue.nOrigValue = _type_name_; \ + aNewValue.nPropsSet = _type_name_; \ + aNewValue.nOrigValue = _type_name_; \ aNewValue._member_name_ = _value_; \ \ m_pValues->push_back( aNewValue ); @@ -264,10 +264,10 @@ namespace ucbhelper { //========================================================================= //========================================================================= -#define PROPERTYVALUESET_INIT() \ - m_xSMgr( rxSMgr ), \ - m_pValues( new PropertyValues ), \ - m_bWasNull( sal_False ), \ +#define PROPERTYVALUESET_INIT() \ + m_xSMgr( rxSMgr ), \ + m_pValues( new PropertyValues ), \ + m_bWasNull( sal_False ), \ m_bTriedToGetTypeConverter( sal_False ) //========================================================================= @@ -484,7 +484,7 @@ Any SAL_CALL PropertyValueSet::getObject( } else { - ucbhelper_impl::PropertyValue& rValue + ucbhelper_impl::PropertyValue& rValue = (*m_pValues)[ columnIndex - 1 ]; if ( rValue.nPropsSet & OBJECT_VALUE_SET ) @@ -833,9 +833,9 @@ void PropertyValueSet::appendPropertySet( Reference< XPropertySetInfo > xInfo = rxSet->getPropertySetInfo(); if ( xInfo.is() ) { - Sequence< Property > aProps = xInfo->getProperties(); - const Property* pProps = aProps.getConstArray(); - sal_Int32 nPropsCount = aProps.getLength(); + Sequence< Property > aProps = xInfo->getProperties(); + const Property* pProps = aProps.getConstArray(); + sal_Int32 nPropsCount = aProps.getLength(); Reference< XPropertyAccess > xPropertyAccess( rxSet, UNO_QUERY ); if ( xPropertyAccess.is() ) diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx index 9e58ba5006e1..f325d0106440 100644 --- a/ucbhelper/source/provider/provconf.cxx +++ b/ucbhelper/source/provider/provconf.cxx @@ -2,7 +2,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 @@ -47,7 +47,7 @@ using namespace com::sun::star; //========================================================================= -#define CONFIG_CONTENTPROVIDERS_KEY \ +#define CONFIG_CONTENTPROVIDERS_KEY \ "/org.openoffice.ucb.Configuration/ContentProviders" //========================================================================= diff --git a/ucbhelper/source/provider/provconf.hxx b/ucbhelper/source/provider/provconf.hxx index e21a619114ce..91ecf42ea352 100644 --- a/ucbhelper/source/provider/provconf.hxx +++ b/ucbhelper/source/provider/provconf.hxx @@ -2,7 +2,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/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index 359e5c952463..cc96ff2eae56 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -2,7 +2,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 @@ namespace ucbhelper_impl struct equalString { - bool operator()( + bool operator()( const rtl::OUString& rKey11, const rtl::OUString& rKey22 ) const { return !!( rKey11 == rKey22 ); @@ -94,9 +94,9 @@ Contents; struct ContentProviderImplHelper_Impl { - uno::Reference< com::sun::star::ucb::XPropertySetRegistry > + uno::Reference< com::sun::star::ucb::XPropertySetRegistry > m_xPropertySetRegistry; - Contents + Contents m_aContents; }; @@ -226,7 +226,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent ) cleanupRegisteredContents(); - const rtl::OUString aURL( + const rtl::OUString aURL( pContent->getIdentifier()->getContentIdentifier() ); ucbhelper_impl::Contents::iterator it = m_pImpl->m_aContents.find( aURL ); @@ -238,7 +238,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent ) //========================================================================= rtl::Reference< ContentImplHelper > ContentProviderImplHelper::queryExistingContent( - const uno::Reference< com::sun::star::ucb::XContentIdentifier >& + const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) { return queryExistingContent( Identifier->getContentIdentifier() ); @@ -254,7 +254,7 @@ ContentProviderImplHelper::queryExistingContent( const rtl::OUString& rURL ) // Check, if a content with given id already exists... - ucbhelper_impl::Contents::const_iterator it + ucbhelper_impl::Contents::const_iterator it = m_pImpl->m_aContents.find( rURL ); if ( it != m_pImpl->m_aContents.end() ) { @@ -276,9 +276,9 @@ void ContentProviderImplHelper::queryExistingContents( cleanupRegisteredContents(); - ucbhelper_impl::Contents::const_iterator it + ucbhelper_impl::Contents::const_iterator it = m_pImpl->m_aContents.begin(); - ucbhelper_impl::Contents::const_iterator end + ucbhelper_impl::Contents::const_iterator end = m_pImpl->m_aContents.end(); while ( it != end ) @@ -295,7 +295,7 @@ void ContentProviderImplHelper::queryExistingContents( } //========================================================================= -void ContentProviderImplHelper::registerNewContent( +void ContentProviderImplHelper::registerNewContent( const uno::Reference< ucb::XContent > & xContent ) { if ( xContent.is() ) @@ -304,9 +304,9 @@ void ContentProviderImplHelper::registerNewContent( cleanupRegisteredContents(); - const rtl::OUString aURL( + const rtl::OUString aURL( xContent->getIdentifier()->getContentIdentifier() ); - ucbhelper_impl::Contents::const_iterator it + ucbhelper_impl::Contents::const_iterator it = m_pImpl->m_aContents.find( aURL ); if ( it == m_pImpl->m_aContents.end() ) m_pImpl->m_aContents[ aURL ] = xContent; @@ -323,10 +323,10 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() if ( !m_pImpl->m_xPropertySetRegistry.is() ) { - uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory > + uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory > xRegFac( m_xSMgr->createInstance( - rtl::OUString::createFromAscii( + rtl::OUString::createFromAscii( "com.sun.star.ucb.Store" ) ), uno::UNO_QUERY ); @@ -352,7 +352,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() //========================================================================= uno::Reference< com::sun::star::ucb::XPersistentPropertySet > -ContentProviderImplHelper::getAdditionalPropertySet( +ContentProviderImplHelper::getAdditionalPropertySet( const rtl::OUString& rKey, sal_Bool bCreate ) { // Get propertyset registry. @@ -362,7 +362,7 @@ ContentProviderImplHelper::getAdditionalPropertySet( { // Open/create persistent property set. return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >( - m_pImpl->m_xPropertySetRegistry->openPropertySet( + m_pImpl->m_xPropertySetRegistry->openPropertySet( rKey, bCreate ) ); } @@ -391,30 +391,30 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< rtl::OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { rtl::OUString aOldKeyWithSlash = rOldKey; rtl::OUString aOldKeyWithoutSlash; - if ( aOldKeyWithSlash.lastIndexOf( - sal_Unicode('/') + if ( aOldKeyWithSlash.lastIndexOf( + sal_Unicode('/') != aOldKeyWithSlash.getLength() - 1 ) ) { aOldKeyWithSlash += rtl::OUString( sal_Unicode('/') ); aOldKeyWithoutSlash = rOldKey; } else if ( rOldKey.getLength() ) - aOldKeyWithoutSlash + aOldKeyWithoutSlash = rOldKey.copy( 0, rOldKey.getLength() - 1 ); const rtl::OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { const rtl::OUString& rKey = pKeys[ n ]; - if ( rKey.compareTo( - aOldKeyWithSlash, + if ( rKey.compareTo( + aOldKeyWithSlash, aOldKeyWithSlash.getLength() ) == 0 || rKey.equals( aOldKeyWithoutSlash ) ) { @@ -442,7 +442,7 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( if ( xOldSet.is() ) { // Rename property set. - uno::Reference< container::XNamed > xNamed( + uno::Reference< container::XNamed > xNamed( xOldSet, uno::UNO_QUERY ); if ( xNamed.is() ) { @@ -478,30 +478,30 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< rtl::OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { rtl::OUString aSrcKeyWithSlash = rSourceKey; rtl::OUString aSrcKeyWithoutSlash; - if ( aSrcKeyWithSlash.lastIndexOf( - sal_Unicode('/') + if ( aSrcKeyWithSlash.lastIndexOf( + sal_Unicode('/') != aSrcKeyWithSlash.getLength() - 1 ) ) { aSrcKeyWithSlash += rtl::OUString( sal_Unicode('/') ); aSrcKeyWithoutSlash = rSourceKey; } else if ( rSourceKey.getLength() ) - aSrcKeyWithoutSlash = rSourceKey.copy( + aSrcKeyWithoutSlash = rSourceKey.copy( 0, rSourceKey.getLength() - 1 ); const rtl::OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { const rtl::OUString& rKey = pKeys[ n ]; - if ( rKey.compareTo( - aSrcKeyWithSlash, + if ( rKey.compareTo( + aSrcKeyWithSlash, aSrcKeyWithSlash.getLength() ) == 0 || rKey.equals( aSrcKeyWithoutSlash ) ) { @@ -524,34 +524,34 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( else { // Get old property set, if exists. - uno::Reference< com::sun::star::ucb::XPersistentPropertySet > + uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xOldPropSet = getAdditionalPropertySet( rSourceKey, sal_False ); if ( !xOldPropSet.is() ) return sal_False; - uno::Reference< beans::XPropertySetInfo > xPropSetInfo + uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xOldPropSet->getPropertySetInfo(); if ( !xPropSetInfo.is() ) return sal_False; - uno::Reference< beans::XPropertyAccess > xOldPropAccess( + uno::Reference< beans::XPropertyAccess > xOldPropAccess( xOldPropSet, uno::UNO_QUERY ); if ( !xOldPropAccess.is() ) return sal_False; // Obtain all values from old set. - uno::Sequence< beans::PropertyValue > aValues + uno::Sequence< beans::PropertyValue > aValues = xOldPropAccess->getPropertyValues(); sal_Int32 nCount = aValues.getLength(); - uno::Sequence< beans::Property > aProps + uno::Sequence< beans::Property > aProps = xPropSetInfo->getProperties(); if ( nCount ) { // Fail, if property set with new key already exists. - uno::Reference< com::sun::star::ucb::XPersistentPropertySet > - xNewPropSet + uno::Reference< com::sun::star::ucb::XPersistentPropertySet > + xNewPropSet = getAdditionalPropertySet( rTargetKey, sal_False ); if ( xNewPropSet.is() ) return sal_False; @@ -617,30 +617,30 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< rtl::OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { rtl::OUString aKeyWithSlash = rKey; rtl::OUString aKeyWithoutSlash; - if ( aKeyWithSlash.lastIndexOf( - sal_Unicode('/') + if ( aKeyWithSlash.lastIndexOf( + sal_Unicode('/') != aKeyWithSlash.getLength() - 1 ) ) { aKeyWithSlash += rtl::OUString( (sal_Unicode)'/' ); aKeyWithoutSlash = rKey; } else if ( rKey.getLength() ) - aKeyWithoutSlash + aKeyWithoutSlash = rKey.copy( 0, rKey.getLength() - 1 ); const rtl::OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { const rtl::OUString& rCurrKey = pKeys[ n ]; - if ( rCurrKey.compareTo( - aKeyWithSlash, + if ( rCurrKey.compareTo( + aKeyWithSlash, aKeyWithSlash.getLength() ) == 0 || rCurrKey.equals( aKeyWithoutSlash ) ) { diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index 2f45d1507ef4..69c76297d5d8 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -2,7 +2,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/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 9f2f97d558fd..dd7a620966a8 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -2,7 +2,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 @@ namespace ucbhelper_impl struct PropertyInfo { - const char* pName; + const char* pName; sal_Int32 nHandle; sal_Int16 nAttributes; const uno::Type& (*pGetCppuType)(); @@ -92,19 +92,19 @@ static const PropertyInfo aPropertyTable[] = //========================================================================= class PropertySetInfo : - public cppu::OWeakObject, - public lang::XTypeProvider, + public cppu::OWeakObject, + public lang::XTypeProvider, public beans::XPropertySetInfo { uno::Reference< lang::XMultiServiceFactory > m_xSMgr; - uno::Sequence< beans::Property >* m_pProps; + uno::Sequence< beans::Property >* m_pProps; private: - sal_Bool queryProperty( + sal_Bool queryProperty( const rtl::OUString& aName, beans::Property& rProp ); public: - PropertySetInfo( + PropertySetInfo( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const PropertyInfo* pProps, sal_Int32 nProps ); @@ -119,7 +119,7 @@ public: // XPropertySetInfo virtual uno::Sequence< beans::Property > SAL_CALL getProperties() throw( uno::RuntimeException ); - virtual beans::Property SAL_CALL getPropertyByName( + virtual beans::Property SAL_CALL getPropertyByName( const rtl::OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ); virtual sal_Bool SAL_CALL hasPropertyByName( const rtl::OUString& Name ) @@ -183,24 +183,24 @@ namespace ucbhelper struct ResultSet_Impl { - uno::Reference< lang::XMultiServiceFactory > m_xSMgr; - uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - uno::Reference< beans::XPropertySetInfo > m_xPropSetInfo; - uno::Reference< sdbc::XResultSetMetaData > m_xMetaData; - uno::Sequence< beans::Property > m_aProperties; - rtl::Reference< ResultSetDataSupplier > m_xDataSupplier; - osl::Mutex m_aMutex; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; - PropertyChangeListeners* m_pPropertyChangeListeners; - sal_Int32 m_nPos; - sal_Bool m_bWasNull; - sal_Bool m_bAfterLast; - - inline ResultSet_Impl( + uno::Reference< lang::XMultiServiceFactory > m_xSMgr; + uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; + uno::Reference< beans::XPropertySetInfo > m_xPropSetInfo; + uno::Reference< sdbc::XResultSetMetaData > m_xMetaData; + uno::Sequence< beans::Property > m_aProperties; + rtl::Reference< ResultSetDataSupplier > m_xDataSupplier; + osl::Mutex m_aMutex; + cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; + PropertyChangeListeners* m_pPropertyChangeListeners; + sal_Int32 m_nPos; + sal_Bool m_bWasNull; + sal_Bool m_bAfterLast; + + inline ResultSet_Impl( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const uno::Sequence< beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier, - const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& + const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv ); inline ~ResultSet_Impl(); }; @@ -237,11 +237,11 @@ inline ResultSet_Impl::~ResultSet_Impl() //========================================================================= //========================================================================= -ResultSet::ResultSet( +ResultSet::ResultSet( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const uno::Sequence< beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier ) -: m_pImpl( new ResultSet_Impl( +: m_pImpl( new ResultSet_Impl( rxSMgr, rProperties, rDataSupplier, @@ -251,7 +251,7 @@ ResultSet::ResultSet( } //========================================================================= -ResultSet::ResultSet( +ResultSet::ResultSet( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const uno::Sequence< beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier, @@ -610,7 +610,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) else if ( row == 0 ) { // @throws SQLException - // ... if row is 0 ... + // ... if row is 0 ... throw sdbc::SQLException(); } else // row > 0 @@ -649,8 +649,8 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) Calling relative( 0 ) is valid, but does not change the cursor position. Calling relative( 1 ) is different from calling next() because it makes - sense to call next() when there is no current row, for example, when - the cursor is positioned before the first row or after the last row of + sense to call next() when there is no current row, for example, when + the cursor is positioned before the first row or after the last row of the result set. */ if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) ) @@ -1148,7 +1148,7 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex ) //========================================================================= // virtual -uno::Any SAL_CALL ResultSet::getObject( +uno::Any SAL_CALL ResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& typeMap ) throw( sdbc::SQLException, uno::RuntimeException ) @@ -1173,7 +1173,7 @@ uno::Any SAL_CALL ResultSet::getObject( //========================================================================= // virtual -uno::Reference< sdbc::XRef > SAL_CALL +uno::Reference< sdbc::XRef > SAL_CALL ResultSet::getRef( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException ) { @@ -1197,7 +1197,7 @@ ResultSet::getRef( sal_Int32 columnIndex ) //========================================================================= // virtual -uno::Reference< sdbc::XBlob > SAL_CALL +uno::Reference< sdbc::XBlob > SAL_CALL ResultSet::getBlob( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException ) { @@ -1221,7 +1221,7 @@ ResultSet::getBlob( sal_Int32 columnIndex ) //========================================================================= // virtual -uno::Reference< sdbc::XClob > SAL_CALL +uno::Reference< sdbc::XClob > SAL_CALL ResultSet::getClob( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException ) { @@ -1245,7 +1245,7 @@ ResultSet::getClob( sal_Int32 columnIndex ) //========================================================================= // virtual -uno::Reference< sdbc::XArray > SAL_CALL +uno::Reference< sdbc::XArray > SAL_CALL ResultSet::getArray( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException ) { @@ -1300,7 +1300,7 @@ rtl::OUString SAL_CALL ResultSet::queryContentIdentifierString() //========================================================================= // virtual -uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL +uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL ResultSet::queryContentIdentifier() throw( uno::RuntimeException ) { @@ -1313,7 +1313,7 @@ ResultSet::queryContentIdentifier() //========================================================================= // virtual -uno::Reference< com::sun::star::ucb::XContent > SAL_CALL +uno::Reference< com::sun::star::ucb::XContent > SAL_CALL ResultSet::queryContent() throw( uno::RuntimeException ) { @@ -1330,7 +1330,7 @@ ResultSet::queryContent() //========================================================================= // virtual -uno::Reference< beans::XPropertySetInfo > SAL_CALL +uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() throw( uno::RuntimeException ) { @@ -1377,7 +1377,7 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, //========================================================================= // virtual -uno::Any SAL_CALL ResultSet::getPropertyValue( +uno::Any SAL_CALL ResultSet::getPropertyValue( const rtl::OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1467,7 +1467,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException ) { - // No constrained props, at the moment. + // No constrained props, at the moment. } //========================================================================= @@ -1479,7 +1479,7 @@ void SAL_CALL ResultSet::removeVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException ) { - // No constrained props, at the moment. + // No constrained props, at the moment. } //========================================================================= @@ -1534,12 +1534,12 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew ) return; propertyChanged( - beans::PropertyChangeEvent( + beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), rtl::OUString::createFromAscii( "RowCount" ), sal_False, 1001, - uno::makeAny( nOld ), // old value + uno::makeAny( nOld ), // old value uno::makeAny( nNew ) ) ); // new value } @@ -1550,23 +1550,23 @@ void ResultSet::rowCountFinal() return; propertyChanged( - beans::PropertyChangeEvent( + beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), rtl::OUString::createFromAscii( "IsRowCountFinal" ), sal_False, 1000, - uno:: makeAny( sal_False ), // old value + uno:: makeAny( sal_False ), // old value uno::makeAny( sal_True ) ) ); // new value } //========================================================================= -const uno::Sequence< beans::Property >& ResultSet::getProperties() +const uno::Sequence< beans::Property >& ResultSet::getProperties() { return m_pImpl->m_aProperties; } //========================================================================= -const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& +const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& ResultSet::getEnvironment() { return m_pImpl->m_xEnv; @@ -1601,9 +1601,9 @@ PropertySetInfo::PropertySetInfo( { beans::Property& rProp = pProperties[ n ]; - rProp.Name = rtl::OUString::createFromAscii( pEntry->pName ); - rProp.Handle = pEntry->nHandle; - rProp.Type = pEntry->pGetCppuType(); + rProp.Name = rtl::OUString::createFromAscii( pEntry->pName ); + rProp.Handle = pEntry->nHandle; + rProp.Type = pEntry->pGetCppuType(); rProp.Attributes = pEntry->nAttributes; pEntry++; @@ -1653,7 +1653,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() //========================================================================= // virtual -beans::Property SAL_CALL PropertySetInfo::getPropertyByName( +beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const rtl::OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { @@ -1666,7 +1666,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( //========================================================================= // virtual -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const rtl::OUString& Name ) throw( uno::RuntimeException ) { diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index a508b47818c9..280ed00cf8b2 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -2,7 +2,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 @@ -117,9 +117,9 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, - rtl::OUString::createFromAscii( + rtl::OUString::createFromAscii( "ResultSetImplHelper" ), - rtl::OUString::createFromAscii( + rtl::OUString::createFromAscii( DYNAMICRESULTSET_SERVICE_NAME ) ); //========================================================================= @@ -151,7 +151,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener( osl::MutexGuard aGuard( m_aMutex ); if ( !m_pDisposeEventListeners ) - m_pDisposeEventListeners + m_pDisposeEventListeners = new cppu::OInterfaceContainerHelper( m_aMutex ); m_pDisposeEventListeners->addInterface( Listener ); @@ -176,9 +176,9 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( //========================================================================= // virtual -uno::Reference< sdbc::XResultSet > SAL_CALL +uno::Reference< sdbc::XResultSet > SAL_CALL ResultSetImplHelper::getStaticResultSet() - throw( com::sun::star::ucb::ListenerAlreadySetException, + throw( com::sun::star::ucb::ListenerAlreadySetException, uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -217,13 +217,13 @@ void SAL_CALL ResultSetImplHelper::setListener( init( sal_False ); uno::Any aInfo; - aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct( + aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct( m_xResultSet1 /* "old" */, m_xResultSet2 /* "new" */ ); uno::Sequence< com::sun::star::ucb::ListAction > aActions( 1 ); - aActions.getArray()[ 0 ] - = com::sun::star::ucb::ListAction( + aActions.getArray()[ 0 ] + = com::sun::star::ucb::ListAction( 0, // Position; not used 0, // Count; not used com::sun::star::ucb::ListActionType::WELCOME, @@ -231,7 +231,7 @@ void SAL_CALL ResultSetImplHelper::setListener( aGuard.clear(); Listener->notify( - com::sun::star::ucb::ListEvent( + com::sun::star::ucb::ListEvent( static_cast< cppu::OWeakObject * >( this ), aActions ) ); } @@ -247,7 +247,7 @@ sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities() //========================================================================= // virtual void SAL_CALL ResultSetImplHelper::connectToCache( - const uno::Reference< com::sun::star::ucb::XDynamicResultSet > & + const uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) throw( com::sun::star::ucb::ListenerAlreadySetException, com::sun::star::ucb::AlreadyInitializedException, @@ -260,17 +260,17 @@ void SAL_CALL ResultSetImplHelper::connectToCache( if ( m_bStatic ) throw com::sun::star::ucb::ListenerAlreadySetException(); - uno::Reference< com::sun::star::ucb::XSourceInitialization > + uno::Reference< com::sun::star::ucb::XSourceInitialization > xTarget( xCache, uno::UNO_QUERY ); if ( xTarget.is() ) { - uno::Reference< - com::sun::star::ucb::XCachedDynamicResultSetStubFactory > + uno::Reference< + com::sun::star::ucb::XCachedDynamicResultSetStubFactory > xStubFactory; try { - xStubFactory - = uno::Reference< + xStubFactory + = uno::Reference< com::sun::star::ucb::XCachedDynamicResultSetStubFactory >( m_xSMgr->createInstance( rtl::OUString::createFromAscii( diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index d7697fb92533..2ca74aafd628 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -2,7 +2,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,10 +62,10 @@ namespace ucbhelper_impl { struct ResultSetMetaData_Impl { - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; std::vector< ::ucbhelper::ResultSetColumnData > m_aColumnData; - sal_Bool m_bObtainedTypes; - sal_Bool m_bGlobalReadOnlyValue; + sal_Bool m_bObtainedTypes; + sal_Bool m_bGlobalReadOnlyValue; ResultSetMetaData_Impl( sal_Int32 nSize ) : m_aColumnData( nSize ), m_bObtainedTypes( sal_False ), @@ -462,34 +462,34 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) nType = DataType::VARCHAR; // XRow::getString else if ( rType == getCppuBooleanType() ) - nType = DataType::BIT; // XRow::getBoolean + nType = DataType::BIT; // XRow::getBoolean else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) - nType = DataType::INTEGER; // XRow::getInt + nType = DataType::INTEGER; // XRow::getInt else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) - nType = DataType::BIGINT; // XRow::getLong + nType = DataType::BIGINT; // XRow::getLong else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) - nType = DataType::SMALLINT; // XRow::getShort + nType = DataType::SMALLINT; // XRow::getShort else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) - nType = DataType::TINYINT; // XRow::getByte + nType = DataType::TINYINT; // XRow::getByte else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) - nType = DataType::REAL; // XRow::getFloat + nType = DataType::REAL; // XRow::getFloat else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) - nType = DataType::DOUBLE; // XRow::getDouble + nType = DataType::DOUBLE; // XRow::getDouble else if ( rType == getCppuType( static_cast< const Sequence< sal_Int8 > * >( 0 ) ) ) nType = DataType::VARBINARY;// XRow::getBytes else if ( rType == getCppuType( static_cast< const Date * >( 0 ) ) ) - nType = DataType::DATE; // XRow::getDate + nType = DataType::DATE; // XRow::getDate else if ( rType == getCppuType( static_cast< const Time * >( 0 ) ) ) - nType = DataType::TIME; // XRow::getTime + nType = DataType::TIME; // XRow::getTime else if ( rType == getCppuType( static_cast< const DateTime * >( 0 ) ) ) nType = DataType::TIMESTAMP;// XRow::getTimestamp else if ( rType == getCppuType( static_cast< Reference< XInputStream > * >( 0 ) ) ) - nType = DataType::LONGVARBINARY; // XRow::getBinaryStream -// nType = DataType::LONGVARCHAR; // XRow::getCharacterStream + nType = DataType::LONGVARBINARY; // XRow::getBinaryStream +// nType = DataType::LONGVARCHAR; // XRow::getCharacterStream else if ( rType == getCppuType( static_cast< Reference< XClob > * >( 0 ) ) ) - nType = DataType::CLOB; // XRow::getClob + nType = DataType::CLOB; // XRow::getClob else if ( rType == getCppuType( static_cast< Reference< XBlob > * >( 0 ) ) ) - nType = DataType::BLOB; // XRow::getBlob + nType = DataType::BLOB; // XRow::getBlob else if ( rType == getCppuType( static_cast< Reference< XArray > * >( 0 ) ) ) nType = DataType::ARRAY;// XRow::getArray else if ( rType == getCppuType( static_cast< Reference< XRef > * >( 0 ) ) ) diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx index d3a7259d91cb..285893a09886 100644 --- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx +++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx @@ -2,7 +2,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 @@ using namespace com::sun::star; using namespace ucbhelper; //========================================================================= -SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, +SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, const com::sun::star::uno::Reference<com::sun::star::security::XCertificate> pCertificate, const rtl::OUString & hostname) { @@ -44,9 +44,9 @@ SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sa aRequest.CertificateValidity = lCertificateValidity; aRequest.Certificate = pCertificate; aRequest.HostName = hostname; - + setRequest( uno::makeAny( aRequest ) ); - + uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( 2 ); aContinuations[ 0 ] = new InteractionAbort( this ); aContinuations[ 1 ] = new InteractionApprove( this ); diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx index e178b695da15..5c8921fce302 100644 --- a/ucbhelper/source/provider/simpleinteractionrequest.cxx +++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx @@ -2,7 +2,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/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx index 4cf82b342365..6ba408019d25 100644 --- a/ucbhelper/source/provider/simpleioerrorrequest.cxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx @@ -2,7 +2,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/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index 36fa09516fbf..9365e16144fc 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -2,7 +2,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/ucbhelper/util/ucbhelper.xml b/ucbhelper/util/ucbhelper.xml index 8e13b5f7bc0c..4b3dca3f5f03 100644 --- a/ucbhelper/util/ucbhelper.xml +++ b/ucbhelper/util/ucbhelper.xml @@ -9,10 +9,10 @@ <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> cppuhelper </project-build-dependency> - <runtime-module-dependency> sal3 </runtime-module-dependency> - <runtime-module-dependency> salhelper3$(COM) </runtime-module-dependency> - <runtime-module-dependency> cppu3 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal3 </runtime-module-dependency> + <runtime-module-dependency> salhelper3$(COM) </runtime-module-dependency> + <runtime-module-dependency> cppu3 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency> <service-dependency> com.sun.star.configuration.ConfigurationAccess diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx index a787ed64467f..027d0d1114cb 100644 --- a/ucbhelper/workben/myucp/myucp_content.cxx +++ b/ucbhelper/workben/myucp/myucp_content.cxx @@ -2,7 +2,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 @@ -177,7 +177,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - // @@@ Adjust implementation name. + // @@@ Adjust implementation name. // Prefix with reversed company domain name. return rtl::OUString::createFromAscii( "com.sun.star.comp.myucp.Content" ); } @@ -433,7 +433,7 @@ uno::Any SAL_CALL Content::execute( removeAdditionalPropertySet( sal_True ); // Remove own and all childrens(!) persistent data. -// removeData(); +// removeData(); } #endif // IMPLEMENT_COMMAND_DELETE else @@ -486,7 +486,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< lang::XMultiServiceFactory >& rSMgr, const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, - const rtl::Reference< + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, const rtl::OUString& rContentId ) { @@ -646,11 +646,11 @@ uno::Sequence< uno::Any > Content::setPropertyValues( beans::PropertyChangeEvent aEvent; aEvent.Source = static_cast< cppu::OWeakObject * >( this ); - aEvent.Further = sal_False; -// aEvent.PropertyName = + aEvent.Further = sal_False; +// aEvent.PropertyName = aEvent.PropertyHandle = -1; -// aEvent.OldValue = -// aEvent.NewValue = +// aEvent.OldValue = +// aEvent.NewValue = const beans::PropertyValue* pValues = rValues.getConstArray(); sal_Int32 nCount = rValues.getLength(); @@ -749,7 +749,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( rValue.Name, rValue.Value ); aEvent.PropertyName = rValue.Name; - aEvent.OldValue = aOldValue; + aEvent.OldValue = aOldValue; aEvent.NewValue = rValue.Value; aChanges.getArray()[ nChanged ] = aEvent; @@ -790,7 +790,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( nChanged > 0 ) { // @@@ Save changes. -// storeData(); +// storeData(); aGuard.clear(); aChanges.realloc( nChanged ); @@ -831,7 +831,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - ::rtl::OUString aChildURL + ::rtl::OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -903,7 +903,7 @@ void Content::insert( m_xIdentifier = xId; // @@@ -// storeData(); +// storeData(); aGuard.clear(); inserted(); diff --git a/ucbhelper/workben/myucp/myucp_content.hxx b/ucbhelper/workben/myucp/myucp_content.hxx index d2a4668fbe98..861ba73b8a39 100644 --- a/ucbhelper/workben/myucp/myucp_content.hxx +++ b/ucbhelper/workben/myucp/myucp_content.hxx @@ -2,7 +2,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 @@ -63,10 +63,10 @@ namespace myucp struct ContentProperties { - ::rtl::OUString aTitle; // Title - ::rtl::OUString aContentType; // ContentType + ::rtl::OUString aTitle; // Title + ::rtl::OUString aContentType; // ContentType sal_Bool bIsDocument; // IsDocument - sal_Bool bIsFolder; // IsFolder + sal_Bool bIsFolder; // IsFolder // @@@ Add other properties supported by your content. diff --git a/ucbhelper/workben/myucp/myucp_contentcaps.cxx b/ucbhelper/workben/myucp/myucp_contentcaps.cxx index 4b5916077dbb..7d74282c843f 100644 --- a/ucbhelper/workben/myucp/myucp_contentcaps.cxx +++ b/ucbhelper/workben/myucp/myucp_contentcaps.cxx @@ -2,7 +2,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 @@ -83,7 +83,7 @@ uno::Sequence< beans::Property > Content::getProperties( // is preferred! In fact you should return a table conatining // even that dynamicly added properties. -// osl::Guard< osl::Mutex > aGuard( m_aMutex ); +// osl::Guard< osl::Mutex > aGuard( m_aMutex ); //================================================================= // @@ -141,7 +141,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { // @@@ Add additional commands... -// osl::Guard< osl::Mutex > aGuard( m_aMutex ); +// osl::Guard< osl::Mutex > aGuard( m_aMutex ); //================================================================= // diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.cxx b/ucbhelper/workben/myucp/myucp_datasupplier.cxx index e0feb0e6d63a..ecdf861a8921 100644 --- a/ucbhelper/workben/myucp/myucp_datasupplier.cxx +++ b/ucbhelper/workben/myucp/myucp_datasupplier.cxx @@ -2,7 +2,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,11 +57,11 @@ namespace myucp struct ResultListEntry { - rtl::OUString aId; + rtl::OUString aId; uno::Reference< ucb::XContentIdentifier > xId; - uno::Reference< ucb::XContent > xContent; - uno::Reference< sdbc::XRow > xRow; - const ContentProperties& rData; + uno::Reference< ucb::XContent > xContent; + uno::Reference< sdbc::XRow > xRow; + const ContentProperties& rData; ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {} }; @@ -82,21 +82,21 @@ typedef std::vector< ResultListEntry* > ResultList; struct DataSupplier_Impl { - osl::Mutex m_aMutex; - ResultList m_aResults; - rtl::Reference< Content > m_xContent; + osl::Mutex m_aMutex; + ResultList m_aResults; + rtl::Reference< Content > m_xContent; uno::Reference< lang::XMultiServiceFactory > m_xSMgr; // @@@ The data source and an iterator for it -// Entry m_aFolder; -// Entry::iterator m_aIterator; - sal_Int32 m_nOpenMode; - sal_Bool m_bCountFinal; +// Entry m_aFolder; +// Entry::iterator m_aIterator; + sal_Int32 m_nOpenMode; + sal_Bool m_bCountFinal; DataSupplier_Impl( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ) : m_xContent( rContent ), m_xSMgr( rxSMgr ), -// m_aFolder( rxSMgr, rContent->getIdentifier()->getContentIdentifier() ), +// m_aFolder( rxSMgr, rContent->getIdentifier()->getContentIdentifier() ), m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {} ~DataSupplier_Impl(); }; @@ -167,7 +167,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) //========================================================================= // virtual -uno::Reference< ucb::XContentIdentifier > +uno::Reference< ucb::XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -186,7 +186,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) rtl::OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { - uno::Reference< ucb::XContentIdentifier > xId + uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); m_pImpl->m_aResults[ nIndex ]->xId = xId; return xId; @@ -196,7 +196,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) //========================================================================= // virtual -uno::Reference< ucb::XContent > +uno::Reference< ucb::XContent > DataSupplier::queryContent( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -212,7 +212,7 @@ DataSupplier::queryContent( sal_uInt32 nIndex ) } } - uno::Reference< ucb::XContentIdentifier > xId + uno::Reference< ucb::XContentIdentifier > xId = queryContentIdentifier( nIndex ); if ( xId.is() ) { @@ -343,7 +343,7 @@ sal_Bool DataSupplier::isCountFinal() //========================================================================= // virtual -uno::Reference< sdbc::XRow > +uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); diff --git a/ucbhelper/workben/myucp/myucp_datasupplier.hxx b/ucbhelper/workben/myucp/myucp_datasupplier.hxx index a4bafb8e4480..351280aa44e5 100644 --- a/ucbhelper/workben/myucp/myucp_datasupplier.hxx +++ b/ucbhelper/workben/myucp/myucp_datasupplier.hxx @@ -2,7 +2,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/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx index f51ec34e261c..5e6b2a6bb222 100644 --- a/ucbhelper/workben/myucp/myucp_provider.cxx +++ b/ucbhelper/workben/myucp/myucp_provider.cxx @@ -2,7 +2,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/ucbhelper/workben/myucp/myucp_provider.hxx b/ucbhelper/workben/myucp/myucp_provider.hxx index 729cb5a36687..522d4423c56d 100644 --- a/ucbhelper/workben/myucp/myucp_provider.hxx +++ b/ucbhelper/workben/myucp/myucp_provider.hxx @@ -2,7 +2,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,14 +43,14 @@ namespace myucp { // create instances of the provider. Prefix with reversed company domain name. #define MYUCP_CONTENT_PROVIDER_SERVICE_NAME \ "com.sun.star.ucb.MyContentProvider" -#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 34 +#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 34 // URL scheme. This is the scheme the provider will be able to create // contents for. The UCB will select the provider ( i.e. in order to create // contents ) according to this scheme. #define MYUCP_URL_SCHEME \ "vnd.sun.star.myucp" -#define MYUCP_URL_SCHEME_LENGTH 18 +#define MYUCP_URL_SCHEME_LENGTH 18 // UCB Content Type. #define MYUCP_CONTENT_TYPE \ diff --git a/ucbhelper/workben/myucp/myucp_resultset.cxx b/ucbhelper/workben/myucp/myucp_resultset.cxx index 370ed3e68a96..ec1a22b83b1d 100644 --- a/ucbhelper/workben/myucp/myucp_resultset.cxx +++ b/ucbhelper/workben/myucp/myucp_resultset.cxx @@ -2,7 +2,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/ucbhelper/workben/myucp/myucp_resultset.hxx b/ucbhelper/workben/myucp/myucp_resultset.hxx index a36509f961ff..27dc73606bc4 100644 --- a/ucbhelper/workben/myucp/myucp_resultset.hxx +++ b/ucbhelper/workben/myucp/myucp_resultset.hxx @@ -2,7 +2,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/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx index 7ab10a200535..ae3d0b0395a4 100644 --- a/ucbhelper/workben/myucp/myucp_services.cxx +++ b/ucbhelper/workben/myucp/myucp_services.cxx @@ -2,7 +2,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/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index cd8b03453c44..4f006cc6bba8 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -2,7 +2,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/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc index e93730da99ef..919ca605a859 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc @@ -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,29 +37,29 @@ #ifndef _UCBEXPLORER_HRC #define _UCBEXPLORER_HRC -#define MENU_MAIN 1000 +#define MENU_MAIN 1000 #define MENU_FILE 100 #define MENU_EXIT 10 -#define MENU_POPUP 1001 -#define MENU_NEW 10 -#define MENU_RENAME 11 -#define MENU_DELETE 12 +#define MENU_POPUP 1001 +#define MENU_NEW 10 +#define MENU_RENAME 11 +#define MENU_DELETE 12 -#define TEXT_TITLEBAR 5000 +#define TEXT_TITLEBAR 5000 -#define BMP_FOLDER_CLOSED 6001 -#define BMP_FOLDER_OPENED 6002 -#define BMP_DOCUMENT 6003 -#define BMP_LINK 6004 +#define BMP_FOLDER_CLOSED 6001 +#define BMP_FOLDER_OPENED 6002 +#define BMP_DOCUMENT 6003 +#define BMP_LINK 6004 -#define DLG_STRINGINPUT 7000 -#define FT_STRINGINPUT_DLG_NAME 10 -#define ED_STRINGINPUT_DLG_NAME 11 -#define GB_STRINGINPUT_DLG_NAME 12 -#define BT_STRINGINPUT_DLG_OK 13 -#define BT_STRINGINPUT_DLG_CANCEL 14 -#define BT_STRINGINPUT_DLG_HELP 15 +#define DLG_STRINGINPUT 7000 +#define FT_STRINGINPUT_DLG_NAME 10 +#define ED_STRINGINPUT_DLG_NAME 11 +#define GB_STRINGINPUT_DLG_NAME 12 +#define BT_STRINGINPUT_DLG_OK 13 +#define BT_STRINGINPUT_DLG_CANCEL 14 +#define BT_STRINGINPUT_DLG_HELP 15 #endif /* !_UCBEXPLORER_HRC */ diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src index 4bee5900eaaf..8e7a1193934d 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src @@ -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 |