[Libreoffice-commits] core.git: include/ucbhelper include/uno include/unotest include/unotools include/vbahelper include/vcl include/xmloff include/xmlscript
Noel Grandin
noel at peralex.com
Fri Oct 23 10:05:42 UTC 2015
include/ucbhelper/activedatasink.hxx | 2
include/ucbhelper/activedatastreamer.hxx | 2
include/ucbhelper/cancelcommandexecution.hxx | 27 -
include/ucbhelper/commandenvironment.hxx | 2
include/ucbhelper/content.hxx | 319 ++++++-------
include/ucbhelper/contenthelper.hxx | 189 +++-----
include/ucbhelper/contentidentifier.hxx | 22
include/ucbhelper/contentinfo.hxx | 80 +--
include/ucbhelper/fd_inputstream.hxx | 4
include/ucbhelper/getcomponentcontext.hxx | 4
include/ucbhelper/interactionrequest.hxx | 276 +++++-------
include/ucbhelper/interceptedinteraction.hxx | 34 -
include/ucbhelper/macros.hxx | 72 +--
include/ucbhelper/propertyvalueset.hxx | 172 +++----
include/ucbhelper/providerhelper.hxx | 57 +-
include/ucbhelper/proxydecider.hxx | 3
include/ucbhelper/registerucb.hxx | 10
include/ucbhelper/resultset.hxx | 342 +++++++--------
include/ucbhelper/resultsethelper.hxx | 77 +--
include/ucbhelper/resultsetmetadata.hxx | 124 ++---
include/ucbhelper/simpleauthenticationrequest.hxx | 6
include/ucbhelper/simplecertificatevalidationrequest.hxx | 4
include/ucbhelper/simpleinteractionrequest.hxx | 2
include/ucbhelper/simpleioerrorrequest.hxx | 10
include/ucbhelper/simplenameclashresolverequest.hxx | 2
include/ucbhelper/std_inputstream.hxx | 4
include/uno/mapping.hxx | 8
include/unotest/bootstrapfixturebase.hxx | 10
include/unotest/officeconnection.hxx | 4
include/unotools/accessiblerelationsethelper.hxx | 30 -
include/unotools/accessiblestatesethelper.hxx | 28 -
include/unotools/calendarwrapper.hxx | 20
include/unotools/charclass.hxx | 30 -
include/unotools/closeveto.hxx | 2
include/unotools/cmdoptions.hxx | 2
include/unotools/collatorwrapper.hxx | 21
include/unotools/compatibility.hxx | 2
include/unotools/configitem.hxx | 50 +-
include/unotools/configmgr.hxx | 6
include/unotools/confignode.hxx | 45 -
include/unotools/configvaluecontainer.hxx | 4
include/unotools/digitgroupingiterator.hxx | 12
include/unotools/dynamicmenuoptions.hxx | 2
include/unotools/eventcfg.hxx | 16
include/unotools/eventlisteneradapter.hxx | 6
include/unotools/fltrcfg.hxx | 4
include/unotools/fontcfg.hxx | 20
include/unotools/historyoptions.hxx | 2
include/unotools/intlwrapper.hxx | 4
include/unotools/lingucfg.hxx | 38 -
include/unotools/localedatawrapper.hxx | 104 ++--
include/unotools/localfilehelper.hxx | 2
include/unotools/mediadescriptor.hxx | 16
include/unotools/moduleoptions.hxx | 6
include/unotools/nativenumberwrapper.hxx | 12
include/unotools/numberformatcodewrapper.hxx | 16
include/unotools/progresshandlerwrap.hxx | 16
include/unotools/securityoptions.hxx | 10
include/unotools/sharedunocomponent.hxx | 79 +--
include/unotools/textsearch.hxx | 20
include/unotools/transliterationwrapper.hxx | 10
include/unotools/ucbhelper.hxx | 6
include/unotools/ucbstreamhelper.hxx | 10
include/unotools/viewoptions.hxx | 10
include/unotools/xmlaccelcfg.hxx | 32 -
include/vbahelper/vbaapplicationbase.hxx | 2
include/vbahelper/vbareturntypes.hxx | 4
include/vcl/FilterConfigItem.hxx | 26 -
include/vcl/canvastools.hxx | 41 -
include/vcl/configsettings.hxx | 2
include/vcl/dndhelp.hxx | 84 +--
include/vcl/embeddedfontshelper.hxx | 2
include/vcl/event.hxx | 2
include/vcl/field.hxx | 6
include/vcl/fltcall.hxx | 2
include/vcl/graph.hxx | 4
include/vcl/graphicfilter.hxx | 2
include/vcl/i18nhelp.hxx | 6
include/vcl/keycodes.hxx | 230 +++++-----
include/vcl/lazydelete.hxx | 12
include/vcl/lineinfo.hxx | 6
include/vcl/mnemonic.hxx | 4
include/vcl/oldprintadaptor.hxx | 2
include/vcl/pdfextoutdevdata.hxx | 12
include/vcl/pdfwriter.hxx | 22
include/vcl/ppdparser.hxx | 4
include/vcl/print.hxx | 6
include/vcl/texteng.hxx | 12
include/vcl/textview.hxx | 12
include/vcl/threadex.hxx | 8
include/vcl/unohelp.hxx | 6
include/vcl/unohelp2.hxx | 20
include/vcl/unowrap.hxx | 10
include/vcl/vclevent.hxx | 6
include/vcl/window.hxx | 30 -
include/vcl/wrkwin.hxx | 4
include/vcl/xtextedt.hxx | 10
include/xmloff/DashStyle.hxx | 7
include/xmloff/DocumentSettingsContext.hxx | 6
include/xmloff/EnumPropertyHdl.hxx | 8
include/xmloff/GradientStyle.hxx | 7
include/xmloff/HatchStyle.hxx | 7
include/xmloff/ImageStyle.hxx | 10
include/xmloff/MarkerStyle.hxx | 7
include/xmloff/NamedBoolPropertyHdl.hxx | 4
include/xmloff/ProgressBarHelper.hxx | 16
include/xmloff/SchXMLImportHelper.hxx | 23 -
include/xmloff/SchXMLSeriesHelper.hxx | 35 -
include/xmloff/SettingsExportHelper.hxx | 24 -
include/xmloff/SinglePropertySetInfoCache.hxx | 15
include/xmloff/WordWrapPropertyHdl.hxx | 4
include/xmloff/XMLBase64ImportContext.hxx | 9
include/xmloff/XMLCharContext.hxx | 4
include/xmloff/XMLConstantsPropertyHandler.hxx | 4
include/xmloff/XMLEmbeddedObjectExportFilter.hxx | 57 +-
include/xmloff/XMLEventExport.hxx | 18
include/xmloff/XMLEventsImportContext.hxx | 30 -
include/xmloff/XMLFontStylesContext.hxx | 6
include/xmloff/XMLGraphicsDefaultStyle.hxx | 7
include/xmloff/XMLPageExport.hxx | 12
include/xmloff/XMLSettingsExportContext.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 7
include/xmloff/XMLTextListAutoStylePool.hxx | 8
include/xmloff/XMLTextMasterPageContext.hxx | 15
include/xmloff/XMLTextMasterPageExport.hxx | 6
include/xmloff/XMLTextMasterStylesContext.hxx | 12
include/xmloff/XMLTextShapeImportHelper.hxx | 9
include/xmloff/XMLTextShapeStyleContext.hxx | 5
include/xmloff/animationexport.hxx | 6
include/xmloff/animexp.hxx | 4
include/xmloff/attrlist.hxx | 36 -
include/xmloff/controlpropertyhdl.hxx | 16
include/xmloff/formlayerexport.hxx | 14
include/xmloff/formlayerimport.hxx | 8
include/xmloff/maptype.hxx | 4
include/xmloff/numehelp.hxx | 10
include/xmloff/prstylei.hxx | 22
include/xmloff/settingsstore.hxx | 12
include/xmloff/shapeexport.hxx | 90 +--
include/xmloff/shapeimport.hxx | 72 +--
include/xmloff/styleexp.hxx | 14
include/xmloff/table/XMLTableExport.hxx | 12
include/xmloff/table/XMLTableImport.hxx | 4
include/xmloff/txtimp.hxx | 98 +---
include/xmloff/txtparae.hxx | 235 +++-------
include/xmloff/txtstyli.hxx | 8
include/xmloff/unoatrcn.hxx | 46 +-
include/xmloff/unointerfacetouniqueidentifiermapper.hxx | 16
include/xmloff/xformsexport.hxx | 10
include/xmloff/xformsimport.hxx | 16
include/xmloff/xmlaustp.hxx | 22
include/xmloff/xmlerror.hxx | 11
include/xmloff/xmlevent.hxx | 8
include/xmloff/xmlexp.hxx | 138 ++----
include/xmloff/xmlexppr.hxx | 3
include/xmloff/xmlictxt.hxx | 6
include/xmloff/xmlimp.hxx | 173 +++----
include/xmloff/xmlimppr.hxx | 33 -
include/xmloff/xmlmetae.hxx | 56 +-
include/xmloff/xmlmetai.hxx | 17
include/xmloff/xmlnume.hxx | 12
include/xmloff/xmlnumfe.hxx | 12
include/xmloff/xmlnumfi.hxx | 36 -
include/xmloff/xmlnumi.hxx | 27 -
include/xmloff/xmlprcon.hxx | 6
include/xmloff/xmlprhdl.hxx | 6
include/xmloff/xmlscripti.hxx | 13
include/xmloff/xmlstyle.hxx | 41 -
include/xmloff/xmltabe.hxx | 4
include/xmloff/xmluconv.hxx | 32 -
include/xmlscript/xml_helper.hxx | 30 -
include/xmlscript/xmldlg_imexp.hxx | 43 -
include/xmlscript/xmllib_imexp.hxx | 16
include/xmlscript/xmlmod_imexp.hxx | 6
174 files changed, 2311 insertions(+), 2737 deletions(-)
New commits:
commit 1c909a13a0816e20d365000cc527d93e02633b0c
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 23 10:32:47 2015 +0200
com::sun::star->css in include/ucbhelper to include/xmlscript
Change-Id: Iaa7f0b8455a601d3992c08cde0943c709c417256
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index 9cb6940..3e6c3ba 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -28,7 +28,7 @@ namespace ucbhelper
{
/**
- * This class implements the interface com::sun::star::io::XActiveDataSink.
+ * This class implements the interface css::io::XActiveDataSink.
* Instances of this class can be passed with the parameters of an
* "open" command.
*/
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 89eccba..af6bae2 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -29,7 +29,7 @@ namespace ucbhelper
/**
- * This class implements the interface com::sun::star::io::XActiveDataStreamer.
+ * This class implements the interface css::io::XActiveDataStreamer.
* Instances of this class can be passed with the parameters of an
* "open" command.
*/
diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index 9685d39..6e850d5 100644
--- a/include/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
@@ -39,7 +39,7 @@ namespace ucbhelper
If an Interaction Handler is given with the command environment and the
handler handles the exception by selecting the supplied continuation,
then this function will put the original exception supplied into a
- com::sun::star::ucb::CommandFailedException and throw the
+ css::ucb::CommandFailedException and throw the
CommandFailedException. If no handler was given or the handler was not
able to handle the exception, then the given exception will be thrown
directly.
@@ -51,17 +51,17 @@ namespace ucbhelper
@param xEnv is the command environment that may contain an Interaction
Handler to use before throwing the appropriate exception.
*/
-UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::uno::Any & rException,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > &
+UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::uno::Any & rException,
+ const css::uno::Reference<
+ css::ucb::XCommandEnvironment > &
xEnv )
- throw( com::sun::star::uno::Exception );
+ throw( css::uno::Exception );
/** Cancel the execution of a command by throwing the appropriate exception.
If an Interaction Handler is given with the command environment and the
handler handles the exception by selecting the supplied continuation,
then this function will put the original exception supplied into a
- com::sun::star::ucb::CommandFailedException and throw the
+ css::ucb::CommandFailedException and throw the
CommandFailedException. If no handler was given or the handler was not
able to handle the exception, then the given exception will be thrown
directly.
@@ -86,17 +86,12 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::uno::Any
Used as debugging aid only. Passed to the member 'Context' of the
uno::Exception thrown by this function.
*/
-UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOErrorCode eError,
- const com::sun::star::uno::Sequence<
- com::sun::star::uno::Any > & rArgs,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > &
- xEnv,
+UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::ucb::IOErrorCode eError,
+ const css::uno::Sequence< css::uno::Any > & rArgs,
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
const OUString & rMessage = OUString(),
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandProcessor > &
- xContext = 0 )
- throw( com::sun::star::uno::Exception );
+ const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = 0 )
+ throw( css::uno::Exception );
}
#endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 6f78aed..11bc5e3 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -30,7 +30,7 @@ struct CommandEnvironment_Impl;
/**
* This class implements the interface
- * com::sun::star::ucb::XCommandEnvironement. Instances of this class can
+ * css::ucb::XCommandEnvironement. Instances of this class can
* be used to supply environments to commands executed by UCB contents.
*/
class UCBHELPER_DLLPUBLIC CommandEnvironment :
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 520ce2a..2cf186b 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -99,12 +99,11 @@ class UCBHELPER_DLLPUBLIC Content
rtl::Reference< Content_Impl > m_xImpl;
protected:
- ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
- ResultSetInclude eMode )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames,
+ ResultSetInclude eMode )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
public:
/**
@@ -122,12 +121,10 @@ public:
* errors.
*/
Content( const OUString& rURL,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& rCtx )
- throw ( ::com::sun::star::ucb::ContentCreationException,
- ::com::sun::star::uno::RuntimeException );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx )
+ throw ( css::ucb::ContentCreationException,
+ css::uno::RuntimeException );
/**
* Constructor.
*
@@ -137,14 +134,11 @@ public:
* implementation to interact with the client and to propagate
* errors.
*/
- Content( const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XContent >& rContent,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& rCtx )
- throw ( ::com::sun::star::ucb::ContentCreationException,
- ::com::sun::star::uno::RuntimeException );
+ Content( const css::uno::Reference< css::ucb::XContent >& rContent,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx )
+ throw ( css::ucb::ContentCreationException,
+ css::uno::RuntimeException );
/**
* Copy Constructor.
*
@@ -179,10 +173,8 @@ public:
*/
static bool
create( const OUString& rURL,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& rCtx,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
+ const css::uno::Reference< css::uno::XComponentContext >& rCtx,
Content& rContent );
@@ -198,8 +190,7 @@ public:
*
* @return the XContent interface of the underlying UCB content.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
- get() const;
+ css::uno::Reference< css::ucb::XContent > get() const;
// Object identity.
@@ -221,8 +212,7 @@ public:
*
* @return the command environment.
*/
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment >&
+ const css::uno::Reference< css::ucb::XCommandEnvironment >&
getCommandEnvironment() const;
/**
@@ -231,8 +221,7 @@ public:
* @param xNewEnv is the new command environment.
*/
void setCommandEnvironment(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment >& xNewEnv );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xNewEnv );
// Access to supported commands/properties.
@@ -245,11 +234,11 @@ public:
* @return an XCommandInfo interface implementation, which can be used
* to obtain meta data of the commands supported by this content.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandInfo >
+ css::uno::Reference< css::ucb::XCommandInfo >
getCommands()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods provides access to meta data of the properties supported
* by this content.
@@ -257,12 +246,11 @@ public:
* @return an XPropertSetInfo interface implementation, which can be used
* to obtain meta data of the properties supported by this content.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo >
+ css::uno::Reference< css::beans::XPropertySetInfo >
getProperties()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
// Access to property value(s).
@@ -275,11 +263,11 @@ public:
* shall be obtained.
* @return the property value.
*/
- ::com::sun::star::uno::Any
+ css::uno::Any
getPropertyValue( const OUString& rPropertyName )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method can be used to set a single property value.
*
@@ -288,28 +276,28 @@ public:
* @return an any containing:
* - No value indicates, that the property value was set
* successfully.
- * - com::sun::star::beans::UnknownPropertyException indicates,
+ * - css::beans::UnknownPropertyException indicates,
* that the property is not known to the content implementation.
- * - com::sun::star::beans::IllegalTypeException indicates, that
+ * - css::beans::IllegalTypeException indicates, that
* the data type of the property value is not acceptable.
- * - com::sun::star::lang::IllegalAccessException indicates, that
+ * - css::lang::IllegalAccessException indicates, that
* the property is constant.
- * - com::sun::star::lang::IllegalArgumentException indicates,
+ * - css::lang::IllegalArgumentException indicates,
* that the property value is not acceptable. For instance,
* setting an empty title may be illegal.
* - Any other exception derived from
- * com::sun::star::uno::Exception indicates, that the value was
+ * css::uno::Exception indicates, that the value was
* not set successfully. For example, this can be a
* com::sun:star::ucb::InteractiveAugmentedIOException
* transporting the error code
- * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED.
+ * css::ucb::IOErrorCode::ACCESS_DENIED.
*/
- ::com::sun::star::uno::Any
+ css::uno::Any
setPropertyValue( const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ const css::uno::Any& rValue )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method can be used to read multiple property values.
*
@@ -317,12 +305,11 @@ public:
* that the values shall be obtained.
* @return the property values.
*/
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- getPropertyValues( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ css::uno::Sequence< css::uno::Any >
+ getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method can be used to read multiple property values.
*
@@ -330,12 +317,11 @@ public:
* that the values shall be obtained.
* @return the property values.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
- getPropertyValuesInterface( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ css::uno::Reference< css::sdbc::XRow >
+ getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method can be used to set multiple property values.
@@ -351,30 +337,28 @@ public:
* An any containing:
* - No value indicates, that the property value was set
* successfully.
- * - com::sun::star::beans::UnknownPropertyException indicates,
+ * - css::beans::UnknownPropertyException indicates,
* that the property is not known to the content implementation.
- * - com::sun::star::beans::IllegalTypeException indicates, that
+ * - css::beans::IllegalTypeException indicates, that
* the data type of the property value is not acceptable.
- * - com::sun::star::lang::IllegalAccessException indicates, that
+ * - css::lang::IllegalAccessException indicates, that
* the property is constant.
- * - com::sun::star::lang::IllegalArgumentException indicates,
+ * - css::lang::IllegalArgumentException indicates,
* that the property value is not acceptable. For instance,
* setting an empty title may be illegal.
* - Any other exception derived from
- * com::sun::star::uno::Exception indicates, that the value was
+ * css::uno::Exception indicates, that the value was
* not set successfully. For example, this can be a
* com::sun:star::ucb::InteractiveAugmentedIOException
* transporting the error code
- * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED.
+ * css::ucb::IOErrorCode::ACCESS_DENIED.
*/
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- setPropertyValues( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any >& rValues )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ css::uno::Sequence< css::uno::Any >
+ setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& rValues )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
// General command execution.
@@ -390,12 +374,12 @@ public:
* specification.
* @return the result of the command according to its specification.
*/
- ::com::sun::star::uno::Any
+ css::uno::Any
executeCommand( const OUString& rCommandName,
- const ::com::sun::star::uno::Any& rCommandArgument )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ const css::uno::Any& rCommandArgument )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
// Special commands.
@@ -416,13 +400,12 @@ public:
* com.cun.star.ucb.ContentResultSet, which can be used to
* get access to the children of a content.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
- createCursor( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
+ css::uno::Reference< css::sdbc::XResultSet >
+ createCursor( const css::uno::Sequence< OUString >& rPropertyNames,
ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives access to the children of a folder content.
* Additionally, the result set returned provides efficient access to
@@ -438,23 +421,21 @@ public:
* com.cun.star.ucb.DynamicResultSet, which can be used to
* get access to the children of a content.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
- createDynamicCursor( const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
- ResultSetInclude eMode
- = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
-
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
- createSortedCursor( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory,
+ css::uno::Reference< css::ucb::XDynamicResultSet >
+ createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames,
+ ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
+
+ css::uno::Reference< css::sdbc::XResultSet >
+ createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo,
+ css::uno::Reference< css::ucb::XAnyCompareFactory > rAnyCompareFactory,
ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read access to the content stream of a content (i.e
@@ -464,11 +445,11 @@ public:
* @return an implementation of the interface XInputStream, which can
* be used to read the content's data.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+ css::uno::Reference< css::io::XInputStream >
openStream()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -478,11 +459,11 @@ public:
* @return an implementation of the interface XInputStream, which can
* be used to read the content's data.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+ css::uno::Reference< css::io::XInputStream >
openStreamNoLock()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read/write access to the content stream of a content (i.e
@@ -492,11 +473,11 @@ public:
* @return an implementation of the interface XStream, which can
* be used to read/write the content's data.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+ css::uno::Reference< css::io::XStream >
openWriteableStream()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read/write access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -506,11 +487,11 @@ public:
* @return an implementation of the interface XStream, which can
* be used to read/write the content's data.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+ css::uno::Reference< css::io::XStream >
openWriteableStreamNoLock()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read access to the content stream of a content (i.e
@@ -521,11 +502,10 @@ public:
* which shall be used by the content to deliver the data.
*/
bool
- openStream( const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XActiveDataSink >& rSink )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives read access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -535,11 +515,10 @@ public:
* which shall be used by the content to deliver the data.
*/
bool
- openStream( const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XOutputStream >& rStream )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ openStream( const css::uno::Reference< css::io::XOutputStream >& rStream )
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This methods gives write access to the content stream of a content (i.e
* the content of a file located at the local file system).
@@ -551,12 +530,11 @@ public:
* shall be overwritten.
*/
void
- writeStream( const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream >& rStream,
+ writeStream( const css::uno::Reference< css::io::XInputStream >& rStream,
bool bReplaceExisting )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method returns the different types of contents this content
@@ -565,11 +543,11 @@ public:
* @return the content types or an empty sequence if no contents can be
* created by this content.
*/
- ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::ContentInfo >
+ css::uno::Sequence< css::ucb::ContentInfo >
queryCreatableContentsInfo()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method creates, initializes and inserts ( commits ) a new content
@@ -596,14 +574,12 @@ public:
*/
bool
insertNewContent( const OUString& rContentType,
- const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any >& rPropertyValues,
+ const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& rPropertyValues,
Content& rNewContent )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method creates, initializes and inserts (commits) a new content
* inside this (the target folder) content. For example, it can be used to
@@ -632,16 +608,13 @@ public:
*/
bool
insertNewContent( const OUString& rContentType,
- const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any >& rPropertyValues,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream >& rStream,
+ const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& rPropertyValues,
+ const css::uno::Reference< css::io::XInputStream >& rStream,
Content& rNewContent )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method transfers (copies/moves) a content. It creates a new
@@ -682,9 +655,9 @@ public:
const OUString & rCommentVersion = OUString( ),
OUString* pResultURL = NULL,
const OUString & rDocumentId = OUString( ) )
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method lock the resource.
@@ -692,9 +665,9 @@ public:
*/
void
lock()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method unlock the resource.
@@ -702,9 +675,9 @@ public:
*/
void
unlock()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
// Required properties.
@@ -717,9 +690,9 @@ public:
*/
bool
isFolder()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
/**
* This method returns the value of the content's property "IsDocument".
*
@@ -728,9 +701,9 @@ public:
*/
bool
isDocument()
- throw( ::com::sun::star::ucb::CommandAbortedException,
- ::com::sun::star::uno::RuntimeException,
- ::com::sun::star::uno::Exception );
+ throw( css::ucb::CommandAbortedException,
+ css::uno::RuntimeException,
+ css::uno::Exception );
};
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 07404a2..20b15c7 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -68,7 +68,7 @@ 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 css::ucb::Content
* - all required listener containers
* ( XComponent, XPropertiesChangeNotifier, XPropertySetInfoChangeNotifier,
* XCommandInfoChangeNotifier )
@@ -82,16 +82,16 @@ class ContentProviderImplHelper;
*/
class UCBHELPER_DLLPUBLIC ContentImplHelper :
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::lang::XComponent,
- public com::sun::star::ucb::XContent,
- public com::sun::star::ucb::XCommandProcessor,
- public com::sun::star::beans::XPropertiesChangeNotifier,
- public com::sun::star::beans::XPropertyContainer,
- public com::sun::star::beans::XPropertySetInfoChangeNotifier,
- public com::sun::star::ucb::XCommandInfoChangeNotifier,
- public com::sun::star::container::XChild
+ public css::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::lang::XComponent,
+ public css::ucb::XContent,
+ public css::ucb::XCommandProcessor,
+ public css::beans::XPropertiesChangeNotifier,
+ public css::beans::XPropertyContainer,
+ public css::beans::XPropertySetInfoChangeNotifier,
+ public css::ucb::XCommandInfoChangeNotifier,
+ public css::container::XChild
{
friend class PropertySetInfo;
friend class CommandProcessorInfo;
@@ -100,9 +100,9 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper :
protected:
osl::Mutex m_aMutex;
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
m_xContext;
- com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >
+ css::uno::Reference< css::ucb::XContentIdentifier >
m_xIdentifier;
rtl::Reference< ContentProviderImplHelper >
m_xProvider;
@@ -122,9 +122,8 @@ private:
* @return a sequence containing the property meta data.
*/
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;
+ virtual css::uno::Sequence< css::beans::Property >
+ getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) = 0;
/**
* Your implementation of this method must return a sequence containing
@@ -134,9 +133,8 @@ private:
* @return a sequence containing the command meta data.
*/
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;
+ virtual css::uno::Sequence< css::ucb::CommandInfo >
+ getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) = 0;
/**
* The implementation of this method shall return the URL of the parent
@@ -163,9 +161,8 @@ protected:
* @return an XPropertySetInfo implementation object containing meta data
* for the properties supported by this content.
*/
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
- getPropertySetInfo( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv,
+ css::uno::Reference< css::beans::XPropertySetInfo >
+ getPropertySetInfo( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
bool bCache = true );
/**
@@ -179,9 +176,8 @@ protected:
* @return an XCommandInfo implementation object containing meta data
* for the commands supported by this content.
*/
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
- getCommandInfo( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv,
+ css::uno::Reference< css::ucb::XCommandInfo >
+ getCommandInfo( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
bool bCache = true );
/**
@@ -190,8 +186,7 @@ protected:
* @param evt is a sequence of property change events.
*/
void notifyPropertiesChange(
- const com::sun::star::uno::Sequence<
- com::sun::star::beans::PropertyChangeEvent >& evt ) const;
+ const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt ) const;
/**
* This method can be used to propagate changes of the propertyset
@@ -204,7 +199,7 @@ protected:
* @param evt is a sequence of property change events.
*/
void notifyPropertySetInfoChange(
- const com::sun::star::beans::PropertySetInfoChangeEvent& evt ) const;
+ const css::beans::PropertySetInfoChangeEvent& evt ) const;
/**
* This method can be used to propagate content events.
@@ -212,7 +207,7 @@ protected:
* @param evt is a sequence of content events.
*/
void notifyContentEvent(
- const com::sun::star::ucb::ContentEvent& evt ) const;
+ const css::ucb::ContentEvent& evt ) const;
/**
* Use this method to announce the insertion of this content at
@@ -238,8 +233,7 @@ protected:
* @param rNewId is the new content identifier for the content.
* @return a success indicator.
*/
- bool exchange( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier >& rNewId );
+ bool exchange( const css::uno::Reference< css::ucb::XContentIdentifier >& rNewId );
/**
* Use this method to get access to the Additional Core Properties of
@@ -252,8 +246,7 @@ protected:
* @return the implementation of the service
* com.sun.star.ucb.PersistentPropertySet.
*/
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XPersistentPropertySet >
+ css::uno::Reference< css::ucb::XPersistentPropertySet >
getAdditionalPropertySet( bool bCreate );
/**
@@ -308,11 +301,9 @@ public:
* @param Identifier is the content identifier for the content.
*/
ContentImplHelper(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const rtl::Reference< ContentProviderImplHelper >& rxProvider,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier >& Identifier );
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier );
/**
* Destructor.
@@ -332,97 +323,87 @@ public:
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL
getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+ throw( css::uno::RuntimeException, std::exception ) override = 0;
virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+ throw( css::uno::RuntimeException, std::exception ) override = 0;
// XComponent
virtual void SAL_CALL
dispose()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- addEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- removeEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XContent
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
getIdentifier()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getContentType()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+ throw( css::uno::RuntimeException, std::exception ) override = 0;
virtual void SAL_CALL
addContentEventListener(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removeContentEventListener(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XCommandProcessor
virtual sal_Int32 SAL_CALL
createCommandIdentifier()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Any SAL_CALL
- execute( const com::sun::star::ucb::Command& aCommand,
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment >& Environment )
- throw( com::sun::star::uno::Exception,
- com::sun::star::ucb::CommandAbortedException,
- com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
+ throw( css::uno::Exception,
+ css::ucb::CommandAbortedException,
+ css::uno::RuntimeException, std::exception ) override = 0;
virtual void SAL_CALL
abort( sal_Int32 CommandId )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0;
+ throw( css::uno::RuntimeException, std::exception ) override = 0;
// XPropertiesChangeNotifier
virtual void SAL_CALL
addPropertiesChangeListener(
- const com::sun::star::uno::Sequence< OUString >& PropertyNames,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertiesChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< OUString >& PropertyNames,
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removePropertiesChangeListener(
- const com::sun::star::uno::Sequence< OUString >& PropertyNames,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertiesChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< OUString >& PropertyNames,
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XCommandInfoChangeNotifier
virtual void SAL_CALL
addCommandInfoChangeListener(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removeCommandInfoChangeListener(
- const com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XPropertyContainer
@@ -439,11 +420,11 @@ public:
virtual void SAL_CALL
addProperty( const OUString& Name,
sal_Int16 Attributes,
- const com::sun::star::uno::Any& DefaultValue )
- throw( com::sun::star::beans::PropertyExistException,
- com::sun::star::beans::IllegalTypeException,
- com::sun::star::lang::IllegalArgumentException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Any& DefaultValue )
+ throw( css::beans::PropertyExistException,
+ css::beans::IllegalTypeException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception ) override;
/**
* This method removes a property from the content according to the
@@ -457,21 +438,19 @@ public:
*/
virtual void SAL_CALL
removeProperty( const OUString& Name )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::beans::NotRemoveableException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::beans::UnknownPropertyException,
+ css::beans::NotRemoveableException,
+ css::uno::RuntimeException, std::exception ) override;
// XPropertySetInfoChangeNotifier
virtual void SAL_CALL
addPropertySetInfoChangeListener(
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removePropertySetInfoChangeListener(
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XChild
@@ -480,19 +459,17 @@ public:
* if such a parent exists. The implementation of this method uses your
* implementation of getParentURL.
*/
- virtual com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > SAL_CALL
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
getParent()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
/**
* The implementation of this method always throws a NoSupportException.
*/
virtual void SAL_CALL
- setParent( const com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface >& Parent )
- throw( com::sun::star::lang::NoSupportException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
+ throw( css::lang::NoSupportException,
+ css::uno::RuntimeException, std::exception ) override;
// Non-interface methods.
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 9f05884..29ff867 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -41,37 +41,37 @@ struct ContentIdentifier_Impl;
*/
class UCBHELPER_DLLPUBLIC ContentIdentifier :
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XContentIdentifier
+ public css::lang::XTypeProvider,
+ public css::ucb::XContentIdentifier
{
public:
ContentIdentifier( const OUString& rURL );
virtual ~ContentIdentifier();
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
acquire() throw() override;
virtual void SAL_CALL
release() throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XContentIdentifier
virtual OUString SAL_CALL
getContentIdentifier()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getContentProviderScheme()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
private:
ContentIdentifier_Impl* m_pImpl;
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index e40c241..929a920 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -47,23 +47,22 @@ class ContentImplHelper;
*/
class PropertySetInfo :
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::beans::XPropertySetInfo
+ public css::lang::XTypeProvider,
+ public css::beans::XPropertySetInfo
{
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
+ css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
- com::sun::star::uno::Sequence< com::sun::star::beans::Property >*
+ css::uno::Sequence< css::beans::Property >*
m_pProps;
osl::Mutex m_aMutex;
ContentImplHelper* m_pContent;
private:
bool queryProperty( const OUString& rName,
- com::sun::star::beans::Property& rProp );
+ css::beans::Property& rProp );
public:
- PropertySetInfo( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment >& rxEnv,
+ PropertySetInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ContentImplHelper* pContent );
virtual ~PropertySetInfo();
@@ -76,25 +75,25 @@ public:
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XPropertySetInfo
- virtual com::sun::star::uno::Sequence<
- com::sun::star::beans::Property > SAL_CALL
+ virtual css::uno::Sequence<
+ css::beans::Property > SAL_CALL
getProperties()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::beans::Property SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::beans::UnknownPropertyException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// Non-Interface methods.
void reset();
@@ -113,25 +112,24 @@ public:
*/
class CommandProcessorInfo :
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XCommandInfo
+ public css::lang::XTypeProvider,
+ public css::ucb::XCommandInfo
{
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
+ css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
- com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >*
+ css::uno::Sequence< css::ucb::CommandInfo >*
m_pCommands;
osl::Mutex m_aMutex;
ContentImplHelper* m_pContent;
private:
bool queryCommand( const OUString& rName,
- com::sun::star::ucb::CommandInfo& rCommand );
+ css::ucb::CommandInfo& rCommand );
bool queryCommand( sal_Int32 nHandle,
- com::sun::star::ucb::CommandInfo& rCommand );
+ css::ucb::CommandInfo& rCommand );
public:
- CommandProcessorInfo( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment >& rxEnv,
+ CommandProcessorInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ContentImplHelper* pContent );
virtual ~CommandProcessorInfo();
@@ -144,32 +142,32 @@ public:
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XCommandInfo
- virtual com::sun::star::uno::Sequence<
- com::sun::star::ucb::CommandInfo > SAL_CALL
+ virtual css::uno::Sequence<
+ css::ucb::CommandInfo > SAL_CALL
getCommands()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::ucb::CommandInfo SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::ucb::CommandInfo SAL_CALL
getCommandInfoByName( const OUString& Name )
- throw( com::sun::star::ucb::UnsupportedCommandException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::ucb::CommandInfo SAL_CALL
+ throw( css::ucb::UnsupportedCommandException,
+ css::uno::RuntimeException, std::exception ) override;
+ virtual css::ucb::CommandInfo SAL_CALL
getCommandInfoByHandle( sal_Int32 Handle )
- throw( com::sun::star::ucb::UnsupportedCommandException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::ucb::UnsupportedCommandException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
hasCommandByName( const OUString& Name )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
hasCommandByHandle( sal_Int32 Handle )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// Non-Interface methods.
void reset();
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index 0a73515..8dd0c54 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -33,8 +33,8 @@
namespace ucbhelper
{
typedef ::cppu::WeakImplHelper2<
- com::sun::star::io::XInputStream,
- com::sun::star::io::XSeekable > FdInputStream_Base;
+ css::io::XInputStream,
+ css::io::XSeekable > FdInputStream_Base;
/** Implements a seekable InputStream
* working on a buffer.
diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx
index 28e0dea..7cdffd0 100644
--- a/include/ucbhelper/getcomponentcontext.hxx
+++ b/include/ucbhelper/getcomponentcontext.hxx
@@ -35,9 +35,9 @@ namespace ucbhelper {
//TODO: a duplicate of comphelper::getComponentContext
// (comphelper/processfactory.hxx)
UCBHELPER_DLLPUBLIC
-com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+css::uno::Reference< css::uno::XComponentContext >
getComponentContext(
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+ css::uno::Reference< css::lang::XMultiServiceFactory >
const & factory);
}
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 6fe8ae3..3361ccb 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -60,13 +60,13 @@ struct InteractionRequest_Impl;
* like authentication requests.
*/
class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::task::XInteractionRequest
+ public css::lang::XTypeProvider,
+ public css::task::XInteractionRequest
{
InteractionRequest_Impl * m_pImpl;
protected:
- void setRequest( const com::sun::star::uno::Any & rRequest );
+ void setRequest( const css::uno::Any & rRequest );
InteractionRequest();
virtual ~InteractionRequest();
@@ -77,7 +77,7 @@ public:
*
* @param rRequest is the exception describing the error.
*/
- InteractionRequest( const com::sun::star::uno::Any & rRequest );
+ InteractionRequest( const css::uno::Any & rRequest );
/**
* This method sets the continuations for the request.
@@ -85,37 +85,32 @@ public:
* @param rContinuations contains the possible continuations.
*/
void setContinuations(
- const com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > &
- rContinuations );
+ const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > & rContinuations );
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionRequest
- virtual com::sun::star::uno::Any SAL_CALL
+ virtual css::uno::Any SAL_CALL
getRequest()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL
getContinuations()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// Non-interface methods.
@@ -181,33 +176,33 @@ public:
* the operation that caused the request.
*/
class UCBHELPER_DLLPUBLIC InteractionAbort : public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::task::XInteractionAbort
+ public css::lang::XTypeProvider,
+ public css::task::XInteractionAbort
{
public:
InteractionAbort( InteractionRequest * pRequest )
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
@@ -218,33 +213,33 @@ public:
* the operation that caused the request.
*/
class UCBHELPER_DLLPUBLIC InteractionRetry : public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::task::XInteractionRetry
+ public css::lang::XTypeProvider,
+ public css::task::XInteractionRetry
{
public:
InteractionRetry( InteractionRequest * pRequest )
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
@@ -255,33 +250,33 @@ public:
* the request.
*/
class UCBHELPER_DLLPUBLIC InteractionApprove : public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::task::XInteractionApprove
+ public css::lang::XTypeProvider,
+ public css::task::XInteractionApprove
{
public:
InteractionApprove( InteractionRequest * pRequest )
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
@@ -292,33 +287,33 @@ public:
* the request.
*/
class UCBHELPER_DLLPUBLIC InteractionDisapprove : public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::task::XInteractionDisapprove
+ public css::lang::XTypeProvider,
+ public css::task::XInteractionDisapprove
{
public:
InteractionDisapprove( InteractionRequest * pRequest )
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
@@ -330,21 +325,21 @@ public:
*/
class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XInteractionSupplyAuthentication2
+ public css::lang::XTypeProvider,
+ public css::ucb::XInteractionSupplyAuthentication2
{
- com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication >
+ css::uno::Sequence< css::ucb::RememberAuthentication >
m_aRememberPasswordModes;
- com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication >
+ css::uno::Sequence< css::ucb::RememberAuthentication >
m_aRememberAccountModes;
OUString m_aRealm;
OUString m_aUserName;
OUString m_aPassword;
OUString m_aAccount;
- com::sun::star::ucb::RememberAuthentication m_eRememberPasswordMode;
- com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
- com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode;
- com::sun::star::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
+ css::ucb::RememberAuthentication m_eRememberPasswordMode;
+ css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
+ css::ucb::RememberAuthentication m_eRememberAccountMode;
+ css::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
bool m_bCanSetRealm : 1;
bool m_bCanSetUserName : 1;
bool m_bCanSetPassword : 1;
@@ -367,7 +362,7 @@ public:
* @param bCanSetAccount indicates, whether the account given with the
* authentication request is read-only.
*
- * @see com::sun::star::ucb::AuthenticationRequest
+ * @see css::ucb::AuthenticationRequest
*/
inline InteractionSupplyAuthentication(
InteractionRequest * pRequest,
@@ -406,8 +401,8 @@ public:
* @param bDefaultUseSystemCredentials specifies the default system
* credentials usage preferred by the requesting client
*
- * @see com::sun::star::ucb::AuthenticationRequest
- * @see com::sun::star::ucb::RememberAuthentication
+ * @see css::ucb::AuthenticationRequest
+ * @see css::ucb::RememberAuthentication
*/
inline InteractionSupplyAuthentication(
InteractionRequest * pRequest,
@@ -415,92 +410,85 @@ public:
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
- const com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > &
- rRememberPasswordModes,
- const com::sun::star::ucb::RememberAuthentication
- eDefaultRememberPasswordMode,
- const com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > &
- rRememberAccountModes,
- const com::sun::star::ucb::RememberAuthentication
- eDefaultRememberAccountMode,
+ const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberPasswordModes,
+ const css::ucb::RememberAuthentication eDefaultRememberPasswordMode,
+ const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberAccountModes,
+ const css::ucb::RememberAuthentication eDefaultRememberAccountMode,
bool bCanUseSystemCredentials,
bool bDefaultUseSystemCredentials );
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionSupplyAuthentication
virtual sal_Bool SAL_CALL
canSetRealm()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
setRealm( const OUString& Realm )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
canSetUserName()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
setUserName( const OUString& UserName )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
canSetPassword()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
setPassword( const OUString& Password )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > SAL_CALL
+ virtual css::uno::Sequence<
+ css::ucb::RememberAuthentication > SAL_CALL
getRememberPasswordModes(
- com::sun::star::ucb::RememberAuthentication& Default )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ css::ucb::RememberAuthentication& Default )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ setRememberPassword( css::ucb::RememberAuthentication Remember )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
canSetAccount()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
setAccount( const OUString& Account )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > SAL_CALL
+ virtual css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL
getRememberAccountModes(
- com::sun::star::ucb::RememberAuthentication& Default )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ css::ucb::RememberAuthentication& Default )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ setRememberAccount( css::ucb::RememberAuthentication Remember )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionSupplyAuthentication2
virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
// Non-interface methods.
@@ -534,7 +522,7 @@ public:
*
* @return the remember-mode for the password.
*/
- const com::sun::star::ucb::RememberAuthentication &
+ const css::ucb::RememberAuthentication &
getRememberPasswordMode() const { return m_eRememberPasswordMode; }
bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
@@ -548,16 +536,12 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
bool bCanSetPassword,
bool bCanSetAccount )
: InteractionContinuation( pRequest ),
- m_aRememberPasswordModes( com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication >( 1 ) ),
- m_aRememberAccountModes( com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication >( 1 ) ),
- m_eRememberPasswordMode( com::sun::star::ucb::RememberAuthentication_NO ),
- m_eDefaultRememberPasswordMode(
- com::sun::star::ucb::RememberAuthentication_NO ),
- m_eRememberAccountMode( com::sun::star::ucb::RememberAuthentication_NO ),
- m_eDefaultRememberAccountMode(
- com::sun::star::ucb::RememberAuthentication_NO ),
+ m_aRememberPasswordModes( css::uno::Sequence< css::ucb::RememberAuthentication >( 1 ) ),
+ m_aRememberAccountModes( css::uno::Sequence< css::ucb::RememberAuthentication >( 1 ) ),
+ m_eRememberPasswordMode( css::ucb::RememberAuthentication_NO ),
+ m_eDefaultRememberPasswordMode( css::ucb::RememberAuthentication_NO ),
+ m_eRememberAccountMode( css::ucb::RememberAuthentication_NO ),
+ m_eDefaultRememberAccountMode( css::ucb::RememberAuthentication_NO ),
m_bCanSetRealm( bCanSetRealm ),
m_bCanSetUserName( bCanSetUserName ),
m_bCanSetPassword( bCanSetPassword ),
@@ -567,9 +551,9 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
m_bUseSystemCredentials( false )
{
m_aRememberPasswordModes[ 0 ]
- = com::sun::star::ucb::RememberAuthentication_NO;
+ = css::ucb::RememberAuthentication_NO;
m_aRememberAccountModes [ 0 ]
- = com::sun::star::ucb::RememberAuthentication_NO;
+ = css::ucb::RememberAuthentication_NO;
}
@@ -579,14 +563,10 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
- const com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > & rRememberPasswordModes,
- const com::sun::star::ucb::RememberAuthentication
- eDefaultRememberPasswordMode,
- const com::sun::star::uno::Sequence<
- com::sun::star::ucb::RememberAuthentication > & rRememberAccountModes,
- const com::sun::star::ucb::RememberAuthentication
- eDefaultRememberAccountMode,
+ const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberPasswordModes,
+ const css::ucb::RememberAuthentication eDefaultRememberPasswordMode,
+ const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberAccountModes,
+ const css::ucb::RememberAuthentication eDefaultRememberAccountMode,
bool bCanUseSystemCredentials,
bool bDefaultUseSystemCredentials )
: InteractionContinuation( pRequest ),
@@ -615,38 +595,38 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
*/
class InteractionReplaceExistingData :
public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XInteractionReplaceExistingData
+ public css::lang::XTypeProvider,
+ public css::ucb::XInteractionReplaceExistingData
{
public:
InteractionReplaceExistingData( InteractionRequest * pRequest )
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getTypes()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
class UCBHELPER_DLLPUBLIC InteractionAuthFallback:
public InteractionContinuation,
- public com::sun::star::ucb::XInteractionAuthFallback
+ public css::ucb::XInteractionAuthFallback
{
OUString m_aCode;
@@ -655,9 +635,9 @@ public:
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
@@ -665,7 +645,7 @@ public:
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XAuthFallback
virtual void SAL_CALL setCode( const OUString& code )
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index e142645..cf29462 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -40,7 +40,7 @@ namespace ucbhelper{
only
- or as base class if interactions must be modified.
*/
-class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionHandler >
+class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
{
// types
@@ -55,13 +55,13 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
/** @short contains the interaction request, which should be intercepted. */
- ::com::sun::star::uno::Any Request;
+ css::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;
+ css::uno::Type Continuation;
/** @short specify, if both interactions must have the same type
@@ -121,9 +121,9 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
influence the type check of the interception request.
Its not used to check the continuation!
*/
- InterceptedRequest( sal_Int32 nHandle ,
- const ::com::sun::star::uno::Any& aRequest ,
- const ::com::sun::star::uno::Type& aContinuation,
+ InterceptedRequest( sal_Int32 nHandle ,
+ const css::uno::Any& aRequest ,
+ const css::uno::Type& aContinuation,
bool bMatchExact )
{
Handle = nHandle;
@@ -163,7 +163,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
expecting th handle() was overwritten by
a derived class.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInterceptedHandler;
+ css::uno::Reference< css::task::XInteractionHandler > m_xInterceptedHandler;
/** @short these list contains the requests, which should be intercepted.
@@ -189,7 +189,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@param lInterceptions
the list of intercepted requests.
*/
- InterceptedInteraction(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler,
+ InterceptedInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xInterceptedHandler,
const ::std::vector< InterceptedRequest >& lInterceptions );
@@ -204,7 +204,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
the outside interaction handler, which should
be intercepted here.
*/
- void setInterceptedHandler(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler);
+ void setInterceptedHandler(const css::uno::Reference< css::task::XInteractionHandler >& xInterceptedHandler);
/** @short set a new list of intercepted interactions.
@@ -231,9 +231,9 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@return A valid reference to the continuation, if it could be located ...
or an empty reference otherwise.
*/
- 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 );
+ static css::uno::Reference< css::task::XInteractionContinuation > extractContinuation(
+ const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations,
+ const css::uno::Type& aType );
// useable for derived classes
@@ -269,7 +269,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
will be used automatically for this request!
*/
virtual EInterceptionState intercepted(const InterceptedRequest& rRequest ,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest);
+ const css::uno::Reference< css::task::XInteractionRequest >& xOrgRequest);
// uno interface
@@ -293,8 +293,8 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@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, std::exception) override;
+ virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
+ throw(css::uno::RuntimeException, std::exception) override;
// helper
@@ -304,7 +304,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
/** @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);
+ UCBHELPER_DLLPRIVATE void impl_handleDefault(const css::uno::Reference< css::task::XInteractionRequest >& xRequest);
/** @short implements the interception of requests.
@@ -324,7 +324,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@return A identifier, which inidicates if the request was intercepted,
the continuation was found and selected ... or not.
*/
- UCBHELPER_DLLPRIVATE EInterceptionState impl_interceptRequest(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest);
+ UCBHELPER_DLLPRIVATE EInterceptionState impl_interceptRequest(const css::uno::Reference< css::task::XInteractionRequest >& xRequest);
};
} // namespace ucbhelper
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 13ebe03..0cf62a4 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -40,17 +40,17 @@
#define XTYPEPROVIDER_COMMON_IMPL( Class ) \
-com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \
+css::uno::Sequence< sal_Int8 > SAL_CALL \
Class::getImplementationId() \
- throw( com::sun::star::uno::RuntimeException, std::exception ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return css::uno::Sequence<sal_Int8>(); \
}
#define GETTYPES_IMPL_START( Class ) \
-com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
+css::uno::Sequence< css::uno::Type > SAL_CALL \
Class::getTypes() \
- throw( com::sun::star::uno::RuntimeException, std::exception ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
static cppu::OTypeCollection* pCollection = NULL; \
if ( !pCollection ) \
@@ -166,7 +166,7 @@ GETTYPES_IMPL_END
#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
OUString SAL_CALL Class::getImplementationName() \
- throw( com::sun::star::uno::RuntimeException, std::exception ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return getImplementationName_Static(); \
} \
@@ -178,42 +178,36 @@ OUString Class::getImplementationName_Static() \
\
sal_Bool SAL_CALL \
Class::supportsService( const OUString& ServiceName ) \
- throw( com::sun::star::uno::RuntimeException, std::exception ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return cppu::supportsService( this, ServiceName ); \
} \
\
-com::sun::star::uno::Sequence< OUString > SAL_CALL \
+css::uno::Sequence< OUString > SAL_CALL \
Class::getSupportedServiceNames() \
- throw( com::sun::star::uno::RuntimeException, std::exception ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return getSupportedServiceNames_Static(); \
}
#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 ) \
+static css::uno::Reference< css::uno::XInterface > SAL_CALL \
+Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \
+ throw( css::uno::Exception ) \
{ \
- com::sun::star::lang::XServiceInfo* pX = \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list