diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-12-10 21:58:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-12-10 21:58:51 +0100 |
| commit | 6559ceb1a290766e6c1c54632fa0ec0d848b46fa (patch) | |
| tree | ae5260679a0f6696d1dfa21e4d9ae6bb322742f4 /sfx2 | |
| parent | 9e1e9a66aeddf0874f9fc3e4bdcdff374bd23586 (diff) | |
gnumake2: fixing namespace collision between ::com::sun::star::uno::Reference and ::rtl::Reference (for PCH)
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/Library_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/querystatus.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 6a8a23095377..ed941d5b9a9f 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -276,7 +276,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ )) endif ifeq ($(OS),WNT) - # workaround: disable PCH for these objects to avoid redeclaration # errors - needs to be fixed in module tools $(eval $(call gb_Library_add_cxxobjects,sfx,\ diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 04d9ce06aa9c..94f300fac690 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -80,7 +80,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui::dialogs; using namespace ::vos; -using namespace ::rtl; +using ::rtl::OUString; using namespace ::sfx2; #ifdef ENABLE_QUICKSTART_APPLET diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 8688740ce0fb..bee4a5c87675 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> -using namespace ::rtl; +using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index f6bb2b2c3004..c2cf5f164e7c 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -50,7 +50,7 @@ #include <sfx2/unoctitm.hxx> #include <sfx2/msgpool.hxx> -using namespace ::rtl; +using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; |