sal/workben/clipboardwben/testcopy/XTDataObject.hxx | 4
sax/inc/xml2utf.hxx | 48 -
sax/source/expatwrap/attrlistimpl.hxx | 20
sax/source/expatwrap/sax_expat.cxx | 10
sax/source/fastparser/fastparser.cxx | 36 -
sax/source/tools/converter.cxx | 40 -
sax/source/tools/fastattribs.cxx | 2
sax/source/tools/fastserializer.cxx | 2
sax/source/tools/fastserializer.hxx | 10
sax/source/tools/fshelper.cxx | 2
sax/test/saxdemo.cxx | 2
scaddins/source/analysis/analysis.hxx | 2
scaddins/source/analysis/analysishelper.hxx | 12
scaddins/source/analysis/bessel.hxx | 8
scaddins/source/datefunc/datefunc.hxx | 92 +--
sccomp/qa/unit/lpsolver.cxx | 2
sccomp/source/solver/SolverComponent.hxx | 106 +--
scripting/source/basprov/baslibnode.hxx | 30
scripting/source/basprov/basmethnode.hxx | 54 -
scripting/source/basprov/basmodnode.hxx | 18
scripting/source/basprov/basprov.hxx | 46 -
scripting/source/basprov/basscript.hxx | 28
scripting/source/dlgprov/DialogModelProvider.hxx | 36 -
scripting/source/dlgprov/dlgevtatt.cxx | 10
scripting/source/dlgprov/dlgevtatt.hxx | 86 +-
scripting/source/dlgprov/dlgprov.cxx | 2
scripting/source/dlgprov/dlgprov.hxx | 108 +--
scripting/source/protocolhandler/scripthandler.cxx | 20
scripting/source/protocolhandler/scripthandler.hxx | 8
scripting/source/provider/ActiveMSPList.cxx | 5
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 6
scripting/source/provider/MasterScriptProvider.hxx | 2
scripting/source/provider/ScriptImpl.hxx | 6
scripting/source/provider/URIHelper.hxx | 2
scripting/source/stringresource/stringresource.cxx | 72 +-
scripting/source/stringresource/stringresource.hxx | 612 +++++++++-----------
scripting/source/vbaevents/eventhelper.cxx | 22
37 files changed, 783 insertions(+), 788 deletions(-)
New commits:
commit 10e4396dc7c96061750208c32f29c372737f63d2
Author: Noel Grandin <n...@peralex.com>
Date: Mon Oct 26 08:52:21 2015 +0200
com::sun::star->css in sal,sax
Change-Id: I24e202b1f8071fe918e4e164b5fa1c08a561cb24
Reviewed-on: https://gerrit.libreoffice.org/19626
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index de36a62..f6eb975 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -70,8 +70,8 @@ public:
private:
LONG m_nRefCnt;
//CWinClipboard& m_rCWinClipboard;
- //const const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboardOwner >&
m_rXClipboardOwner;
- //const const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& m_rXTDataSource;
+ //const const css::uno::Reference<
css::datatransfer::clipboard::XClipboardOwner >& m_rXClipboardOwner;
+ //const const css::uno::Reference< css::datatransfer::XTransferable >&
m_rXTDataSource;
//friend class CWinClipboard;
friend class CEnumFormatEtc;
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index bbbfd41..a2781d5 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -31,18 +31,18 @@ public:
Text2UnicodeConverter( const OString & sEncoding );
~Text2UnicodeConverter();
- ::com::sun::star::uno::Sequence < sal_Unicode > convert( const
::com::sun::star::uno::Sequence<sal_Int8> & );
+ css::uno::Sequence < sal_Unicode > convert( const
css::uno::Sequence<sal_Int8> & );
bool canContinue() { return m_bCanContinue; }
private:
void init( rtl_TextEncoding encoding );
- rtl_TextToUnicodeConverter m_convText2Unicode;
- rtl_TextToUnicodeContext m_contextText2Unicode;
- bool m_bCanContinue;
- bool m_bInitialized;
- rtl_TextEncoding m_rtlEncoding;
- ::com::sun::star::uno::Sequence<sal_Int8> m_seqSource;
+ rtl_TextToUnicodeConverter m_convText2Unicode;
+ rtl_TextToUnicodeContext m_contextText2Unicode;
+ bool m_bCanContinue;
+ bool m_bInitialized;
+ rtl_TextEncoding m_rtlEncoding;
+ css::uno::Sequence<sal_Int8> m_seqSource;
};
/*----------------------------------------
@@ -56,18 +56,18 @@ public:
Unicode2TextConverter( rtl_TextEncoding encoding );
~Unicode2TextConverter();
- ::com::sun::star::uno::Sequence<sal_Int8> convert( const sal_Unicode * ,
sal_Int32 nLength );
+ css::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32
nLength );
bool canContinue() { return m_bCanContinue; }
private:
void init( rtl_TextEncoding encoding );
- rtl_UnicodeToTextConverter m_convUnicode2Text;
- rtl_UnicodeToTextContext m_contextUnicode2Text;
- bool m_bCanContinue;
- bool m_bInitialized;
- rtl_TextEncoding m_rtlEncoding;
- ::com::sun::star::uno::Sequence<sal_Unicode> m_seqSource;
+ rtl_UnicodeToTextConverter m_convUnicode2Text;
+ rtl_UnicodeToTextContext m_contextUnicode2Text;
+ bool m_bCanContinue;
+ bool m_bInitialized;
+ rtl_TextEncoding m_rtlEncoding;
+ css::uno::Sequence<sal_Unicode> m_seqSource;
};
@@ -88,39 +88,39 @@ public:
~XMLFile2UTFConverter();
- void setInputStream( ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > &r ) { m_in = r; }
+ void setInputStream( css::uno::Reference< css::io::XInputStream > &r ) {
m_in = r; }
void setEncoding( const OString &s ) { m_sEncoding = s; }
// @param nMaxToRead The number of chars, that should be read. Note that
this is no exact number. There
// may be returned less or more bytes than ordered.
- sal_Int32 readAndConvert( ::com::sun::star::uno::Sequence<sal_Int8> &seq ,
sal_Int32 nMaxToRead )
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::io::NotConnectedException ,
- ::com::sun::star::io::BufferSizeExceededException ,
- ::com::sun::star::uno::RuntimeException );
+ sal_Int32 readAndConvert( css::uno::Sequence<sal_Int8> &seq , sal_Int32
nMaxToRead )
+ throw ( css::io::IOException,
+ css::io::NotConnectedException ,
+ css::io::BufferSizeExceededException ,
+ css::uno::RuntimeException );
private:
// Called only on first Sequence of bytes. Tries to figure out file format
and encoding information.
// @return TRUE, when encoding information could be retrieved
// @return FALSE, when no encoding information was found in file
- bool scanForEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
+ bool scanForEncoding( css::uno::Sequence<sal_Int8> &seq );
// Called only on first Sequence of bytes. Tries to figure out
// if enough data is available to scan encoding
// @return TRUE, when encoding is retrievable
// @return FALSE, when more data is needed
- static bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence<
sal_Int8 > & seq );
+ static bool isEncodingRecognizable( const css::uno::Sequence< sal_Int8 > &
seq );
// When encoding attribute is within the text (in the first line), it is
removed.
- static void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq
);
+ static void removeEncoding( css::uno::Sequence<sal_Int8> &seq );
// Initializes decoding depending on m_sEncoding setting
void initializeDecoding();
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
m_in;
+ css::uno::Reference< css::io::XInputStream > m_in;
bool m_bStarted;
OString m_sEncoding;
diff --git a/sax/source/expatwrap/attrlistimpl.hxx
b/sax/source/expatwrap/attrlistimpl.hxx
index 6a47638..f5d283f 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -34,8 +34,8 @@ struct AttributeList_impl;
//FIXME
class AttributeList :
public ::cppu::WeakImplHelper<
- ::com::sun::star::xml::sax::XAttributeList,
- ::com::sun::star::util::XCloneable >
+ css::xml::sax::XAttributeList,
+ css::util::XCloneable >
{
public:
AttributeList();
@@ -48,21 +48,21 @@ public:
public:
// XAttributeList
virtual sal_Int16 SAL_CALL getLength()
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByName(const OUString& aName)
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByName(const OUString& aName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw( css::uno::RuntimeException, std::exception) override;
// XCloneable
- virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL
- createClone() throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
+ virtual css::uno::Reference< XCloneable > SAL_CALL
+ createClone() throw(css::uno::RuntimeException, std::exception)
override;
private:
struct AttributeList_impl *m_pImpl;
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 5ca04d8..42c610d 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -80,12 +80,12 @@ namespace {
pThis->rDocumentLocator->getColumnNumber()\
) );\
}\
- catch( const com::sun::star::uno::RuntimeException &e ) {\
+ catch( const css::uno::RuntimeException &e ) {\
pThis->bExceptionWasThrown = true; \
pThis->bRTExceptionWasThrown = true; \
pImpl->rtexception = e; \
}\
- catch( const com::sun::star::uno::Exception &e ) {\
+ catch( const css::uno::Exception &e ) {\
pThis->bExceptionWasThrown = true; \
pThis->bRTExceptionWasThrown = true; \
pImpl->rtexception = WrappedTargetRuntimeException("Non-runtime
UNO exception caught during parse", e.Context, makeAny(e)); \
@@ -107,7 +107,7 @@ public:
SaxExpatParser();
virtual ~SaxExpatParser();
- // ::com::sun::star::lang::XInitialization:
+ // css::lang::XInitialization:
virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const&
rArguments)
throw (css::uno::RuntimeException, css::uno::Exception,
std::exception) override;
@@ -317,7 +317,7 @@ extern "C"
// LocatorImpl
class LocatorImpl :
- public WeakImplHelper< XLocator, com::sun::star::io::XSeekable >
+ public WeakImplHelper< XLocator, css::io::XSeekable >
// should use a different interface for stream positions!
{
public:
@@ -386,7 +386,7 @@ SaxExpatParser::~SaxExpatParser()
delete m_pImpl;
}
-// ::com::sun::star::lang::XInitialization:
+// css::lang::XInitialization:
void SAL_CALL
SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const&
rArguments)
throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 15edc08..824225e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -116,12 +116,12 @@ struct SaxContext
struct ParserData
{
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastDocumentHandler > mxDocumentHandler;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastTokenHandler > mxTokenHandler;
- FastTokenHandlerBase *mpTokenHandler;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XErrorHandler > mxErrorHandler;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XEntityResolver > mxEntityResolver;
- ::com::sun::star::lang::Locale maLocale;
+ css::uno::Reference< css::xml::sax::XFastDocumentHandler >
mxDocumentHandler;
+ css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler;
+ FastTokenHandlerBase* mpTokenHandler;
+ css::uno::Reference< css::xml::sax::XErrorHandler > mxErrorHandler;
+ css::uno::Reference< css::xml::sax::XEntityResolver >
mxEntityResolver;
+ css::lang::Locale maLocale;
ParserData();
~ParserData();
@@ -162,14 +162,14 @@ struct Entity : public ParserData
// Allow to disable threading for small documents:
bool mbEnableThreads;
- ::com::sun::star::xml::sax::InputSource maStructSource;
+ css::xml::sax::InputSource maStructSource;
xmlParserCtxtPtr mpParser;
::sax_expatwrap::XMLFile2UTFConverter maConverter;
// Exceptions cannot be thrown through the C-XmlParser (possible
// resource leaks), therefore any exception thrown by a UNO callback
// must be saved somewhere until the C-XmlParser is stopped.
- ::com::sun::star::uno::Any maSavedException;
+ css::uno::Any maSavedException;
void saveException( const Any & e );
void throwException( const ::rtl::Reference< FastLocatorImpl >
&xDocumentLocator,
bool mbDuringParse );
@@ -204,14 +204,14 @@ public:
~FastSaxParserImpl();
// XFastParser
- void parseStream( const ::com::sun::star::xml::sax::InputSource&
aInputSource ) throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception);
- void setFastDocumentHandler( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw
(::com::sun::star::uno::RuntimeException);
- void setTokenHandler( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw
(::com::sun::star::uno::RuntimeException);
- void registerNamespace( const OUString& NamespaceURL, sal_Int32
NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- OUString getNamespaceURL( const OUString& rPrefix )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- void setErrorHandler( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw
(::com::sun::star::uno::RuntimeException);
- void setEntityResolver( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw
(::com::sun::star::uno::RuntimeException);
- void setLocale( const ::com::sun::star::lang::Locale& rLocale ) throw
(::com::sun::star::uno::RuntimeException);
+ void parseStream( const css::xml::sax::InputSource& aInputSource ) throw
(css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException,
std::exception);
+ void setFastDocumentHandler( const css::uno::Reference<
css::xml::sax::XFastDocumentHandler >& Handler ) throw
(css::uno::RuntimeException);
+ void setTokenHandler( const css::uno::Reference<
css::xml::sax::XFastTokenHandler >& Handler ) throw
(css::uno::RuntimeException);
+ void registerNamespace( const OUString& NamespaceURL, sal_Int32
NamespaceToken ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException);
+ OUString getNamespaceURL( const OUString& rPrefix )
throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ void setErrorHandler( const css::uno::Reference<
css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException);
+ void setEntityResolver( const css::uno::Reference<
css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException);
+ void setLocale( const css::lang::Locale& rLocale ) throw
(css::uno::RuntimeException);
// called by the C callbacks of the expat parser
void callbackStartElement( const xmlChar *localName , const xmlChar*
prefix, const xmlChar* URI,
@@ -241,8 +241,8 @@ private:
void sendPendingCharacters();
sal_Int32 GetToken( const xmlChar* pName, sal_Int32 nameLen );
- sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const
xmlChar* pName, int nameLen ) throw (::com::sun::star::xml::sax::SAXException);
- OUString GetNamespaceURL( const OString& rPrefix ) throw
(::com::sun::star::xml::sax::SAXException);
+ sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const
xmlChar* pName, int nameLen ) throw (css::xml::sax::SAXException);
+ OUString GetNamespaceURL( const OString& rPrefix ) throw
(css::xml::sax::SAXException);
sal_Int32 GetNamespaceToken( const OUString& rNamespaceURL );
sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const
xmlChar* pName, int nNameLen );
void DefineNamespace( const OString& rPrefix, const OUString& namespaceURL
);
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index ab8e43b..911da6f 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1297,7 +1297,7 @@ void Converter::convertDate(
static void convertTime(
OUStringBuffer& i_rBuffer,
- const com::sun::star::util::DateTime& i_rDateTime)
+ const css::util::DateTime& i_rDateTime)
{
if (i_rDateTime.Hours < 10) {
i_rBuffer.append('0');
@@ -1326,7 +1326,7 @@ static void convertTime(
static void convertTimeZone(
OUStringBuffer& i_rBuffer,
- const com::sun::star::util::DateTime& i_rDateTime,
+ const css::util::DateTime& i_rDateTime,
sal_Int16 const* pTimeZoneOffset)
{
if (pTimeZoneOffset)
@@ -1342,7 +1342,7 @@ static void convertTimeZone(
/** convert util::DateTime to ISO "time" or "dateTime" string */
void Converter::convertTimeOrDateTime(
OUStringBuffer& i_rBuffer,
- const com::sun::star::util::DateTime& i_rDateTime,
+ const css::util::DateTime& i_rDateTime,
sal_Int16 const* pTimeZoneOffset)
{
if (i_rDateTime.Year == 0 ||
@@ -1361,7 +1361,7 @@ void Converter::convertTimeOrDateTime(
/** convert util::DateTime to ISO "date" or "dateTime" string */
void Converter::convertDateTime(
OUStringBuffer& i_rBuffer,
- const com::sun::star::util::DateTime& i_rDateTime,
+ const css::util::DateTime& i_rDateTime,
sal_Int16 const*const pTimeZoneOffset,
bool i_bAddTimeIf0AM )
{
@@ -2530,7 +2530,7 @@ sal_Int16 Converter::GetUnitFromString(const OUString&
rString, sal_Int16 nDefau
bool Converter::convertAny(OUStringBuffer& rsValue,
OUStringBuffer& rsType ,
- const com::sun::star::uno::Any& rValue)
+ const css::uno::Any& rValue)
{
bool bConverted = false;
@@ -2539,11 +2539,11 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
switch (rValue.getValueTypeClass())
{
- case com::sun::star::uno::TypeClass_BYTE :
- case com::sun::star::uno::TypeClass_SHORT :
- case com::sun::star::uno::TypeClass_UNSIGNED_SHORT :
- case com::sun::star::uno::TypeClass_LONG :
- case com::sun::star::uno::TypeClass_UNSIGNED_LONG :
+ case css::uno::TypeClass_BYTE :
+ case css::uno::TypeClass_SHORT :
+ case css::uno::TypeClass_UNSIGNED_SHORT :
+ case css::uno::TypeClass_LONG :
+ case css::uno::TypeClass_UNSIGNED_LONG :
{
sal_Int32 nTempValue = 0;
if (rValue >>= nTempValue)
@@ -2555,7 +2555,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
- case com::sun::star::uno::TypeClass_BOOLEAN :
+ case css::uno::TypeClass_BOOLEAN :
{
bool bTempValue = false;
if (rValue >>= bTempValue)
@@ -2567,8 +2567,8 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
- case com::sun::star::uno::TypeClass_FLOAT :
- case com::sun::star::uno::TypeClass_DOUBLE :
+ case css::uno::TypeClass_FLOAT :
+ case css::uno::TypeClass_DOUBLE :
{
double fTempValue = 0.0;
if (rValue >>= fTempValue)
@@ -2580,7 +2580,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
- case com::sun::star::uno::TypeClass_STRING :
+ case css::uno::TypeClass_STRING :
{
OUString sTempValue;
if (rValue >>= sTempValue)
@@ -2592,17 +2592,17 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
- case com::sun::star::uno::TypeClass_STRUCT :
+ case css::uno::TypeClass_STRUCT :
{
- com::sun::star::util::Date aDate ;
- com::sun::star::util::Time aTime ;
- com::sun::star::util::DateTime aDateTime;
+ css::util::Date aDate ;
+ css::util::Time aTime ;
+ css::util::DateTime aDateTime;
if (rValue >>= aDate)
{
rsType.append("date");
bConverted = true;
- com::sun::star::util::DateTime aTempValue;
+ css::util::DateTime aTempValue;
aTempValue.Day = aDate.Day;
aTempValue.Month = aDate.Month;
aTempValue.Year = aDate.Year;
@@ -2617,7 +2617,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
{
rsType.append("time");
bConverted = true;
- com::sun::star::util::Duration aTempValue;
+ css::util::Duration aTempValue;
aTempValue.Days = 0;
aTempValue.Months = 0;
aTempValue.Years = 0;
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index cb97acc..0d1aa9d 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -52,7 +52,7 @@ void UnknownAttribute::FillAttribute( Attribute* pAttrib )
const
}
}
-FastAttributeList::FastAttributeList( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastTokenHandler >& xTokenHandler,
+FastAttributeList::FastAttributeList( const css::uno::Reference<
css::xml::sax::XFastTokenHandler >& xTokenHandler,
sax_fastparser::FastTokenHandlerBase
*pTokenHandler)
: mxTokenHandler( xTokenHandler ),
mpTokenHandler( pTokenHandler )
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index 0d0eb71..56d2fe8 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -268,7 +268,7 @@ namespace sax_fastparser {
writeBytes(sSlashAndClosingBracket, N_CHARS(sSlashAndClosingBracket));
}
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
FastSaxSerializer::getOutputStream()
+ css::uno::Reference< css::io::XOutputStream >
FastSaxSerializer::getOutputStream()
{
return maCachedOutputStream.getOutputStream();
}
diff --git a/sax/source/tools/fastserializer.hxx
b/sax/source/tools/fastserializer.hxx
index cbcf4b2..a45da2e 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -44,14 +44,14 @@ typedef std::vector<TokenValue> TokenValueList;
/// Receives notification of sax document events to write into an
XOutputStream.
class FastSaxSerializer
{
- typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
- typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence;
+ typedef css::uno::Sequence< ::sal_Int8 > Int8Sequence;
+ typedef css::uno::Sequence< ::sal_Int32 > Int32Sequence;
public:
FastSaxSerializer( const css::uno::Reference< css::io::XOutputStream >&
xOutputStream );
~FastSaxSerializer();
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
getOutputStream();
+ css::uno::Reference< css::io::XOutputStream > getOutputStream();
/// called by FSHelper to put data in for writeTokenValueList
TokenValueList& getTokenValueList() { return maTokenValues; }
@@ -158,7 +158,7 @@ private:
* to ensure correct order of ForSort methods.
*/
CachedOutputStream maCachedOutputStream;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler;
+ css::uno::Reference< css::xml::sax::XFastTokenHandler > mxFastTokenHandler;
class ForMerge : public ForMergeBase
{
@@ -241,7 +241,7 @@ private:
The latter in the case that we are inside a mark().
*/
- void writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >&
aData );
+ void writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData );
void writeBytes( const char* pStr, size_t nLen );
};
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 1ba11cc..e2150d4 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -148,7 +148,7 @@ FastSerializerHelper*
FastSerializerHelper::writeId(sal_Int32 tokenId)
return this;
}
-::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
FastSerializerHelper::getOutputStream()
+css::uno::Reference< css::io::XOutputStream >
FastSerializerHelper::getOutputStream()
{
return mpSerializer->getOutputStream();
}
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 95d83f0..51012fe 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -76,7 +76,7 @@ public:
return nBytesToRead;
}
virtual sal_Int32 SAL_CALL readSomeBytes(
- ::com::sun::star::uno::Sequence< sal_Int8 >& aData,
+ css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
{
commit d95a27f944c8a28d0368f248028ddf395fe1c57e
Author: Noel Grandin <n...@peralex.com>
Date: Tue Oct 27 15:38:52 2015 +0200
com::sun::star->css in scaddins,sccomp,scripting
Change-Id: Id9167341940bac65f055e1e33ff0670f6fa0f6c4
Reviewed-on: https://gerrit.libreoffice.org/19629
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/scaddins/source/analysis/analysis.hxx
b/scaddins/source/analysis/analysis.hxx
index 24e1a29..1a38489 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -123,7 +123,7 @@ public:
virtual sal_Int32 SAL_CALL getIseven( sal_Int32 nVal ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception
) override;
virtual sal_Int32 SAL_CALL getIsodd( sal_Int32 nVal ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception
) override;
- virtual double SAL_CALL getMultinomial( const css::uno::Reference<
css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence<
sal_Int32 > >& aVLst, const css::uno::Sequence< com::sun::star::uno::Any >&
aOptVLst ) throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
+ virtual double SAL_CALL getMultinomial( const css::uno::Reference<
css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence<
sal_Int32 > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst )
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException,
std::exception ) override;
virtual double SAL_CALL getSeriessum( double fX, double fN, double fM,
const css::uno::Sequence< css::uno::Sequence< double > >& aCoeffList ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception
) override;
virtual double SAL_CALL getQuotient( double fNum, double fDenum )
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException,
std::exception ) override;
diff --git a/scaddins/source/analysis/analysishelper.hxx
b/scaddins/source/analysis/analysishelper.hxx
index 6041bce..0fcd1f4b 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -779,7 +779,7 @@ private:
/** Converts a string to double using the
number formatter. If the formatter is not
valid, ::rtl::math::stringToDouble() with
english separators will be used.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on strings not representing any double
value.
@return the converted double value. */
double convertToDouble(
@@ -798,7 +798,7 @@ public:
/** Converts an Any to double (without
initialization).
The Any can be empty or contain a double
or string.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on other Any types or on invalid
strings.
@return true if the Any contains a double
or a non-empty valid string,
false if the Any is empty or the
string is empty */
@@ -809,7 +809,7 @@ public:
/** Converts an Any to double (with
initialization).
The Any can be empty or contain a double
or string.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on other Any types or on invalid
strings.
@return true if the Any contains a double
or a non-empty valid string,
false if the Any is empty or the
string is empty */
@@ -821,7 +821,7 @@ public:
/** Converts an Any to double (with
initialization).
The Any can be empty or contain a double
or string.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on other Any types or on invalid
strings.
@return the value of the double or string
or fDefault if the Any or string is empty */
double getDouble(
@@ -832,7 +832,7 @@ public:
/** Converts an Any to sal_Int32 (with
initialization).
The Any can be empty or contain a double
or string.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on other Any types or on invalid
values or strings.
@return true if the Any contains a double
or a non-empty valid string,
false if the Any is empty or the
string is empty */
@@ -844,7 +844,7 @@ public:
/** Converts an Any to sal_Int32 (with
initialization).
The Any can be empty or contain a double
or string.
- @throws
com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
on other Any types or on invalid
values or strings.
@return the truncated value of the double
or string or nDefault if the Any or string is empty */
sal_Int32 getInt32(
diff --git a/scaddins/source/analysis/bessel.hxx
b/scaddins/source/analysis/bessel.hxx
index 87481f9..5f7c8e3 100644
--- a/scaddins/source/analysis/bessel.hxx
+++ b/scaddins/source/analysis/bessel.hxx
@@ -32,16 +32,16 @@ namespace analysis {
/** Returns the result for the unmodified BESSEL function of first kind (J),
n-th order, at point x. */
-double BesselJ( double x, sal_Int32 n ) throw(
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::sheet::NoConvergenceException );
+double BesselJ( double x, sal_Int32 n ) throw(
css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
/** Returns the result for the modified BESSEL function of first kind (I),
n-th order, at point x. */
-double BesselI( double x, sal_Int32 n ) throw(
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::sheet::NoConvergenceException );
+double BesselI( double x, sal_Int32 n ) throw(
css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
/** Returns the result for the unmodified BESSEL function of second kind (Y),
n-th order, at point x. */
-double BesselY( double x, sal_Int32 n ) throw(
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::sheet::NoConvergenceException );
+double BesselY( double x, sal_Int32 n ) throw(
css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
/** Returns the result for the modified BESSEL function of second kind (K),
n-th order, at point x. */
-double BesselK( double x, sal_Int32 n ) throw(
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::sheet::NoConvergenceException );
+double BesselK( double x, sal_Int32 n ) throw(
css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
} // namespace analysis
} // namespace sca
diff --git a/scaddins/source/datefunc/datefunc.hxx
b/scaddins/source/datefunc/datefunc.hxx
index 4d798d6c..6b0fb53 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -169,111 +169,111 @@ struct FindScaFuncData
};
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
DateFunctionAddIn_CreateInstance(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& );
+css::uno::Reference< css::uno::XInterface > SAL_CALL
DateFunctionAddIn_CreateInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& );
// THE AddIn class for date functions
class ScaDateAddIn : public ::cppu::WeakImplHelper<
- ::com::sun::star::sheet::XAddIn,
- ::com::sun::star::sheet::XCompatibilityNames,
- ::com::sun::star::sheet::addin::XDateFunctions,
- ::com::sun::star::sheet::addin::XMiscFunctions,
- ::com::sun::star::lang::XServiceName,
- ::com::sun::star::lang::XServiceInfo >
+ css::sheet::XAddIn,
+ css::sheet::XCompatibilityNames,
+ css::sheet::addin::XDateFunctions,
+ css::sheet::addin::XMiscFunctions,
+ css::lang::XServiceName,
+ css::lang::XServiceInfo >
{
private:
- ::com::sun::star::lang::Locale aFuncLoc;
- std::unique_ptr< ::com::sun::star::lang::Locale[] > pDefLocales;
- std::unique_ptr< ResMgr > pResMgr;
- std::unique_ptr< ScaFuncDataList > pFuncDataList;
+ css::lang::Locale aFuncLoc;
+ std::unique_ptr< css::lang::Locale[] > pDefLocales;
+ std::unique_ptr< ResMgr > pResMgr;
+ std::unique_ptr< ScaFuncDataList > pFuncDataList;
void InitDefLocales();
- const ::com::sun::star::lang::Locale& GetLocale( sal_uInt32 nIndex );
- ResMgr& GetResMgr() throw(
::com::sun::star::uno::RuntimeException, std::exception );
+ const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
+ ResMgr& GetResMgr() throw( css::uno::RuntimeException,
std::exception );
void InitData();
- OUString GetDisplFuncStr( sal_uInt16 nResId ) throw(
::com::sun::star::uno::RuntimeException, std::exception );
- OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16
nStrIndex ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ OUString GetDisplFuncStr( sal_uInt16 nResId ) throw(
css::uno::RuntimeException, std::exception );
+ OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16
nStrIndex ) throw( css::uno::RuntimeException, std::exception );
public:
ScaDateAddIn();
virtual ~ScaDateAddIn() =default;
static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XAddIn
- virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString&
aDisplayName ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
- virtual OUString SAL_CALL getDisplayFunctionName( const OUString&
aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
- virtual OUString SAL_CALL getFunctionDescription( const OUString&
aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
- virtual OUString SAL_CALL getDisplayArgumentName( const OUString&
aProgrammaticName, sal_Int32 nArgument ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getArgumentDescription( const OUString&
aProgrammaticName, sal_Int32 nArgument ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString&
aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
- virtual OUString SAL_CALL getDisplayCategoryName( const OUString&
aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
+ virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString&
aDisplayName ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getDisplayFunctionName( const OUString&
aProgrammaticName ) throw( css::uno::RuntimeException, std::exception )
override;
+ virtual OUString SAL_CALL getFunctionDescription( const OUString&
aProgrammaticName ) throw( css::uno::RuntimeException, std::exception )
override;
+ virtual OUString SAL_CALL getDisplayArgumentName( const OUString&
aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException,
std::exception ) override;
+ virtual OUString SAL_CALL getArgumentDescription( const OUString&
aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException,
std::exception ) override;
+ virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString&
aProgrammaticName ) throw( css::uno::RuntimeException, std::exception )
override;
+ virtual OUString SAL_CALL getDisplayCategoryName( const OUString&
aProgrammaticName ) throw( css::uno::RuntimeException, std::exception )
override;
// XCompatibilityNames
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const
OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
+ virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL
getCompatibilityNames( const OUString& aProgrammaticName ) throw(
css::uno::RuntimeException, std::exception ) override;
// XLocalizable
- virtual void SAL_CALL setLocale( const
::com::sun::star::lang::Locale& eLocale ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale )
throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::lang::Locale SAL_CALL getLocale() throw(
css::uno::RuntimeException, std::exception ) override;
// XServiceName
- virtual OUString SAL_CALL getServiceName() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getServiceName() throw(
css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- 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
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
// methods from own interfaces start here
// XDateFunctions
virtual sal_Int32 SAL_CALL getDiffWeeks(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nEndDate, sal_Int32 nStartDate,
sal_Int32 nMode )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getDiffMonths(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nEndDate, sal_Int32 nStartDate,
sal_Int32 nMode )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getDiffYears(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nEndDate, sal_Int32 nStartDate,
sal_Int32 nMode )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getIsLeapYear(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nDate )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getDaysInMonth(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nDate )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getDaysInYear(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nDate )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
virtual sal_Int32 SAL_CALL getWeeksInYear(
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xOptions,
+ const css::uno::Reference<
css::beans::XPropertySet >& xOptions,
sal_Int32 nDate )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
// XMiscFunctions
virtual OUString SAL_CALL getRot13(
const OUString& aSrcText )
- throw(
::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IllegalArgumentException, std::exception ) override;
+ throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException, std::exception ) override;
};
#endif // INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HXX
diff --git a/sccomp/qa/unit/lpsolver.cxx b/sccomp/qa/unit/lpsolver.cxx
index b6a14b4..079d7fc 100644
--- a/sccomp/qa/unit/lpsolver.cxx
+++ b/sccomp/qa/unit/lpsolver.cxx
@@ -44,7 +44,7 @@ void LpSolverTest::setUp()
uno::Reference<frame::XDesktop2> xComponentLoader =
frame::Desktop::create(m_xContext);
uno::Reference<lang::XComponent>
xComponent(xComponentLoader->loadComponentFromURL(
"private:factory/scalc", "_blank", 0,
- uno::Sequence < ::com::sun::star::beans::PropertyValue >()));
+ uno::Sequence < css::beans::PropertyValue >()));
m_xDocument.set(xComponent, uno::UNO_QUERY_THROW);
}
diff --git a/sccomp/source/solver/SolverComponent.hxx
b/sccomp/source/solver/SolverComponent.hxx
index 316426e..7f9ba1b 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -55,9 +55,9 @@ struct ScSolverCellEqual
typedef std::unordered_map< css::table::CellAddress, std::vector<double>,
ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
typedef cppu::WeakImplHelper<
- com::sun::star::sheet::XSolver,
- com::sun::star::sheet::XSolverDescription,
- com::sun::star::lang::XServiceInfo >
+ css::sheet::XSolver,
+ css::sheet::XSolverDescription,
+ css::lang::XServiceInfo >
SolverComponent_Base;
class SolverComponent : public comphelper::OMutexAndBroadcastHelper,
@@ -69,22 +69,22 @@ protected:
static ResMgr* pSolverResMgr;
// settings
- com::sun::star::uno::Reference<
com::sun::star::sheet::XSpreadsheetDocument > mxDoc;
- com::sun::star::table::CellAddress
maObjective;
- com::sun::star::uno::Sequence< com::sun::star::table::CellAddress >
maVariables;
- com::sun::star::uno::Sequence< com::sun::star::sheet::SolverConstraint >
maConstraints;
- bool
mbMaximize;
+ css::uno::Reference< css::sheet::XSpreadsheetDocument > mxDoc;
+ css::table::CellAddress maObjective;
+ css::uno::Sequence< css::table::CellAddress > maVariables;
+ css::uno::Sequence< css::sheet::SolverConstraint > maConstraints;
+ bool mbMaximize;
// set via XPropertySet
- bool
mbNonNegative;
- bool
mbInteger;
- sal_Int32
mnTimeout;
- sal_Int32
mnEpsilonLevel;
- bool
mbLimitBBDepth;
+ bool mbNonNegative;
+ bool mbInteger;
+ sal_Int32 mnTimeout;
+ sal_Int32 mnEpsilonLevel;
+ bool mbLimitBBDepth;
// results
- bool
mbSuccess;
- double
mfResultValue;
- com::sun::star::uno::Sequence< double >
maSolution;
- OUString
maStatus;
+ bool mbSuccess;
+ double mfResultValue;
+ css::uno::Sequence< double > maSolution;
+ OUString maStatus;
static OUString GetResourceString( sal_uInt32 nId );
static css::uno::Reference<css::table::XCell> GetCell(
@@ -104,53 +104,53 @@ public:
DECLARE_XINTERFACE()
DECLARE_XTYPEPROVIDER()
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
// from OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
// from OPropertyArrayUsageHelper
// XSolver
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XSpreadsheetDocument > SAL_CALL getDocument()
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL setDocument( const
::com::sun::star::uno::Reference<
-
::com::sun::star::sheet::XSpreadsheetDocument >& _document )
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::table::CellAddress SAL_CALL getObjective()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setObjective( const
::com::sun::star::table::CellAddress& _objective )
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::table::CellAddress > SAL_CALL getVariables()
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL setVariables( const
::com::sun::star::uno::Sequence<
- ::com::sun::star::table::CellAddress >&
_variables )
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::SolverConstraint > SAL_CALL getConstraints()
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL setConstraints( const
::com::sun::star::uno::Sequence<
- ::com::sun::star::sheet::SolverConstraint
>& _constraints )
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL getMaximize()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMaximize( sal_Bool _maximize )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
- virtual sal_Bool SAL_CALL getSuccess()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getResultValue()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getSolution()
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
-
- virtual void SAL_CALL solve()
throw(::com::sun::star::uno::RuntimeException, std::exception) override = 0;
+ virtual css::uno::Reference< css::sheet::XSpreadsheetDocument > SAL_CALL
getDocument()
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL setDocument( const css::uno::Reference<
+ css::sheet::XSpreadsheetDocument >&
_document )
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual css::table::CellAddress SAL_CALL getObjective()
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setObjective( const css::table::CellAddress&
_objective )
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual css::uno::Sequence< css::table::CellAddress > SAL_CALL
getVariables()
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL setVariables( const css::uno::Sequence<
+ css::table::CellAddress >& _variables )
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual css::uno::Sequence< css::sheet::SolverConstraint > SAL_CALL
getConstraints()
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL setConstraints( const css::uno::Sequence<
+ css::sheet::SolverConstraint >&
_constraints )
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual sal_Bool SAL_CALL getMaximize() throw(css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL setMaximize( sal_Bool _maximize )
throw(css::uno::RuntimeException, std::exception) override;
+
+ virtual sal_Bool SAL_CALL getSuccess() throw(css::uno::RuntimeException,
std::exception) override;
+ virtual double SAL_CALL getResultValue() throw(css::uno::RuntimeException,
std::exception) override;
+ virtual css::uno::Sequence< double > SAL_CALL getSolution()
+ throw(css::uno::RuntimeException,
std::exception) override;
+
+ virtual void SAL_CALL solve() throw(css::uno::RuntimeException,
std::exception) override = 0;
// XSolverDescription
- virtual OUString SAL_CALL getComponentDescription() throw
(::com::sun::star::uno::RuntimeException, std::exception) override = 0;
- virtual OUString SAL_CALL getStatusDescription() throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getComponentDescription() throw
(css::uno::RuntimeException, std::exception) override = 0;
+ virtual OUString SAL_CALL getStatusDescription() throw
(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getPropertyDescription( const OUString&
aPropertyName )
- 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
getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException,
std::exception) override;
+ throw(css::uno::RuntimeException,
std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw(css::uno::RuntimeException,
std::exception) override;
};
#endif
diff --git a/scripting/source/basprov/baslibnode.hxx
b/scripting/source/basprov/baslibnode.hxx
index 8b9e61b..f9a82af 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -39,37 +39,37 @@ namespace basprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::browse::XBrowseNode >
BasicLibraryNodeImpl_BASE;
+ css::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
class BasicLibraryNodeImpl : public BasicLibraryNodeImpl_BASE
{
private:
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- OUString m_sScriptingContext;
- BasicManager* m_pBasicManager;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XLibraryContainer > m_xLibContainer;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > m_xLibrary;
- OUString m_sLibName;
- bool m_bIsAppScript;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ OUString
m_sScriptingContext;
+ BasicManager* m_pBasicManager;
+ css::uno::Reference< css::script::XLibraryContainer > m_xLibContainer;
+ css::uno::Reference< css::container::XNameContainer > m_xLibrary;
+ OUString m_sLibName;
+ bool m_bIsAppScript;
public:
- BasicLibraryNodeImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
+ BasicLibraryNodeImpl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
const OUString& sScriptingContext,
BasicManager* pBasicManager,
- const ::com::sun::star::uno::Reference<
::com::sun::star::script::XLibraryContainer >& xLibContainer,
+ const css::uno::Reference< css::script::XLibraryContainer >&
xLibContainer,
const OUString& sLibName, bool isAppScript=true );
virtual ~BasicLibraryNodeImpl();
// XBrowseNode
virtual OUString SAL_CALL getName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode
> > SAL_CALL getChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL getType( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/scripting/source/basprov/basmethnode.hxx
b/scripting/source/basprov/basmethnode.hxx
index 05f7028..547d5a1 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -44,8 +44,8 @@ namespace basprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::browse::XBrowseNode,
- ::com::sun::star::script::XInvocation > BasicMethodNodeImpl_BASE;
+ css::script::browse::XBrowseNode,
+ css::script::XInvocation > BasicMethodNodeImpl_BASE;
class BasicMethodNodeImpl : public BasicMethodNodeImpl_BASE,
public ::scripting_helper::OMutexHolder,
@@ -54,8 +54,8 @@ namespace basprov
public
::comphelper::OPropertyArrayUsageHelper< BasicMethodNodeImpl >
{
private:
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- OUString m_sScriptingContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ OUString m_sScriptingContext;
SbMethod* m_pMethod;
bool m_bIsAppScript;
@@ -71,7 +71,7 @@ namespace basprov
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const
override;
public:
- BasicMethodNodeImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
+ BasicMethodNodeImpl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
const OUString& sScriptingContext,
SbMethod* pMethod, bool isAppScript = true );
virtual ~BasicMethodNodeImpl();
@@ -84,37 +84,37 @@ namespace basprov
// XBrowseNode
virtual OUString SAL_CALL getName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode
> > SAL_CALL getChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL getType( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XInvocation
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Any SAL_CALL invoke(
+ virtual css::uno::Reference< css::beans::XIntrospectionAccess >
SAL_CALL getIntrospection( )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL invoke(
const OUString& aFunctionName,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any
>& aParams,
- ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
aOutParam )
- throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::script::CannotConvertException,
- ::com::sun::star::reflection::InvocationTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setValue( const OUString& aPropertyName, const
::com::sun::star::uno::Any& aValue )
- throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::script::CannotConvertException,
- ::com::sun::star::reflection::InvocationTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString&
aPropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aParams,
+ css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ css::uno::Sequence< css::uno::Any >& aOutParam )
+ throw (css::lang::IllegalArgumentException,
css::script::CannotConvertException,
+ css::reflection::InvocationTargetException,
css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setValue( const OUString& aPropertyName, const
css::uno::Any& aValue )
+ throw (css::beans::UnknownPropertyException,
css::script::CannotConvertException,
+ css::reflection::InvocationTargetException,
css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName
)
+ throw (css::beans::UnknownPropertyException,
css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/scripting/source/basprov/basmodnode.hxx
b/scripting/source/basprov/basmodnode.hxx
index 308a0ac..7af9c97 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -38,32 +38,32 @@ namespace basprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::browse::XBrowseNode >
BasicModuleNodeImpl_BASE;
+ css::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
class BasicModuleNodeImpl : public BasicModuleNodeImpl_BASE
{
private:
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- OUString m_sScriptingContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ OUString m_sScriptingContext;
SbModule* m_pModule;
bool m_bIsAppScript;
public:
- BasicModuleNodeImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
+ BasicModuleNodeImpl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
const OUString& sScriptingContext,
SbModule* pModule, bool isAppScript = true );
virtual ~BasicModuleNodeImpl();
// XBrowseNode
virtual OUString SAL_CALL getName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode
> > SAL_CALL getChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL getType( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/scripting/source/basprov/basprov.hxx
b/scripting/source/basprov/basprov.hxx
index 19a0dec..40b8304 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -43,10 +43,10 @@ namespace basprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::script::provider::XScriptProvider,
- ::com::sun::star::script::browse::XBrowseNode > BasicProviderImpl_BASE;
+ css::lang::XServiceInfo,
+ css::lang::XInitialization,
+ css::script::provider::XScriptProvider,
+ css::script::browse::XBrowseNode > BasicProviderImpl_BASE;
class BasicProviderImpl : public BasicProviderImpl_BASE
@@ -54,49 +54,49 @@ namespace basprov
private:
BasicManager* m_pAppBasicManager;
BasicManager* m_pDocBasicManager;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XLibraryContainer > m_xLibContainerApp;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XLibraryContainer > m_xLibContainerDoc;
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::uno::Reference<
::com::sun::star::document::XScriptInvocationContext > m_xInvocationContext;
+ css::uno::Reference< css::script::XLibraryContainer >
m_xLibContainerApp;
+ css::uno::Reference< css::script::XLibraryContainer >
m_xLibContainerDoc;
+ css::uno::Reference< css::uno::XComponentContext >
m_xContext;
+ css::uno::Reference< css::document::XScriptInvocationContext >
m_xInvocationContext;
OUString m_sScriptingContext;
bool m_bIsAppScriptCtx;
bool m_bIsUserCtx;
bool isLibraryShared(
- const ::com::sun::star::uno::Reference<
::com::sun::star::script::XLibraryContainer >& rxLibContainer,
+ const css::uno::Reference< css::script::XLibraryContainer >&
rxLibContainer,
const OUString& rLibName );
public:
BasicProviderImpl(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xContext );
+ const css::uno::Reference< css::uno::XComponentContext >& xContext
);
virtual ~BasicProviderImpl();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
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
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence<
css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException,
std::exception) override;
// XScriptProvider
- virtual ::com::sun::star::uno::Reference <
::com::sun::star::script::provider::XScript > SAL_CALL getScript(
+ virtual css::uno::Reference < css::script::provider::XScript >
SAL_CALL getScript(
const OUString& scriptURI )
- throw (
::com::sun::star::script::provider::ScriptFrameworkErrorException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::script::provider::ScriptFrameworkErrorException,
css::uno::RuntimeException, std::exception) override;
// XBrowseNode
virtual OUString SAL_CALL getName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode
> > SAL_CALL getChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasChildNodes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL getType( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/scripting/source/basprov/basscript.hxx
b/scripting/source/basprov/basscript.hxx
index 94061f4..6805cd6 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -41,7 +41,7 @@ namespace basprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
+ css::script::provider::XScript > BasicScriptImpl_BASE;
class BasicScriptImpl : public BasicScriptImpl_BASE, public SfxListener,
@@ -52,14 +52,14 @@ namespace basprov
{
private:
SbMethodRef m_xMethod;
- OUString m_funcName;
+ OUString m_funcName;
BasicManager* m_documentBasicManager;
- ::com::sun::star::uno::Reference<
::com::sun::star::document::XScriptInvocationContext >
+ css::uno::Reference< css::document::XScriptInvocationContext >
m_xDocumentScriptContext;
// hack, OPropertyContainer doesn't allow you to define a property of
unknown
// type ( I guess because an Any can't contain an Any... I've always
wondered why?
// as its not unusual to do that in corba )
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_caller;
+ css::uno::Sequence< css::uno::Any > m_caller;
protected:
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper( )
override;
@@ -76,7 +76,7 @@ namespace basprov
const OUString& funcName,
SbMethodRef xMethod,
BasicManager& documentBasicManager,
- const ::com::sun::star::uno::Reference<
::com::sun::star::document::XScriptInvocationContext >& documentScriptContext
+ const css::uno::Reference< css::document::XScriptInvocationContext
>& documentScriptContext
);
virtual ~BasicScriptImpl();
@@ -87,17 +87,17 @@ namespace basprov
DECLARE_XTYPEPROVIDER()
// XScript
- virtual ::com::sun::star::uno::Any SAL_CALL invoke(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any
>& aParams,
- ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
aOutParam )
+ virtual css::uno::Any SAL_CALL invoke(
+ const css::uno::Sequence< css::uno::Any >& aParams,
+ css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ css::uno::Sequence< css::uno::Any >& aOutParam )
throw (
-
::com::sun::star::script::provider::ScriptFrameworkErrorException,
- ::com::sun::star::reflection::InvocationTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ css::script::provider::ScriptFrameworkErrorException,
+ css::reflection::InvocationTargetException,
+ css::uno::RuntimeException, std::exception ) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo( )
+ throw (css::uno::RuntimeException, std::exception) override;
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx
b/scripting/source/dlgprov/DialogModelProvider.hxx
index ef278b3..ccf04a8 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -41,37 +41,37 @@ class DialogModelProvider:
public:
explicit DialogModelProvider(css::uno::Reference<
css::uno::XComponentContext > const & context);
private:
- // ::com::sun::star::lang::XInitialization:
- virtual void SAL_CALL initialize(const css::uno::Sequence<
::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException,
css::uno::Exception, std::exception) override;
+ // css::lang::XInitialization:
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >
& aArguments) throw (css::uno::RuntimeException, css::uno::Exception,
std::exception) override;
- // ::com::sun::star::container::XElementAccess:
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw
(css::uno::RuntimeException, std::exception) override;
+ // css::container::XElementAccess:
+ virtual css::uno::Type SAL_CALL getElementType() throw
(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException,
std::exception) override;
- // ::com::sun::star::container::XNameAccess:
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString &
aName) throw (css::uno::RuntimeException,
css::container::NoSuchElementException, css::lang::WrappedTargetException,
std::exception) override;
+ // css::container::XNameAccess:
+ virtual css::uno::Any SAL_CALL getByName(const OUString & aName) throw
(css::uno::RuntimeException, css::container::NoSuchElementException,
css::lang::WrappedTargetException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw
(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasByName(const OUString & aName) throw
(css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::container::XNameReplace:
- virtual void SAL_CALL replaceByName(const OUString & aName, const
::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, css::container::NoSuchElementException,
css::lang::WrappedTargetException, std::exception) override;
+ // css::container::XNameReplace:
+ virtual void SAL_CALL replaceByName(const OUString & aName, const
css::uno::Any & aElement) throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, css::container::NoSuchElementException,
css::lang::WrappedTargetException, std::exception) override;
- // ::com::sun::star::container::XNameContainer:
- virtual void SAL_CALL insertByName(const OUString & aName, const
::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, css::container::ElementExistException,
css::lang::WrappedTargetException, std::exception) override;
+ // css::container::XNameContainer:
+ virtual void SAL_CALL insertByName(const OUString & aName, const
css::uno::Any & aElement) throw (css::uno::RuntimeException,
css::lang::IllegalArgumentException, css::container::ElementExistException,
css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL removeByName(const OUString & Name) throw
(css::uno::RuntimeException, css::container::NoSuchElementException,
css::lang::WrappedTargetException, std::exception) override;
- // ::com::sun::star::lang::XServiceInfo:
+ // css::lang::XServiceInfo:
virtual OUString SAL_CALL getImplementationName() throw
(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName)
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString&
PropertyName ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& xListener ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& aListener ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
private:
DialogModelProvider(const DialogModelProvider &) = delete;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index afb21e7..8dfa86a 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -327,7 +327,7 @@ namespace dlgprov
void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence<
Reference< XInterface > >& Objects,
- const
com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
+ const css::uno::Reference<css::script::XScriptListener>&,
const Any& Helper )
throw (IllegalArgumentException, IntrospectionException,
CannotCreateAdapterException,
ServiceNotRegisteredException, RuntimeException, std::exception)
@@ -448,10 +448,10 @@ namespace dlgprov
DialogUnoScriptListenerImpl::DialogUnoScriptListenerImpl( const Reference<
XComponentContext >& rxContext,
- const Reference< ::com::sun::star::frame::XModel >& rxModel,
- const Reference< ::com::sun::star::awt::XControl >& rxControl,
- const Reference< ::com::sun::star::uno::XInterface >& rxHandler,
- const Reference< ::com::sun::star::beans::XIntrospectionAccess >&
rxIntrospectionAccess,
+ const Reference< css::frame::XModel >& rxModel,
+ const Reference< css::awt::XControl >& rxControl,
+ const Reference< css::uno::XInterface >& rxHandler,
+ const Reference< css::beans::XIntrospectionAccess >&
rxIntrospectionAccess,
bool bDialogProviderMode )
: DialogSFScriptListenerImpl( rxContext, rxModel )
,m_xControl( rxControl )
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx
b/scripting/source/dlgprov/dlgevtatt.hxx
index 8debbea..01c1313 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -38,12 +38,12 @@ namespace dlgprov
{
// class DialogEventsAttacherImpl
typedef std::unordered_map< OUString,
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptListener >,
+ css::uno::Reference< css::script::XScriptListener >,
OUStringHash,
std::equal_to< OUString > > ListenerHash;
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::XScriptEventsAttacher >
DialogEventsAttacherImpl_BASE;
+ css::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
class DialogEventsAttacherImpl : public DialogEventsAttacherImpl_BASE
@@ -51,32 +51,32 @@ namespace dlgprov
private:
bool mbUseFakeVBAEvents;
ListenerHash listernersForTypes;
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XEventAttacher > m_xEventAttacher;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptListener > getScriptListenerForKey( const
OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>&
xControl, OUString& sCodeName );
- void nestedAttachEvents( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >&
Objects, const ::com::sun::star::uno::Any& Helper, OUString& sDialogCodeName );
- void attachEventsToControl( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControl>& xControl, const
::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptEventsSupplier >& events, const
::com::sun::star::uno::Any& Helper );
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher;
+ css::uno::Reference< css::script::XScriptListener >
getScriptListenerForKey( const OUString& sScriptName ) throw (
css::uno::RuntimeException );
+ css::uno::Reference< css::script::XScriptEventsSupplier >
getFakeVbaEventsSupplier( const css::uno::Reference< css::awt::XControl>&
xControl, OUString& sCodeName );
+ void nestedAttachEvents( const css::uno::Sequence<
css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Any&
Helper, OUString& sDialogCodeName );
+ void attachEventsToControl( const css::uno::Reference<
css::awt::XControl>& xControl, const css::uno::Reference<
css::script::XScriptEventsSupplier >& events, const css::uno::Any& Helper );
public:
- DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControl >& xControl,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xHandler,
- const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XIntrospectionAccess >& xIntrospect,
+ DialogEventsAttacherImpl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::frame::XModel >& xModel,
+ const css::uno::Reference< css::awt::XControl >& xControl,
+ const css::uno::Reference< css::uno::XInterface >& xHandler,
+ const css::uno::Reference< css::beans::XIntrospectionAccess >&
xIntrospect,
bool bProviderMode,
- const ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptListener >& xRTLListener ,const OUString&
sDialogLibName );
+ const css::uno::Reference< css::script::XScriptListener >&
xRTLListener ,const OUString& sDialogLibName );
virtual ~DialogEventsAttacherImpl();
// XScriptEventsAttacher
- virtual void SAL_CALL attachEvents( const
::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > >& Objects,
- const
com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
- const ::com::sun::star::uno::Any& Helper )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::beans::IntrospectionException,
- ::com::sun::star::script::CannotCreateAdapterException,
- ::com::sun::star::lang::ServiceNotRegisteredException,
- ::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL attachEvents( const css::uno::Sequence<
+ css::uno::Reference< css::uno::XInterface > >& Objects,
+ const css::uno::Reference<css::script::XScriptListener>&,
+ const css::uno::Any& Helper )
+ throw (css::lang::IllegalArgumentException,
+ css::beans::IntrospectionException,
+ css::script::CannotCreateAdapterException,
+ css::lang::ServiceNotRegisteredException,
+ css::uno::RuntimeException, std::exception) override;
};
@@ -85,32 +85,32 @@ namespace dlgprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE;
+ css::script::XAllListener > DialogAllListenerImpl_BASE;
class DialogAllListenerImpl : public DialogAllListenerImpl_BASE
{
private:
- ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptListener > m_xScriptListener;
+ css::uno::Reference< css::script::XScriptListener > m_xScriptListener;
OUString m_sScriptType;
OUString m_sScriptCode;
- void firing_impl( const ::com::sun::star::script::AllEventObject&
Event, ::com::sun::star::uno::Any* pRet );
+ void firing_impl( const css::script::AllEventObject& Event,
css::uno::Any* pRet );
public:
- DialogAllListenerImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::script::XScriptListener >& rxListener,
+ DialogAllListenerImpl( const css::uno::Reference<
css::script::XScriptListener >& rxListener,
const OUString& rScriptType, const OUString& rScriptCode );
virtual ~DialogAllListenerImpl();
// XEventListener
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+ throw (css::uno::RuntimeException, std::exception) override;
// XAllListener
- virtual void SAL_CALL firing( const
::com::sun::star::script::AllEventObject& Event )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Any SAL_CALL approveFiring( const
::com::sun::star::script::AllEventObject& Event )
- throw (::com::sun::star::reflection::InvocationTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL firing( const css::script::AllEventObject& Event
)
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL approveFiring( const
css::script::AllEventObject& Event )
+ throw (css::reflection::InvocationTargetException,
css::uno::RuntimeException, std::exception) override;
};
@@ -119,27 +119,27 @@ namespace dlgprov
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::script::XScriptListener >
DialogScriptListenerImpl_BASE;
+ css::script::XScriptListener > DialogScriptListenerImpl_BASE;
class DialogScriptListenerImpl : public DialogScriptListenerImpl_BASE
{
protected:
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
- virtual void firing_impl( const ::com::sun::star::script::ScriptEvent&
aScriptEvent, ::com::sun::star::uno::Any* pRet ) = 0;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ virtual void firing_impl( const css::script::ScriptEvent&
aScriptEvent, css::uno::Any* pRet ) = 0;
public:
- DialogScriptListenerImpl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext ) : m_xContext( rxContext
) {}
+ DialogScriptListenerImpl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) {}
virtual ~DialogScriptListenerImpl();
// XEventListener
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+ throw (css::uno::RuntimeException, std::exception) override;
// XScriptListener
- virtual void SAL_CALL firing( const
::com::sun::star::script::ScriptEvent& aScriptEvent )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Any SAL_CALL approveFiring( const
::com::sun::star::script::ScriptEvent& aScriptEvent )
- throw (::com::sun::star::reflection::InvocationTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL firing( const css::script::ScriptEvent&
aScriptEvent )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL approveFiring( const
css::script::ScriptEvent& aScriptEvent )
+ throw (css::reflection::InvocationTargetException,
css::uno::RuntimeException, std::exception) override;
};
diff --git a/scripting/source/dlgprov/dlgprov.cxx
b/scripting/source/dlgprov/dlgprov.cxx
index c6b23ba..1107fc7 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -97,7 +97,7 @@ static const char aResourceResolverPropName[] =
"ResourceResolver";
aInetObj.removeSegment();
OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE
);
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
