diff options
34 files changed, 53 insertions, 159 deletions
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index ec03c4a87095..1cfdc81f36a2 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -56,7 +56,7 @@ #include <sfx2/minarray.hxx> #include "cfgutil.hxx" -#define css ::com::sun::star +namespace css = ::com::sun::star; class SfxMacroInfoItem; class SfxConfigGroupListBox_Impl; @@ -219,10 +219,6 @@ public: virtual ~SvxShortcutAssignDlg(); }; - - -#undef css - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 94c764bd4f4d..4e0fd27a71c4 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -51,7 +51,7 @@ class SfxMacroInfoItem; struct SfxStyleInfo_Impl; struct SfxStylesInfo_Impl; -#define css ::com::sun::star +namespace css = ::com::sun::star; struct SfxStyleInfo_Impl { @@ -203,8 +203,6 @@ public: void SetStylesInfo(SfxStylesInfo_Impl* pStyles); }; -#undef css - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 765d6a78074b..3161879ee7ab 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -45,11 +45,7 @@ #include <svl/smplhint.hxx> -namespace { - -namespace css = com::sun::star; - -} +namespace css = ::com::sun::star; ////////////////////////////////////////////////////////////////////////// // OSqlEdit diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 47909d7953c9..ca1b223f745c 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -45,11 +45,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -73,8 +69,6 @@ class IVistaFilePickerInternalNotify }}} -#undef css - #endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index 1a46ca0e1504..1c0dd48ab3b4 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -57,11 +57,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -311,8 +307,6 @@ public: } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_FILEPICKER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 76e680500cb5..a63fbf8b9fc2 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -57,11 +57,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -224,8 +220,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // __IFileDialogCustomize_INTERFACE_DEFINED__ #endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index a8a07a2349ff..f7dae0ebeb3f 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -71,11 +71,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -363,8 +359,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // __IFileDialogCustomize_INTERFACE_DEFINED__ #endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index ba9b07eae995..7e7c9de93735 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -45,11 +45,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -223,8 +219,6 @@ class AsyncRequests : private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_ASYNCREQUESTS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index 08b4613f6d25..e1b1fc580923 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -40,11 +40,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -64,8 +60,6 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index 692daaa11447..da9e8366a9e2 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -52,13 +52,9 @@ // namespace //_________________________________________________________________________________________________________________ -namespace framework{ +namespace css = ::com::sun::star; -#ifdef css - #error "Conflict during define of namespace alias ..." -#else - #define css ::com::sun::star -#endif +namespace framework{ //_________________________________________________________________________________________________________________ // exported const @@ -266,8 +262,6 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 PreventDuplicateInteraction::InteractionInfo* pReturn ) const; }; -#undef css - } // namespace framework #endif // #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index 6b3ba6ce1fc6..a86bbaf95b34 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -57,13 +57,9 @@ //_______________________________________________ // namespace -namespace framework{ +namespace css = ::com::sun::star; -#ifdef css - #error "Ambigious namespace definition of css." -#else - #define css ::com::sun::star -#endif +namespace framework{ //_______________________________________________ // definitions @@ -220,8 +216,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex ::cppu::OMultiTypeInterfaceContainerHelper m_aListener; }; -#undef css - } // namespace framework #endif // _FRAMEWORK_TITLEHELPER_HXX_ diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 741e9718e2d6..78c1a28d39f2 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -51,15 +51,11 @@ //=============================================== // namespace +namespace css = ::com::sun::star; + namespace framework { -#ifdef css - #error "Who defines css? I will use it as namespace alias inside header." -#else - #define css ::com::sun::star -#endif - //=============================================== // definitions @@ -251,8 +247,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); }; -#undef css // dont let it out! - } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_ diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index ef15fe75c06d..9afe6d95e7ca 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -69,9 +69,7 @@ #include <rtl/logfile.hxx> using namespace ::com::sun::star; -#ifndef css -#define css ::com::sun::star -#endif +namespace css = ::com::sun::star; static const char HELPID_PREFIX[] = "helpid:"; diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 50d693302589..5a8554b24294 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -48,10 +48,10 @@ #include "util.hxx" +namespace css = ::com::sun::star; + namespace sf_misc { -// for simplification -#define css ::com::sun::star class MiscUtils { diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 73f4e56b8771..7b12e68c6a5e 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -509,8 +509,7 @@ const Reference< XMultiServiceFactory >& xServiceManager ) extern "C" { -#undef css -#define css ::com::sun::star + namespace css = ::com::sun::star; SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 42964cd0b4fd..08eb70d7f1b9 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -45,10 +45,10 @@ #include <comphelper/stl_types.hxx> +namespace css = ::com::sun::star; + namespace func_provider { -// for simplification -#define css ::com::sun::star //Typedefs //============================================================================= diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index 9594b6f6f067..226f236faf94 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -38,10 +38,10 @@ #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp> +namespace css = ::com::sun::star; + namespace browsenodefactory { -// for simplification -#define css ::com::sun::star class BrowseNodeFactoryImpl : public ::cppu::WeakImplHelper2 < diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 89336a9dadb9..fa6c71e26e8c 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -45,10 +45,10 @@ #include "ProviderCache.hxx" +namespace css = ::com::sun::star; + namespace func_provider { -// for simplification -#define css ::com::sun::star typedef ::cppu::WeakImplHelper5< css::script::provider::XScriptProvider, diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index 9db031e2e87e..cf1a67f34804 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -39,10 +39,10 @@ #include "ActiveMSPList.hxx" +namespace css = ::com::sun::star; + namespace func_provider { -// for simplification -#define css ::com::sun::star class MasterScriptProviderFactory : public ::cppu::WeakImplHelper2 < diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index db1c7d3db70e..ebb6d344ad61 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -44,10 +44,10 @@ #include "ScriptingContext.hxx" +namespace css = ::com::sun::star; + namespace func_provider { -// for simplification -#define css ::com::sun::star //Typedefs //============================================================================= diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx index b49f245cdd3d..d7e6b41339a1 100644 --- a/scripting/source/provider/ScriptImpl.hxx +++ b/scripting/source/provider/ScriptImpl.hxx @@ -41,11 +41,10 @@ #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 { -// for simplification -#define css ::com::sun::star - class ScriptImpl : public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::provider::XScript > diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx index 97998c25ade5..afb5bf7c33d4 100644 --- a/scripting/source/provider/ScriptingContext.hxx +++ b/scripting/source/provider/ScriptingContext.hxx @@ -44,10 +44,11 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/broadcasthelper.hxx> + +namespace css = ::com::sun::star; + namespace func_provider { -// for simplification -#define css ::com::sun::star //Typedefs //============================================================================= diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index 25683dcbb916..b1e89469b0c8 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -40,11 +40,11 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase3.hxx> +namespace css = ::com::sun::star; + namespace func_provider { -#define css ::com::sun::star - class ScriptingFrameworkURIHelper : public ::cppu::WeakImplHelper3< css::script::provider::XScriptURIHelper, diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx index 4a068ed4b1e9..3df87d221b76 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx @@ -41,10 +41,10 @@ #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp> #include <drafts/com/sun/star/script/framework/storage/XScriptInfo.hpp> +namespace css = ::com::sun::star; + namespace scripting_runtimemgr { -// for simplification -#define css ::com::sun::star class ScriptNameResolverImpl : public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver > diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx index 33fea58f3a5e..6850027e1c18 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx @@ -44,10 +44,10 @@ #include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp> #include <drafts/com/sun/star/script/framework/runtime/XScriptNameResolver.hpp> +namespace css = ::com::sun::star; + namespace scripting_runtimemgr { -// for simplification -#define css ::com::sun::star /** * Class responsible for managing the various ScriptRuntime implementations. diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx index 153d174e9a63..3f407b0ace85 100644 --- a/scripting/source/runtimemgr/StorageBridge.hxx +++ b/scripting/source/runtimemgr/StorageBridge.hxx @@ -36,10 +36,10 @@ #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp> #include "StorageBridgeFactory.hxx" +namespace css = ::com::sun::star; + namespace scripting_runtimemgr { -// for simplification -#define css ::com::sun::star class StorageBridge : public ::cppu::WeakImplHelper1< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > { diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx index 35f774d4ce00..e4f2970863a9 100644 --- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx +++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx @@ -37,10 +37,10 @@ #include <drafts/com/sun/star/script/framework/storage/XScriptInfoAccess.hpp> +namespace css = ::com::sun::star; + namespace scripting_runtimemgr { -// for simplification -#define css ::com::sun::star class StorageBridgeFactory { diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index e3e0350663a6..82a27c96c75d 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -187,11 +187,8 @@ //________________________________________________________________________________________________________ // namespace //________________________________________________________________________________________________________ -#ifdef css - #error "class is using css as namespace define .-)" -#else - #define css ::com::sun::star -#endif + +namespace css = ::com::sun::star; //________________________________________________________________________________________________________ // forwards @@ -1640,8 +1637,6 @@ private: SolarMutexResettableGuard m_aGuard; }; -#undef css - #endif // _SFX_SFXBASEMODEL_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index 884536d89bb0..18c7e9b7f307 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -39,11 +39,7 @@ //----------------------------------------------- // namespaces -#ifdef css -#error "Cant use css as namespace alias." -#else -#define css ::com::sun::star -#endif +namespace css = ::com::sun::star; //----------------------------------------------- // definitions @@ -82,11 +78,6 @@ class ItemHolder2 : private ItemHolderMutexBase void impl_deleteItem(TItemInfo& rItem); }; -//----------------------------------------------- -// namespaces - -#undef css - #endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index ec2a69e1edfd..321c53869657 100644 --- a/svtools/inc/svtools/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -58,11 +58,7 @@ //=============================================== // namespace -#ifdef css - #error "Conflict on using css as namespace alias!" -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace svt { @@ -271,8 +267,6 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit } // namespace svt -#undef css - #endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index 1e0ade748546..bd4ac34003e8 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -39,11 +39,7 @@ //----------------------------------------------- // namespaces -#ifdef css -#error "Cant use css as namespace alias." -#else -#define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace svtools { //----------------------------------------------- @@ -84,10 +80,6 @@ class ItemHolder2 : private ItemHolderMutexBase }; } // namespace svtools -//----------------------------------------------- -// namespaces - -#undef css #endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_ diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index ec4b9dff5940..dfbd66c679c9 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -99,15 +99,11 @@ //=============================================== // namespace +namespace css = ::com::sun::star; + namespace svx{ namespace DocRecovery{ -#ifdef css -# error "Who uses css? I need it as temp. namespace alias!" -#else -# define css ::com::sun::star -#endif - //=============================================== enum EDocStates { @@ -953,8 +949,6 @@ class BrokenRecoveryDialog : public ModalDialog } // namespace DocRecovery } // namespace svx -#undef css - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index e04b423152ba..aa0775ea176b 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -39,11 +39,7 @@ //----------------------------------------------- // namespaces -#ifdef css -#error "Cant use css as namespace alias." -#else -#define css ::com::sun::star -#endif +namespace css = ::com::sun::star; //----------------------------------------------- // definitions diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx index 4c18d38cfd04..6a1a069ab476 100644 --- a/unotools/source/i18n/instance.hxx +++ b/unotools/source/i18n/instance.hxx @@ -33,8 +33,7 @@ #include <rtl/oustringostreaminserter.hxx> #include <rtl/strbuf.hxx> -// ugly but so is this namespacing evil. -#define css ::com::sun::star +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 |