summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-04 21:17:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-05 10:54:19 +0100
commite99a072c0e19d1bab68a49758acaac22dd981e0c (patch)
tree927772b072c8cf79026a2146478f9e1c267cac5a /svtools
parentaf60795f76f04e5a0315eeaa4cb9c5a90f4ae90c (diff)
add a fairly efficient read_LEuInt16s_AsOUString, merge similar things
Diffstat (limited to 'svtools')
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/Package_inc.mk1
-rw-r--r--svtools/inc/svtools/filterutils.hxx24
-rw-r--r--svtools/source/misc/filterutils.cxx39
4 files changed, 0 insertions, 65 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 7bedf766aa02..8d012052d7b9 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -208,7 +208,6 @@ $(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/filechangedchecker \
svtools/source/misc/helpagentwindow \
svtools/source/misc/imagemgr \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 540db0909d9c..0a94ec8c8947 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -69,7 +69,6 @@ $(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/filechangedchecker.hxx,svtools/filechangedchecker.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))
diff --git a/svtools/inc/svtools/filterutils.hxx b/svtools/inc/svtools/filterutils.hxx
deleted file mode 100644
index 0676ce968da8..000000000000
--- a/svtools/inc/svtools/filterutils.hxx
+++ /dev/null
@@ -1,24 +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 );
- };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/filterutils.cxx b/svtools/source/misc/filterutils.cxx
deleted file mode 100644
index d0d481a81988..000000000000
--- a/svtools/source/misc/filterutils.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- 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 <svtools/filterutils.hxx>
-#include <rtl/ustrbuf.hxx>
-
-namespace svt
-{
-//........................................................................
-
- using namespace ::com::sun::star;
-
- rtl::OUString lcl_createStringFromArray( const char* pcCharArr, sal_uInt32 nBufSize )
- {
- rtl::OUStringBuffer aBuffer;
- // buffer contains Little-Endian Unicode
- sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
- aBuffer.setLength( nStrLen );
- const char* pcCurrChar = pcCharArr;
- for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
- {
- /* *pcCurrChar may contain negative values and therefore MUST be
- casted to unsigned char, before assigned to a sal_Unicode. */
- sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
- cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
- aBuffer.setCharAt( nChar, cChar );
- }
- return aBuffer.makeStringAndClear();
- }
-
- rtl::OUString BinFilterUtils::CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize )
- {
- return lcl_createStringFromArray( pcCharArr, nBufSize );
- }
-//........................................................................
-} // namespace svt
-//........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */