dr77: code cleanup

12 files changed, 89 insertions, 86 deletions

diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index 30938f9ebbe6..7932ff2e6f4e 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -29,8 +29,8 @@
 
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
-#include "oox/dump/oledumper.hxx"
 #include "oox/core/filterbase.hxx"
+#include "oox/dump/oledumper.hxx"
 #include "oox/ole/olestorage.hxx"
 #include "oox/xls/biffdetector.hxx"
 #include "oox/xls/biffinputstream.hxx"
@@ -38,23 +38,27 @@
 
 #if OOX_INCLUDE_DUMPER
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
+namespace oox {
+namespace dump {
+namespace biff {
+
+// ============================================================================
+
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+using namespace ::oox::xls;
+
+using ::comphelper::MediaDescriptor;
+using ::oox::core::FilterBase;
 using ::rtl::OString;
 using ::rtl::OStringBuffer;
 using ::rtl::OStringToOUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::util::DateTime;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::io::XInputStream;
-using ::comphelper::MediaDescriptor;
-using ::oox::core::FilterBase;
-
-using namespace ::oox::xls;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
-namespace oox {
-namespace dump {
-namespace biff {
+// ============================================================================
 
 namespace  {
 
@@ -93,12 +97,7 @@ const sal_uInt16 BIFF_STYLE_BUILTIN         = 0x8000;
 
 const sal_uInt16 BIFF_PT_NOSTRING           = 0xFFFF;
 
-} // namespace
-
-// ============================================================================
-// ============================================================================
-
-namespace {
+// ----------------------------------------------------------------------------
 
 void lclDumpDffClientPos( const OutputRef& rxOut, const BinaryInputStreamRef& rxStrm, const String& rName, sal_uInt16 nSubScale )
 {
@@ -128,7 +127,8 @@ void lclDumpDffClientRect( const OutputRef& rxOut, const BinaryInputStreamRef& r
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+// ============================================================================
+// ============================================================================
 
 BiffDffStreamObject::BiffDffStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm )
 {
@@ -4362,10 +4362,10 @@ void Dumper::implDump()
 }
 
 // ============================================================================
+// ============================================================================
 
 } // namespace biff
 } // namespace dump
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index d4b862825b3c..881001cb05c9 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -2235,4 +2235,3 @@ multilist=XFEXT-SUBREC
 end
 
 # ============================================================================
-
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 8730698561ce..01994865c69d 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -29,13 +29,15 @@
 
 #if OOX_INCLUDE_DUMPER
 
-using ::rtl::OUString;
-
 namespace oox {
 namespace dump {
 
 // ============================================================================
 
+using ::rtl::OUString;
+
+// ============================================================================
+
 namespace {
 
 const sal_uInt16 DFF_ID_BSE                 = 0xF007;   /// BLIP store entry.
@@ -320,4 +322,3 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader()
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/dffdumper.ini b/oox/source/dump/dffdumper.ini
index c33d733c6bd8..5526663e0e15 100644
--- a/oox/source/dump/dffdumper.ini
+++ b/oox/source/dump/dffdumper.ini
@@ -648,4 +648,3 @@ combilist=DFFSPLITMENUC-RECORD-INST
 end
 
 # ============================================================================
-
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 807a5ec74715..2a6cf61542f9 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -29,44 +29,44 @@
 
 #include <algorithm>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XTextInputStream.hpp>
 #include <com/sun/star/io/XTextOutputStream.hpp>
-#include <rtl/math.hxx>
-#include <osl/file.hxx>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <comphelper/docpasswordhelper.hxx>
+#include <osl/file.hxx>
+#include <rtl/math.hxx>
+#include "oox/core/filterbase.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 #include "oox/helper/textinputstream.hxx"
-#include "oox/core/filterbase.hxx"
 #include "oox/xls/biffhelper.hxx"
 
 #if OOX_INCLUDE_DUMPER
 
+namespace oox {
+namespace dump {
+
+// ============================================================================
+
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+
+using ::comphelper::MediaDescriptor;
+using ::oox::core::FilterBase;
 using ::rtl::OString;
 using ::rtl::OStringBuffer;
 using ::rtl::OStringToOUString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using ::rtl::OUStringToOString;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::util::DateTime;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::ucb::XSimpleFileAccess;
-using ::com::sun::star::io::XActiveDataSink;
-using ::com::sun::star::io::XActiveDataSource;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XOutputStream;
-using ::com::sun::star::io::XTextInputStream;
-using ::com::sun::star::io::XTextOutputStream;
-using ::comphelper::MediaDescriptor;
-using ::oox::core::FilterBase;
 
-namespace oox {
-namespace dump {
+// ============================================================================
+
+namespace {
 
 const sal_Unicode OOX_DUMP_BOM          = 0xFEFF;
 const sal_Int32 OOX_DUMP_MAXSTRLEN      = 80;
@@ -79,6 +79,8 @@ const sal_Unicode OOX_DUMP_ITEMSEP      = '=';
 const sal_Int32 OOX_DUMP_BYTESPERLINE   = 16;
 const sal_Int64 OOX_DUMP_MAXARRAY       = 16;
 
+} // namespace
+
 // ============================================================================
 // ============================================================================
 
@@ -3212,4 +3214,3 @@ void DumperBase::construct( const ConfigRef& rxConfig )
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/dumperbase.ini b/oox/source/dump/dumperbase.ini
index 34ef302c784c..28aa59a03b81 100644
--- a/oox/source/dump/dumperbase.ini
+++ b/oox/source/dump/dumperbase.ini
@@ -393,4 +393,3 @@ multilist=SYSTEMCOLOR
 end
 
 # ============================================================================
-
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index cc49ee050ea6..eb7abef6c29d 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -26,30 +26,33 @@
  ************************************************************************/
 
 #include "oox/dump/oledumper.hxx"
+
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <osl/thread.h>
 #include <osl/file.hxx>
+#include <osl/thread.h>
 #include <rtl/tencinfo.h>
-#include "oox/helper/binaryoutputstream.hxx"
 #include "oox/core/filterbase.hxx"
+#include "oox/helper/binaryoutputstream.hxx"
 #include "oox/ole/olestorage.hxx"
 #include "oox/ole/vbainputstream.hxx"
 
 #if OOX_INCLUDE_DUMPER
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XOutputStream;
-
 namespace oox {
 namespace dump {
 
 // ============================================================================
+
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+// ============================================================================
 // ============================================================================
 
 OUString OleInputObjectBase::dumpAnsiString32( const String& rName )
@@ -2312,4 +2315,3 @@ void ActiveXStorageObject::implDumpBaseStream( const BinaryInputStreamRef& rxStr
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/oledumper.ini b/oox/source/dump/oledumper.ini
index 13478464e6b3..c8461d4b28a7 100644
--- a/oox/source/dump/oledumper.ini
+++ b/oox/source/dump/oledumper.ini
@@ -885,4 +885,3 @@ end
 shortlist=VBA-DIR-PROJECTSYSKIND-PLATFORM,0,16-bit-windows,32-bit-windows,macintosh
 
 # ============================================================================
-
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index e01d7d349855..39e0ccc2be55 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -26,27 +26,31 @@
  ************************************************************************/
 
 #include "oox/dump/pptxdumper.hxx"
-#include "oox/helper/zipstorage.hxx"
-#include "oox/ole/olestorage.hxx"
+
 #include "oox/dump/biffdumper.hxx"
 #include "oox/dump/oledumper.hxx"
 #include "oox/dump/xlsbdumper.hxx"
+#include "oox/helper/zipstorage.hxx"
+#include "oox/ole/olestorage.hxx"
 
 #if OOX_INCLUDE_DUMPER
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::io::XInputStream;
-using ::comphelper::MediaDescriptor;
-using ::oox::core::FilterBase;
-
 namespace oox {
 namespace dump {
 namespace pptx {
 
 // ============================================================================
 
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+using ::comphelper::MediaDescriptor;
+using ::oox::core::FilterBase;
+using ::rtl::OUString;
+
+// ============================================================================
+
 RootStorageObject::RootStorageObject( const DumperBase& rParent )
 {
     StorageObjectBase::construct( rParent );
@@ -144,4 +148,3 @@ void Dumper::implDump()
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/pptxdumper.ini b/oox/source/dump/pptxdumper.ini
index fa03953b7113..f3c058ecfbf5 100644
--- a/oox/source/dump/pptxdumper.ini
+++ b/oox/source/dump/pptxdumper.ini
@@ -16,4 +16,3 @@ include-config-file=dumperbase.ini
 # enable-import=1
 
 # ============================================================================
-
diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx
index dd78ac3c4e2e..8f249a909000 100644
--- a/oox/source/dump/xlsbdumper.cxx
+++ b/oox/source/dump/xlsbdumper.cxx
@@ -26,12 +26,13 @@
  ************************************************************************/
 
 #include "oox/dump/xlsbdumper.hxx"
+
 #include <com/sun/star/io/XTextInputStream.hpp>
+#include "oox/core/filterbase.hxx"
 #include "oox/dump/biffdumper.hxx"
 #include "oox/dump/oledumper.hxx"
 #include "oox/dump/pptxdumper.hxx"
 #include "oox/helper/zipstorage.hxx"
-#include "oox/core/filterbase.hxx"
 #include "oox/ole/olestorage.hxx"
 #include "oox/xls/biffhelper.hxx"
 #include "oox/xls/formulabase.hxx"
@@ -39,23 +40,25 @@
 
 #if OOX_INCLUDE_DUMPER
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::util::DateTime;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::io::XInputStream;
-using ::comphelper::MediaDescriptor;
-using ::oox::core::FilterBase;
-
-using namespace ::oox::xls;
-
 namespace oox {
 namespace dump {
 namespace xlsb {
 
 // ============================================================================
 
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+using namespace ::oox::xls;
+
+using ::comphelper::MediaDescriptor;
+using ::oox::core::FilterBase;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+// ============================================================================
+
 namespace {
 
 const sal_uInt8 OOBIN_STRINGFLAG_FONTS          = 0x01;
@@ -2269,4 +2272,3 @@ void Dumper::implDump()
 } // namespace oox
 
 #endif
-
diff --git a/oox/source/dump/xlsbdumper.ini b/oox/source/dump/xlsbdumper.ini
index f2ac3b49b4d6..b53870f09a15 100644
--- a/oox/source/dump/xlsbdumper.ini
+++ b/oox/source/dump/xlsbdumper.ini
@@ -1076,4 +1076,3 @@ flagslist=XF-USEDFLAGS
 end
 
 # ============================================================================
-