diff options
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/inc/comphelper/configurationhelper.hxx | 11 | ||||
-rw-r--r-- | comphelper/inc/comphelper/numberedcollection.hxx | 9 | ||||
-rw-r--r-- | comphelper/inc/comphelper/servicedecl.hxx | 1 | ||||
-rw-r--r-- | comphelper/qa/weakbag/test_weakbag.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/misc/configuration.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/misc/configurationhelper.cxx | 3 | ||||
-rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 3 | ||||
-rw-r--r-- | comphelper/source/misc/numberedcollection.cxx | 3 | ||||
-rw-r--r-- | comphelper/source/misc/sequenceashashmap.cxx | 3 | ||||
-rw-r--r-- | comphelper/source/misc/stillreadwriteinteraction.cxx | 2 |
10 files changed, 0 insertions, 39 deletions
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) |