diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:38:26 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:38:26 +0100 |
| commit | 62abc842160313fbcdee8ff46c6b4fae6321f21d (patch) | |
| tree | e64848c660027d77782a046e5da55d827c2e4b29 /oox/source/helper/binaryinputstream.cxx | |
| parent | af9cd95a2499e602887352c833d3ac52ce9670f2 (diff) | |
| parent | c08aba6a410bd7e85095a485486dcfb5bb6612b8 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
binfilter/bf_forms/source/component/forms_Filter.cxx
binfilter/bf_sw/source/core/inc/node2lay.hxx
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
binfilter/inc/bf_sw/swdbtoolsclient.hxx
filter/source/xsltdialog/xmlfileview.cxx
oox/source/ole/axcontrol.cxx
oox/source/vml/vmlformatting.cxx
oox/source/xls/autofiltercontext.cxx
oox/source/xls/externallinkfragment.cxx
oox/source/xls/formulaparser.cxx
oox/source/xls/pivotcachebuffer.cxx
oox/source/xls/pivotcachefragment.cxx
oox/source/xls/sheetdatacontext.cxx
writerfilter/source/dmapper/GraphicImport.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/ooxml/model.xml
Diffstat (limited to 'oox/source/helper/binaryinputstream.cxx')
| -rw-r--r-- | oox/source/helper/binaryinputstream.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 7696947561de..482d4ab9b055 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -27,27 +27,32 @@ ************************************************************************/ #include "oox/helper/binaryinputstream.hxx" + #include <string.h> #include <vector> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include "oox/helper/binaryoutputstream.hxx" +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + using ::rtl::OString; using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XSeekable; -namespace oox { +namespace { const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000; +} // namespace + // ============================================================================ OString BinaryInputStream::readNulCharArray() |