diff options
456 files changed, 50 insertions, 1115 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 267d7dec6886..6d8db6866f80 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -55,8 +55,6 @@ class TextEngine; class TextView; -namespace css = ::com::sun::star; - namespace accessibility { diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 547319ec1711..71e6c780cf92 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -28,8 +28,6 @@ #include <vector> #include <boost/unordered_map.hpp> -namespace css = ::com::sun::star; - namespace accessibility { diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 2db52ed43183..96203abd1930 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -40,8 +40,6 @@ #include <avmedia/mediawindow.hxx> #include <osl/mutex.hxx> -namespace css = ::com::sun::star; - namespace avmedia{ struct ThreadHelpBase diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index fe91e703f1ba..3337f9f19994 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -46,7 +46,6 @@ namespace basctl using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; Reference< view::XRenderable > Shell::GetRenderable() { diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx index 768a273b26c8..14ca48681688 100644 --- a/basic/inc/basic/sbobjmod.hxx +++ b/basic/inc/basic/sbobjmod.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/frame/XModel.hpp> #include "basicdllapi.h" -namespace css = ::com::sun::star; - // Basic-Module for excel object. class BASIC_DLLPUBLIC SbObjModule : public SbModule diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx index 9846673ef0d1..759b120a2d20 100644 --- a/binaryurp/qa/test-unmarshal.cxx +++ b/binaryurp/qa/test-unmarshal.cxx @@ -36,8 +36,6 @@ namespace { -namespace css = com::sun::star; - class Test: public CppUnit::TestFixture { private: CPPUNIT_TEST_SUITE(Test); diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index 9a60dacf3582..a56663afad2d 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -29,12 +29,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - BinaryAny::BinaryAny() throw () { uno_any_construct(&data_, 0, 0, 0); } diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 5256ac081663..5b463f59c8c3 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -73,8 +73,6 @@ namespace binaryurp { namespace { -namespace css = com::sun::star; - sal_Int32 random() { sal_Int32 n; rtlRandomPool pool = rtl_random_createPool(); diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 4050e068d619..24105f30ff9d 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -38,12 +38,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) SAL_THROW((css::uno::Exception)) diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx index a2d6c1a5d1c2..143dd34879ac 100644 --- a/binaryurp/source/currentcontext.cxx +++ b/binaryurp/source/currentcontext.cxx @@ -32,12 +32,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - namespace current_context { css::uno::UnoInterfaceReference get() { diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx index b156196d040c..1ac6e10ef24b 100644 --- a/binaryurp/source/incomingrequest.cxx +++ b/binaryurp/source/incomingrequest.cxx @@ -40,12 +40,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - IncomingRequest::IncomingRequest( rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid, OUString const & oid, css::uno::UnoInterfaceReference const & object, diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx index d5c9f71b2441..476fb19b13aa 100644 --- a/binaryurp/source/marshal.cxx +++ b/binaryurp/source/marshal.cxx @@ -50,8 +50,6 @@ namespace binaryurp { namespace { -namespace css = com::sun::star; - void write64(std::vector< unsigned char > * buffer, sal_uInt64 value) { Marshal::write8(buffer, value >> 56); Marshal::write8(buffer, (value >> 48) & 0xFF); diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx index 2a15d04a0e5b..a0fb6d272f82 100644 --- a/binaryurp/source/outgoingrequests.cxx +++ b/binaryurp/source/outgoingrequests.cxx @@ -29,12 +29,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - OutgoingRequests::OutgoingRequests() {} OutgoingRequests::~OutgoingRequests() {} diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index fde8b31cbd4d..355ac8787d1f 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -41,8 +41,6 @@ namespace binaryurp { namespace { -namespace css = com::sun::star; - extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) { assert(pInterface != 0); static_cast< Proxy * >(pInterface)->do_acquire(); diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index cbfb7dd42d3c..522b1654452d 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -56,8 +56,6 @@ namespace binaryurp { namespace { -namespace css = com::sun::star; - css::uno::Sequence< sal_Int8 > read( css::uno::Reference< css::connection::XConnection > const & connection, sal_uInt32 size, bool eofOk) diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx index f0c9ef52456a..d413e5f84e78 100644 --- a/binaryurp/source/unmarshal.cxx +++ b/binaryurp/source/unmarshal.cxx @@ -55,8 +55,6 @@ namespace binaryurp { namespace { -namespace css = com::sun::star; - void * allocate(sal_Size size) { void * p = rtl_allocateMemory(size); if (p == 0) { diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index dbbaf85e6c4c..3d5c199befa0 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -38,12 +38,6 @@ namespace binaryurp { -namespace { - -namespace css = com::sun::star; - -} - Writer::Item::Item() {} Writer::Item::Item( diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx index 9822979c6d22..7f9323f865ca 100644 --- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx @@ -45,8 +45,6 @@ namespace { -namespace css = com::sun::star; - void loadFpRegsFromStruct(typelib_TypeDescription * type, void * data) { for (typelib_CompoundTypeDescription * t = reinterpret_cast< typelib_CompoundTypeDescription * >(type); diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx index 2a55fcdf2d88..d192036eb24e 100644 --- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx +++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx @@ -49,8 +49,6 @@ namespace { -namespace css = com::sun::star; - typedef void (* Function)(void *); Function toFunction(void * pointer) { diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx index cf4545a7fdd7..b91f2ab0806d 100644 --- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx @@ -46,8 +46,6 @@ namespace { -namespace css = com::sun::star; - void storeFpRegsToStruct(typelib_TypeDescription * type, void * data) { for (typelib_CompoundTypeDescription * t = reinterpret_cast< typelib_CompoundTypeDescription * >(type); diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index 713b3f60b5d1..61dd3e8420be 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -29,7 +29,6 @@ #include "uno/lbnames.h" -namespace css = ::com::sun::star; using namespace ::std; using namespace ::osl; using namespace ::rtl; diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index f7a94a19cc90..fddc097edb42 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -50,8 +50,6 @@ #include <iostream> #include <cstdlib> -namespace css = com::sun::star; - namespace { class WaitCondition { diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index d64efc39f2b0..106e0a318c48 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -46,8 +46,6 @@ #include "uno/environment.h" #include "uno/lbnames.h" -namespace css = com::sun::star; - namespace { class Service: public cppu::WeakImplHelper2< diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index b30f20346071..df0991c245ac 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -46,8 +46,6 @@ #include <iostream> -namespace css = com::sun::star; - namespace { class Client: public cppu::WeakImplHelper2< diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index c4308033bc73..607a05414c2e 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -41,8 +41,6 @@ #include "sal/types.h" #include "uno/lbnames.h" -namespace css = com::sun::star; - namespace { class Server: diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h index f70fe705d514..f6e987f45777 100755 --- a/cli_ure/source/climaker/climaker_share.h +++ b/cli_ure/source/climaker/climaker_share.h @@ -34,8 +34,6 @@ #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) -namespace css = ::com::sun::star; - namespace climaker { diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 9292b4af43c5..373e4bf10a5f 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -37,8 +37,6 @@ #undef VOID -namespace css = com::sun::star; - namespace sri = System::Runtime::InteropServices; namespace sr = System::Reflection; namespace st = System::Text; @@ -542,7 +540,7 @@ System::String^ mapUnoTypeName(rtl_uString const * typeName) The values in the type list are uno types and are replaced by cli types, such as System.Char, System.Int32, etc. - The präfix unoidl is not added. + The präfix unoidl is not added. */ inline System::String^ mapUnoPolymorphicName(System::String^ unoName) { @@ -553,7 +551,7 @@ inline System::String^ mapUnoPolymorphicName(System::String^ unoName) The values in the type list are CLI types and are replaced by uno types, such as char, long, etc. - The präfix unoidl remains. + The präfix unoidl remains. */ inline System::String^ mapCliPolymorphicName(System::String^ unoName) { diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index aaa59e9f9971..61c3036ee14d 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -35,7 +35,6 @@ namespace srrm = System::Runtime::Remoting::Messaging; namespace srr = System::Runtime::Remoting; namespace srrp = System::Runtime::Remoting::Proxies; namespace sd = System::Diagnostics; -namespace css = com::sun::star; namespace ucss = unoidl::com::sun::star; using namespace cli_uno; diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index e72b8651472f..93ab81e62328 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -23,7 +23,6 @@ #include "cli_bridge.h" namespace sr=System::Reflection; -namespace css=com::sun::star; using ::rtl::OUStringBuffer; diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx index db5c468c6faa..3cfd7133c0f1 100644 --- a/codemaker/inc/codemaker/commoncpp.hxx +++ b/codemaker/inc/codemaker/commoncpp.hxx @@ -24,8 +24,16 @@ namespace codemaker { namespace cpp { -rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace=false, - bool shortname=false); +/** Stick a namespace scope to c++ type + + @param type + Undecorated type + + @param ns_alias + Use common namespace aliases instead of fully specified (nested) + namespace. currently replaces com::sun::star with css. + */ +rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true); rtl::OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 53cd5dae61ab..989052d67030 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -37,8 +37,7 @@ namespace codemaker { namespace cpp { -rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, - bool shortname) +rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias) { char c('/'); sal_Int32 nPos = type.lastIndexOf( c ); @@ -49,8 +48,6 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, c = '.'; } - if (bNoNameSpace) - return type.copy(nPos+1); rtl::OStringBuffer tmpBuf(type.getLength()*2); nPos = 0; @@ -60,15 +57,13 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, tmpBuf.append(type.getToken(0, c, nPos)); } while( nPos != -1 ); - if (shortname) { - rtl::OString s(tmpBuf.makeStringAndClear()); - if (s.indexOf("::com::sun::star") == 0) - return s.replaceAt(0, 16, "css"); - else - return s; + rtl::OString s(tmpBuf.makeStringAndClear()); + if (ns_alias && s.indexOf("::com::sun::star::") == 0) + { + return s.replaceAt(0, 18, "css::"); // nicer shorthand } - return tmpBuf.makeStringAndClear(); + return s; } diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx index 2f6c94166337..1a31c9afb851 100644 --- a/comphelper/inc/comphelper/configurationhelper.hxx +++ b/comphelper/inc/comphelper/configurationhelper.hxx @@ -34,15 +34,6 @@ //_______________________________________________ // namespaces -// no panic .. this define will be reseted at the end of this file. -// BUT doing so it's neccessary to add all includes BEFORE this css-value -// will be defined :_) -#ifdef css -#error "Who use css? I need it as namespace alias." -#else -#define css ::com::sun::star -#endif - namespace comphelper{ @@ -244,8 +235,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper } // namespace comphelper -#undef css // important! - #endif // _COMPHELPER_CONFIGURATIONHELPER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx index d2ea6b892f17..59183e460b9e 100644 --- a/comphelper/inc/comphelper/numberedcollection.hxx +++ b/comphelper/inc/comphelper/numberedcollection.hxx @@ -37,13 +37,6 @@ namespace comphelper{ -#ifdef css - #error "Ambigious namespace definition of css." -#else - #define css ::com::sun::star -#endif - - /** @short defines a collection of UNO components, where every component will get it's own unique number. @descr Such number will be unique at runtime only ... but it supports fragmentation. @@ -176,8 +169,6 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex css::uno::WeakReference< css::uno::XInterface > m_xOwner; }; -#undef css - } // namespace comphelper #endif // _COMPHELPER_NUMBEREDCOLLECTION_HXX_ diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index 442bf9f592f7..d02e47fba612 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.hxx @@ -37,7 +37,6 @@ namespace service_decl { class ServiceDecl; namespace detail { -namespace css = ::com::sun::star; typedef ::boost::function3< css::uno::Reference<css::uno::XInterface> /* return */, ServiceDecl const&, diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx index 742b1b21453d..ddc515e2b44b 100644 --- a/comphelper/qa/weakbag/test_weakbag.cxx +++ b/comphelper/qa/weakbag/test_weakbag.cxx @@ -28,8 +28,6 @@ namespace { -namespace css = com::sun::star; - class Test: public CppUnit::TestFixture { public: void test() { diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index dd5e6ca14fc1..e4bb82d0edb0 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -52,8 +52,6 @@ namespace { -namespace css = com::sun::star; - struct TheConfigurationWrapper: public rtl::StaticWithArg< comphelper::detail::ConfigurationWrapper, diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 7c16385fd3cc..add324ba5712 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -28,9 +28,6 @@ namespace comphelper{ -namespace css = ::com::sun::star; - - //----------------------------------------------- css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const ::rtl::OUString& sPackage, diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 84d3331da4ea..1957ab633a21 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -50,9 +50,6 @@ namespace comphelper{ -namespace css = ::com::sun::star; - - const ::rtl::OUString& MediaDescriptor::PROP_ABORTED() { static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Aborted")); diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 0bba81e73fd8..a23690ecfdd9 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -25,9 +25,6 @@ namespace comphelper{ -namespace css = ::com::sun::star; - - static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; //----------------------------------------------- diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 3760b3cb1752..2867447222c4 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -22,9 +22,6 @@ namespace comphelper{ -namespace css = ::com::sun::star; - - SequenceAsHashMap::SequenceAsHashMap() : SequenceAsHashMapBase() { diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index b3dd6e863520..c1999e914650 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -27,8 +27,6 @@ namespace comphelper{ - namespace css = ::com::sun::star; - StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) : m_bUsed (sal_False) , m_bHandledByMySelf (sal_False) diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index abfc224d8d20..a721f77bf839 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -57,8 +57,6 @@ namespace { -namespace css = com::sun::star; - void normalize( rtl::OUString const & path, rtl::OUString const & relative, rtl::OUString * normalizedPath, rtl::OUString * name) diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index e8c91acafaf9..664127397cfb 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -101,12 +101,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - oslInterlockedCount Access::acquireCounting() { return osl_atomic_increment(&m_refCount); } diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx index adceeef2d73e..d7592c683c68 100644 --- a/configmgr/source/broadcaster.cxx +++ b/configmgr/source/broadcaster.cxx @@ -44,8 +44,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - void appendMessage( rtl::OUStringBuffer & buffer, css::uno::Exception const & exception) { diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 99c4d2df587c..6b2cd4186e33 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -61,12 +61,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - namespace { class theChildAccessUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theChildAccessUnoTunnelId > {}; diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 82b4be70d9bb..779a030ce72f 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -70,8 +70,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - struct UnresolvedListItem { rtl::OUString name; rtl::Reference< ParseManager > manager; diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index db10168e4b8f..4f0b53291552 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -66,8 +66,6 @@ namespace configmgr { namespace configuration_provider { namespace { -namespace css = com::sun::star; - char const accessServiceName[] = "com.sun.star.configuration.ConfigurationAccess"; char const updateAccessServiceName[] = diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 40b694109da3..7df357e728b8 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -67,8 +67,6 @@ namespace configmgr { namespace configuration_registry { namespace { -namespace css = com::sun::star; - class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::registry::XSimpleRegistry, diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx index d7d77555c630..4602f004bde7 100644 --- a/configmgr/source/data.cxx +++ b/configmgr/source/data.cxx @@ -45,8 +45,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - bool decode( rtl::OUString const & encoded, sal_Int32 begin, sal_Int32 end, rtl::OUString * decoded) diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx index 06b8356610a5..ea620321d917 100644 --- a/configmgr/source/defaultprovider.cxx +++ b/configmgr/source/defaultprovider.cxx @@ -33,8 +33,6 @@ namespace configmgr { namespace default_provider { -namespace css = com::sun::star; - css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context) { diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx index db0989112600..b5f36e94e5d3 100644 --- a/configmgr/source/localizedvaluenode.cxx +++ b/configmgr/source/localizedvaluenode.cxx @@ -29,12 +29,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - LocalizedValueNode::LocalizedValueNode(int layer, css::uno::Any const & value): Node(layer), value_(value) {} diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx index 456723cf5acc..59662ffdb8e6 100644 --- a/configmgr/source/node.cxx +++ b/configmgr/source/node.cxx @@ -34,12 +34,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - NodeMap & Node::getMembers() { assert(false); throw css::uno::RuntimeException( diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx index 27f3f2028956..bf2a998b63f3 100644 --- a/configmgr/source/parsemanager.cxx +++ b/configmgr/source/parsemanager.cxx @@ -33,12 +33,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - ParseManager::ParseManager( rtl::OUString const & url, rtl::Reference< Parser > const & parser) SAL_THROW(( diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx index 29d85ddb40e9..e82cf59b81cc 100644 --- a/configmgr/source/partial.cxx +++ b/configmgr/source/partial.cxx @@ -37,8 +37,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - bool parseSegment( rtl::OUString const & path, sal_Int32 * index, rtl::OUString * segment) { diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx index e5ecb6bd8b15..4ef895bb5dcb 100644 --- a/configmgr/source/propertynode.cxx +++ b/configmgr/source/propertynode.cxx @@ -35,12 +35,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - PropertyNode::PropertyNode( int layer, Type staticType, bool nillable, css::uno::Any const & value, bool extension): diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index 264eae14b3dd..aee12125942f 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -60,8 +60,6 @@ namespace configmgr { namespace read_only_access { namespace { -namespace css = com::sun::star; - class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::lang::XInitialization, diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx index 5d8d1dedd800..b302ad8f4ded 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -62,8 +62,6 @@ namespace configmgr { namespace read_write_access { namespace { -namespace css = com::sun::star; - class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::lang::XInitialization, diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index 56e5204b5e38..6b9b3b5f84a9 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -57,12 +57,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - RootAccess::RootAccess( Components & components, rtl::OUString const & pathRepresentation, rtl::OUString const & locale, bool update): diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index 6d691bf71ab1..3fa16fa03522 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -38,8 +38,6 @@ namespace { -namespace css = com::sun::star; - css::uno::Reference< css::uno::XInterface > SAL_CALL dummy( SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > const &) diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx index 2265daa46ad6..01d930eed586 100644 --- a/configmgr/source/type.cxx +++ b/configmgr/source/type.cxx @@ -38,12 +38,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - bool isListType(Type type) { return type >= TYPE_BOOLEAN_LIST; } diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 24400990b0da..157a39830f07 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -49,8 +49,6 @@ namespace configmgr { namespace update { namespace { -namespace css = com::sun::star; - std::set< rtl::OUString > seqToSet( css::uno::Sequence< rtl::OUString > const & sequence) { diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index 75ddef26e077..65190e41b6f1 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -49,8 +49,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - bool parseHexDigit(char c, int * value) { assert(value != 0); if (c >= '0' && c <= '9') { diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 7e69cd9e5d64..89616bc8f607 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -57,8 +57,6 @@ class Components; namespace { -namespace css = com::sun::star; - rtl::OString convertToUtf8( rtl::OUString const & text, sal_Int32 offset, sal_Int32 length) { diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index d7bc544ad7ae..0f267db95ad4 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -40,12 +40,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - XcdParser::XcdParser( int layer, std::set< OUString > const & processedDependencies, Data & data): layer_(layer), processedDependencies_(processedDependencies), data_(data), diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 686bfdb003eb..1e6f914a3fbf 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -51,8 +51,6 @@ namespace configmgr { namespace { -namespace css = com::sun::star; - // Conservatively merge a template or component (and its recursive parts) into // an existing instance: void merge( diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index 56f9e2133c9a..3515cce905c1 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -54,12 +54,6 @@ namespace configmgr { -namespace { - -namespace css = com::sun::star; - -} - XcuParser::XcuParser( int layer, Data & data, Partial const * partial, Modifications * broadcastModifications, Additions * additions): diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx index 8ba6ae5ca92a..6e3def05159c 100644 --- a/configmgr/source/xmldata.cxx +++ b/configmgr/source/xmldata.cxx @@ -54,12 +54,6 @@ namespace configmgr { namespace xmldata { -namespace { - -namespace css = com::sun::star; - -} - Type parseType( xmlreader::XmlReader const & reader, xmlreader::Span const & text) { diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 5dd1a7847121..ff2f359bb48e 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -31,8 +31,6 @@ namespace connectivity { namespace mork { - namespace css = com::sun::star; - class MorkDriver; class ProfileAccess; class ErrorDescriptor; diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 722bb9239f4d..994b2769e02f 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -43,7 +43,6 @@ namespace rtl { class OUString; } namespace connectivity { namespace mork { class ProfileAccess; -namespace css = com::sun::star; css::uno::Reference< css::uno::XInterface > SAL_CALL create(css::uno::Reference< css::uno::XComponentContext > const &); diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 05a07b85c7a2..d53f0e2aa7e7 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -59,8 +59,6 @@ namespace { -namespace css = com::sun::star; - class Base { public: Base(): m_count(0) {} diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 60921c899d3b..527cac596205 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -47,8 +47,6 @@ namespace com { namespace sun { namespace star { namespace uno { namespace { -namespace css = com::sun::star; - struct DerivedStruct1: css::lang::EventObject {}; struct DerivedStruct2: css::beans::PropertyChangeEvent {}; diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index 70961ccd10e2..f0dc4d6b67eb 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -31,12 +31,6 @@ #include "jobqueue.hxx" #include "threadpool.hxx" -namespace { - -namespace css = com::sun::star; - -} - using namespace osl; namespace cppu_threadpool { diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 1d7448a94ac8..9d4f9cd22b31 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -62,8 +62,6 @@ namespace com { namespace sun { namespace star { class XEventListener; } } } -namespace css = com::sun::star; - namespace { class Empty1: diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 85bb689f68d6..e46ff6f86c6d 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -77,8 +77,6 @@ namespace com { namespace sun { namespace star { struct EventObject; } } } -namespace css = com::sun::star; - namespace { std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) { diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index 861433fb19eb..a9d0c489bb45 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.cxx @@ -44,8 +44,6 @@ namespace { -namespace css = com::sun::star; - class Reference: public cppu::WeakImplHelper1< css::uno::XReference > { public: Reference(): m_disposed(false) {} diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index f27d82c5c114..1fe1aa76e8bd 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -77,8 +77,6 @@ namespace { -namespace css = com::sun::star; - bool nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) { assert(url != 0); for (;;) { diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx index d834e25dcab8..ba491c3af281 100644 --- a/cppuhelper/source/paths.cxx +++ b/cppuhelper/source/paths.cxx @@ -38,12 +38,6 @@ #include "paths.hxx" -namespace { - -namespace css = com::sun::star; - -} - rtl::OUString cppu::get_this_libpath() { static rtl::OUString s_uri; if (s_uri.isEmpty()) { diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index c3c30fb3acd9..3f309ee65c28 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -92,8 +92,6 @@ using cppu::PropertySetMixinImpl; -namespace css = com::sun::star; - namespace { template< typename T > struct AutoDispose { diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index 062e7ffe2d58..6b3acb29bb6e 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -69,7 +69,6 @@ using namespace ::rtl; using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = com::sun::star; namespace cppu { diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx index 9a3771384d28..afef759b965a 100644 --- a/cppuhelper/source/supportsservice.cxx +++ b/cppuhelper/source/supportsservice.cxx @@ -17,12 +17,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" -namespace { - -namespace css = com::sun::star; - -} - bool cppu::supportsService( css::lang::XServiceInfo * implementation, rtl::OUString const & name) { diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 78b9e7358e7d..931a025d2c91 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -70,12 +70,6 @@ //----------------------------------------------- // namespaces -#ifdef css - #error "ambigous praeprozessor directive for css ..." -#else - namespace css = ::com::sun::star; -#endif - using namespace com::sun::star; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 1db51dc8bf8a..a6bc4d8ca01a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -118,7 +118,6 @@ static const char aMenuSeparatorStr[] = " | "; #endif using rtl::OUString; -namespace css = com::sun::star; namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; namespace lang = com::sun::star::lang; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index a837b8d2d441..e3b64316e372 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -46,8 +46,6 @@ #include <sfx2/minarray.hxx> #include "cfgutil.hxx" -namespace css = ::com::sun::star; - class SfxMacroInfoItem; class SfxConfigGroupListBox_Impl; class SfxConfigFunctionListBox_Impl; diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index d2ec922822f2..a67548437524 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -36,8 +36,6 @@ class SfxMacroInfoItem; -namespace css = ::com::sun::star; - struct SfxStyleInfo_Impl { ::rtl::OUString sFamily; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index ae328c02e5b8..21c04140f005 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -79,7 +79,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::beans; -namespace css = com::sun::star; #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d464e68ebb84..f8c3aff2977b 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -49,8 +49,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -namespace css = ::com::sun::star; - // Load save embed functionality SvxLoadSaveEmbed::SvxLoadSaveEmbed( Window *pParent, Window *pDialog, diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 2d62e2cfaa32..543237590687 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -81,7 +81,6 @@ using namespace ::cppu; using namespace ::osl; using namespace ::dbtools; using namespace ::comphelper; -namespace css = ::com::sun::star; namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index b692bb5f4114..7d7bc995cf16 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -90,7 +90,6 @@ using namespace ::cppu; using namespace ::osl; using namespace ::dbtools; using namespace ::comphelper; -namespace css = ::com::sun::star; namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 47c6cd385292..d3e660e3ea3e 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -123,7 +123,6 @@ using namespace drawing; using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; -namespace css = ::com::sun::star; using sdb::application::XDatabaseDocumentUI; namespace DatabaseObject = sdb::application::DatabaseObject; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 07fe9f25229c..5d6db822038b 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -85,7 +85,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::embed; -namespace css = ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using ::com::sun::star::awt::XWindow; using ::com::sun::star::sdb::application::NamedDatabaseObject; diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 5a46fcd5dff8..4154c280e403 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -35,7 +35,6 @@ #include "QueryDesignView.hxx" #include <svl/smplhint.hxx> -namespace css = ::com::sun::star; using namespace dbaui; class OSqlEdit::ChangesListener: diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 34ef4c439236..f83d8c24b4f7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -127,8 +127,6 @@ using namespace ::com::sun::star::system; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::container; -namespace css = ::com::sun::star; - ResMgr* desktop::Desktop::pResMgr = 0; namespace desktop diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index de558fb27653..c2873914d121 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; -namespace css = ::com::sun::star; namespace dp_gui { //============================================================================== diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx index 31fa1aab1084..f407ed92ff46 100644 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ b/desktop/source/deployment/gui/dp_gui_shared.hxx @@ -24,8 +24,6 @@ #include "tools/resmgr.hxx" -namespace css = ::com::sun::star; - namespace dp_gui { struct DeploymentGuiResMgr : diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index e844cb895295..d123cec177a8 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -76,7 +76,6 @@ class Window; namespace cssu = ::com::sun::star::uno; -namespace css = ::com::sun::star; using dp_misc::StrTitle; using ::rtl::OUString; diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 9f803c757bc9..9d3a105fd786 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -27,8 +27,6 @@ #include "com/sun/star/task/XAbortChannel.hpp" #include "dp_misc_api.hxx" -namespace css = ::com::sun::star; - namespace dp_misc { diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 37090587a5cb..7da43b7f64c8 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -33,8 +33,6 @@ namespace ucbhelper class Content; } -namespace css = ::com::sun::star; - namespace dp_misc { struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index d5fbb523d702..607c717c9307 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -33,8 +33,6 @@ namespace ucbhelper class Content; } -namespace css = ::com::sun::star; - namespace dp_misc { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index baaa0cb63779..fcd51f4e3eec 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -34,7 +34,6 @@ namespace deployment = com::sun::star::deployment; namespace task = com::sun::star::task; namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; -namespace css = com::sun::star; #define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index adead8c788da..93d1626e26a3 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -24,8 +24,6 @@ #include "ucbhelper/content.hxx" #include "com/sun/star/uno/Type.hxx" -namespace css = ::com::sun::star; - namespace dp_manager { /** diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 492c33a50168..3213c1a18a55 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -66,7 +66,6 @@ namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; namespace beans = com::sun::star::beans; namespace util = com::sun::star::util; -namespace css = com::sun::star; using ::com::sun::star::uno::Reference; using ::rtl::OUString; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index dd4f3748dbeb..b57a155f15e4 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -33,8 +33,6 @@ #include <list> #include <boost/unordered_map.hpp> -namespace css = ::com::sun::star; - namespace dp_manager { typedef ::boost::unordered_map< diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 79301d630ab8..17d170d5a97e 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -33,8 +33,6 @@ #include <memory> -namespace css = ::com::sun::star; - namespace dp_manager { typedef ::cppu::WeakComponentImplHelper1< diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index 7ca3f7e38c4d..7c227aa35975 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -31,7 +31,6 @@ namespace lang = com::sun::star::lang; namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; -namespace css = com::sun::star; #define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index 25a0594114da..34d8ebe56194 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -27,8 +27,6 @@ #include "boost/optional.hpp" -namespace css = ::com::sun::star; - namespace dp_manager { diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 66cd2691822a..84f72fdfb000 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -40,8 +40,6 @@ namespace { -namespace css = com::sun::star; - static char const namespaceLibreOffice[] = "http://libreoffice.org/extensions/description/2011"; diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 534b1c6afabc..81c0e85e73f8 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -56,7 +56,6 @@ namespace { -namespace css = ::com::sun::star; using css::uno::Reference; using ::rtl::OUString; diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index ec90c1d06fa7..c1528f2503cc 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -31,10 +31,6 @@ #include "dp_identifier.hxx" -namespace { - namespace css = ::com::sun::star; -} - namespace dp_misc { ::rtl::OUString generateIdentifier( diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index a5500f65b236..4a39d8dc03bb 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -73,7 +73,6 @@ #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) using ::rtl::OUString; -namespace css = ::com::sun::star; namespace dp_misc { diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index 648a19a39043..3e57d15fb2a5 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -29,7 +29,6 @@ #include "dp_compbackenddb.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index 24a08e88487f..c7b9522da73b 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -26,8 +26,6 @@ #include <list> #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 5d7082ab34ae..7205a17c88f2 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using ::rtl::OUString; -namespace css = com::sun::star; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index 0fd3ba1a38cc..3d97ce2c484e 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -29,7 +29,6 @@ #include "dp_configurationbackenddb.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 2d17e72566c3..31435015811c 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -26,8 +26,6 @@ #include "boost/optional.hpp" #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 308fb238033b..40a15c93e540 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -35,7 +35,6 @@ #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index 4113d072b7d9..496d2765fd74 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -23,8 +23,6 @@ #include "rtl/ustring.hxx" #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx index 7d61cf30efaa..24382f85ff45 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx @@ -29,7 +29,6 @@ #include "dp_helpbackenddb.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 9a38d0e703bd..eeda03533db6 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -25,8 +25,6 @@ #include "boost/optional.hpp" #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 9416f36050a0..457ca6251d93 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -43,8 +43,6 @@ namespace dp_registry namespace backend { -namespace css = ::com::sun::star; - class PackageRegistryBackend; #define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend" diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index bb47e3c853b4..53e555c3bf71 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -24,8 +24,6 @@ #include <list> #include <vector> -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx index fe527e61da0e..7c8b6145918b 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx @@ -28,7 +28,6 @@ #include "dp_extbackenddb.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 59ffacf93205..9cb5b3619da2 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -27,8 +27,6 @@ #include "dp_backenddb.hxx" -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 3e2615bb3385..3e5d31c6d348 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -70,8 +70,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; - using ::rtl::OUString; namespace dp_registry { diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 90efd68a35c1..53696cf5b11a 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -35,8 +35,6 @@ namespace rtl { class OUString; } -namespace css = ::com::sun::star; - namespace dp_registry { namespace backend { namespace script { diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 3f061f130ad1..0791ef5045ff 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using ::rtl::OUString; -namespace css = ::com::sun::star; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index cd7a6d70e08f..37266ef54e71 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -23,7 +23,6 @@ #include "rtl/ustring.hxx" #include "dp_backenddb.hxx" #include "boost/optional.hpp" -namespace css = ::com::sun::star; namespace com { namespace sun { namespace star { namespace uno { diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 04bd407fb2f5..34f9a4d52ffe 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -namespace css = ::com::sun::star; namespace dp_registry { namespace backend diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index c13cc7420a7a..6a6067f14bf3 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -51,7 +51,6 @@ using ::rtl::OUString; #define ENABLE_JAVA 1 #define USER_CLASS_PATH 2 -namespace css = com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::lang; diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 0d28c75a40d8..0cd512e539e5 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -29,8 +29,6 @@ #include "com/sun/star/task/XJob.hpp" -namespace css = com::sun::star; - namespace migration { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 91ab6e315480..b2b09a6ede96 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::unopkg; using ::rtl::OUString; -namespace css = ::com::sun::star; namespace { struct ExtensionName diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 39844e31dbbd..f93a049d0131 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -43,7 +43,6 @@ #include "deployment.hrc" #include "dp_version.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index d75ca67e822a..93afa9091e0e 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -28,8 +28,6 @@ #define APP_NAME "unopkg" -namespace css = ::com::sun::star; - namespace unopkg { inline ::com::sun::star::lang::Locale toLocale( ::rtl::OUString const & slang ) diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index d8ad660abd8b..2c2ecd255df5 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::uno; namespace { -namespace css = com::sun::star; - class SplashScreen : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization > , public IntroWindow diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 0881e04f1e9b..3e5e0c5581c8 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -58,8 +58,6 @@ namespace { -namespace css = com::sun::star; - class Provider: public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatchProvider >, diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 401e50f9dd0a..c3fb5a3b0e72 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -55,8 +55,6 @@ namespace { -namespace css = com::sun::star; - class Provider: public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatchProvider >, diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 17a879060a78..8f681702b255 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -39,7 +39,6 @@ namespace extensions { namespace config { namespace ldap { -namespace css = com::sun::star ; namespace uno = css::uno ; namespace lang = css::lang ; namespace ldap = css::ldap ; diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index cc9dde63ad46..c91cc55bdf59 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace uno { namespace extensions { namespace config { namespace ldap { -namespace css = com::sun::star ; namespace uno = css::uno ; namespace lang = css::lang ; namespace container = css::container; diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 1a97e5968b54..7e636836aedc 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -57,7 +57,6 @@ #include "so_closelistener.hxx" #include <osl/process.h> -namespace css=com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::connection; diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index bdbeb1ad8cac..989bf18e05f4 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -35,7 +35,6 @@ #include <cppuhelper/implbase1.hxx> -namespace css = com::sun::star ; namespace container = css::container ; namespace deployment = css::deployment ; namespace lang = css::lang ; diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx index a1ae5075fdf3..db479002fa6f 100644 --- a/filter/inc/filter/msfilter/mstoolbar.hxx +++ b/filter/inc/filter/msfilter/mstoolbar.hxx @@ -45,8 +45,6 @@ #include <vcl/bitmap.hxx> #include <cppuhelper/implbase1.hxx> -namespace css = ::com::sun::star; - class TBCHeader; diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index c25a8af0d9c3..431bac69a3c7 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -30,8 +30,6 @@ #define LOAD_IMPLICIT -namespace css = ::com::sun::star; - namespace filter{ namespace config{ diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index a743c605d445..005285d1524c 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -30,11 +30,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - - - CacheItem::CacheItem() : SequenceAsHashMap() { diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 9b24cdbd9b4f..33e7272d4df8 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -35,8 +35,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - /** @short Must be used as first derived base class to get a full initialized mutex member, diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 6062d2a6657f..287b07646d18 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -31,11 +31,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - - - CacheUpdateListener::CacheUpdateListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, FilterCache &rFilterCache, const css::uno::Reference< css::uno::XInterface >& xConfigAccess, diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index ede6ce6258ac..a6371f025663 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -24,8 +24,6 @@ #include <osl/diagnose.h> -namespace css = ::com::sun::star; - namespace filter{ namespace config{ diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index c25f01130673..2733d22aefd8 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -31,11 +31,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - - - ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { BaseContainer::init(xSMGR , diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 4f37e73022fa..1db718e12064 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -29,8 +29,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - //_______________________________________________ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index ee0ac397818a..3e512edc0417 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -56,8 +56,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - FilterCache::FilterCache() : BaseLock ( ) , m_xSMGR (::comphelper::getProcessServiceFactory()) diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index cfba722a43aa..d4eed05328c7 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -33,9 +33,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - /** @short define all possible parts of a filter query. @descr syntax: "<query>[:<param>[=<value>]]" diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 6e912eb032e4..3010561257af 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - //_______________________________________________ diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index d393b6a89901..2f25149218f7 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -30,11 +30,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - - - FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { BaseContainer::init(xSMGR , diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index c1fc76c50f50..c361dc2e07f6 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -29,8 +29,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - //_______________________________________________ diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index c3c5a265e7eb..5f6dbf7aae92 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -31,11 +31,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - - - - LateInitListener::LateInitListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : BaseLock( ) { diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 144ea33e9388..0732f06b5e5d 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -38,8 +38,6 @@ namespace filter{ namespace config{ -namespace css = ::com::sun::star; - TypeDetection::TypeDetection(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { BaseContainer::init(xSMGR , diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 0aa87e81d228..00537c80481b 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -28,8 +28,6 @@ namespace filter{ namespace config { -namespace css = ::com::sun::star; - //_______________________________________________ diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 9be12e01aca4..f1ccc52dc09b 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -namespace css = com::sun::star; - XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const css::uno::Reference< XMultiServiceFactory >& rxMSF ) : TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_XSLT, rResMgr ) ), diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 56aaffc3a4f6..b0b570510fe0 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -80,8 +80,6 @@ using ::std::list; using ::std::map; using ::std::pair; -namespace css = com::sun::star; - #define _INPUT_BUFFER_SIZE 4096 #define _OUTPUT_BUFFER_SIZE 4096 diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 94c2253dd47e..85add7168f13 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -89,8 +89,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::util; using namespace ::com::sun::star::task; -namespace css = com::sun::star; - namespace XSLT { /* diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index cf1ec475005b..43f584589f06 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -35,8 +35,6 @@ #include <odma_lib.hxx> #endif -namespace css = com::sun::star; - using css::uno::Reference; using css::uno::Sequence; using rtl::OUString; diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index da1cc07ae105..40c2fa37d548 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -56,8 +56,6 @@ // namespace directives //------------------------------------------------------------------------ -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index 86a2784d3f47..0fdd42de3529 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -40,8 +40,6 @@ #include <cppuhelper/basemutex.hxx> #include <rtl/ustring.hxx> -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 988b7fd1f942..cef6ad360f35 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -41,8 +41,6 @@ // namespace directives //------------------------------------------------------------------------ -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index dd22a75044fa..4da4bee44747 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -40,8 +40,6 @@ #include <cppuhelper/interfacecontainer.h> #include <osl/interlck.h> -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index d3d1689ae217..655568508b76 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -55,8 +55,6 @@ namespace fpicker{ namespace win32{ namespace vista{ -namespace css = ::com::sun::star; - //----------------------------------------------------------------------------- // types, const etcpp. //----------------------------------------------------------------------------- diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 15ed136b5d8c..03e5a927b651 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -54,8 +54,6 @@ #include <osl/conditn.hxx> #include <rtl/ustring.hxx> -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index 6e3fc5233220..265259dbece1 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -28,8 +28,6 @@ #include <queue> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index a510110c8232..921a54b8ae23 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -30,8 +30,6 @@ #include <cppuhelper/implbase1.hxx> -namespace css = ::com::sun::star; - namespace framework{ /** diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index b46a45f79656..92fff24df7c3 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -44,8 +44,6 @@ #include <framework/fwedllapi.h> -namespace css = ::com::sun::star; - namespace framework{ diff --git a/framework/inc/general.h b/framework/inc/general.h index fe7899b100a8..57e24101aca7 100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h @@ -29,16 +29,6 @@ #include <rtl/ustring.hxx> - -//----------------------------------------------------------------------------- -/** will make our code more readable if we can use such short name css instead - of typing ::com::sun::star everytimes. - - On the other side we had so many problems with "using namespace" so we dont use - it here any longer. - */ -namespace css = ::com::sun::star; - #endif // #ifndef __FRAMEWORK_GENERAL_H_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index e61e24e13a5d..9ef0a2fcf4b7 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -51,10 +51,6 @@ //_______________________________________________ // definition -#ifndef css -namespace css = ::com::sun::star; -#endif - namespace framework { diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index eb1b9f456f54..849d5500b969 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -36,8 +36,6 @@ namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } } -namespace css = com::sun::star; - //_______________________________________________ // definition diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 8e9d7c3f1413..42bb80cf131f 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -50,8 +50,6 @@ namespace framework { -namespace css = ::com::sun::star; - //----------------------------------------------- StorageHolder::StorageHolder() : ThreadHelpBase( ) diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 7c700d4b10f4..b0c6db53d2a4 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -30,8 +30,6 @@ namespace framework{ -namespace css = ::com::sun::star; - DEFINE_XINTERFACE_1(DispatchInformationProvider , OWeakObject , DIRECT_INTERFACE(css::frame::XDispatchInformationProvider)) diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 96edcac573e3..4d0a12b7c85e 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -25,8 +25,6 @@ namespace framework{ -namespace css = ::com::sun::star; - LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , const ::rtl::OUString sTargetName , diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index e293764010b7..620f5449153a 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -39,8 +39,6 @@ namespace framework{ -namespace css = ::com::sun::star; - //----------------------------------------------- WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame) diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index fe8d24ad159e..b54c3042202a 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -38,8 +38,6 @@ namespace framework{ -namespace css = ::com::sun::star; - //----------------------------------------------- TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : ::cppu::BaseMutex () diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 59cf842e86d5..eeddfd7717b2 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -24,8 +24,6 @@ namespace framework{ -namespace css = ::com::sun::star; - #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler")) PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 5541d3c858f5..9b4955b7e699 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -30,8 +30,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -namespace css = ::com::sun::star; - namespace framework { diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 41e033253515..20c003916efe 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -29,8 +29,6 @@ namespace framework{ -namespace css = ::com::sun::star; - /** @short implements a dispatch object which can be used to load non-visible components (by using the mechanism of ContentHandler) or visible-components (by using the mechanism of FrameLoader). diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 0597e322c5b1..4d561cb8ee5b 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -32,8 +32,6 @@ namespace framework{ -namespace css = ::com::sun::star; - /** @short internal helper to bind e.g. MAC-Menu events to our internal dispatch API. @descr On e.g. MAC platform system menus are merged together with some fix entries as diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 9ccde9e57f95..832a3a93f837 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -29,11 +29,6 @@ namespace framework{ -#ifndef css -namespace css = ::com::sun::star; -#endif - - /** @short implements a guard, which can use the interface <type scope="com::sun::star::document">XActionLockable</type>. diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 665882485d5e..ba50b7d24b0e 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -43,7 +43,6 @@ namespace framework { -namespace css = ::com::sun::star; class QuietInteraction; /** @short implements general mechainsm for loading documents. diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 858f7b14881b..a1b4be2418b6 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -27,10 +27,6 @@ namespace framework{ -#ifndef css // conflict with define :-( -namespace css = ::com::sun::star; -#endif - /** @short specify an exception, which can be used inside the load environment only. diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index e1ad98262b23..01d97c1d5456 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -33,10 +33,6 @@ #include <rtl/ustrbuf.hxx> -#ifndef css -namespace css = ::com::sun::star; -#endif - namespace framework{ namespace pattern{ namespace configuration{ diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 5a51422abe72..6bb2b8e4659a 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -31,10 +31,6 @@ // namespaces -#ifndef css -namespace css = ::com::sun::star; -#endif - namespace framework{ namespace pattern{ namespace frame{ diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index e91a3ba68c1e..6604488d52ba 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -36,10 +36,6 @@ //_______________________________________________ // namespaces -#ifndef css -namespace css = ::com::sun::star; -#endif - namespace framework{ diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 3176246be3ef..c676fe49ac03 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; eval:(c-set-style "bsd"); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -83,10 +83,6 @@ const char PROP_NAME[] = "Name"; namespace framework { -// may there exist already a define .-( -#ifndef css -namespace css = ::com::sun::star; -#endif using namespace com::sun::star; diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 2cb8309e78ea..3d4a794eba89 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -90,10 +90,6 @@ //_______________________________________________ // namespaces -#ifndef css -namespace css = ::com::sun::star; -#endif - using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 67f3c1df1d10..6c0e37ca0525 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -26,15 +26,10 @@ #include "tools/urlobj.hxx" -// component helper namespace -namespace css = ::com::sun::star; - // framework namespace namespace framework { -namespace css = ::com::sun::star; - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index c6fd9f185fb4..25b29a4900bc 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -50,7 +50,6 @@ #include <rtl/logfile.hxx> using namespace ::com::sun::star; -namespace css = ::com::sun::star; // Property names of a menu/menu item ItemDescriptor static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index 0aaacdfc394a..d73a058f2348 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -32,8 +32,6 @@ namespace { -namespace css = ::com::sun::star; - struct MutexHolder { ::osl::Mutex m_mutex; diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx index d92b119741af..4861849e2789 100644 --- a/jvmaccess/source/classpath.cxx +++ b/jvmaccess/source/classpath.cxx @@ -40,12 +40,6 @@ #include "jni.h" #endif -namespace { - -namespace css = ::com::sun::star; - -} - void * ::jvmaccess::ClassPath::doTranslateToUrls( css::uno::Reference< css::uno::XComponentContext > const & context, void * environment, ::rtl::OUString const & classPath) diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index d6330ff0e29f..981de86baf84 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -54,8 +54,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; -namespace css = ::com::sun::star; - //================================================================================================== #define A2OU(x) ::rtl::OUString::createFromAscii( x ) diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index 817639170ed9..47878f281154 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -33,9 +33,6 @@ class SvStream; typedef boost::shared_ptr< SvStream > SvStreamPtr; -namespace css = ::com::sun::star; - - struct LangSvcEntries { css::uno::Sequence< ::rtl::OUString > aSvcImplNames; diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx index 59d964fff5bb..bea997603bf5 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx @@ -24,9 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> -namespace css = ::com::sun::star; - - MyListener::MyListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : m_xSMGR(xSMGR) {} diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h index 25fd45cb46f2..12d485cddaaf 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h @@ -29,14 +29,12 @@ #define MYLISTENER_IMPLEMENTATIONNAME "vnd.My.impl.NewDocListener" #define MYLISTENER_SERVICENAME "vnd.My.NewDocListener" -namespace css = ::com::sun::star; - /*--------------------------------------------------- * Registriert sich in der Office Konfiguration als Job. - * Dieser wird dann für alle neu geöffneten Dokumente automatisch - * gerufen. Man bekommt eine Reference auf das geöffnete Dokument - * überreicht und kann dann prüfen, ob es ein unterstütztes Format - * hat. (Wir interessieren uns ja schließlich nur für Writer/Calc Dokumente.) + * Dieser wird dann für alle neu geöffneten Dokumente automatisch + * gerufen. Man bekommt eine Reference auf das geöffnete Dokument + * überreicht und kann dann prüfen, ob es ein unterstütztes Format + * hat. (Wir interessieren uns ja schließlich nur für Writer/Calc Dokumente.) * * @see CalcListener * @see WriterListener diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx index b7196bc123c7..f1dd0b8e37e6 100644 --- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx @@ -22,8 +22,6 @@ #include "MyProtocolHandler.h" #include "MyListener.h" -namespace css = ::com::sun::star; - extern "C" { diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 8f2fee391d51..6128bc534bf3 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -30,8 +30,6 @@ #include "oox/core/xmlfilterbase.hxx" #include "ShapeFilterBase.hxx" -namespace css = ::com::sun::star; - namespace oox { namespace shape { class ShapeFragmentHandler : public core::FragmentHandler diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 318bfa7bfa68..a6be1552f5fb 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -411,6 +411,14 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { } +namespace com { namespace sun { namespace star { } } } + +/** short-circuit extra-verbose API namespaces + + @since LibreOffice 4.0 +*/ +namespace css = ::com::sun::star; + #else /* __cplusplus */ /** diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index ed598d5311fa..41b10028f016 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -33,8 +33,6 @@ #include <filter/msfilter/mstoolbar.hxx> -namespace css = ::com::sun::star; - class ScCTBWrapper; // hmm I don't normally use these packed structures // but.. hey always good to do something different diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx index 3b07f1a06a77..26d688f3534c 100644 --- a/sc/source/ui/collab/sccollaboration.cxx +++ b/sc/source/ui/collab/sccollaboration.cxx @@ -16,8 +16,6 @@ #include <unotools/tempfile.hxx> #include <unotools/localfilehelper.hxx> -namespace css = ::com::sun::star; - ScCollaboration::ScCollaboration( ScDocShell* pScDocShell ) : mpScDocShell( pScDocShell ) { diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index 176ed1452745..8567d88fe51a 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -26,7 +26,6 @@ // component helper namespace namespace comp_DialogModelProvider { -namespace css = ::com::sun::star; using namespace ::com::sun::star; using namespace awt; using namespace lang; @@ -47,7 +46,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc /// anonymous implementation namespace namespace dlgprov { -namespace css = ::com::sun::star; using namespace ::com::sun::star; using namespace awt; using namespace lang; diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index e80e12a5669f..9ce8518a1784 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -27,8 +27,6 @@ /// anonymous implementation namespace namespace dlgprov{ -namespace css = ::com::sun::star; - class DialogModelProvider: public ::cppu::WeakImplHelper4< css::lang::XInitialization, diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 41a57fe5d9ef..657355c9aaf5 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -39,8 +39,6 @@ #include "util.hxx" -namespace css = ::com::sun::star; - namespace sf_misc { diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index faa25bb3613e..36ca322e932e 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -489,9 +489,6 @@ const Reference< XMultiServiceFactory >& xServiceManager ) extern "C" { - - namespace css = ::com::sun::star; - SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx index 87bd9b7a2551..d2bf74309236 100644 --- a/scripting/source/protocolhandler/scripthandler.hxx +++ b/scripting/source/protocolhandler/scripthandler.hxx @@ -63,8 +63,6 @@ namespace com { namespace sun { namespace star { namespace scripting_protocolhandler { -namespace css = ::com::sun::star; - class ScriptProtocolHandler : public ::cppu::WeakImplHelper4< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo, css::lang::XInitialization > diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index efb38fb0881f..37fd8d6ab349 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -36,8 +36,6 @@ #include <comphelper/stl_types.hxx> -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index cf9a109bfc21..0953a9f26f18 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp> -namespace css = ::com::sun::star; - namespace browsenodefactory { diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 86643722514b..3299fcfe35e3 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -36,8 +36,6 @@ #include "ProviderCache.hxx" -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index 8ee4c76394ea..f07a03b3df32 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -30,8 +30,6 @@ #include "ActiveMSPList.hxx" -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index eefa9fb6cf03..2021baa08e2b 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -35,8 +35,6 @@ #include "ScriptingContext.hxx" -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx index ffe114771a40..f6f1f6bfce4e 100644 --- a/scripting/source/provider/ScriptImpl.hxx +++ b/scripting/source/provider/ScriptImpl.hxx @@ -32,8 +32,6 @@ #include <drafts/com/sun/star/script/framework/provider/XScript.hpp> #include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp> -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx index a1ab2dd362d7..881445790700 100644 --- a/scripting/source/provider/ScriptingContext.hxx +++ b/scripting/source/provider/ScriptingContext.hxx @@ -36,8 +36,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/broadcasthelper.hxx> -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index ddf65c04db0c..2ceb3d875fb7 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -31,8 +31,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase3.hxx> -namespace css = ::com::sun::star; - namespace func_provider { diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index 051caaea7938..0adf85fc3182 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -43,8 +43,6 @@ class SdStyleSheet; class SdPage; struct SdStyleFamilyImpl; -namespace css = ::com::sun::star; - class SdStyleFamily : public ::cppu::WeakImplHelper7< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet > { public: diff --git a/sd/source/core/annotations/AnnotationAccess.cxx b/sd/source/core/annotations/AnnotationAccess.cxx index eaff69c0b066..a284a5663577 100644 --- a/sd/source/core/annotations/AnnotationAccess.cxx +++ b/sd/source/core/annotations/AnnotationAccess.cxx @@ -22,8 +22,6 @@ #include "cppuhelper/implbase1.hxx" #include "com/sun/star/office/XAnnotationAccess.hpp" -namespace css = ::com::sun::star; - class AnnotationAccess: public ::cppu::WeakImplHelper1< css::office::XAnnotationAccess> diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx index a0449823e160..8e1081d9d528 100644 --- a/sd/source/core/annotations/AnnotationEnumeration.cxx +++ b/sd/source/core/annotations/AnnotationEnumeration.cxx @@ -26,7 +26,6 @@ #include "com/sun/star/office/XAnnotationEnumeration.hpp" #include "sdpage.hxx" -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::office; diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 9deae0b0d0a3..e2a7f22f564e 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -25,8 +25,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include "smarttag.hxx" -namespace css = ::com::sun::star; - namespace sd { class View; diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index b3fe6fa1d40a..b34b2cd85ebe 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -43,11 +43,6 @@ #include <svtools/filter.hxx> -//----------------------------------------------------------------------------- - -namespace css = ::com::sun::star; - - // -------------------------------------------------------------------- // ----------- SdFileDialog_Imp --------------------------- // -------------------------------------------------------------------- diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 8329543bf4ee..288ad97f392b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -28,8 +28,6 @@ #include <vector> #include <boost/unordered_map.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace framework { /** This class manages the set of XConfigurationChangeListeners and diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index d154e1ccf21b..f9945892f872 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -28,8 +28,6 @@ #include <map> #include <vector> -namespace css = ::com::sun::star; - namespace sd { namespace framework { class ConfigurationControllerBroadcaster; diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 7723ad1951ca..5149b23544d2 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -28,8 +28,6 @@ #include <vector> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace framework { class ConfigurationClassifier; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index cc6a97c885a8..28b56736bfd0 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include <cppuhelper/compbase2.hxx> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper2 < diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 267aa0505196..81b1efd01d22 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -28,8 +28,6 @@ #include <comphelper/stl_types.hxx> #include <boost/unordered_map.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace framework { /** Container of resource factories of the drawing framework. diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index b1d5c8b3449b..472609a17677 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -35,8 +35,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace { diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index fd59a1eba450..377619c2ec57 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -33,8 +33,6 @@ #include <cppuhelper/basemutex.hxx> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper3 < diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 486970d8a822..88d33a4dc1ce 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -35,8 +35,6 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { class ViewShell; class ViewShellBase; diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index b880d1f199a9..4cef40a3c4bd 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -26,8 +26,6 @@ #include <vcl/vclevent.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - class WorkWindow; namespace sd { class ViewShellBase; } diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 787eb0090da0..d23a0378fca0 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -29,8 +29,6 @@ #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper2 < diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 60da4dd1609d..71e440840899 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -27,8 +27,6 @@ #include <cppuhelper/compbase1.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper1 < diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 83d908a0e074..021e62c4fc56 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -33,9 +33,6 @@ #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - - namespace { typedef ::cppu::WeakComponentImplHelper1 < diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index c183954d00cb..64897c09d5c9 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace framework { /** This module is responsible for showing the slide sorter bar and the the diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index d88b0960f4e9..8ba51892ae26 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -30,8 +30,6 @@ #include <cppuhelper/compbase1.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { class ViewShellBase; } diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index cfc1f7c32b97..d02404fa9a14 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace framework { /** This module is responsible for showing the toolpanel bar. diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index 91716f6c4757..f06870ff29bf 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -29,8 +29,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase1.hxx> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper1 < diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 69772cb18d53..f45020c7b5a0 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -27,8 +27,6 @@ #include <cppuhelper/basemutex.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace { diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 7a7a91eddf0a..7cf975da08d5 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -41,8 +41,6 @@ #include <vector> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { typedef ::cppu::ImplInheritanceHelper7 < diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index 1bfae2e973f9..740465c2934c 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -25,15 +25,12 @@ #include "sddllapi.h" -namespace css = ::com::sun::star; - /** * The port for use for the main communication between LibO and remote control app. */ #define PORT 1599 #define CHARSET RTL_TEXTENCODING_UTF8 -namespace css = ::com::sun::star; namespace sd { diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 00cf7228ed11..d572ac7a8227 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -26,8 +26,6 @@ class SdXImpressDocument; -namespace css = ::com::sun::star; - namespace com { namespace sun { namespace star { namespace drawing { class XLayer; } } } } diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 7960a124966b..21b3432b759a 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/lang/EventObject.hpp> -namespace css = ::com::sun::star; - namespace sd { class OutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 8a56fe15bd53..2fb06b520562 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -24,8 +24,6 @@ #include <cppuhelper/basemutex.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace slidesorter { class SlideSorter; } } diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e05b74d80cc7..f1411652c8b7 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -51,8 +51,6 @@ namespace embed { class XEmbeddedObject; }}}} -namespace css = ::com::sun::star; - namespace sd { class DrawDocShell; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 93c73fcc8e7a..1d07e178922b 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -39,8 +39,6 @@ #include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper2 < diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 2056b9cdeaa0..2024b3ba6ffb 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -43,8 +43,6 @@ namespace rtl { class OUString; } -namespace css = ::com::sun::star; - namespace sd { namespace framework { /** The FrameworkHelper is a convenience class that simplifies the diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 10cc2ed4e0a1..bf83930ba8ba 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -32,8 +32,6 @@ #include <boost/scoped_ptr.hpp> #include <set> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper2 < diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index b602711ddb90..49a99ce1e38d 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -32,7 +32,6 @@ class Window; -namespace css = ::com::sun::star; namespace cssu = ::com::sun::star::uno; namespace { diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 86493dc585a7..4634bed147af 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -35,8 +35,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace { typedef ::cppu::WeakComponentImplHelper2 < diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 77427608aa74..460db6db2bd6 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -26,9 +26,6 @@ #include <cppuhelper/compbase2.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - - namespace { typedef ::cppu::WeakImplHelper2 < diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index 694c14443e64..6b4e49a727f8 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -28,8 +28,6 @@ #include <vector> #include <boost/function.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace tools { /** This class gives access to the configuration. Create an object of this diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 1721000e6354..0dedecda0beb 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -26,8 +26,6 @@ #include <boost/scoped_ptr.hpp> #include <map> -namespace css = ::com::sun::star; - namespace sd { namespace tools { namespace { diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index 7b2832227ea4..239f57188494 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -25,8 +25,6 @@ #include <boost/shared_ptr.hpp> #include <com/sun/star/uno/XInterface.hpp> -namespace css = ::com::sun::star; - namespace sd { class SdGlobalResource diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index e2fe5483b49a..bf4b35fcf4a2 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -29,8 +29,6 @@ #include <tools/link.hxx> #include <vector> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { /** Each UpdateRequester handles update requests (calls to diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index efe816c2167d..b2447d1bec62 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -35,8 +35,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { namespace { diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index dbe3e80857ed..2bfe3ff1c890 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -27,8 +27,6 @@ #include <cppuhelper/compbase2.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { namespace { diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 57c5ca9c116f..5d0ceab59811 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -29,8 +29,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { namespace { diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 47adb2644b38..19cfd9110d9c 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -28,8 +28,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { namespace { diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index aa052b7a732f..1638d0067f99 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -29,8 +29,6 @@ #include <cppuhelper/compbase2.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace presenter { namespace { diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx index cd3e312f3065..10078bf63387 100644 --- a/sd/source/ui/remotecontrol/Communicator.hxx +++ b/sd/source/ui/remotecontrol/Communicator.hxx @@ -25,8 +25,6 @@ #include "BufferedStreamSocket.hxx" #define CHARSET RTL_TEXTENCODING_UTF8 -namespace css = ::com::sun::star; - namespace sd { diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx index 02486ba6a324..eafca4160b6f 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.hxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx @@ -18,8 +18,6 @@ #include <rtl/ref.hxx> #include <osl/thread.hxx> -namespace css = ::com::sun::star; - /** * The port for use for the main communication between LibO and remote control app. */ diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 86234d5383a4..aa013d766c16 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -15,8 +15,6 @@ #include "Transmitter.hxx" -namespace css = ::com::sun::star; - namespace sd { diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 63f7dc32c41b..e3385eb359fc 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -21,8 +21,6 @@ #include "Communicator.hxx" #include "Transmitter.hxx" -namespace css = ::com::sun::star; - namespace sd { /** * Slide show listener. This class can also be used for anything else that is diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index e4f19f59203f..0bee508089d5 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -21,8 +21,6 @@ #include "Transmitter.hxx" -namespace css = ::com::sun::star; - namespace sd { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index cb395e638c2e..7f87ea01ccd5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -81,8 +81,6 @@ class SfxViewFrame; class SfxRequest; -namespace css = ::com::sun::star; - namespace sd { class SlideShowView; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index c2916b1af3d4..a5879ca96dc8 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -31,8 +31,6 @@ class SdrPage; namespace sd { namespace slidesorter { namespace cache { -namespace css = ::com::sun::star; - class BitmapCache; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index e49e2aa00df5..1e1ce4df0f8b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -43,8 +43,6 @@ namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; } } } -namespace css = ::com::sun::star; - namespace sd { namespace slidesorter { namespace controller { class Animator; diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index ef32d53faa8b..197d6280b33c 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -34,8 +34,6 @@ class SdDrawDocument; #include <vector> #include <functional> -namespace css = ::com::sun::star; - class SdrPage; class SdPage; diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 702b127a4c24..1f5f70f6b9df 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -36,8 +36,6 @@ class SdrPage; namespace sd { namespace slidesorter { namespace model { -namespace css = ::com::sun::star; - /** Each PageDescriptor object represents the preview of one draw page, slide, or master page of a Draw or Impress document as they are displayed in the slide sorter. This class gives access to some associated diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 5e9a6e729019..fcc7ffa83842 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -35,8 +35,6 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sd { namespace slidesorter { namespace { diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index d23a381e5888..6a70c9ed625e 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -39,7 +39,6 @@ #include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; namespace cssu = ::com::sun::star::uno; namespace cssa = ::com::sun::star::accessibility; diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index c06f6cf58bd5..60f029629f29 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -34,8 +34,6 @@ #include <vector> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Manage a set of bitmap groups as they are used for buttons: three diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 10ccbe78958b..2c56e2195498 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -35,8 +35,6 @@ #include <boost/noncopyable.hpp> #include <rtl/ref.hxx> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterController; diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index cb7d10980a81..d9e10dd04967 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -30,8 +30,6 @@ #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Collection of functions to ease the life of a canvas user. diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 0ddb80c3843d..c38d5b44e231 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -28,8 +28,6 @@ #include <vector> #include <boost/function.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** This class gives access to the configuration. Create an object of this diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index b68638d6434c..fb66f31b2e4b 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -50,8 +50,6 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterCanvasHelper; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 1ad7fafaaaed..1c009c3af53d 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -29,8 +29,6 @@ #include <rtl/ref.hxx> #include <salhelper/timer.hxx> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { namespace { diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index ae338faaa5af..659beddcb29f 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -27,8 +27,6 @@ #include <boost/function.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { typedef ::cppu::WeakComponentImplHelper1 < diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index 7fd249e06b43..0279933fd5b2 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -28,8 +28,6 @@ #include <com/sun/star/geometry/RealRectangle2D.hpp> #include <vector> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Collection of geometry related convenience functions. diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 50e43ff97130..4d7427007377 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -30,8 +30,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -namespace css = ::com::sun::star; - namespace { typedef cppu::WeakComponentImplHelper3< css::drawing::framework::XView, diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 28fa0b5f1741..d0145afffc53 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Collection of helper functions that do not fit in anywhere else. diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index c7213da73442..012206d3386e 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -39,8 +39,6 @@ #include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace { typedef cppu::WeakComponentImplHelper5< css::awt::XWindowListener, diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index bf0620fff0c9..494dc101df5c 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -26,8 +26,6 @@ #include <rtl/ref.hxx> #include <boost/function.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterPaneContainer; diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index ef6169978a21..67bf1814c2f4 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -34,8 +34,6 @@ #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Pane used by the presenter screen. Pane objects are stored in the diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index d6f62f94f0a4..eb9fa8d9b3a3 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -38,7 +38,6 @@ #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; namespace cssu = ::com::sun::star::uno; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index 22cc87409b20..a37fde6db78e 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -44,8 +44,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterController; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index ab0f0b36c7dc..50f630038712 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -33,8 +33,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterPane; diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 2531256c40d1..951ee1564c40 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -38,8 +38,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterPaneBase; diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 9152bb519829..c03674dd69ad 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -33,8 +33,6 @@ #include <boost/scoped_ptr.hpp> #include <map> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterController; diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 34920217b42b..0d3994fa24d1 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -30,8 +30,6 @@ #include <rtl/ref.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { namespace { diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index b83e62fa6555..cc0102b235be 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -38,8 +38,6 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterController; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 191d30cac366..5bac82280025 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -32,8 +32,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterCanvasHelper; diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 0a795f667d39..d98a4860ac19 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -38,8 +38,6 @@ #include <cppuhelper/compbase4.hxx> #include <rtl/ref.hxx> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { namespace { diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 76aa439b9b96..ed676c13ccb3 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -41,8 +41,6 @@ #include <cppuhelper/basemutex.hxx> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { namespace { diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index f9b397d735d5..6212e773449e 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -38,8 +38,6 @@ #include <com/sun/star/rendering/XSprite.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -namespace css = ::com::sun::star; - namespace { typedef cppu::WeakComponentImplHelper8< css::drawing::framework::XView, diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 4cc23598e211..ca60f9711105 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** A wrapper around a com::sun::star::rendering::XCustomSprite that allows diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 4d4c33bd2b71..43687e3b87df 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -40,8 +40,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Use a sprite to display the contents and the border of a pane. Windows diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 4f9a5dadd87f..aeac34c76977 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> -namespace css = ::com::sun::star; namespace cssu = ::com::sun::star::uno; namespace cssa = ::com::sun::star::accessibility; diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 7e1c6bead071..436758f123e1 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -29,8 +29,6 @@ #include <com/sun/star/util/Color.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** A theme is a set of properties describing fonts, colors, and bitmaps to be used to draw diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 5006a4488c2d..31bff655d0ab 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -32,8 +32,6 @@ #include <boost/function.hpp> #include <vector> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** The timer allows tasks to be scheduled for execution at a specified time diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 141db899414a..1158b84a22e2 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -48,8 +48,6 @@ #include <boost/function.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace { typedef cppu::WeakComponentImplHelper5< css::awt::XWindowListener, diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index 141287fb5ee0..d2749ab44cb5 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/rendering/XBitmap.hpp> #include <boost/noncopyable.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { /** Functions for painting UI elements. diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index e590f564d7f2..80df427fa171 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -32,8 +32,6 @@ #include <rtl/ref.hxx> #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { namespace { diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index f065b7fed2cb..efbf895c6b77 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -42,8 +42,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace sdext { namespace presenter { class PresenterController; diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 486426a5879e..66b9c9c20445 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -161,8 +161,6 @@ #define XTITLECHANGEBROADCASTER ::com::sun::star::frame::XTitleChangeBroadcaster #define XUNTITLEDNUMBERS ::com::sun::star::frame::XUntitledNumbers -namespace css = ::com::sun::star; - //________________________________________________________________________________________________________ // forwards //________________________________________________________________________________________________________ diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index d79f838118f6..e4fd8cde0e8f 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -70,7 +70,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star; -namespace css = ::com::sun::star; class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateListener, XServiceInfo > { diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 6c764b8a2dc8..e7c0f6da1e62 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -113,8 +113,6 @@ using namespace ::com::sun::star::container; using namespace ::cppu; using namespace ::sfx2; -namespace css = ::com::sun::star; - //========================================================================= class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener > diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 744a0ef807d9..b85612bff2b4 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -130,8 +130,6 @@ using namespace ::com::sun::star::system; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -namespace css = com::sun::star; - /// Find the correct location of the document (LICENSE.odt, etc.), and return /// it in rURL if found. static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index d715f4d3dd88..83a2252a974b 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -42,8 +42,6 @@ #include "fileobj.hxx" #include "app.hrc" -namespace css = ::com::sun::star; - #define FILETYPE_TEXT 1 #define FILETYPE_GRF 2 #define FILETYPE_OBJECT 3 diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 56631e9ba801..3ad5d2bcd8c1 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -80,8 +80,6 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star } }; -namespace css = com::sun::star; - using sfx2::appl::ImeStatusWindow; ImeStatusWindow::ImeStatusWindow( diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index b704b38cb649..7fcc17439386 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -49,12 +49,6 @@ #include "app.hrc" -namespace { - -namespace css = com::sun::star; - -} - bool sfx2::openUriExternally( rtl::OUString const & uri, bool handleSystemShellExecuteException) { diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index c7cb563cdfb8..e7212722add6 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; struct ResIdToResName { diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 1af5157d4868..352a4fe2d928 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -61,7 +61,6 @@ #include <boost/scoped_ptr.hpp> -namespace css = ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 884ad4fc8e86..6ce7a2215a01 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -85,7 +85,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::system; using namespace ::rtl; -namespace css = ::com::sun::star; // - class PrepareListener_Impl ------------------------------------------ class PrepareListener_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener > { diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index b530da3571e9..c41257822611 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -109,9 +109,6 @@ /// anonymous implementation namespace namespace { -namespace css = ::com::sun::star; - - /// a list of attribute-lists, where attribute means name and content typedef std::vector<std::vector<std::pair<const char*, ::rtl::OUString> > > AttrVector; diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 4315fb73880d..d0e305895868 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -53,7 +53,6 @@ #include <assert.h> -namespace css = ::com::sun::star; using namespace ::com::sun::star; //======================================================================== diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 9fe53943155e..88380bbe9bf4 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -141,8 +141,6 @@ using namespace ::com::sun::star::document; using namespace ::rtl; using namespace ::cppu; -namespace css = ::com::sun::star; - //========================================================================= void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel) { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 57e8f27d4609..5dd7d63246c1 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -115,7 +115,6 @@ // namespaces //________________________________________________________________________________________________________ -namespace css = ::com::sun::star; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::com::sun::star::beans::PropertyValue; diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx index e8a3779a02c6..080713a2efeb 100644 --- a/sfx2/source/inc/SfxDocumentMetaData.hxx +++ b/sfx2/source/inc/SfxDocumentMetaData.hxx @@ -27,8 +27,6 @@ // component helper namespace namespace comp_SfxDocumentMetaData { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); @@ -39,8 +37,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( namespace comp_CompatWriterDocProps { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 56f6639fe299..a6a274fa5d40 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -27,8 +27,6 @@ #include <vcl/menu.hxx> #include <sfx2/mnuitem.hxx> -namespace css = ::com::sun::star; - class SfxThesSubMenuHelper { css::uno::Reference< css::linguistic2::XLinguServiceManager2 > m_xLngMgr; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 21b578b7146a..8218d20236f5 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -57,7 +57,6 @@ #define PROPERTYVALUE ::com::sun::star::beans::PropertyValue #define UNO_QUERY ::com::sun::star::uno::UNO_QUERY -namespace css = ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index dee5ea764914..f1b2b01bf73b 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -112,7 +112,6 @@ using ::com::sun::star::frame::XFrameActionListener; using ::com::sun::star::util::XCloseListener; using ::com::sun::star::task::XStatusIndicator; using ::com::sun::star::frame::XTitle; -namespace css = ::com::sun::star; struct GroupIDToCommandGroup { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 60bd2a758673..b97f7615ecbf 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -99,7 +99,6 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::document::XViewDataSupplier; using ::com::sun::star::container::XIndexContainer; -namespace css = ::com::sun::star; // Due to ViewFrame::Current #include "appdata.hxx" diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index f6c2eb55248f..d865d2687709 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::cppu; -namespace css = ::com::sun::star; //========================================================================= DBG_NAME(SfxViewShell) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 76d6c8c76349..fe50565536d0 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -54,8 +54,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString SAL_CALL getDefaultImplementationName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index ce5c71085f0d..87382045c24f 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -39,7 +39,6 @@ namespace gconfaccess { namespace { -namespace css = com::sun::star ; namespace uno = css::uno ; using ::rtl::OUString; diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index c93a06329dc1..34f4560a58ce 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -55,8 +55,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 62d1669de27f..1669263b3c95 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -42,7 +42,6 @@ namespace kde4access { namespace { -namespace css = com::sun::star ; namespace uno = css::uno ; } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index c453864cca1c..6e8bbd9a9cd6 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -55,8 +55,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index ccc98a7c5a21..5785579c06c2 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -38,7 +38,6 @@ namespace kdeaccess { namespace { -namespace css = com::sun::star ; namespace uno = css::uno ; } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 9efe8dbbf16f..20dd08b7bdea 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -55,8 +55,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index 00eb9bf41aee..e84be5e2285e 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -26,7 +26,6 @@ #include <rtl/string.hxx> -namespace css = com::sun::star ; namespace uno = css::uno ; namespace lang = css::lang ; diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index 7005426ca7b7..bc623709449f 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -28,7 +28,6 @@ // FIXME: stdio.h only for debugging... #include <stdio.h> -namespace css = com::sun::star; namespace uno = css::uno; namespace lang = css::lang; diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index e7120fa5ed16..dd6edf165afb 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -26,7 +26,6 @@ #include <cppuhelper/implbase2.hxx> #include <rtl/string.hxx> -namespace css = com::sun::star ; namespace uno = css::uno ; namespace lang = css::lang ; diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index a3efe312dc92..4c69d771bef2 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -64,8 +64,6 @@ using namespace cppu; namespace // private { - namespace css = com::sun::star; - Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames() { Sequence< OUString > aRet(1); diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index efc720fcb65a..30ff62deb07b 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -63,8 +63,6 @@ using namespace cppu; namespace // private { - namespace css = com::sun::star; - Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames() { Sequence< OUString > aRet(1); diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx index 94ee2e07362d..58214bcf5878 100644 --- a/shell/source/win32/simplemail/smplmailclient.hxx +++ b/shell/source/win32/simplemail/smplmailclient.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/system/XSimpleMailClient.hpp> -namespace css = ::com::sun::star; - class CSmplMailClient : public cppu::WeakImplHelper1<css::system::XSimpleMailClient> { public: diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx index 349bce9059a6..5a572c8b9a4d 100644 --- a/slideshow/source/engine/effectrewinder.hxx +++ b/slideshow/source/engine/effectrewinder.hxx @@ -31,8 +31,6 @@ #include <boost/function.hpp> #include <vector> -namespace css = ::com::sun::star; - namespace slideshow { namespace internal { class EventMultiplexer; diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 67257ea0fba8..8b565f091888 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -54,8 +54,6 @@ namespace { -namespace css = com::sun::star; - struct Result: private boost::noncopyable { osl::Condition condition; bool success; diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index cb48b6cf83fc..f60719f31519 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -55,8 +55,6 @@ #include "jvmaccess/unovirtualmachine.hxx" #include "jvmaccess/virtualmachine.hxx" -namespace css = com::sun::star; - using namespace ::com::sun::star::java; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::loader; diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index 112353531c03..236649f542be 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -28,8 +28,6 @@ #include "cppuhelper/implbase1.hxx" #include "osl/mutex.hxx" -namespace css = com::sun::star; - using stoc_javavm::InteractionRequest; namespace { diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 4667fee609fc..b0e7225dfe09 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -117,8 +117,6 @@ * com.sun.star.uno.RuntimeException. */ -namespace css = com::sun::star; - using stoc_javavm::JavaVirtualMachine; namespace { diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx index 75019ca7a162..8840451355fe 100644 --- a/stoc/source/registry_tdprovider/functiondescription.cxx +++ b/stoc/source/registry_tdprovider/functiondescription.cxx @@ -38,8 +38,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" -namespace css = com::sun::star; - using stoc::registry_tdprovider::FunctionDescription; FunctionDescription::FunctionDescription( diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx index f071f6eeb8ae..fd2d6c3343aa 100644 --- a/stoc/source/registry_tdprovider/methoddescription.cxx +++ b/stoc/source/registry_tdprovider/methoddescription.cxx @@ -35,8 +35,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" -namespace css = com::sun::star; - using stoc::registry_tdprovider::MethodDescription; namespace { diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx index 84d88c4eee61..3251fd1812d2 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.cxx +++ b/stoc/source/registry_tdprovider/structtypedescription.cxx @@ -37,7 +37,6 @@ #include <new> -namespace css = com::sun::star; using stoc::registry_tdprovider::StructTypeDescription; StructTypeDescription::StructTypeDescription( diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 24f47e057c14..e08aba30593a 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -59,8 +59,6 @@ extern rtl_StandardModuleCount g_moduleCount; namespace { -namespace css = com::sun::star; - class SimpleRegistry: public cppu::WeakImplHelper2< css::registry::XSimpleRegistry, css::lang::XServiceInfo > diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 6c007ac2f52f..eae2f4255547 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -49,8 +49,6 @@ namespace stoc { namespace simpleregistry { namespace { -namespace css = com::sun::star; - struct Implementation { rtl::OUString uri; rtl::OUString loader; diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx index b8dda62799d6..a4830a70d1a9 100644 --- a/stoc/source/tdmanager/tdmgr_common.hxx +++ b/stoc/source/tdmanager/tdmgr_common.hxx @@ -28,8 +28,6 @@ #define ARLEN(x) (sizeof (x) / sizeof *(x)) -namespace css = ::com::sun::star; - namespace stoc_tdmgr { extern rtl_StandardModuleCount g_moduleCount; diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index b67ab7924b5b..cad73741f527 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -43,8 +43,6 @@ #include <new> -namespace css = com::sun::star; - namespace { class Translator: public cppu::WeakImplHelper2< diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index d2e7b0af2469..2dafb685a8d9 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -27,7 +27,6 @@ #include "rtl/ustring.hxx" #include "sal/types.h" -namespace css = com::sun::star; using stoc::uriproc::UriReference; UriReference::UriReference( diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index c89777b0d8e0..ef947c1f90e4 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -51,8 +51,6 @@ #include <new> #include <vector> -namespace css = com::sun::star; - namespace { //TODO: move comphelper::string::misc into something like diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index e9af16695485..47b2bc7b965c 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -48,8 +48,6 @@ namespace { -namespace css = ::com::sun::star; - bool parseSchemeSpecificPart(::rtl::OUString const & part) { // Liberally accepts both an empty opaque_part and an opaque_part that // starts with a non-escaped "/": diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 09c57fc80f72..9db6f7300a5f 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -43,8 +43,6 @@ #include <new> -namespace css = com::sun::star; - namespace { int getHexWeight(sal_Unicode c) { diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index e0843277c02a..50a0fbdd4c6d 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -45,8 +45,6 @@ #include <new> -namespace css = com::sun::star; - namespace { class Factory: public cppu::WeakImplHelper2< diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 7fa6947611b7..4e03b5aaf68b 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -56,8 +56,6 @@ #include <iostream> #include <ostream> -namespace css = com::sun::star; - namespace { class Service: public cppu::WeakImplHelper1< css::lang::XMain > { diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index dc0d29e5d027..9e45fb3ff27c 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -54,8 +54,6 @@ #include <iostream> #include <ostream> -namespace css = com::sun::star; - namespace { class Service: public cppu::WeakImplHelper1< css::lang::XMain > { diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index c2b4d84e69f1..34a3b2d9c0c1 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -48,8 +48,6 @@ #include <cstdlib> -namespace css = com::sun::star; - namespace { #define TEST_ASSERT_EQUAL(token1, token2, token3, expected, actual) \ diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 179ef3a2289e..1f16193196f5 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -64,8 +64,6 @@ namespace com { namespace sun { namespace star { namespace ucb { namespace { -namespace css = com::sun::star; - // This class only implements that subset of functionality of a proper // css::ucb::Content that is known to be needed here: class Content: diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index 810b1c163c3c..29868af5e5f7 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -44,8 +44,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString toString(css::lang::Locale const & locale) { SAL_WARN_IF( locale.Language.indexOf('-') != -1, "svl", diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 1659d0a89134..e8129d35a6c9 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -32,12 +32,6 @@ #include <tools/debug.hxx> //----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - -//----------------------------------------------- ItemHolder2::ItemHolder2() : ItemHolderMutexBase() { diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index d8b43bde8ece..1e0db6bfa715 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -24,12 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XEventListener.hpp> -//----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - class ItemHolder2 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > { diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index a87c36b334d7..22d5cad97847 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -35,8 +35,6 @@ namespace { -namespace css = com::sun::star; - class ResMgrMap: private boost::noncopyable { public: ~ResMgrMap(); diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 35bd41ed265d..2e7e2bd5b19b 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -44,7 +44,6 @@ #include <unotools/charclass.hxx> #include "rtl/instance.hxx" -namespace css = com::sun::star; using namespace com::sun::star; //============================================================================ diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 841d0d56e8fd..e35e3b89b4a8 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -namespace css = com::sun::star; using rtl::OUString; // ----------------------------------------------------------------------- diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index f8c380f95594..b0f3b5bdbf4a 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <svl/svldllapi.h> -namespace css = com::sun::star; using css::uno::Reference; using css::uno::Sequence; using rtl::OUString; diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index b3788d41eea4..b3682858e77e 100644 --- a/svtools/inc/svtools/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -36,8 +36,6 @@ #include <osl/mutex.h> -namespace css = ::com::sun::star; - namespace svt { diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 2b1911ddcbfe..92ed2bd0f72b 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -40,8 +40,6 @@ using namespace utl; using namespace com::sun::star::uno; -namespace css = com::sun::star; - #define HELP_TIP_TIMEOUT 0xffff // max. timeout setting to pretend a non-timeout namespace diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 8248758c411c..beb5e478c585 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -37,12 +37,6 @@ #include <tools/debug.hxx> -//----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - namespace svtools { //----------------------------------------------- ItemHolder2::ItemHolder2() diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index 141b57250444..9d39e189e308 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -24,11 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XEventListener.hpp> -//----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - namespace svtools { diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 3d0c0c0d07bd..84ba19d6b0ff 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -74,7 +74,6 @@ using namespace ::utl; using namespace ::rtl; using namespace ::osl; using namespace ::com::sun::star::uno; -namespace css = com::sun::star; // ----------- // - statics - diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 379355b28d65..aa7783b803fc 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -41,12 +41,6 @@ namespace svtools { -namespace { - -namespace css = com::sun::star; - -} - ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits), m_pInfoTable(new SvtDocInfoTable_Impl), diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 2e8428f935cf..faf05df42e4b 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -23,8 +23,6 @@ namespace { -namespace css = com::sun::star; - class RestartDialog: public ModalDialog { public: RestartDialog(Window * parent, svtools::RestartReason reason): diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index eb4277687130..4c12b6c55c36 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -33,8 +33,6 @@ MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId ) { } -namespace css = ::com::sun::star; - // virtual ::css::uno::Reference< ::css::awt::XWindowPeer > MultiLineEdit::GetComponentInterface(sal_Bool bCreate) diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index 59eee86937c3..082897854eaa 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -22,8 +22,6 @@ #include <vcl/textview.hxx> #include "svtaccessiblefactory.hxx" -namespace css = ::com::sun::star; - namespace svt { TextWindowPeer::TextWindowPeer(::TextView & rView, bool bCompoundControlChild): diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index bcf943045bd0..144a211f25f4 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -38,8 +38,6 @@ #include <osl/mutex.hxx> -namespace css = ::com::sun::star; - namespace svt { diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 21044043495d..47a1d00a8f7a 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -39,7 +39,6 @@ #include <map> #include <vector> -namespace css = ::com::sun::star ; namespace svx { diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index dd0956940cee..a108d84549ff 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -35,8 +35,6 @@ namespace { -namespace css = com::sun::star; - class ColorNameMap: private boost::noncopyable { public: ColorNameMap(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 6ce25d7fb68f..3f9d4de11c3f 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -60,8 +60,6 @@ namespace svx{ namespace DocRecovery{ -namespace css = ::com::sun::star; - using namespace ::rtl; using namespace ::osl; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 2ec92b89ace4..3d6b18bfd280 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -66,8 +66,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::dom::events; using namespace ::svx; -namespace css = ::com::sun::star; - #define CFGNAME_DATANAVIGATOR DEFINE_CONST_UNICODE("DataNavigator") #define CFGNAME_SHOWDETAILS DEFINE_CONST_UNICODE("ShowDetails") #define MSG_VARIABLE DEFINE_CONST_UNICODE("%1") diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 6802827ac3bc..f3e47e0cbc89 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -80,8 +80,6 @@ #define DLG_RET_OK_AUTOLUNCH 101 -namespace css = ::com::sun::star; - namespace svx{ namespace DocRecovery{ diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 4ec8ddc94873..c94271774b37 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -32,8 +32,6 @@ namespace svx { -// Dont export this header ... Otherwise you have to remove this namespace alias! -namespace css = ::com::sun::star; namespace svxdr = ::svx::DocRecovery; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index e987e7a870cf..c3e7c45be034 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -39,7 +39,6 @@ namespace svx { -namespace css = ::com::sun::star; namespace svxdr = ::svx::DocRecovery; using namespace ::rtl; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 1101bcd80ffc..49fe00c4011f 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -51,9 +51,6 @@ using namespace ::rtl; using ::com::sun::star::uno::XInterface; -namespace css = ::com::sun::star; - - //------------------------------------------------------------------------ // SvxTextEditSourceImpl //------------------------------------------------------------------------ diff --git a/sw/inc/unoflatpara.hxx b/sw/inc/unoflatpara.hxx index 310ff80cd7af..6de6eae6a81f 100644 --- a/sw/inc/unoflatpara.hxx +++ b/sw/inc/unoflatpara.hxx @@ -30,8 +30,6 @@ #include <set> -namespace css = com::sun::star; - namespace com { namespace sun { namespace star { namespace container { class XStringKeyMap; } } } } diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 7a302012bc42..a43ce05fb8a7 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -107,8 +107,6 @@ public Ifc31, public Ifc32 __DEF_IMPLHELPER_EX( 32 ) -namespace css = ::com::sun::star; - class SwDoc; class SwDocShell; class UnoActionContext; diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index bff4f6cc1b03..2936edc91685 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -36,8 +36,6 @@ #include <vcl/window.hxx> -namespace css = ::com::sun::star; - namespace sw { namespace access { SwAccessibleChild::SwAccessibleChild() diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 138a54bf8c60..70d5b97ef3f8 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -29,8 +29,6 @@ #include <docary.hxx> #include <redline.hxx> -namespace css = com::sun::star; - namespace { void initChangeTrackTextMarkupLists( const SwTxtFrm& rTxtFrm, SwWrongList*& opChangeTrackInsertionTextMarkupList, diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index fc11ee0ff02e..947596ca5988 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -26,8 +26,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/frame/XFramesSupplier.hpp> -namespace css = ::com::sun::star; - /** thread to cancel a give list of cancellable jobs helper class for FinalThreadManager diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 954958f92da5..85b8a902ab6f 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -33,8 +33,6 @@ #include <filter/msfilter/mstoolbar.hxx> -namespace css = ::com::sun::star; - class Xst : public TBBase { rtl::OUString sString; diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index d55bf9a99bab..17ca3caa3df2 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -51,8 +51,6 @@ #include <shellres.hxx> #include <SwRewriter.hxx> -namespace css = ::com::sun::star; - namespace sw { namespace sidebarwindows { SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin, diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx index 4e78579ae4c8..52d3047a2243 100644 --- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx @@ -31,8 +31,6 @@ #include <editeng/outliner.hxx> -namespace css = ::com::sun::star; - namespace sw { namespace sidebarwindows { // ============================================================================= diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 6dd5f53c1ea7..8ad2c153b502 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -70,8 +70,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/shadowprimitive2d.hxx> -namespace css = ::com::sun::star; - namespace sw { namespace sidebarwindows { #define METABUTTON_WIDTH 16 diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx index 7fbb17cf82df..a54286497c94 100644 --- a/sw/source/ui/docvw/SidebarWinAcc.cxx +++ b/sw/source/ui/docvw/SidebarWinAcc.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> -namespace css = ::com::sun::star; - namespace sw { namespace sidebarwindows { // ============================================================================= diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 213dabfe98ef..1e4058657c97 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -46,12 +46,6 @@ #include <helpid.h> #include <deque> -namespace { - -namespace css = com::sun::star; - -} - struct SwTextPortion { sal_uInt16 nLine; diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx index 862726119d71..fc07b7561d32 100644 --- a/sw/source/ui/wrtsh/navmgr.cxx +++ b/sw/source/ui/wrtsh/navmgr.cxx @@ -38,8 +38,6 @@ #include <com/sun/star/frame/XLayoutManager.hpp> -namespace css = ::com::sun::star; - /** * If SMART is defined, the navigation history has recency with temporal ordering enhancement, * as described on http://zing.ncsl.nist.gov/hfweb/proceedings/greenberg/ diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 8208aa5465b7..2d452f9487ba 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -58,7 +58,6 @@ namespace { -namespace css = ::com::sun::star; namespace ttb = ::test::testtools::bridgetest; class Impl: public ::cppu::WeakImplHelper1< css::lang::XInitialization > { public: diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index 0cbd686d1dd9..3e99f73923d0 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -47,8 +47,6 @@ namespace { -namespace css = ::com::sun::star; - static char const KEY[] = "testtools.bridgetest.Key"; static char const VALUE[] = "good"; diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index c3cdc08294b2..e7085ef636e8 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -37,8 +37,6 @@ #include <sstream> -namespace css = com::sun::star; - namespace { struct CheckFailed { diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index a147c2a18968..4c5a981f078a 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -31,8 +31,6 @@ // component helper namespace namespace comp_AsyncCallback { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); @@ -45,8 +43,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc /// anonymous implementation namespace namespace { -namespace css = ::com::sun::star; - class AsyncCallback: public ::cppu::WeakImplHelper2< css::lang::XServiceInfo, diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index b59b9e97ce7f..be0712a0e152 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -641,8 +641,6 @@ void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString // BEGIN ANONYMOUS NAMESPACE namespace { - namespace css = ::com::sun::star; - Image lcl_XGraphic2VCLImage( const css::uno::Reference< css::graphic::XGraphic >& xGraphic, sal_Bool bResize ) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f54f8b97b1f0..8879054c8cea 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -124,8 +124,6 @@ using org::libreoffice::touch::ByteBufferWrapper; #include <comphelper/processfactory.hxx> #include <toolkit/awt/scrollabledialog.hxx> -namespace css = ::com::sun::star; - #define VCLWINDOW_FRAMEWINDOW 0x1000 #define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 26b4872a0a37..b924e8f790df 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -48,8 +48,6 @@ #include <map> #include <set> -namespace css = ::com::sun::star; - #if defined SAL_LOG_INFO namespace { diff --git a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx b/ucbhelper/inc/ucbhelper/fd_inputstream.hxx index aa9603bf89f1..df3d6e386b67 100644 --- a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx +++ b/ucbhelper/inc/ucbhelper/fd_inputstream.hxx @@ -35,8 +35,6 @@ namespace ucbhelper /** Implements a seekable InputStream * working on a buffer. */ - namespace css = com::sun::star; - class UCBHELPER_DLLPUBLIC FdInputStream : public cppu::OWeakObject, public com::sun::star::io::XInputStream, diff --git a/ucbhelper/inc/ucbhelper/std_inputstream.hxx b/ucbhelper/inc/ucbhelper/std_inputstream.hxx index 23ab4100b945..92c9577519bc 100644 --- a/ucbhelper/inc/ucbhelper/std_inputstream.hxx +++ b/ucbhelper/inc/ucbhelper/std_inputstream.hxx @@ -24,8 +24,6 @@ namespace ucbhelper { - namespace css = com::sun::star; - /** Implements a seekable InputStream * working on an std::istream */ diff --git a/ucbhelper/inc/ucbhelper/std_outputstream.hxx b/ucbhelper/inc/ucbhelper/std_outputstream.hxx index 38f1b4fddbc6..d0ad4a660248 100644 --- a/ucbhelper/inc/ucbhelper/std_outputstream.hxx +++ b/ucbhelper/inc/ucbhelper/std_outputstream.hxx @@ -21,8 +21,6 @@ namespace ucbhelper { - namespace css = com::sun::star; - /** Implements a OutputStream * working on an std::ostream */ diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index ee48a9e8be7f..b925f7ca290f 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -22,9 +22,6 @@ namespace ucbhelper{ -namespace css = ::com::sun::star; - - InterceptedInteraction::InterceptedInteraction() { } diff --git a/ucbhelper/source/provider/getcomponentcontext.cxx b/ucbhelper/source/provider/getcomponentcontext.cxx index 41f3923988e8..5dddf15db989 100644 --- a/ucbhelper/source/provider/getcomponentcontext.cxx +++ b/ucbhelper/source/provider/getcomponentcontext.cxx @@ -25,8 +25,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "ucbhelper/getcomponentcontext.hxx" -namespace { namespace css = com::sun::star; } - css::uno::Reference< css::uno::XComponentContext > ucbhelper::getComponentContext( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 21dec5f8ec40..8f42cd4d575a 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -282,7 +282,7 @@ void generateXPropertyAccessBodies(std::ostream& o, o << "css::uno::Sequence< css::beans::PropertyValue > SAL_CALL " << classname << "getPropertyValues( ) throw (" - "::com::sun::star::uno::RuntimeException)\n{\n" + "css::uno::RuntimeException)\n{\n" " return ::cppu::PropertySetMixin< " << propertyhelper << " >::getPropertyValues();\n}\n\n"; @@ -297,7 +297,7 @@ void generateXPropertyAccessBodies(std::ostream& o, void generateXLocalizable(std::ostream& o, const OString & classname) { - o << "// ::com::sun::star::lang::XLocalizable:\n" + o << "// css::lang::XLocalizable:\n" "void SAL_CALL " << classname << "setLocale(const css::lang::" "Locale & eLocale) throw (css::uno::RuntimeException)\n{\n" " m_locale = eLocale;\n}\n\n" @@ -307,7 +307,7 @@ void generateXLocalizable(std::ostream& o, const OString & classname) void generateXAddInBodies(std::ostream& o, const OString & classname) { - o << "// ::com::sun::star::sheet::XAddIn:\n"; + o << "// css::sheet::XAddIn:\n"; o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticFuntionName(" "const ::rtl::OUString & aDisplayName) throw (css::uno::RuntimeException)" @@ -362,7 +362,7 @@ void generateXAddInBodies(std::ostream& o, const OString & classname) void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classname) { - o << "// ::com::sun::star::sheet::XCompatibilityNames:\n" + o << "// css::sheet::XCompatibilityNames:\n" "css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL " << classname << "getCompatibilityNames(const ::rtl::OUString & aProgrammaticName) throw " "(css::uno::RuntimeException)\n{\n css::uno::Sequence< " @@ -401,7 +401,7 @@ void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classnam void generateXInitialization(std::ostream& o, const OString & classname) { - o << "// ::com::sun::star::lang::XInitialization:\n" + o << "// css::lang::XInitialization:\n" "void SAL_CALL " << classname << "initialize( const css::uno::Sequence< " "css::uno::Any >& aArguments ) " "throw (css::uno::Exception, css::uno::RuntimeException)\n{\n" @@ -416,7 +416,7 @@ void generateXDispatch(std::ostream& o, { // com.sun.star.frame.XDispatch // dispatch - o << "// ::com::sun::star::frame::XDispatch:\n" + o << "// css::frame::XDispatch:\n" "void SAL_CALL " << classname << "dispatch( const css::util::URL& aURL, const " "css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw" "(css::uno::RuntimeException)\n{\n"; @@ -458,7 +458,7 @@ void generateXDispatchProvider(std::ostream& o, // com.sun.star.frame.XDispatchProvider // queryDispatch - o << "// ::com::sun::star::frame::XDispatchProvider:\n" + o << "// css::frame::XDispatchProvider:\n" "css::uno::Reference< css::frame::XDispatch > SAL_CALL " << classname << "queryDispatch( const css::util::URL& aURL," " const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) " @@ -645,7 +645,7 @@ OString generateClassDefinition(std::ostream& o, interfaces.begin(); while (iter != interfaces.end()) { - o << "\n " << scopedCppName(*iter, false, true); + o << "\n " << scopedCppName(*iter); ++iter; if (iter != interfaces.end()) o << ","; @@ -656,7 +656,7 @@ OString generateClassDefinition(std::ostream& o, if (propertyhelper.getLength() > 1) { o << ",\n public ::cppu::PropertySetMixin< " - << scopedCppName(propertyhelper, false, true) << " >"; + << scopedCppName(propertyhelper) << " >"; } o << "\n{\npublic:\n" @@ -674,7 +674,7 @@ OString generateClassDefinition(std::ostream& o, // overload queryInterface if (propertyhelper.getLength() > 1) { - o << " // ::com::sun::star::uno::XInterface:\n" + o << " // css::uno::XInterface:\n" " virtual css::uno::Any SAL_CALL queryInterface(" "css::uno::Type const & type) throw (" "css::uno::RuntimeException);\n"; @@ -686,7 +686,7 @@ OString generateClassDefinition(std::ostream& o, interfaces.begin(); while (iter != interfaces.end()) { - buffer.append(scopedCppName(*iter, false, true)); + buffer.append(scopedCppName(*iter)); ++iter; if (iter != interfaces.end()) buffer.append(", "); @@ -797,7 +797,7 @@ OString generateClassDefinition(std::ostream& o, boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { - o << "\n " << scopedCppName(*iter, false, true); + o << "\n " << scopedCppName(*iter); ++iter; if (iter != interfaces.end()) o << ","; @@ -807,7 +807,7 @@ OString generateClassDefinition(std::ostream& o, } if (propertyhelper.getLength() > 1) { o << " ::cppu::PropertySetMixin< " - << scopedCppName(propertyhelper, false, true) << " >(\n" + << scopedCppName(propertyhelper) << " >(\n" << " context, static_cast< Implements >(\n "; OStringBuffer buffer(128); if (propinterfaces.find("com/sun/star/beans/XPropertySet") @@ -928,7 +928,7 @@ void generateQueryInterface(std::ostream& o, interfaces.begin(); while (iter != interfaces.end()) { - o << "\n " << scopedCppName(*iter, false, true); + o << "\n " << scopedCppName(*iter); ++iter; if (iter != interfaces.end()) o << ","; diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index b66a049c0342..7bac1f765a36 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -93,7 +93,7 @@ void printType(std::ostream & o, o << scopedCppName(codemaker::cpp::translateUnoToCppType( sort, typeClass, name, false), - false, options.shortnames && referenceType > 0); + options.shortnames && referenceType > 0); if (typeClass == RT_TYPE_INTERFACE && referenceType > 0) o << " >"; @@ -391,17 +391,17 @@ void printMethods(std::ostream & o, if ( type.equals("com/sun/star/beans/XPropertySet")) { generated.add(type); generateXPropertySetBodies( - o, classname, scopedCppName(propertyhelper, false, true)); + o, classname, scopedCppName(propertyhelper)); return; } else if ( type.equals("com/sun/star/beans/XFastPropertySet")) { generated.add(type); generateXFastPropertySetBodies( - o, classname, scopedCppName(propertyhelper, false, true)); + o, classname, scopedCppName(propertyhelper)); return; } else if ( type.equals("com/sun/star/beans/XPropertyAccess")) { generated.add(type); generateXPropertyAccessBodies( - o, classname, scopedCppName(propertyhelper, false, true)); + o, classname, scopedCppName(propertyhelper)); return; } } diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 96f9a8a6252f..69c28283edcd 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -36,12 +36,6 @@ #include "getargument.hxx" -namespace { - -namespace css = com::sun::star; - -} - namespace test { OfficeConnection::OfficeConnection(): process_(0) {} diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx index 4805a9f39903..b92069b418f7 100644 --- a/unotest/source/cpp/toabsolutefileurl.cxx +++ b/unotest/source/cpp/toabsolutefileurl.cxx @@ -27,12 +27,6 @@ #include "rtl/ustring.hxx" #include "unotest/toabsolutefileurl.hxx" -namespace { - -namespace css = com::sun::star; - -} - namespace test { rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index 1ee70993437e..b28e075f4ff3 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -36,8 +36,6 @@ namespace { -namespace css = com::sun::star; - // Best effort conversion: std::string convert(rtl::OUString const & s16) { rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding())); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index a4589601e37c..b81bbccf71fe 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -39,8 +39,6 @@ namespace { -namespace css = com::sun::star; - class RegisterConfigItemHelper: private boost::noncopyable { public: RegisterConfigItemHelper( diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 141555044ec7..aed1f4ba13c8 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -50,8 +50,6 @@ using namespace ::osl ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::beans ; -namespace css = ::com::sun::star; - namespace { static const ::sal_Int32 s_nOffsetURL = 0; static const ::sal_Int32 s_nOffsetFilter = 1; diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 19ff19d95e36..0bac77328ccb 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -53,12 +53,6 @@ #include <unotools/syslocaleoptions.hxx> //----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - -//----------------------------------------------- ItemHolder1::ItemHolder1() : ItemHolderMutexBase() { diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 5133f777edc1..9051e18adc83 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -24,12 +24,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XEventListener.hpp> -//----------------------------------------------- -// namespaces - -namespace css = ::com::sun::star; - - class ItemHolder1 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > { diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 1d008d74d65b..4c03a2cd93dd 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -40,14 +40,6 @@ #include "itemholder1.hxx" -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - -#ifndef css -namespace css = ::com::sun::star; -#endif - /*-************************************************************************************************************//** @descr These values are used to define neccessary keys from our configuration management to support all functionality of these implementation. diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 7f43c5a6be16..16186382a8b1 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star::uno; using ::rtl::OUString; -namespace css = ::com::sun::star; - class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 688e1ec0d1ec..461f6fcbb338 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -32,12 +32,6 @@ #include <itemholder1.hxx> -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - -namespace css = ::com::sun::star; - #ifdef CONST_ASCII #error "Who define CONST_ASCII before! I use it to create const ascii strings ..." #else diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx index e0378af36a59..074da8363e64 100644 --- a/unotools/source/i18n/instance.hxx +++ b/unotools/source/i18n/instance.hxx @@ -32,8 +32,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/strbuf.hxx> -namespace css = ::com::sun::star; - // Helper to share code between activators with a fallback MSF. // Potentially this may also needs to find the library the component // is implemented inside, but at least centralises this. diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 1b6902eceb82..2961fff80a24 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -60,8 +60,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString canonic(rtl::OUString const & url) { INetURLObject o(url); SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"'); diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 963ab636fc17..62d4fb77ddb8 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -23,8 +23,6 @@ #include <osl/file.hxx> #include <unotools/configmgr.hxx> -namespace css = com::sun::star; - OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context) : ::cppu::PropertySetMixin< ::css::io::XTempFile >( context diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 0f6f012c01b0..fd949ce641fe 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -30,8 +30,6 @@ /// anonymous implementation namespace namespace { -namespace css = ::com::sun::star; - class CBlankNode: public ::cppu::WeakImplHelper3< css::lang::XServiceInfo, diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index fb7251d2c96b..2261d45819bd 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -32,8 +32,6 @@ /// anonymous implementation namespace namespace { -namespace css = ::com::sun::star; - class CLiteral: public ::cppu::WeakImplHelper3< css::lang::XServiceInfo, diff --git a/unoxml/source/rdf/CNodes.hxx b/unoxml/source/rdf/CNodes.hxx index 432107fa4cb5..87e1344c7282 100644 --- a/unoxml/source/rdf/CNodes.hxx +++ b/unoxml/source/rdf/CNodes.hxx @@ -27,8 +27,6 @@ // component helper namespace namespace comp_CBlankNode { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); @@ -40,8 +38,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc // component helper namespace namespace comp_CURI { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); @@ -53,8 +49,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc // component helper namespace namespace comp_CLiteral { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index e073aa655e94..d0955378e60f 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -31,8 +31,6 @@ /// anonymous implementation namespace namespace { -namespace css = ::com::sun::star; - class CURI: public ::cppu::WeakImplHelper3< css::lang::XServiceInfo, diff --git a/unoxml/source/rdf/librdf_repository.hxx b/unoxml/source/rdf/librdf_repository.hxx index f5a84e5cd81c..5cfe623b8999 100644 --- a/unoxml/source/rdf/librdf_repository.hxx +++ b/unoxml/source/rdf/librdf_repository.hxx @@ -27,8 +27,6 @@ // component helper namespace namespace comp_librdf_Repository { -namespace css = ::com::sun::star; - // component and service helper functions: ::rtl::OUString SAL_CALL _getImplementationName(); css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 54e6c6890018..92aa1257ea4d 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -56,8 +56,6 @@ #include "test/types/TestException.hpp" #include "test/types/XTest.hpp" -namespace css = ::com::sun::star; - namespace { class Service: public ::cppu::WeakImplHelper1< ::css::lang::XMain > { diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 8d6e9a9fe4be..70dfa142bef7 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -39,8 +39,6 @@ #include "test/types/Data.hpp" #include "test/types/XServer.hpp" -namespace css = ::com::sun::star; - namespace { class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > { diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index d8fc62408eff..d1d641582b96 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -37,8 +37,6 @@ #include "test/types/TestException.hpp" #include "test/types/XTest.hpp" -namespace css = com::sun::star; - namespace { class Service: public cppu::WeakImplHelper1< test::types::XTest > { diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 5dc0344858de..b10a2bfb24b4 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -35,9 +35,7 @@ namespace security { #include <com/sun/star/uno/Sequence.hxx> -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; -namespace css = ::com::sun::star; class MacroWarning : public ModalDialog { diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index e5601c33a8ff..b56d3f3360ea 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -27,7 +27,7 @@ //#define VBAHELPER_DLLIMPLEMENTATION #include <vbahelper/vbadllapi.h> #include <memory> -namespace css = ::com::sun::star; + namespace ooo { namespace vba diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index be84387d9f6a..f6b1d5e9ec96 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -40,7 +40,6 @@ #include <memory> #include "vbaaccesshelper.hxx" -namespace css = ::com::sun::star; namespace ooo { namespace vba diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index cae0bc93c664..aa84fc749d34 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -79,12 +79,6 @@ #define PRINTER_METRICDIR "fontmetric" -namespace { - -namespace css = com::sun::star; - -} - using namespace vcl; using namespace utl; using namespace psp; diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 543fe7197d00..728a1df66ef2 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -36,12 +36,6 @@ #include <list> -namespace { - -namespace css = com::sun::star; - -} - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b238497e3a00..d933348b5905 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -54,12 +54,6 @@ #include <stdio.h> -namespace { - -namespace css = com::sun::star; - -} - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::awt; diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index a67e8f56f0cf..79541e67d44d 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -63,8 +63,6 @@ namespace { -namespace css = com::sun::star; - rtl::OUString createPath( rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale) { diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index d63b4b123390..69136d6b0b05 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -24,12 +24,6 @@ #include "svdata.hxx" #include "salinst.hxx" -namespace { - -namespace css = com::sun::star; - -} - using namespace osl; using namespace vcl; using namespace com::sun::star::uno; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 4fca0b17d7f1..20f143124080 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -474,8 +474,6 @@ Dialog::Dialog( WindowType nType ) rtl::OUString VclBuilderContainer::getUIRootDir() { - namespace css = ::com::sun::star; - /*to-do, check if user config has an override before using shared one, etc*/ css::uno::Reference< css::beans::XPropertySet > xPathSettings( ::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS), diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 1421a5b09870..9c11fe0587d2 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -71,12 +71,6 @@ EnterWindowMask |\ LeaveWindowMask -namespace { - -namespace css = com::sun::star; - -} - using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::lang; diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 056d791888fc..dc2ff1766ee2 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -29,12 +29,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/compbase1.hxx> -namespace { - -namespace css = com::sun::star; - -} - using namespace cppu; using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer::clipboard; diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx index 3af8b5d36867..120c4e70a74f 100644 --- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx @@ -25,8 +25,6 @@ #include "cppuhelper/implbase1.hxx" #include "com/sun/star/xml/sax/XFastTokenHandler.hpp" -namespace css = ::com::sun::star; - namespace writerfilter { namespace ooxml { diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx index 3bb72156c5ab..6155a094a010 100644 --- a/xmlreader/source/span.cxx +++ b/xmlreader/source/span.cxx @@ -32,12 +32,6 @@ namespace xmlreader { -namespace { - -namespace css = com::sun::star; - -} - rtl::OUString Span::convertFromUtf8() const { assert(is()); rtl_uString * s = 0; diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index fcf6e157a246..129ee5310e94 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -41,8 +41,6 @@ namespace xmlreader { namespace { -namespace css = com::sun::star; - bool isSpace(char c) { switch (c) { case '\x09': diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx index a03d42b69173..3b836de6c449 100644 --- a/xmlscript/source/xmldlg_imexp/exp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx @@ -31,8 +31,6 @@ #include <vector> -namespace css = ::com::sun::star; - namespace xmlscript { diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 8700c441dcc1..d82dffaf8dd1 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -38,8 +38,6 @@ #include <vector> #include <boost/shared_ptr.hpp> -namespace css = ::com::sun::star; - namespace xmlscript { diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index cf858008c681..8e9b2bac314c 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -37,7 +37,6 @@ namespace xml { namespace crypto { #include <com/sun/star/uno/Sequence.hxx> #include <xmlsecurity/sigstruct.hxx> -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; namespace dcss = ::com::sun::star; diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 91def5575271..e7d50d1d6944 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -39,7 +39,6 @@ namespace xml { namespace crypto { class XSecurityEnvironment; }} }}} -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; namespace dcss = ::com::sun::star; diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 5a1812e3ff6a..14fbc9a7cf5f 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -48,7 +48,6 @@ namespace xml { namespace dom { class XDocumentBuilder; } } }}} -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; class HeaderBar; diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx index c00f15be05f4..c4d6fb15cb43 100644 --- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx @@ -38,8 +38,6 @@ namespace embed { class XStorage; } }}} -namespace css = com::sun::star; - /********************************************************** DocumentSignatureHelper diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 967dc59a989f..9450ffa425a2 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -37,7 +37,6 @@ namespace xml { namespace crypto { class XSecurityEnvironment; }} }}} -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; namespace dcss = ::com::sun::star; diff --git a/xmlsecurity/inc/xmlsecurity/warnings.hxx b/xmlsecurity/inc/xmlsecurity/warnings.hxx index 480895327203..a3690b25d35a 100644 --- a/xmlsecurity/inc/xmlsecurity/warnings.hxx +++ b/xmlsecurity/inc/xmlsecurity/warnings.hxx @@ -37,7 +37,6 @@ namespace xml { namespace crypto { #include <com/sun/star/uno/Sequence.hxx> #include <xmlsecurity/sigstruct.hxx> -namespace css = com::sun::star; namespace cssu = com::sun::star::uno; namespace dcss = ::com::sun::star; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index edf21ab11b92..b4fbde86ef52 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 7e163193917b..dd4d2198ff62 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; - namespace { diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index d8653eaef442..ddd929a13e3e 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -69,7 +69,6 @@ using namespace ::com::sun::star::security; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -namespace css = ::com::sun::star; namespace { diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 1f08f4f95f5c..2d7a921cc893 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -32,10 +32,8 @@ #include "rtl/uri.hxx" using namespace ::com::sun::star::uno; -namespace css = ::com::sun::star; using rtl::OUString; - namespace { ::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index) diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index af92f34c0267..1e7c9c39d06e 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -69,7 +69,6 @@ #include <secmod.h> #include <nssckbi.h> -namespace css = ::com::sun::star; namespace cssu = css::uno; namespace cssl = css::lang; diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 666e3490ba7f..623919ae86a7 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -59,7 +59,6 @@ #include <nssckbi.h> -namespace css = ::com::sun::star; namespace cssl = css::lang; namespace cssxc = css::xml::crypto; |