[Libreoffice-commits] core.git: 17 commits - comphelper/source connectivity/source filter/source forms/source include/comphelper include/unotools svtools/source svx/source unotools/source
Thomas Arnhold
thomas at arnhold.org
Thu Aug 21 00:03:57 PDT 2014
comphelper/source/container/enumhelper.cxx | 54 +++++-----
comphelper/source/misc/numbers.cxx | 33 ++----
comphelper/source/misc/sequence.cxx | 8 -
comphelper/source/property/property.cxx | 2
comphelper/source/streaming/basicio.cxx | 38 +++----
comphelper/source/streaming/oslfile2streamwrap.cxx | 50 ++++-----
comphelper/source/streaming/streamsection.cxx | 6 -
connectivity/source/commontools/dbexception.cxx | 4
connectivity/source/drivers/jdbc/CallableStatement.cxx | 52 ++++-----
connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/jdbc/JStatement.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 2
connectivity/source/drivers/jdbc/SQLException.cxx | 8 -
connectivity/source/inc/dbase/DTables.hxx | 1
connectivity/source/inc/flat/ETables.hxx | 1
connectivity/source/inc/java/sql/SQLException.hxx | 6 -
connectivity/source/inc/java/sql/SQLWarning.hxx | 3
filter/source/flash/swffilter.cxx | 2
filter/source/xmlfilteradaptor/streamwrap.cxx | 8 -
filter/source/xmlfilteradaptor/streamwrap.hxx | 13 --
forms/source/component/Button.cxx | 2
forms/source/component/CheckBox.cxx | 6 -
forms/source/component/ComboBox.cxx | 6 -
forms/source/component/File.cxx | 4
forms/source/component/FormComponent.cxx | 30 ++---
forms/source/component/GroupBox.cxx | 4
forms/source/component/RadioButton.cxx | 2
forms/source/component/RadioButton.hxx | 2
forms/source/component/Time.hxx | 2
forms/source/inc/FormComponent.hxx | 10 -
forms/source/inc/property.hxx | 6 -
forms/source/xforms/submission/serialization.hxx | 10 -
forms/source/xforms/submission/serialization_app_xml.cxx | 10 -
forms/source/xforms/submission/serialization_app_xml.hxx | 6 -
forms/source/xforms/submission/serialization_urlencoded.cxx | 10 -
forms/source/xforms/submission/serialization_urlencoded.hxx | 6 -
forms/source/xforms/submission/submission.hxx | 28 ++---
forms/source/xforms/submission/submission_get.cxx | 22 ++--
forms/source/xforms/submission/submission_get.hxx | 6 -
forms/source/xforms/submission/submission_post.cxx | 16 +--
forms/source/xforms/submission/submission_post.hxx | 4
forms/source/xforms/submission/submission_put.cxx | 16 +--
forms/source/xforms/submission/submission_put.hxx | 4
include/comphelper/basicio.hxx | 37 +++---
include/comphelper/enumhelper.hxx | 56 ++++------
include/comphelper/numbers.hxx | 15 --
include/comphelper/oslfile2streamwrap.hxx | 27 ++---
include/comphelper/proparrhlp.hxx | 7 -
include/comphelper/property.hxx | 24 +---
include/comphelper/sequence.hxx | 18 +--
include/comphelper/streamsection.hxx | 13 --
include/comphelper/types.hxx | 61 +++++------
include/unotools/datetime.hxx | 20 +--
include/unotools/streamhelper.hxx | 24 ++--
include/unotools/streamsection.hxx | 17 +--
include/unotools/streamwrap.hxx | 64 +++++-------
svtools/source/uno/genericunodialog.cxx | 2
svx/source/xml/xmleohlp.cxx | 2
unotools/source/misc/datetime.cxx | 24 ++--
unotools/source/streaming/streamhelper.cxx | 34 +++---
unotools/source/streaming/streamwrap.cxx | 48 ++++-----
62 files changed, 466 insertions(+), 538 deletions(-)
New commits:
commit 46bf3068de40192e0b69ef5f6ab3b2f43c71ef71
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Aug 21 08:18:38 2014 +0200
remove commented out namespace aliases
Change-Id: I2895204753f3302b5c7cbcce6f4d01d6bdd0694e
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 33319f6..cccd8a2 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -26,7 +26,6 @@ namespace connectivity
{
namespace dbase
{
- // namespace ::com::sun::star::sdbcx = ::com::sun::star::sdbcx;
typedef file::OTables ODbaseTables_BASE;
class ODbaseTables : public ODbaseTables_BASE
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index 887d5a4..650ad17 100644
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
@@ -26,7 +26,6 @@ namespace connectivity
{
namespace flat
{
- // namespace ::com::sun::star::sdbcx = ::com::sun::star::sdbcx;
typedef file::OTables OFlatTables_BASE;
class OFlatTables : public OFlatTables_BASE
commit 339d967dbf91ae22bc0a09a894c4499f47c72615
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Aug 21 08:15:37 2014 +0200
forms: CSS -> css
Change-Id: Ib2fb1f4f4b64a67cebdebb6ebfb36dbe6878bef6
diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx
index e55968f..405f563 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -31,8 +31,6 @@
#include <com/sun/star/xml/xpath/XXPathObject.hpp>
#include <com/sun/star/xml/dom/XDocumentFragment.hpp>
-namespace CSS = com::sun::star;
-
/**
Serialize an XObject
*/
@@ -42,7 +40,7 @@ typedef std::map<OUString, OUString> PropMap;
class CSerialization
{
protected:
- CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment;
+ css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
PropMap m_properties;
public:
@@ -51,7 +49,7 @@ public:
/**
sets the XObject that is to serialized
*/
- virtual void setSource(const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+ virtual void setSource(const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
{
m_aFragment = aFragment;
}
@@ -61,7 +59,7 @@ public:
that control aspects of the serialization
eachs serialization may support individual properties
*/
- void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props)
+ void setProperties(const css::uno::Sequence< css::beans::NamedValue >& props)
{
m_properties.clear();
OUString aValue;
@@ -83,7 +81,7 @@ public:
bytes read.
returns -1 on error
*/
- virtual CSS::uno::Reference< CSS::io::XInputStream > getInputStream() = 0;
+ virtual css::uno::Reference< css::io::XInputStream > getInputStream() = 0;
};
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index 1b4b241..66cb1ce 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -61,16 +61,16 @@ using ::com::sun::star::xml::sax::Writer;
using ::com::sun::star::xml::sax::XDocumentHandler;
CSerializationAppXML::CSerializationAppXML()
- : m_xBuffer(CSS::io::Pipe::create(comphelper::getProcessComponentContext()))
+ : m_xBuffer(css::io::Pipe::create(comphelper::getProcessComponentContext()))
{
}
-Reference< CSS::io::XInputStream >
+Reference< css::io::XInputStream >
CSerializationAppXML::getInputStream()
{
// The pipes output is provided through it's
// XOutputStream interface aspect
- return Reference< CSS::io::XInputStream >(m_xBuffer, UNO_QUERY);
+ return Reference< css::io::XInputStream >(m_xBuffer, UNO_QUERY);
}
void
@@ -107,8 +107,8 @@ CSerializationAppXML::serialize_node(const Reference< XNode >& rNode)
"CSerializationAppXML::serialize_node: no serialization access to the node/document!" );
// create a SAXWriter to take the serialization events, and connect it to our pipe
- Reference< CSS::xml::sax::XWriter > const xSaxWriter = Writer::create( comphelper::getProcessComponentContext() );
- xSaxWriter->setOutputStream( Reference< CSS::io::XOutputStream >( m_xBuffer, UNO_QUERY_THROW) );
+ Reference< css::xml::sax::XWriter > const xSaxWriter = Writer::create( comphelper::getProcessComponentContext() );
+ xSaxWriter->setOutputStream( Reference< css::io::XOutputStream >( m_xBuffer, UNO_QUERY_THROW) );
// do the serialization
xSerializer->serialize( Reference< XDocumentHandler >(xSaxWriter, UNO_QUERY_THROW), Sequence< StringPair >() );
diff --git a/forms/source/xforms/submission/serialization_app_xml.hxx b/forms/source/xforms/submission/serialization_app_xml.hxx
index 35df01d..35ee740 100644
--- a/forms/source/xforms/submission/serialization_app_xml.hxx
+++ b/forms/source/xforms/submission/serialization_app_xml.hxx
@@ -27,16 +27,16 @@
class CSerializationAppXML : public CSerialization
{
private:
- CSS::uno::Reference< CSS::io::XPipe > m_xBuffer;
+ css::uno::Reference< css::io::XPipe > m_xBuffer;
- void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode);
+ void serialize_node(const css::uno::Reference< css::xml::dom::XNode >& aNode);
void serialize_nodeset();
public:
CSerializationAppXML();
virtual void serialize() SAL_OVERRIDE;
- virtual CSS::uno::Reference< CSS::io::XInputStream > getInputStream() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > getInputStream() SAL_OVERRIDE;
};
#endif
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index bc20fa1..8bd3807 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -34,10 +34,10 @@
#include "serialization_urlencoded.hxx"
-using namespace CSS::uno;
-using namespace CSS::io;
-using namespace CSS::xml::xpath;
-using namespace CSS::xml::dom;
+using namespace css::uno;
+using namespace css::io;
+using namespace css::xml::xpath;
+using namespace css::xml::dom;
CSerializationURLEncoded::CSerializationURLEncoded()
: m_aPipe(Pipe::create(comphelper::getProcessComponentContext()))
@@ -164,7 +164,7 @@ void CSerializationURLEncoded::serialize()
// output stream to the pipe buffer
Reference< XOutputStream > out(m_aPipe, UNO_QUERY);
- CSS::uno::Reference< CSS::xml::dom::XNode > cur = m_aFragment->getFirstChild();
+ css::uno::Reference< css::xml::dom::XNode > cur = m_aFragment->getFirstChild();
while (cur.is())
{
serialize_node(cur);
diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx
index 0e6874a..32a7ed4 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.hxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.hxx
@@ -29,17 +29,17 @@
class CSerializationURLEncoded : public CSerialization
{
private:
- CSS::uno::Reference< CSS::io::XPipe > m_aPipe;
+ css::uno::Reference< css::io::XPipe > m_aPipe;
bool is_unreserved(sal_Char);
void encode_and_append(const OUString& aString, OStringBuffer& aBuffer);
- void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode);
+ void serialize_node(const css::uno::Reference< css::xml::dom::XNode >& aNode);
void serialize_nodeset();
public:
CSerializationURLEncoded();
virtual void serialize() SAL_OVERRIDE;
- virtual CSS::uno::Reference< CSS::io::XInputStream > getInputStream() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > getInputStream() SAL_OVERRIDE;
};
#endif
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 95c9ed3..7ac4eefd 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -48,13 +48,11 @@
#include <memory>
-namespace CSS = com::sun::star;
-
class CSubmissionPut;
class CSubmissionPost;
class CSubmissionGet;
-class CCommandEnvironmentHelper : public cppu::WeakImplHelper1< CSS::ucb::XCommandEnvironment >
+class CCommandEnvironmentHelper : public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment >
{
friend class CSubmissionPut;
friend class CSubmissionPost;
@@ -62,21 +60,21 @@ class CCommandEnvironmentHelper : public cppu::WeakImplHelper1< CSS::ucb::XComma
friend class CSubmission;
protected:
- CSS::uno::Reference< CSS::task::XInteractionHandler > m_aInteractionHandler;
- CSS::uno::Reference< CSS::ucb::XProgressHandler > m_aProgressHandler;
+ css::uno::Reference< css::task::XInteractionHandler > m_aInteractionHandler;
+ css::uno::Reference< css::ucb::XProgressHandler > m_aProgressHandler;
public:
- virtual CSS::uno::Reference< CSS::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (CSS::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
return m_aInteractionHandler;
}
- virtual CSS::uno::Reference< CSS::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (CSS::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
return m_aProgressHandler;
}
};
-class CProgressHandlerHelper : public cppu::WeakImplHelper1< CSS::ucb::XProgressHandler >
+class CProgressHandlerHelper : public cppu::WeakImplHelper1< css::ucb::XProgressHandler >
{
friend class CSubmissionPut;
friend class CSubmissionPost;
@@ -113,10 +111,10 @@ class CSubmission
protected:
INetURLObject m_aURLObj;
- CSS::uno::Reference< CSS::xml::xpath::XXPathObject > m_aXPathObject;
- CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment;
- CSS::uno::Reference< CSS::io::XInputStream > m_aResultStream;
- CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::xml::xpath::XXPathObject > m_aXPathObject;
+ css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
+ css::uno::Reference< css::io::XInputStream > m_aResultStream;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
OUString m_aEncoding;
::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler
@@ -132,7 +130,7 @@ public:
UNKNOWN_ERROR
};
- CSubmission(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+ CSubmission(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: m_aURLObj(aURL)
, m_aFragment(aFragment)
, m_xContext(::comphelper::getProcessComponentContext())
@@ -144,9 +142,9 @@ public:
{
m_aEncoding = aEncoding;
}
- virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& ) = 0;
+ virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
- virtual SubmissionResult replace(const OUString&, const CSS::uno::Reference< CSS::xml::dom::XDocument >&, const CSS::uno::Reference< CSS::frame::XFrame>&);
+ virtual SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
};
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 119186a..3c497e5 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -32,29 +32,29 @@
#include <boost/scoped_ptr.hpp>
-using namespace CSS::uno;
-using namespace CSS::ucb;
-using namespace CSS::task;
-using namespace CSS::io;
+using namespace css::uno;
+using namespace css::ucb;
+using namespace css::task;
+using namespace css::io;
using namespace osl;
using namespace ucbhelper;
using namespace std;
-CSubmissionGet::CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
-CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
+CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
{
// GET always uses apllicatin/x-www-formurlencoded
boost::scoped_ptr< CSerialization > apSerialization(new CSerializationURLEncoded());
apSerialization->setSource(m_aFragment);
apSerialization->serialize();
- CSS::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
+ css::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
// create a commandEnvironment and use the default interaction handler
CCommandEnvironmentHelper *pHelper = new CCommandEnvironmentHelper;
@@ -62,12 +62,12 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
pHelper->m_aInteractionHandler = aInteractionHandler;
else
pHelper->m_aInteractionHandler.set(
- CSS::task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW);
+ css::task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW);
CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper;
- pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper);
+ pHelper->m_aProgressHandler = css::uno::Reference< XProgressHandler >(pProgressHelper);
// UCB has ownership of environment...
- CSS::uno::Reference< XCommandEnvironment > aEnvironment(pHelper);
+ css::uno::Reference< XCommandEnvironment > aEnvironment(pHelper);
// append query string to the URL
try {
@@ -87,7 +87,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
}
OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
ucbhelper::Content aContent(aQueryURL, aEnvironment, m_xContext);
- CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(m_xContext), UNO_QUERY_THROW );
+ css::uno::Reference< XOutputStream > aPipe( css::io::Pipe::create(m_xContext), UNO_QUERY_THROW );
aContent.openStream(aPipe);
// get reply
try {
diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx
index 81a893d..c8689e9 100644
--- a/forms/source/xforms/submission/submission_get.hxx
+++ b/forms/source/xforms/submission/submission_get.hxx
@@ -27,10 +27,10 @@
class CSubmissionGet : public CSubmission
{
private:
- CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
- virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
+ CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
+ virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
};
#endif
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index eb057f3..0aecefc 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -29,25 +29,25 @@
#include <ucbhelper/activedatasink.hxx>
#include <com/sun/star/ucb/PostCommandArgument2.hpp>
-using namespace CSS::uno;
-using namespace CSS::ucb;
-using namespace CSS::task;
-using namespace CSS::io;
+using namespace css::uno;
+using namespace css::ucb;
+using namespace css::task;
+using namespace css::io;
using namespace osl;
using namespace ucbhelper;
using namespace std;
-CSubmissionPost::CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionPost::CSubmissionPost(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
-CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
+CSubmission::SubmissionResult CSubmissionPost::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
{
// PUT always uses application/xml
- CSS::uno::Reference< XCommandEnvironment > aEnvironment;
+ css::uno::Reference< XCommandEnvironment > aEnvironment;
auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
@@ -57,7 +57,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
OUString aCommandName("post");
PostCommandArgument2 aPostArgument;
aPostArgument.Source = apSerialization->getInputStream();
- CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink);
+ css::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink);
aPostArgument.Sink = aSink;
aPostArgument.MediaType = "application/xml";
aPostArgument.Referer = "";
diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx
index 7a31fdf..64195b8 100644
--- a/forms/source/xforms/submission/submission_post.hxx
+++ b/forms/source/xforms/submission/submission_post.hxx
@@ -25,8 +25,8 @@
class CSubmissionPost : public CSubmission
{
public:
- CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
- virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
+ CSubmissionPost(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
+ virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
};
#endif
diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index ed5950a..aedbd8c 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -28,30 +28,30 @@
#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
-using namespace CSS::uno;
-using namespace CSS::ucb;
-using namespace CSS::task;
-using namespace CSS::io;
+using namespace css::uno;
+using namespace css::ucb;
+using namespace css::task;
+using namespace css::io;
using namespace osl;
using namespace ucbhelper;
using namespace std;
-CSubmissionPut::CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionPut::CSubmissionPut(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
-CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
+CSubmission::SubmissionResult CSubmissionPut::submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
{
- CSS::uno::Reference< XCommandEnvironment > aEnvironment;
+ css::uno::Reference< XCommandEnvironment > aEnvironment;
auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment, comphelper::getProcessComponentContext());
// insert serialized data to content -> PUT
- CSS::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
+ css::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
aContent.writeStream(aInStream, true);
//aContent.closeStream();
diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx
index 8b8abe3..3a58c4c 100644
--- a/forms/source/xforms/submission/submission_put.hxx
+++ b/forms/source/xforms/submission/submission_put.hxx
@@ -28,8 +28,8 @@
class CSubmissionPut : public CSubmission
{
public:
- CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
- virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
+ CSubmissionPut(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
+ virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
};
#endif
commit 56ad57dee709cb4ff910d6ec00f2df2362859400
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:46:53 2014 +0200
starsdbc -> css::sdbc
Change-Id: Id0411425b0a3400dffe47143f908ab283fd2247e
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index bb16548..7b48aea 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -56,18 +56,18 @@ java_sql_CallableStatement::~java_sql_CallableStatement()
Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
Any aRet = java_sql_PreparedStatement::queryInterface(rType);
- return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< starsdbc::XRow*>(this),static_cast< starsdbc::XOutParameters*>(this));
+ return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::sdbc::XRow*>(this),static_cast< css::sdbc::XOutParameters*>(this));
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( cppu::UnoType<starsdbc::XRow>::get(),
- cppu::UnoType<starsdbc::XOutParameters>::get());
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<css::sdbc::XRow>::get(),
+ cppu::UnoType<css::sdbc::XOutParameters>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes());
}
-sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -75,14 +75,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLExc
return callBooleanMethod( "wasNull", mID );
}
-sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
}
-sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -90,7 +90,7 @@ sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) t
jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod;
return callMethodWithIntArg<jbyte>(pCallMethod,"getByte","(I)B",mID,columnIndex);
}
-Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -109,7 +109,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co
}
return aSeq;
}
-::com::sun::star::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+::com::sun::star::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -117,7 +117,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co
jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex);
return out ? static_cast <com::sun::star::util::Date>(java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date();
}
-double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -126,7 +126,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) t
return callMethodWithIntArg<double>(pCallMethod,"getDouble","(I)D",mID,columnIndex);
}
-float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -135,7 +135,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) thr
return callMethodWithIntArg<jfloat>(pCallMethod,"getFloat","(I)F",mID,columnIndex);
}
-sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -143,7 +143,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t
return callIntMethodWithIntArg("getInt",mID,columnIndex);
}
-sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -152,7 +152,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex )
return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex);
}
-Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -162,7 +162,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const
return Any();
}
-sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -171,7 +171,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex )
return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex);
}
-OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -181,7 +181,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
return callStringMethodWithIntArg("getString",mID,columnIndex);
}
- ::com::sun::star::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+ ::com::sun::star::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -191,7 +191,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time();
}
- ::com::sun::star::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+ ::com::sun::star::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -201,7 +201,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime();
}
-void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -251,18 +251,18 @@ jclass java_sql_CallableStatement::getMyClass() const
return theClass;
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
- Reference< starsdbc::XBlob > xBlob = getBlob(columnIndex);
+ Reference< css::sdbc::XBlob > xBlob = getBlob(columnIndex);
return xBlob.is() ? xBlob->getBinaryStream() : Reference< ::com::sun::star::io::XInputStream >();
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
- Reference< starsdbc::XClob > xClob = getClob(columnIndex);
+ Reference< css::sdbc::XClob > xClob = getClob(columnIndex);
return xClob.is() ? xClob->getCharacterStream() : Reference< ::com::sun::star::io::XInputStream >();
}
-Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -272,7 +272,7 @@ Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal
return out==0 ? 0 : new java_sql_Array( t.pEnv, out );
}
-Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -281,7 +281,7 @@ Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_I
// WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_Clob( t.pEnv, out );
}
-Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
@@ -291,7 +291,7 @@ Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_I
return out==0 ? 0 : new java_sql_Blob( t.pEnv, out );
}
-Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 45676d4..d0c35e5 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -48,9 +48,9 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
}
-java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
+java_sql_DriverPropertyInfo::operator css::sdbc::DriverPropertyInfo()
{
- starsdbc::DriverPropertyInfo aInfo;
+ css::sdbc::DriverPropertyInfo aInfo;
aInfo.Name = name();
aInfo.Description = description();
aInfo.IsRequired = required();
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index a4b0feb..f1b341e 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -572,7 +572,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc
if( out )
{
java_sql_SQLWarning_BASE warn_base(t.pEnv, out);
- SQLException aAsException( static_cast< starsdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) );
+ SQLException aAsException( static_cast< css::sdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) );
// translate to warning
SQLWarning aWarning;
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 7154cd9..12fa5d6 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd
{
java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
return makeAny(
- static_cast< starsdbc::SQLException >(
+ static_cast< css::sdbc::SQLException >(
java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this)));
}
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 8f87b17..c8390e6 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -523,7 +523,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc
{
java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
return makeAny(
- static_cast< starsdbc::SQLException >(
+ static_cast< css::sdbc::SQLException >(
java_sql_SQLWarning(warn_base,*this)));
}
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 765afb2..6249a4e 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::lang;
//************ Class: java.sql.SQLException
java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext)
- : starsdbc::SQLException( _rException.getMessage(),
+ : css::sdbc::SQLException( _rException.getMessage(),
_rContext,
_rException.getSQLState(),
_rException.getErrorCode(),
@@ -61,7 +61,7 @@ jclass java_sql_SQLException_BASE::st_getMyClass()
return theClass;
}
-starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const
+css::sdbc::SQLException java_sql_SQLException_BASE::getNextException() const
{
SDBThreadAttach t;
static jmethodID mID(NULL);
@@ -70,10 +70,10 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const
if( out )
{
java_sql_SQLException_BASE warn_base(t.pEnv,out);
- return (starsdbc::SQLException)java_sql_SQLException(warn_base,0);
+ return (css::sdbc::SQLException)java_sql_SQLException(warn_base,0);
}
- return starsdbc::SQLException();
+ return css::sdbc::SQLException();
}
OUString java_sql_SQLException_BASE::getSQLState() const
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 6d32195..84c74ab 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -24,12 +24,10 @@
namespace connectivity
{
- namespace starsdbc = ::com::sun::star::sdbc;
-
//************ Class: java.sql.SQLException
class java_sql_SQLException_BASE;
- class java_sql_SQLException : public starsdbc::SQLException
+ class java_sql_SQLException : public css::sdbc::SQLException
{
public:
// A ctor that is needed for returning the object
@@ -50,7 +48,7 @@ namespace connectivity
OUString getSQLState() const;
sal_Int32 getErrorCode() const;
- starsdbc::SQLException getNextException() const;
+ css::sdbc::SQLException getNextException() const;
static jclass st_getMyClass();
};
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index c7b5cce..fbe7f09 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -24,9 +24,6 @@
namespace connectivity
{
- // namespace starsdbc = ::com::sun::star::sdbc;
- // namespace ::com::sun::star::uno = ::com::sun::star::uno;
-
//************ Class: java.sql.SQLWarning
class java_sql_SQLWarning_BASE : public java_sql_SQLException_BASE
commit cb347ddc5c7fc5a7e66c342d4e7a5a15f274fc21
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:45:18 2014 +0200
stario -> css::io
Change-Id: Iad96e0a2bfd6c126c696f14919dbfd8e072dd230
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index 0680af6..e1413f4 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -25,8 +25,8 @@ namespace comphelper
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (
- const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream,
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (
+ const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream,
const css::awt::FontDescriptor& _rFont)
{
_rxOutStream->writeUTF( _rFont.Name );
@@ -50,8 +50,8 @@ const css::uno::Reference<stario::XObjectOutputStream>& operator << (
// FontDescriptor
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (
- const css::uno::Reference<stario::XObjectInputStream>& _rxInStream,
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (
+ const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream,
css::awt::FontDescriptor& _rFont)
{
// schreiben des Fontdescriptors
@@ -75,84 +75,84 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> (
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, bool& _rVal)
{
_rVal = _rxInStream->readBoolean();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal)
{
_rxOutStream->writeBoolean(_bVal);
return _rxOutStream;
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& rStr)
{
rStr = _rxInStream->readUTF();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
{
_rxOutStream->writeUTF(rStr);
return _rxOutStream;
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int16& _rValue)
{
_rValue = _rxInStream->readShort();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue)
{
_rxOutStream->writeShort(_nValue);
return _rxOutStream;
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue)
{
_rValue = _rxInStream->readShort();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue)
{
_rxOutStream->writeShort(_nValue);
return _rxOutStream;
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue)
{
_rValue = _rxInStream->readLong();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue)
{
_rxOutStream->writeLong(_nValue);
return _rxOutStream;
}
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int32& _rValue)
{
_rValue = _rxInStream->readLong();
return _rxInStream;
}
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue)
{
_rxOutStream->writeLong(_nValue);
return _rxOutStream;
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 1c8584e..4b9aad4 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -38,13 +38,13 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper()
sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
- throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+ throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
if (!m_pFile)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
if (nBytesToRead < 0)
- throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
::osl::MutexGuard aGuard( m_aMutex );
@@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8
sal_uInt64 nRead = 0;
FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead);
if (eError != FileBase::E_None)
- throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
// Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
if (nRead < (sal_uInt32)nBytesToRead)
@@ -63,23 +63,23 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8
}
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
if (!m_pFile)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
if (nMaxBytesToRead < 0)
- throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
return readBytes(aData, nMaxBytesToRead);
}
-void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if (!m_pFile)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
sal_uInt64 nCurrentPos;
m_pFile->getPos(nCurrentPos);
@@ -88,45 +88,45 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
if (eError != FileBase::E_None)
{
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
}
}
-sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if (!m_pFile)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
sal_uInt64 nPos;
FileBase::RC eError = m_pFile->getPos(nPos);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
sal_uInt64 nDummy = 0;
eError = m_pFile->setPos(osl_Pos_End, nDummy);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
sal_uInt64 nAvailable;
eError = m_pFile->getPos(nAvailable);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
nAvailable = nAvailable - nPos;
eError = m_pFile->setPos(osl_Pos_Absolut, nPos);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
return sal::static_int_cast< sal_Int32 >(
std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32)));
}
-void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
{
if (!m_pFile)
- throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+ throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
m_pFile->close();
@@ -134,7 +134,7 @@ void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedExc
}
/*************************************************************************/
-// stario::XOutputStream
+// css::io::XOutputStream
OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
@@ -143,24 +143,24 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {}
-void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
sal_uInt64 nWritten;
FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten);
if (eError != FileBase::E_None
|| nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength()))
{
- throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+ throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
}
}
-void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
}
-void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
{
rFile.close();
}
diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx
index c1b2408..ea3955b 100644
--- a/comphelper/source/streaming/streamsection.cxx
+++ b/comphelper/source/streaming/streamsection.cxx
@@ -24,7 +24,7 @@ namespace comphelper
{
-OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataInputStream >& _rxInput)
+OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput)
:m_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY)
,m_xInStream(_rxInput)
,m_nBlockStart(-1)
@@ -39,7 +39,7 @@ OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataInputStre
}
-OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength)
+OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength)
:m_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY)
,m_xOutStream(_rxOutput)
,m_nBlockStart(-1)
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 525daf6..c48a313 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -28,43 +28,40 @@
namespace comphelper
{
-
-namespace stario = ::com::sun::star::io;
-
// bool
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, bool& _rVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal);
void operator <<(
css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool)
SAL_DELETED_FUNCTION;
// OUString
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& _rStr);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
// sal_Int16
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int16& _rValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue);
// sal_uInt16
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue);
// sal_uInt32
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue);
// sal_Int16
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, sal_Int32& _rValue);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue);
// FontDescriptor
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal);
// sequences
template <class ELEMENT>
-const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, css::uno::Sequence<ELEMENT>& _rSeq)
+const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, css::uno::Sequence<ELEMENT>& _rSeq)
{
sal_Int32 nLen = _rxInStream->readLong();
_rSeq.realloc(nLen);
@@ -78,7 +75,7 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::u
}
template <class ELEMENT>
-const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const css::uno::Sequence<ELEMENT>& _rSeq)
+const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const css::uno::Sequence<ELEMENT>& _rSeq)
{
sal_Int32 nLen = _rSeq.getLength();
_rxOutStream->writeLong(nLen);
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index 230c88b..9753aec 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -28,12 +28,11 @@
namespace comphelper
{
- namespace stario = ::com::sun::star::io;
// FmUnoIOStream,
// Stream to read and write data, based on File
-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream>
+class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XInputStream>
{
::osl::Mutex m_aMutex;
::osl::File* m_pFile;
@@ -42,19 +41,19 @@ public:
OSLInputStreamWrapper(::osl::File& _rStream);
virtual ~OSLInputStreamWrapper();
-// stario::XInputStream
- virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+// css::io::XInputStream
+ virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
// FmUnoOutStream,
// data sink for the files
-class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
+class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<css::io::XOutputStream>
{
public:
COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
@@ -62,10 +61,10 @@ public:
private:
virtual ~OSLOutputStreamWrapper();
-// stario::XOutputStream
- virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+// css::io::XOutputStream
+ virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
::osl::File& rFile;
};
diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 72545d0..44da3d5 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -28,8 +28,6 @@
namespace comphelper
{
- namespace stario = ::com::sun::star::io;
-
/** implements handling for compatibly reading/writing data from/into an input/output stream.
data written in a block secured by this class should be readable by older versions which
use the same mechanism.
@@ -40,9 +38,9 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OStreamSection
{
- css::uno::Reference< stario::XMarkableStream > m_xMarkStream;
- css::uno::Reference< stario::XDataInputStream > m_xInStream;
- css::uno::Reference< stario::XDataOutputStream > m_xOutStream;
+ css::uno::Reference< css::io::XMarkableStream > m_xMarkStream;
+ css::uno::Reference< css::io::XDataInputStream > m_xInStream;
+ css::uno::Reference< css::io::XDataOutputStream > m_xOutStream;
sal_Int32 m_nBlockStart;
sal_Int32 m_nBlockLen;
@@ -52,7 +50,7 @@ public:
@param _rxInput the stream to read from. Must support the
com::sun::star::io::XMarkableStream interface
*/
- OStreamSection(const css::uno::Reference< stario::XDataInputStream >& _rxInput);
+ OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput);
/** starts writing of a "skippable" section of data into the given output stream
@param _rxOutput the stream the stream to write to. Must support the
@@ -62,7 +60,7 @@ public:
needed. If you know how much bytes you are about to write, you may
want to use this param, saving some stream operations this way.
*/
- OStreamSection(const css::uno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength = 0);
+ OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength = 0);
/** dtor. <BR>If constructed for writing, the section "opened" by this object will be "closed".<BR>
If constructed for reading, any remaining bytes 'til the end of the section will be skipped.
commit edda7dbad7e03487b75a79455a7d48198046cbfc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:42:06 2014 +0200
starcontainer -> css::container
Change-Id: Ie6e75483aa4262a5f66a4c557015af8b3c02d592
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 6deb6c1..46f9a13 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -29,7 +29,7 @@ namespace comphelper
//= OEnumerationByName
-OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess)
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<css::container::XNameAccess>& _rxAccess)
:m_aNames(_rxAccess->getElementNames())
,m_nPos(0)
,m_xAccess(_rxAccess)
@@ -39,7 +39,7 @@ OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::
}
-OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess,
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<css::container::XNameAccess>& _rxAccess,
const css::uno::Sequence< OUString >& _aNames )
:m_aNames(_aNames)
,m_nPos(0)
@@ -74,7 +74,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim
css::uno::Any SAL_CALL OEnumerationByName::nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -89,7 +89,7 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement( )
}
if (!aRes.hasValue()) //There are no more elements
- throw starcontainer::NoSuchElementException();
+ throw css::container::NoSuchElementException();
return aRes;
}
@@ -144,7 +144,7 @@ void OEnumerationByName::impl_stopDisposeListening()
//= OEnumerationByIndex
-OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< starcontainer::XIndexAccess >& _rxAccess)
+OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess)
:m_nPos(0)
,m_xAccess(_rxAccess)
,m_bListening(false)
@@ -177,7 +177,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti
css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -193,7 +193,7 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( )
}
if (!aRes.hasValue())
- throw starcontainer::NoSuchElementException();
+ throw css::container::NoSuchElementException();
return aRes;
}
@@ -269,10 +269,10 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeEx
css::uno::Any SAL_CALL OAnyEnumeration::nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( ! hasMoreElements())
- throw starcontainer::NoSuchElementException();
+ throw css::container::NoSuchElementException();
::osl::ResettableMutexGuard aLock(m_aLock);
sal_Int32 nPos = m_nPos;
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index e46fb94..3983a29 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -34,10 +34,6 @@
namespace comphelper
{
-
- namespace starcontainer = ::com::sun::star::container;
-
-
//= OEnumerationLock
struct OEnumerationLock
@@ -53,23 +49,23 @@ struct OEnumerationLock
on an object implementing the com.sun.star.container::XNameAccess interface
*/
class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
- , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
+ , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
css::lang::XEventListener >
{
css::uno::Sequence< OUString > m_aNames;
sal_Int32 m_nPos;
- css::uno::Reference< starcontainer::XNameAccess > m_xAccess;
+ css::uno::Reference< css::container::XNameAccess > m_xAccess;
bool m_bListening;
public:
- OEnumerationByName(const css::uno::Reference< starcontainer::XNameAccess >& _rxAccess);
- OEnumerationByName(const css::uno::Reference< starcontainer::XNameAccess >& _rxAccess,
+ OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess);
+ OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess,
const css::uno::Sequence< OUString >& _aNames );
virtual ~OEnumerationByName();
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -85,20 +81,20 @@ private:
on an object implementing the com.sun.star.container::XNameAccess interface
*/
class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
- , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
+ , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
css::lang::XEventListener >
{
sal_Int32 m_nPos;
- css::uno::Reference< starcontainer::XIndexAccess > m_xAccess;
+ css::uno::Reference< css::container::XIndexAccess > m_xAccess;
bool m_bListening;
public:
- OEnumerationByIndex(const css::uno::Reference< starcontainer::XIndexAccess >& _rxAccess);
+ OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess);
virtual ~OEnumerationByIndex();
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -115,7 +111,7 @@ private:
*/
class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
- , public ::cppu::WeakImplHelper1< starcontainer::XEnumeration >
+ , public ::cppu::WeakImplHelper1< css::container::XEnumeration >
{
sal_Int32 m_nPos;
css::uno::Sequence< css::uno::Any > m_lItems;
@@ -126,7 +122,7 @@ public:
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL nextElement( )
- throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
commit 150df3c020613bd956c4ad38ab4b5e247801296b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:40:54 2014 +0200
star* -> css::*
Change-Id: I156d40badb1a11727d1320600a9d3af2b8b24e4a
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 262bd89..8d45fae 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -425,7 +425,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
{
- // Asynchronous for starutil::URL-Button
+ // Asynchronous for css::util::URL-Button
ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index c66b9c2..9e9b596 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::util;
-InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory)
+InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory)
{
return *(new OGroupBoxModel( comphelper::getComponentContext(_rxFactory) ));
}
@@ -132,7 +132,7 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt
-InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory)
+InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory)
{
return *(new OGroupBoxControl( comphelper::getComponentContext(_rxFactory) ));
}
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 2dcec5b..dd8c54f 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -70,7 +70,7 @@ ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rx
}
-void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>& _rxToolkit, const Reference<starawt::XWindowPeer>& _rxParent) throw (RuntimeException, std::exception)
+void SAL_CALL ORadioButtonControl::createPeer(const Reference<css::awt::XToolkit>& _rxToolkit, const Reference<css::awt::XWindowPeer>& _rxParent) throw (RuntimeException, std::exception)
{
OBoundControl::createPeer(_rxToolkit, _rxParent);
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index fbdacad..62e8246 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -88,7 +88,7 @@ public:
protected:
// XControl
- virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 374d4ad..db8e51e 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -253,11 +253,11 @@ protected:
// XControl
virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<starawt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<starawt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<starawt::XView> SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<css::awt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference<css::awt::XView> SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 0bcb840..c55af0b 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -162,7 +162,7 @@ public:
#define DECL_IFACE_PROP1(varname, type, attrib1) \
- DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1)
+ DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1)
#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \
@@ -170,11 +170,11 @@ public:
#define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \
- DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3)
+ DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3)
#define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \
- DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4)
+ DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4)
// === or Boolean properties
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index f02d99c..0ce8959 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -126,7 +126,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any&
{
case UNODIALOG_PROPERTY_ID_PARENT:
{
- Reference<starawt::XWindow> xNew(rValue, css::uno::UNO_QUERY);
+ Reference<css::awt::XWindow> xNew(rValue, css::uno::UNO_QUERY);
if (xNew != m_xParent)
{
rConvertedValue <<= xNew;
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 8709aac..a806528 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -179,19 +179,19 @@ namespace
namespace utl
{
-void typeConvert(const Date& _rDate, starutil::Date& _rOut)
+void typeConvert(const Date& _rDate, css::util::Date& _rOut)
{
_rOut.Day = _rDate.GetDay();
_rOut.Month = _rDate.GetMonth();
_rOut.Year = _rDate.GetYear();
}
-void typeConvert(const starutil::Date& _rDate, Date& _rOut)
+void typeConvert(const css::util::Date& _rDate, Date& _rOut)
{
_rOut = Date(_rDate.Day, _rDate.Month, _rDate.Year);
}
-void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut)
+void typeConvert(const DateTime& _rDateTime, css::util::DateTime& _rOut)
{
_rOut.Year = _rDateTime.GetYear();
_rOut.Month = _rDateTime.GetMonth();
@@ -202,21 +202,21 @@ void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut)
_rOut.NanoSeconds = _rDateTime.GetNanoSec();
}
-void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut)
+void typeConvert(const css::util::DateTime& _rDateTime, DateTime& _rOut)
{
Date aDate(_rDateTime.Day, _rDateTime.Month, _rDateTime.Year);
Time aTime(_rDateTime.Hours, _rDateTime.Minutes, _rDateTime.Seconds, _rDateTime.NanoSeconds);
_rOut = DateTime(aDate, aTime);
}
-void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut)
+void extractDate(const css::util::DateTime& _rDateTime, css::util::Date& _rOut)
{
_rOut.Day = _rDateTime.Day;
_rOut.Month = _rDateTime.Month;
_rOut.Year = _rDateTime.Year;
}
-OUString toISO8601(const starutil::DateTime& rDateTime)
+OUString toISO8601(const css::util::DateTime& rDateTime)
{
OUStringBuffer rBuffer;
rBuffer.append((sal_Int32) rDateTime.Year);
@@ -261,13 +261,13 @@ OUString toISO8601(const starutil::DateTime& rDateTime)
}
/** convert ISO8601 DateTime String to util::DateTime */
-bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime)
+bool ISO8601parseDateTime(const OUString &rString, css::util::DateTime& rDateTime)
{
bool bSuccess = true;
rtl::OUString aDateStr, aTimeStr;
- starutil::Date aDate;
- starutil::Time aTime;
+ css::util::Date aDate;
+ css::util::Time aTime;
sal_Int32 nPos = rString.indexOf( 'T' );
if ( nPos >= 0 )
{
@@ -286,7 +286,7 @@ bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime
if (bSuccess)
{
- rDateTime = starutil::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours,
+ rDateTime = css::util::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours,
aDate.Day, aDate.Month, aDate.Year, false);
}
@@ -297,7 +297,7 @@ bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime
// TODO: supports only calendar dates YYYY-MM-DD
// MISSING: calendar dates YYYYMMDD YYYY-MM
// year, week date, ordinal date
-bool ISO8601parseDate(const OUString &aDateStr, starutil::Date& rDate)
+bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate)
{
bool bSuccess = true;
@@ -339,7 +339,7 @@ bool ISO8601parseDate(const OUString &aDateStr, starutil::Date& rDate)
}
/** convert ISO8601 Time String to util::Time */
-bool ISO8601parseTime(const OUString &aTimeStr, starutil::Time& rTime)
+bool ISO8601parseTime(const OUString &aTimeStr, css::util::Time& rTime)
{
bool bSuccess = true;
commit 123c64ab007868eaed24810d1c52ca84f7a6ac52
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:39:27 2014 +0200
starawt -> css::awt
Change-Id: I76dd16aa2c42a649162ea2e37c824af30cdd557b
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index d81ec90..0680af6 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -27,7 +27,7 @@ namespace comphelper
const css::uno::Reference<stario::XObjectOutputStream>& operator << (
const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream,
- const starawt::FontDescriptor& _rFont)
+ const css::awt::FontDescriptor& _rFont)
{
_rxOutStream->writeUTF( _rFont.Name );
_rxOutStream->writeShort( _rFont.Height );
@@ -52,7 +52,7 @@ const css::uno::Reference<stario::XObjectOutputStream>& operator << (
const css::uno::Reference<stario::XObjectInputStream>& operator >> (
const css::uno::Reference<stario::XObjectInputStream>& _rxInStream,
- starawt::FontDescriptor& _rFont)
+ css::awt::FontDescriptor& _rFont)
{
// schreiben des Fontdescriptors
_rFont.Name = _rxInStream->readUTF();
@@ -64,7 +64,7 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> (
_rFont.Pitch = _rxInStream->readShort();
_rFont.CharacterWidth = static_cast< float >(_rxInStream->readDouble());
_rFont.Weight = static_cast< float >(_rxInStream->readDouble());
- _rFont.Slant = (starawt::FontSlant)_rxInStream->readShort();
+ _rFont.Slant = (css::awt::FontSlant)_rxInStream->readShort();
_rFont.Underline = _rxInStream->readShort();
_rFont.Strikeout = _rxInStream->readShort();
_rFont.Orientation = static_cast< float >(_rxInStream->readDouble());
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index e5bcd77..525daf6 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -30,7 +30,6 @@ namespace comphelper
namespace stario = ::com::sun::star::io;
-namespace starawt = ::com::sun::star::awt;
// bool
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal);
@@ -60,8 +59,8 @@ COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& oper
COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue);
// FontDescriptor
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, starawt::FontDescriptor& rVal);
-COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const starawt::FontDescriptor& rVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal);
+COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal);
// sequences
template <class ELEMENT>
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 25e9a48..355daf2 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { namespace awt {
namespace comphelper
{
- namespace starawt = ::com::sun::star::awt;
typedef css::uno::Reference< css::uno::XInterface > InterfaceRef;
typedef css::uno::Sequence< OUString > StringSequence;
@@ -52,8 +51,8 @@ namespace comphelper
/** compare two FontDescriptor's
*/
- COMPHELPER_DLLPUBLIC bool operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight);
- inline bool operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight)
+ COMPHELPER_DLLPUBLIC bool operator ==(const css::awt::FontDescriptor& _rLeft, const css::awt::FontDescriptor& _rRight);
+ inline bool operator !=(const css::awt::FontDescriptor& _rLeft, const css::awt::FontDescriptor& _rRight)
{
return !(_rLeft == _rRight);
}
@@ -129,7 +128,7 @@ namespace comphelper
the XXX_DONTKNOW enum values (which isn't the case if you instantiate it
via the default constructor)
*/
- COMPHELPER_DLLPUBLIC starawt::FontDescriptor getDefaultFont();
+ COMPHELPER_DLLPUBLIC css::awt::FontDescriptor getDefaultFont();
/** examine a sequence for the com.sun.star.uno::Type of it's elements.
*/
commit 78b2d8211112df0a5938efbc8db0f8e48ae9e2e7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 20 21:36:29 2014 +0200
comphelper: starbeans -> css::beans
Change-Id: Iedfc4460194f179b20d734cb7671894213c77008
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 5dd15ac..6df5a15 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -28,10 +28,6 @@
namespace comphelper
{
-
-namespace starbeans = ::com::sun::star::beans;
-
-
sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormats>& xFormats, sal_Int32 nKey)
{
sal_Int16 nReturn(css::util::NumberFormat::UNDEFINED);
@@ -39,7 +35,7 @@ sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormat
{
try
{
- css::uno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
+ css::uno::Reference<css::beans::XPropertySet> xFormat(xFormats->getByKey(nKey));
if (xFormat.is())
xFormat->getPropertyValue("Type") >>= nReturn;
}
@@ -68,7 +64,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb
{
try
{
- css::uno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
+ css::uno::Reference<css::beans::XPropertySet> xFormat( xFormats->getByKey(nKey));
if (xFormat.is())
{
static OUString PROPERTY_DECIMALS( "Decimals" );
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index ece8c32..2f7003a 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -33,8 +33,6 @@ namespace cppu {
//... namespace comphelper ................................................
namespace comphelper
{
- namespace starbeans = ::com::sun::star::beans;
-
template <typename TYPE> struct OPropertyArrayUsageHelperMutex
: public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {};
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 71fd71c..56c0f6a 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -35,7 +35,6 @@
//... namespace comphelper .......................................................
namespace comphelper
{
- namespace starbeans = ::com::sun::star::beans;
/** compare two properties by name
*/
@@ -77,7 +76,7 @@ namespace comphelper
/// remove the property with the given name from the given sequence
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list