Kaydet (Commit) e6ff6f9a authored tarafından Thomas Arnhold's avatar Thomas Arnhold

use namespace css instead of com::sun

Change-Id: I47582b072bb939cf270a76e430a9f7908b5c1d93
üst 3041269f
......@@ -40,7 +40,7 @@
namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
// unnamed namespaces don't work well yet...
using namespace com::sun;
using namespace css;
// INetURLObject
......@@ -3702,7 +3702,7 @@ OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism,
OUString
INetURLObject::getAbbreviated(
star::uno::Reference< star::util::XStringWidth > const & rStringWidth,
uno::Reference< util::XStringWidth > const & rStringWidth,
sal_Int32 nWidth,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset)
......
......@@ -22,10 +22,10 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun;
using namespace css;
UUIInteractionRequestStringResolver::UUIInteractionRequestStringResolver(
star::uno::Reference< star::uno::XComponentContext > const &
uno::Reference< uno::XComponentContext > const &
rxContext)
SAL_THROW(())
: m_pImpl(new UUIInteractionHelper(rxContext))
......@@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
OUString SAL_CALL
UUIInteractionRequestStringResolver::getImplementationName()
throw (star::uno::RuntimeException, std::exception)
throw (uno::RuntimeException, std::exception)
{
return OUString::createFromAscii(m_aImplementationName);
}
......@@ -47,50 +47,50 @@ UUIInteractionRequestStringResolver::getImplementationName()
sal_Bool SAL_CALL
UUIInteractionRequestStringResolver::supportsService(
OUString const & rServiceName)
throw (star::uno::RuntimeException, std::exception)
throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
star::uno::Sequence< OUString > SAL_CALL
uno::Sequence< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getSupportedServiceNames()
throw (star::uno::RuntimeException, std::exception)
throw (uno::RuntimeException, std::exception)
{
return getSupportedServiceNames_static();
}
star::beans::Optional< OUString > SAL_CALL
beans::Optional< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
const star::uno::Reference<
star::task::XInteractionRequest >& Request )
throw (star::uno::RuntimeException, std::exception)
const uno::Reference<
task::XInteractionRequest >& Request )
throw (uno::RuntimeException, std::exception)
{
try
{
return m_pImpl->getStringFromRequest(Request);
}
catch (star::uno::RuntimeException const & ex)
catch (uno::RuntimeException const & ex)
{
throw star::uno::RuntimeException(ex.Message, *this);
throw uno::RuntimeException(ex.Message, *this);
}
}
char const UUIInteractionRequestStringResolver::m_aImplementationName[]
= "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
star::uno::Sequence< OUString >
uno::Sequence< OUString >
UUIInteractionRequestStringResolver::getSupportedServiceNames_static()
{
star::uno::Sequence< OUString > aNames(1);
uno::Sequence< OUString > aNames(1);
aNames[0] = "com.sun.star.task.InteractionRequestStringResolver";
return aNames;
}
star::uno::Reference< star::uno::XInterface > SAL_CALL
uno::Reference< uno::XInterface > SAL_CALL
UUIInteractionRequestStringResolver::createInstance(
star::uno::Reference< star::lang::XMultiServiceFactory > const &
uno::Reference< lang::XMultiServiceFactory > const &
rServiceFactory)
SAL_THROW((star::uno::Exception))
SAL_THROW((uno::Exception))
{
try
{
......@@ -98,7 +98,7 @@ UUIInteractionRequestStringResolver::createInstance(
}
catch (std::bad_alloc const &)
{
throw star::uno::RuntimeException("out of memory", 0);
throw uno::RuntimeException("out of memory", 0);
}
}
......
......@@ -104,7 +104,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard;
using namespace ::com::sun::star::datatransfer::dnd;
using namespace ::com::sun::star;
using namespace com::sun;
using ::com::sun::star::awt::XTopWindow;
......
......@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard;
using namespace ::com::sun::star::datatransfer::dnd;
using namespace ::com::sun::star;
using namespace com::sun;
using ::com::sun::star::awt::XTopWindow;
......
......@@ -26,14 +26,13 @@
#include "content.hxx"
using namespace com::sun;
using namespace com::sun::star;
using namespace chelp;
// virtual
uno::Sequence< beans::Property > Content::getProperties(
const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ )
const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ )
{
bool withMediaType = m_aURLParameter.isFile() || m_aURLParameter.isRoot();
bool isModule = m_aURLParameter.isModule();
......@@ -155,44 +154,44 @@ uno::Sequence< beans::Property > Content::getProperties(
}
// virtual
uno::Sequence< star::ucb::CommandInfo > Content::getCommands(
const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ )
uno::Sequence< ucb::CommandInfo > Content::getCommands(
const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ )
{
// Supported commands
#define COMMAND_COUNT 5
static const star::ucb::CommandInfo aCommandInfoTable[] =
static const ucb::CommandInfo aCommandInfoTable[] =
{
// Required commands
star::ucb::CommandInfo(
ucb::CommandInfo(
"getCommandInfo",
-1,
getCppuVoidType()
),
star::ucb::CommandInfo(
ucb::CommandInfo(
"getPropertySetInfo",
-1,
getCppuVoidType()
),
star::ucb::CommandInfo(
ucb::CommandInfo(
"getPropertyValues",
-1,
getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
star::ucb::CommandInfo(
ucb::CommandInfo(
"setPropertyValues",
-1,
getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
),
star::ucb::CommandInfo(
ucb::CommandInfo(
"open",
-1,
cppu::UnoType<star::ucb::OpenCommandArgument2>::get()
cppu::UnoType<ucb::OpenCommandArgument2>::get()
)
};
return uno::Sequence< star::ucb::CommandInfo >(
return uno::Sequence< ucb::CommandInfo >(
aCommandInfoTable, COMMAND_COUNT );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment