[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/novell-win32-odma.diff |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 84fc2d2075c14728501d7dcba78a615e454d9b08
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 17 18:00:22 2010 +0300

    pathoptions.hxx has moved

diff --git a/patches/dev300/novell-win32-odma.diff b/patches/dev300/novell-win32-odma.diff
index ac31737..84567cb 100644
--- a/patches/dev300/novell-win32-odma.diff
+++ b/patches/dev300/novell-win32-odma.diff
@@ -1178,7 +1178,7 @@ new file mode 100644
 index 0000000..4f43437
 --- /dev/null
 +++ fpicker/source/odma/ODMAFolderPicker.cxx
-@@ -0,0 +1,202 @@
+@@ -0,0 +1,189 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1222,25 +1222,12 @@ index 0000000..4f43437
 +#define _SVSTDARR_STRINGSDTOR
 +#include "svl/svstdarr.hxx"
 +
-+#ifndef  _COM_SUN_STAR_CONTAINER_XCONTENTENUMERATIONACCESS_HPP_
 +#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-+#endif
-+#ifndef  _COM_SUN_STAR_CONTAINER_XSET_HPP_
 +#include <com/sun/star/container/XSet.hpp>
-+#endif
-+#ifndef  _COM_SUN_STAR_UNO_ANY_HXX_
 +#include <com/sun/star/uno/Any.hxx>
-+#endif
-+#ifndef  _CPPUHELPER_FACTORY_HXX_
 +#include <cppuhelper/factory.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 +#include <com/sun/star/beans/XPropertySet.hpp>
-+#endif
-+
-+#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-+#include <svtools/pathoptions.hxx>
-+#endif
++#include <unotools/pathoptions.hxx>
 +
 +#ifndef ODMA_LIB_HXX
 +#include <tools/prewin.h>