diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-15 12:10:06 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | d3756b8b7318ecae4eaf0552aea3cde940e91490 (patch) | |
| tree | 266d82b888950bf415cf6aeddce2c1bdb7329591 /framework | |
| parent | 7d22ff57241f19213453ecd0c98d67fb579a3803 (diff) | |
merge vosremoval-reference.diff
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/framecontainer.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/pch/precompiled_framework.hxx | 3 | ||||
| -rw-r--r-- | framework/source/helper/dockingareadefaultacceptor.cxx | 1 | ||||
| -rw-r--r-- | framework/source/helper/oframes.cxx | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index cf19f99dcb55..cf915ad12502 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -55,7 +55,6 @@ // other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> -#include <vos/ref.hxx> #include <rtl/ustring.hxx> #include <vcl/evntpost.hxx> diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index c6cc1b95f7b7..f8cf02eebdfb 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -359,6 +359,7 @@ #include "rtl/instance.hxx" #include "rtl/logfile.hxx" #include "rtl/random.h" +#include "rtl.ref.hxx" #include "rtl/strbuf.hxx" #include "rtl/string.h" #include "rtl/string.hxx" @@ -370,6 +371,7 @@ #include "sal/alloca.h" #include "sal/main.h" +#include "salhelper/simplereferenceobject.hxx" #include "salhelper/singletonref.hxx" #include "salhelper/timer.hxx" @@ -487,7 +489,6 @@ #include "vos/mutex.hxx" #include "vos/process.hxx" -#include "vos/ref.hxx" #include "vos/thread.hxx" //---MARKER--- diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 1c5166e60d47..d0b6a1abaab4 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; -using namespace ::rtl ; //_________________________________________________________________________________________________________________ // non exported const diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 7d56209ff718..bd854e6397ce 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -59,9 +59,9 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; -using namespace ::rtl ; using namespace ::std ; -using namespace ::vos ; + +using rtl::OUString; //_________________________________________________________________________________________________________________ // non exported const |