summaryrefslogtreecommitdiff
path: root/shell/source/win32
diff options
context:
space:
mode:
Diffstat (limited to 'shell/source/win32')
-rw-r--r--shell/source/win32/SysShExec.cxx3
-rw-r--r--shell/source/win32/SysShExec.hxx8
-rw-r--r--shell/source/win32/simplemail/senddoc.cxx2
-rw-r--r--shell/source/win32/simplemail/smplmailclient.cxx56
-rw-r--r--shell/source/win32/simplemail/smplmailclient.hxx2
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.cxx7
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.hxx36
-rw-r--r--shell/source/win32/simplemail/smplmailsuppl.cxx1
-rw-r--r--shell/source/win32/simplemail/smplmailsuppl.hxx6
9 files changed, 59 insertions, 62 deletions
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 30ff62deb07b..1279dafa2c19 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -47,7 +47,6 @@ using com::sun::star::uno::XInterface;
using com::sun::star::lang::EventObject;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
using osl::Mutex;
using com::sun::star::system::XSystemShellExecute;
using com::sun::star::system::SystemShellExecuteException;
@@ -282,7 +281,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
if (!(uri.is() && uri->isAbsolute()))
{
throw css::lang::IllegalArgumentException(
- (rtl::OUString(
+ (OUString(
"XSystemShellExecute.execute URIS_ONLY with"
" non-absolute URI reference ")
+ aCommand),
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 01941cc2b215..39cd51e47f6f 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -53,20 +53,20 @@ public:
// XSystemShellExecute
//------------------------------------------------
- virtual void SAL_CALL execute( const ::rtl::OUString& aCommand, const ::rtl::OUString& aParameter, sal_Int32 nFlags )
+ virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException);
//------------------------------------------------
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 5a27c849012b..869a683d0bb6 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -164,7 +164,7 @@ void initMapiMessage(
rtl_uString_newFromAscii(&subject, const_cast<char*>(gSubject.c_str()));
rtl_uString *decoded_subject = NULL;
rtl_uriDecode(subject, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &decoded_subject);
- rtl::OUString ou_subject(decoded_subject);
+ OUString ou_subject(decoded_subject);
pMapiMessage->lpszSubject = strdup(OUStringToOString(ou_subject, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr());
}
catch (...) {
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 55445ad32f7a..9db17ce8347c 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -49,25 +49,25 @@ using css::system::XSimpleMailMessage;
using css::system::SimpleMailClientFlags::NO_USER_INTERFACE;
using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG;
-typedef std::vector<rtl::OUString> StringList_t;
+typedef std::vector<OUString> StringList_t;
-const rtl::OUString TO("--to");
-const rtl::OUString CC("--cc");
-const rtl::OUString BCC("--bcc");
-const rtl::OUString FROM("--from");
-const rtl::OUString SUBJECT("--subject");
-const rtl::OUString ATTACH("--attach");
-const rtl::OUString FLAG_MAPI_DIALOG("--mapi-dialog");
-const rtl::OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui");
+const OUString TO("--to");
+const OUString CC("--cc");
+const OUString BCC("--bcc");
+const OUString FROM("--from");
+const OUString SUBJECT("--subject");
+const OUString ATTACH("--attach");
+const OUString FLAG_MAPI_DIALOG("--mapi-dialog");
+const OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui");
namespace /* private */
{
/** @internal
look if an alternative program is configured
which should be used as senddoc executable */
- rtl::OUString getAlternativeSenddocUrl()
+ OUString getAlternativeSenddocUrl()
{
- rtl::OUString altSenddocUrl;
+ OUString altSenddocUrl;
HKEY hkey;
LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\LibreOffice\\SendAsEMailClient", &hkey);
if (lret == ERROR_SUCCESS)
@@ -91,13 +91,13 @@ namespace /* private */
the absolute file Url of the senddoc executable. In case
of an error an empty string will be returned.
*/
- rtl::OUString getSenddocUrl()
+ OUString getSenddocUrl()
{
- rtl::OUString senddocUrl = getAlternativeSenddocUrl();
+ OUString senddocUrl = getAlternativeSenddocUrl();
if (senddocUrl.getLength() == 0)
{
- senddocUrl = rtl::OUString( "$BRAND_BASE_DIR/program/senddoc.exe");
+ senddocUrl = OUString( "$BRAND_BASE_DIR/program/senddoc.exe");
rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure
}
return senddocUrl;
@@ -114,7 +114,7 @@ namespace /* private */
*/
bool executeSenddoc(const StringList_t& rCommandArgs)
{
- rtl::OUString senddocUrl = getSenddocUrl();
+ OUString senddocUrl = getSenddocUrl();
if (senddocUrl.getLength() == 0)
return false;
@@ -122,7 +122,7 @@ namespace /* private */
oslProcessError err = osl_Process_E_Unknown;
/* for efficiency reasons we are using a 'bad' cast here
- as a vector or rtl::OUStrings is nothing else than
+ as a vector or OUStrings is nothing else than
an array of pointers to rtl_uString's */
err = osl_executeProcess(
senddocUrl.pData,
@@ -175,49 +175,49 @@ void CSmplMailClient::assembleCommandLine(
{
OSL_ENSURE(rCommandArgs.empty(), "Provided command argument buffer not empty");
- rtl::OUString to = xSimpleMailMessage->getRecipient();
+ OUString to = xSimpleMailMessage->getRecipient();
if (to.getLength() > 0)
{
rCommandArgs.push_back(TO);
rCommandArgs.push_back(to);
}
- Sequence<rtl::OUString> ccRecipients = xSimpleMailMessage->getCcRecipient();
+ Sequence<OUString> ccRecipients = xSimpleMailMessage->getCcRecipient();
for (int i = 0; i < ccRecipients.getLength(); i++)
{
rCommandArgs.push_back(CC);
rCommandArgs.push_back(ccRecipients[i]);
}
- Sequence<rtl::OUString> bccRecipients = xSimpleMailMessage->getBccRecipient();
+ Sequence<OUString> bccRecipients = xSimpleMailMessage->getBccRecipient();
for (int i = 0; i < bccRecipients.getLength(); i++)
{
rCommandArgs.push_back(BCC);
rCommandArgs.push_back(bccRecipients[i]);
}
- rtl::OUString from = xSimpleMailMessage->getOriginator();
+ OUString from = xSimpleMailMessage->getOriginator();
if (from.getLength() > 0)
{
rCommandArgs.push_back(FROM);
rCommandArgs.push_back(from);
}
- rtl::OUString subject = xSimpleMailMessage->getSubject();
+ OUString subject = xSimpleMailMessage->getSubject();
if (subject.getLength() > 0)
{
rCommandArgs.push_back(SUBJECT);
rCommandArgs.push_back(subject);
}
- Sequence<rtl::OUString> attachments = xSimpleMailMessage->getAttachement();
+ Sequence<OUString> attachments = xSimpleMailMessage->getAttachement();
for (int i = 0; i < attachments.getLength(); i++)
{
- rtl::OUString sysPath;
+ OUString sysPath;
osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath);
if (err != osl::FileBase::E_None)
throw IllegalArgumentException(
- rtl::OUString("Invalid attachment file URL"),
+ OUString("Invalid attachment file URL"),
static_cast<XSimpleMailClient*>(this),
1);
@@ -243,7 +243,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage(
if (!executeSenddoc(senddocParams))
throw Exception(
- rtl::OUString("Send email failed"),
+ OUString("Send email failed"),
static_cast<XSimpleMailClient*>(this));
}
@@ -252,7 +252,7 @@ void CSmplMailClient::validateParameter(
{
if (!xSimpleMailMessage.is())
throw IllegalArgumentException(
- rtl::OUString("Empty mail message reference"),
+ OUString("Empty mail message reference"),
static_cast<XSimpleMailClient*>(this),
1);
@@ -261,14 +261,14 @@ void CSmplMailClient::validateParameter(
// check the flags, the allowed range is 0 - (2^n - 1)
if (aFlag < 0 || aFlag > 3)
throw IllegalArgumentException(
- rtl::OUString("Invalid flag value"),
+ OUString("Invalid flag value"),
static_cast<XSimpleMailClient*>(this),
2);
// check if a recipient is specified of the flags NO_USER_INTERFACE is specified
if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength())
throw IllegalArgumentException(
- rtl::OUString("No recipient specified"),
+ OUString("No recipient specified"),
static_cast<XSimpleMailClient*>(this),
1);
}
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 58214bcf5878..c9020678b30d 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -36,7 +36,7 @@ public:
private:
void validateParameter(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag);
- void assembleCommandLine(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag, std::vector<rtl::OUString>& rCommandArgs);
+ void assembleCommandLine(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag, std::vector<OUString>& rCommandArgs);
};
#endif
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index d5f23844a055..bae8bec90db7 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -31,7 +31,6 @@ using com::sun::star::uno::RuntimeException;
using com::sun::star::uno::Sequence;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
using osl::Mutex;
using namespace cppu;
@@ -46,7 +45,7 @@ CSmplMailMsg::CSmplMailMsg( )
//------------------------------------------------
-void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient )
+void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient )
throw (RuntimeException)
{
m_aRecipient = aRecipient;
@@ -54,7 +53,7 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient )
//------------------------------------------------
-::rtl::OUString SAL_CALL CSmplMailMsg::getRecipient( )
+OUString SAL_CALL CSmplMailMsg::getRecipient( )
throw (RuntimeException)
{
return m_aRecipient;
@@ -126,7 +125,7 @@ OUString SAL_CALL CSmplMailMsg::getSubject( )
//------------------------------------------------
-void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachement )
+void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement )
throw (IllegalArgumentException, RuntimeException)
{
m_Attachements = aAttachement;
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index addaab07adff..76e3822a6a32 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -38,59 +38,59 @@ public:
//------------------------------------------------
- virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient )
+ virtual void SAL_CALL setRecipient( const OUString& aRecipient )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRecipient( )
+ virtual OUString SAL_CALL getRecipient( )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
- virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient )
+ virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
- virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient )
+ virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
- virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator )
+ virtual void SAL_CALL setOriginator( const OUString& aOriginator )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getOriginator( )
+ virtual OUString SAL_CALL getOriginator( )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
- virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject )
+ virtual void SAL_CALL setSubject( const OUString& aSubject )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubject( )
+ virtual OUString SAL_CALL getSubject( )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
- virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement )
+ virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( )
throw (::com::sun::star::uno::RuntimeException);
private:
- rtl::OUString m_aRecipient;
- rtl::OUString m_aOriginator;
- rtl::OUString m_aSubject;
- com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients;
- com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients;
- com::sun::star::uno::Sequence< rtl::OUString > m_Attachements;
+ OUString m_aRecipient;
+ OUString m_aOriginator;
+ OUString m_aSubject;
+ com::sun::star::uno::Sequence< OUString > m_CcRecipients;
+ com::sun::star::uno::Sequence< OUString > m_BccRecipients;
+ com::sun::star::uno::Sequence< OUString > m_Attachements;
};
#endif
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 3dc241a911be..76ba6c0dabc4 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -27,7 +27,6 @@ using com::sun::star::uno::Sequence;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::system::XSimpleMailClientSupplier;
using com::sun::star::system::XSimpleMailClient;
-using rtl::OUString;
using osl::Mutex;
using namespace cppu;
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index ca88982547c1..557c01d78e53 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -50,13 +50,13 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
};
generated by cgit (git 2.34.1) at 2025-05-14 03:57:04 +0000