From 6cafb68322fa85a54a6fa1ca47239af459f519ce Mon Sep 17 00:00:00 2001
From: "Daniel Rentz [dr]" <daniel.rentz@oracle.com>
Date: Mon, 8 Nov 2010 13:47:01 +0100
Subject: dr77: optimizations in generation of XML tokens, XML namespaces,
 property names; code cleanup

---
 oox/source/ole/olestorage.cxx | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 oox/source/ole/olestorage.cxx

(limited to 'oox/source/ole/olestorage.cxx')

diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
old mode 100755
new mode 100644
index 0ca2992d47ad..e9aa8f6a9ae8
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -26,6 +26,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>
@@ -35,38 +36,26 @@
 #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/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;
-- 
cgit 


From 32bb320ed0e4c52a7adf84d13a8066877adceb54 Mon Sep 17 00:00:00 2001
From: "Daniel Rentz [dr]" <daniel.rentz@oracle.com>
Date: Tue, 9 Nov 2010 10:52:14 +0100
Subject: dr77: more cleanup: remove RecordInputStream, cleanup ContainerHelper

---
 oox/source/ole/olestorage.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'oox/source/ole/olestorage.cxx')

diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index e9aa8f6a9ae8..cf55d6463778 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -38,6 +38,7 @@
 #include <cppuhelper/implbase2.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
+#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/helper.hxx"
 
 namespace oox {
-- 
cgit