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 @@ ...@@ -40,7 +40,7 @@
namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj; namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
// unnamed namespaces don't work well yet... // unnamed namespaces don't work well yet...
using namespace com::sun; using namespace css;
// INetURLObject // INetURLObject
...@@ -3702,7 +3702,7 @@ OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism, ...@@ -3702,7 +3702,7 @@ OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism,
OUString OUString
INetURLObject::getAbbreviated( INetURLObject::getAbbreviated(
star::uno::Reference< star::util::XStringWidth > const & rStringWidth, uno::Reference< util::XStringWidth > const & rStringWidth,
sal_Int32 nWidth, sal_Int32 nWidth,
DecodeMechanism eMechanism, DecodeMechanism eMechanism,
rtl_TextEncoding eCharset) rtl_TextEncoding eCharset)
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
using namespace com::sun; using namespace css;
UUIInteractionRequestStringResolver::UUIInteractionRequestStringResolver( UUIInteractionRequestStringResolver::UUIInteractionRequestStringResolver(
star::uno::Reference< star::uno::XComponentContext > const & uno::Reference< uno::XComponentContext > const &
rxContext) rxContext)
SAL_THROW(()) SAL_THROW(())
: m_pImpl(new UUIInteractionHelper(rxContext)) : m_pImpl(new UUIInteractionHelper(rxContext))
...@@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver() ...@@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
OUString SAL_CALL OUString SAL_CALL
UUIInteractionRequestStringResolver::getImplementationName() UUIInteractionRequestStringResolver::getImplementationName()
throw (star::uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return OUString::createFromAscii(m_aImplementationName); return OUString::createFromAscii(m_aImplementationName);
} }
...@@ -47,50 +47,50 @@ UUIInteractionRequestStringResolver::getImplementationName() ...@@ -47,50 +47,50 @@ UUIInteractionRequestStringResolver::getImplementationName()
sal_Bool SAL_CALL sal_Bool SAL_CALL
UUIInteractionRequestStringResolver::supportsService( UUIInteractionRequestStringResolver::supportsService(
OUString const & rServiceName) OUString const & rServiceName)
throw (star::uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return cppu::supportsService(this, rServiceName); return cppu::supportsService(this, rServiceName);
} }
star::uno::Sequence< OUString > SAL_CALL uno::Sequence< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getSupportedServiceNames() UUIInteractionRequestStringResolver::getSupportedServiceNames()
throw (star::uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return getSupportedServiceNames_static(); return getSupportedServiceNames_static();
} }
star::beans::Optional< OUString > SAL_CALL beans::Optional< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getStringFromInformationalRequest( UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
const star::uno::Reference< const uno::Reference<
star::task::XInteractionRequest >& Request ) task::XInteractionRequest >& Request )
throw (star::uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
try try
{ {
return m_pImpl->getStringFromRequest(Request); 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[] char const UUIInteractionRequestStringResolver::m_aImplementationName[]
= "com.sun.star.comp.uui.UUIInteractionRequestStringResolver"; = "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
star::uno::Sequence< OUString > uno::Sequence< OUString >
UUIInteractionRequestStringResolver::getSupportedServiceNames_static() UUIInteractionRequestStringResolver::getSupportedServiceNames_static()
{ {
star::uno::Sequence< OUString > aNames(1); uno::Sequence< OUString > aNames(1);
aNames[0] = "com.sun.star.task.InteractionRequestStringResolver"; aNames[0] = "com.sun.star.task.InteractionRequestStringResolver";
return aNames; return aNames;
} }
star::uno::Reference< star::uno::XInterface > SAL_CALL uno::Reference< uno::XInterface > SAL_CALL
UUIInteractionRequestStringResolver::createInstance( UUIInteractionRequestStringResolver::createInstance(
star::uno::Reference< star::lang::XMultiServiceFactory > const & uno::Reference< lang::XMultiServiceFactory > const &
rServiceFactory) rServiceFactory)
SAL_THROW((star::uno::Exception)) SAL_THROW((uno::Exception))
{ {
try try
{ {
...@@ -98,7 +98,7 @@ UUIInteractionRequestStringResolver::createInstance( ...@@ -98,7 +98,7 @@ UUIInteractionRequestStringResolver::createInstance(
} }
catch (std::bad_alloc const &) 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; ...@@ -104,7 +104,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::clipboard;
using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star::datatransfer::dnd;
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace com::sun;
using ::com::sun::star::awt::XTopWindow; using ::com::sun::star::awt::XTopWindow;
......
...@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang; ...@@ -41,7 +41,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::clipboard;
using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star::datatransfer::dnd;
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace com::sun;
using ::com::sun::star::awt::XTopWindow; using ::com::sun::star::awt::XTopWindow;
......
...@@ -26,14 +26,13 @@ ...@@ -26,14 +26,13 @@
#include "content.hxx" #include "content.hxx"
using namespace com::sun;
using namespace com::sun::star; using namespace com::sun::star;
using namespace chelp; using namespace chelp;
// virtual // virtual
uno::Sequence< beans::Property > Content::getProperties( 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 withMediaType = m_aURLParameter.isFile() || m_aURLParameter.isRoot();
bool isModule = m_aURLParameter.isModule(); bool isModule = m_aURLParameter.isModule();
...@@ -155,44 +154,44 @@ uno::Sequence< beans::Property > Content::getProperties( ...@@ -155,44 +154,44 @@ uno::Sequence< beans::Property > Content::getProperties(
} }
// virtual // virtual
uno::Sequence< star::ucb::CommandInfo > Content::getCommands( uno::Sequence< ucb::CommandInfo > Content::getCommands(
const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ ) const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ )
{ {
// Supported commands // Supported commands
#define COMMAND_COUNT 5 #define COMMAND_COUNT 5
static const star::ucb::CommandInfo aCommandInfoTable[] = static const ucb::CommandInfo aCommandInfoTable[] =
{ {
// Required commands // Required commands
star::ucb::CommandInfo( ucb::CommandInfo(
"getCommandInfo", "getCommandInfo",
-1, -1,
getCppuVoidType() getCppuVoidType()
), ),
star::ucb::CommandInfo( ucb::CommandInfo(
"getPropertySetInfo", "getPropertySetInfo",
-1, -1,
getCppuVoidType() getCppuVoidType()
), ),
star::ucb::CommandInfo( ucb::CommandInfo(
"getPropertyValues", "getPropertyValues",
-1, -1,
getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) )
), ),
star::ucb::CommandInfo( ucb::CommandInfo(
"setPropertyValues", "setPropertyValues",
-1, -1,
getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
), ),
star::ucb::CommandInfo( ucb::CommandInfo(
"open", "open",
-1, -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 ); 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