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/ole/olestorage.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/ole/olestorage.cxx')
| -rw-r--r-- | oox/source/ole/olestorage.cxx | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index cff723194908..b45e29beaae3 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "oox/ole/olestorage.hxx" + #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -36,38 +37,27 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase2.hxx> -#include "oox/helper/helper.hxx" #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" - -using ::rtl::OUString; -using ::com::sun::star::container::XNameContainer; -using ::com::sun::star::beans::PropertyValue; -using ::com::sun::star::embed::XStorage; -using ::com::sun::star::embed::XTransactedObject; -using ::com::sun::star::io::BufferSizeExceededException; -using ::com::sun::star::io::IOException; -using ::com::sun::star::io::NotConnectedException; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::io::XSeekable; -using ::com::sun::star::io::XStream; -using ::com::sun::star::lang::IllegalArgumentException; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::RuntimeException; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::UNO_SET_THROW; +#include "oox/helper/containerhelper.hxx" +#include "oox/helper/helper.hxx" namespace oox { namespace ole { // ============================================================================ +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::embed; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { typedef ::cppu::WeakImplHelper2< XSeekable, XOutputStream > OleOutputStreamBase; |