[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source

[Norbert Thiebaud]

 svtools/Library_svt.mk              |    1 +
 svtools/Package_inc.mk              |    1 +
 svtools/inc/filterutils.hxx         |   25 -------------------------
 svtools/inc/svtools/filterutils.hxx |   25 +++++++++++++++++++++++++
 svtools/source/misc/filterutils.cxx |    2 +-
 5 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit bc55b90772937a05bdab07ce987889faa0680ce2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 13 05:35:10 2011 -0500

    export filterutils.hxx (andd compile filterutils.cxx)

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 5a3e3d2..8236f15 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -218,6 +218,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/misc/ehdl \
     svtools/source/misc/embedhlp \
     svtools/source/misc/embedtransfer \
+    svtools/source/misc/filterutils \
     svtools/source/misc/helpagentwindow \
     svtools/source/misc/imagemgr \
     svtools/source/misc/imageresourceaccess \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index a2ab53c..3afd5f4 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/f
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filterutils.hxx,svtools/filterutils.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx))
diff --git a/svtools/inc/filterutils.hxx b/svtools/inc/filterutils.hxx
deleted file mode 100644
index ac14f92..0000000
--- a/svtools/inc/filterutils.hxx
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef SVTOOLS_INC_FILTERUTILS_HXX
-#define SVTOOLS_INC_FILTERUTILS_HXX
-
-#include "svtools/svtdllapi.h"
-#include <com/sun/star/uno/RuntimeException.hpp>
-namespace svt
-{
-    class BinFilterUtils
-    {
-    private:
-        BinFilterUtils();    // never implemented
-
-    public:
-        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
-        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filterutils.hxx b/svtools/inc/svtools/filterutils.hxx
new file mode 100644
index 0000000..ac14f92
--- /dev/null
+++ b/svtools/inc/svtools/filterutils.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef SVTOOLS_INC_FILTERUTILS_HXX
+#define SVTOOLS_INC_FILTERUTILS_HXX
+
+#include "svtools/svtdllapi.h"
+#include <com/sun/star/uno/RuntimeException.hpp>
+namespace svt
+{
+    class BinFilterUtils
+    {
+    private:
+        BinFilterUtils();    // never implemented
+
+    public:
+        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+        SVT_DLLPUBLIC static  rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/filterutils.cxx b/svtools/source/misc/filterutils.cxx
index 578c940..06640c5 100644
--- a/svtools/source/misc/filterutils.cxx
+++ b/svtools/source/misc/filterutils.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "filterutils.hxx"
+#include <svtools/filterutils.hxx>
 #include <rtl/ustrbuf.hxx>
 
 namespace svt