diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 21:03:18 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:32 -0500 |
| commit | ef07ecf985e308fc4915cfbe8c2a15d583238f5b (patch) | |
| tree | 3b6e49771cc1d21c378f8c61fad0fe56b89e8e83 /framework | |
| parent | a76829b305fec288bf4f1b0b885f16caa3f3c62a (diff) | |
merge vosremoval-timer.diff
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/helper/timerhelper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/pch/precompiled_framework.hxx | 2 | ||||
| -rw-r--r-- | framework/util/makefile.mk | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx index a37bd5b2ce05..7c45b0e2dcaf 100644 --- a/framework/inc/helper/timerhelper.hxx +++ b/framework/inc/helper/timerhelper.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_TIMERHELPER_HXX_ #include <threadhelp/threadhelpbase.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <osl/mutex.hxx> //........................................................................ diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 45919a31047b..c6cc1b95f7b7 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -371,6 +371,7 @@ #include "sal/main.h" #include "salhelper/singletonref.hxx" +#include "salhelper/timer.hxx" #include "sot/exchange.hxx" #include "sot/filelist.hxx" @@ -488,7 +489,6 @@ #include "vos/process.hxx" #include "vos/ref.hxx" #include "vos/thread.hxx" -#include "vos/timer.hxx" //---MARKER--- #endif diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 544c543254be..85dff0aab67e 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -354,6 +354,7 @@ SHL4STDLIBS= \ $(CPPULIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ + $(SALHELPERLIB) \ $(I18NISOLANGLIB) SHL4DEF= $(MISC)$/$(SHL4TARGET).def |