diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-03 13:57:25 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-03 13:57:25 +0100 |
commit | 63c89a3a088afaa723ac8deb3e0e1e820d1c14ef (patch) | |
tree | 8ec7b2460535d4ce5ca21e7d6f88b6db76fc9743 /sot/source/base | |
parent | 79f23856aa5f8a9c28d1650d5f02559e6a5fbddb (diff) | |
parent | 7997ab5bac6fbdfe3b3427c322507a993d33acbc (diff) |
fwk162: merge to DEV300_m96
Diffstat (limited to 'sot/source/base')
-rw-r--r-- | sot/source/base/exchange.cxx | 2 | ||||
-rw-r--r-- | sot/source/base/factory.cxx | 2 | ||||
-rw-r--r-- | sot/source/base/filelist.cxx | 2 | ||||
-rw-r--r-- | sot/source/base/formats.cxx | 4 | ||||
-rw-r--r-- | sot/source/base/object.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 67c2b64f105f..d860c8b0f572 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -37,7 +37,7 @@ #include <sot/sotdata.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <clsids.hxx> +#include <sot/clsids.hxx> #include <rtl/instance.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index e0605b5f0063..3c034a980578 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -36,7 +36,7 @@ #include <tools/string.hxx> #include <sot/object.hxx> #include <sot/sotdata.hxx> -#include <clsids.hxx> +#include <sot/clsids.hxx> #include <rtl/instance.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 4f854add304d..048f19e65bd7 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -33,7 +33,7 @@ #include<tools/string.hxx> #include<tools/rtti.hxx> #include<sot/exchange.hxx> -#include<filelist.hxx> +#include<sot/filelist.hxx> #include <osl/thread.h> TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream ); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index baddde6e716f..58b08fb53f18 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -34,8 +34,8 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include "filelist.hxx" -#include "clsids.hxx" +#include "sot/filelist.hxx" +#include "sot/clsids.hxx" #include <tools/globname.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 0db2e45a5f83..70792a325d31 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -33,7 +33,7 @@ #include <tools/debug.hxx> #include <sot/object.hxx> #include <sot/factory.hxx> -#include <agg.hxx> +#include <sot/agg.hxx> /************** class SotObject ******************************************/ class SotObjectFactory : public SotFactory |