#i10000#

15 files changed, 25 insertions, 50 deletions

diff --git a/oox/inc/oox/dump/biffdumper.hxx b/oox/inc/oox/dump/biffdumper.hxx
index 2695202dd..2a6fe0d8d 100644
--- a/oox/inc/oox/dump/biffdumper.hxx
+++ b/oox/inc/oox/dump/biffdumper.hxx
@@ -146,6 +146,7 @@ protected:
     inline explicit     BiffObjectBase() {}
     virtual             ~BiffObjectBase();
 
+    using               InputObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, ::oox::xls::BiffType eBiff, const ::rtl::OUString& rSysFileName );
     void                construct( const BiffObjectBase& rParent );
 
@@ -221,9 +222,6 @@ protected:
     void                dumpOcxControl();
 
 private:
-    using               InputObjectBase::construct;
-
-private:
     typedef ::boost::shared_ptr< BiffSharedData >       BiffSharedDataRef;
     typedef ::boost::shared_ptr< BiffDffStreamObject >  BiffDffStreamObjRef;
     typedef ::boost::shared_ptr< BiffCtlsStreamObject > BiffCtlsStrmObjRef;
@@ -382,6 +380,7 @@ protected:
     inline explicit     RecordStreamObject() {}
     virtual             ~RecordStreamObject();
 
+    using               BiffObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, ::oox::xls::BiffType eBiff, const ::rtl::OUString& rSysFileName );
 
     virtual bool        implIsValid() const;
@@ -389,9 +388,6 @@ protected:
     inline FormulaObject& getFormulaDumper() const { return *mxFmlaObj; }
 
 private:
-    using               BiffObjectBase::construct;
-
-private:
     typedef ::boost::shared_ptr< FormulaObject > FormulaObjectRef;
     FormulaObjectRef    mxFmlaObj;
 };
@@ -408,8 +404,6 @@ protected:
     virtual void        implDumpRecordBody();
 
 private:
-    using               RecordStreamObject::construct;
-
     void                initializePerSheet();
 
     ::rtl::OUString     createFontName( const ::rtl::OUString& rName, sal_uInt16 nHeight, bool bBold, bool bItalic ) const;
diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx
index 6ef6ae1ca..f986df19f 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/oox/inc/oox/dump/dffdumper.hxx
@@ -50,6 +50,7 @@ public:
 protected:
     inline explicit     DffStreamObject() {}
 
+    using               SequenceRecordObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
     void                construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm );
 
@@ -59,8 +60,6 @@ protected:
     virtual void        implDumpClientAnchor();
 
 private:
-    using               SequenceRecordObjectBase::construct;
-
     void                constructDffObj();
 
     sal_uInt16          dumpDffOptPropHeader();
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index d82b64758..bccf3b7e5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1277,6 +1277,7 @@ protected:
     inline explicit     StorageObjectBase() {}
 
 protected:
+    using               ObjectBase::construct;
     void                construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
     void                construct( const ObjectBase& rParent );
 
@@ -1298,8 +1299,6 @@ protected:
     void                addPreferredStorage( const String& rStrgPath );
 
 private:
-    using               ObjectBase::construct;
-
     ::rtl::OUString     getSysFileName(
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysOutPath );
@@ -1351,6 +1350,7 @@ public:
 protected:
     inline explicit     OutputObjectBase() {}
 
+    using               ObjectBase::construct;
     void                construct( const ObjectBase& rParent, const ::rtl::OUString& rSysFileName );
     void                construct( const ObjectBase& rParent, const OutputRef& rxOut );
     void                construct( const OutputObjectBase& rParent );
@@ -1409,8 +1409,6 @@ protected:
     void                writeValueItem( const ItemFormat& rItemFmt, Type nData );
 
 private:
-    using               ObjectBase::construct;
-
     OutputRef           mxOut;
 };
 
@@ -1517,6 +1515,7 @@ public:
 protected:
     inline explicit     InputObjectBase() {}
 
+    using               OutputObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OutputRef& rxOut );
     void                construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm );
@@ -1591,8 +1590,6 @@ protected:
     Type1               dumpValue( bool bType1, const ItemFormat& rItemFmt );
 
 private:
-    using               OutputObjectBase::construct;
-
     BinaryInputStreamRef mxStrm;
 };
 
@@ -1786,6 +1783,7 @@ protected:
     inline sal_Int64    getRecSize() const { return mnRecSize; }
     inline NameListRef  getRecNames() const { return maRecNames.getNameList( cfg() ); }
 
+    using               InputObjectBase::construct;
     void                construct(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
@@ -1793,7 +1791,6 @@ protected:
                             const BinaryInputStreamRef& rxRecStrm,
                             const String& rRecNames,
                             const String& rSimpleRecs = EMPTY_STRING );
-
     void                construct(
                             const OutputObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
@@ -1809,8 +1806,6 @@ protected:
     virtual void        implDumpRecordBody();
 
 private:
-    using               InputObjectBase::construct;
-
     void                constructRecObjBase(
                             const BinaryInputStreamRef& rxBaseStrm,
                             const String& rRecNames,
@@ -1836,6 +1831,7 @@ protected:
 
     inline StreamDataSequence& getRecordDataSequence() { return *mxRecData; }
 
+    using               RecordObjectBase::construct;
     void                construct(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
@@ -1843,21 +1839,18 @@ protected:
                             const BinaryInputStreamRef& rxRecStrm,
                             const String& rRecNames,
                             const String& rSimpleRecs = EMPTY_STRING );
-
     void                construct(
                             const OutputObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
                             const BinaryInputStreamRef& rxRecStrm,
                             const String& rRecNames,
                             const String& rSimpleRecs = EMPTY_STRING );
-
     void                construct(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
                             const ::rtl::OUString& rSysFileName,
                             const String& rRecNames,
                             const String& rSimpleRecs = EMPTY_STRING );
-
     void                construct(
                             const OutputObjectBase& rParent,
                             const BinaryInputStreamRef& rxBaseStrm,
@@ -1868,9 +1861,6 @@ protected:
     virtual bool        implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0;
 
 private:
-    using               RecordObjectBase::construct;
-
-private:
     typedef ::boost::shared_ptr< StreamDataSequence > StreamDataSeqRef;
     StreamDataSeqRef    mxRecData;
 };
@@ -1891,10 +1881,8 @@ public:
 protected:
     inline explicit     DumperBase() {}
 
-    void                construct( const ConfigRef& rxConfig );
-
-private:
     using               ObjectBase::construct;
+    void                construct( const ConfigRef& rxConfig );
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index ca6007999..9c243a303 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -135,6 +135,7 @@ public:
 protected:
     inline explicit     OleStorageObject() {}
 
+    using               StorageObjectBase::construct;
     void                construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
     void                construct( const ObjectBase& rParent );
 
@@ -143,9 +144,6 @@ protected:
                             const ::rtl::OUString& rStrgPath,
                             const ::rtl::OUString& rStrmName,
                             const ::rtl::OUString& rSysFileName );
-
-private:
-    using               StorageObjectBase::construct;
 };
 
 // ============================================================================
@@ -179,6 +177,7 @@ class OcxPropertyObjectBase : public InputObjectBase
 protected:
     inline explicit     OcxPropertyObjectBase() {}
 
+    using               InputObjectBase::construct;
     void                construct(
                             const ObjectBase& rParent,
                             const BinaryInputStreamRef& rxStrm,
@@ -245,8 +244,6 @@ protected:
     void                dumpToPosition( sal_Int64 nPos );
 
 private:
-    using               InputObjectBase::construct;
-
     void                constructOcxPropObj( const String& rPropNameList, bool b64BitPropFlags );
 
     void                dumpVersion();
@@ -255,10 +252,10 @@ private:
     void                dumpLargeProperties();
 
 private:
-    enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY };
-
     struct LargeProperty
     {
+        enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY };
+
         LargePropertyType   mePropType;
         ::rtl::OUString     maItemName;
         sal_uInt32          mnDataSize;
diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/oox/inc/oox/dump/xlsbdumper.hxx
index 44cda06b2..b41f97a71 100644
--- a/oox/inc/oox/dump/xlsbdumper.hxx
+++ b/oox/inc/oox/dump/xlsbdumper.hxx
@@ -55,6 +55,7 @@ protected:
     explicit            RecordObjectBase();
     virtual             ~RecordObjectBase();
 
+    using               SequenceRecordObjectBase::construct;
     void                construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
     void                construct( const RecordObjectBase& rParent );
 
@@ -94,8 +95,6 @@ protected:
 
     // ------------------------------------------------------------------------
 private:
-    using               SequenceRecordObjectBase::construct;
-
     bool                readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue );
 
 private:
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index 387775f20..0f2f08cee 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -2839,7 +2839,6 @@ void WorkbookStreamObject::dumpObjRec()
 
 void WorkbookStreamObject::dumpObjRecBiff3()
 {
-    BiffInputStream& rStrm = getBiffStream();
     dumpDec< sal_uInt32 >( "obj-count" );
     sal_uInt16 nObjType = dumpDec< sal_uInt16 >( "obj-type", "OBJ-TYPE" );
     dumpDec< sal_uInt16 >( "obj-id" );
@@ -2903,7 +2902,6 @@ void WorkbookStreamObject::dumpObjRecBiff3()
 
 void WorkbookStreamObject::dumpObjRecBiff4()
 {
-    BiffInputStream& rStrm = getBiffStream();
     dumpDec< sal_uInt32 >( "obj-count" );
     sal_uInt16 nObjType = dumpDec< sal_uInt16 >( "obj-type", "OBJ-TYPE" );
     dumpDec< sal_uInt16 >( "obj-id" );
diff --git a/oox/source/dump/biffdumperconfig.dat b/oox/source/dump/biffdumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/biffdumperconfig.dat
+++ /dev/null
diff --git a/oox/source/dump/dffdumperconfig.dat b/oox/source/dump/dffdumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/dffdumperconfig.dat
+++ /dev/null
diff --git a/oox/source/dump/dumperconfig.dat b/oox/source/dump/dumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/dumperconfig.dat
+++ /dev/null
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index d168d1a87..248e49732 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -706,19 +706,19 @@ void OcxPropertyObjectBase::dumpUnknownProperty()
 void OcxPropertyObjectBase::dumpPosProperty()
 {
     if( startNextProperty() )
-        maLargeProps.push_back( LargeProperty( PROPTYPE_POS, getPropertyName(), 8 ) );
+        maLargeProps.push_back( LargeProperty( LargeProperty::PROPTYPE_POS, getPropertyName(), 8 ) );
 }
 
 void OcxPropertyObjectBase::dumpSizeProperty()
 {
     if( startNextProperty() )
-        maLargeProps.push_back( LargeProperty( PROPTYPE_SIZE, getPropertyName(), 8 ) );
+        maLargeProps.push_back( LargeProperty( LargeProperty::PROPTYPE_SIZE, getPropertyName(), 8 ) );
 }
 
 void OcxPropertyObjectBase::dumpGuidProperty( OUString* pValue )
 {
     if( startNextProperty() )
-        maLargeProps.push_back( LargeProperty( PROPTYPE_GUID, getPropertyName(), 16, pValue ) );
+        maLargeProps.push_back( LargeProperty( LargeProperty::PROPTYPE_GUID, getPropertyName(), 16, pValue ) );
 }
 
 void OcxPropertyObjectBase::dumpStringProperty( OUString* pValue )
@@ -727,7 +727,7 @@ void OcxPropertyObjectBase::dumpStringProperty( OUString* pValue )
     {
         alignInput< sal_uInt32 >();
         sal_uInt32 nLen = dumpHex< sal_uInt32 >( getPropertyName(), "OCX-STRINGLEN" );
-        maLargeProps.push_back( LargeProperty( PROPTYPE_STRING, getPropertyName(), nLen, pValue ) );
+        maLargeProps.push_back( LargeProperty( LargeProperty::PROPTYPE_STRING, getPropertyName(), nLen, pValue ) );
     }
 }
 
@@ -737,7 +737,7 @@ void OcxPropertyObjectBase::dumpStringArrayProperty()
     {
         alignInput< sal_uInt32 >();
         sal_uInt32 nLen = dumpHex< sal_uInt32 >( getPropertyName(), "CONV-DEC" );
-        maLargeProps.push_back( LargeProperty( PROPTYPE_STRINGARRAY, getPropertyName(), nLen ) );
+        maLargeProps.push_back( LargeProperty( LargeProperty::PROPTYPE_STRINGARRAY, getPropertyName(), nLen ) );
     }
 }
 
@@ -820,7 +820,7 @@ void OcxPropertyObjectBase::dumpLargeProperties()
         {
             switch( aIt->mePropType )
             {
-                case PROPTYPE_POS:
+                case LargeProperty::PROPTYPE_POS:
                 {
                     MultiItemsGuard aMultiGuard( out() );
                     writeEmptyItem( aIt->maItemName );
@@ -828,7 +828,7 @@ void OcxPropertyObjectBase::dumpLargeProperties()
                     dumpDec< sal_Int32 >( "left", "CONV-HMM-TO-CM" );
                 }
                 break;
-                case PROPTYPE_SIZE:
+                case LargeProperty::PROPTYPE_SIZE:
                 {
                     MultiItemsGuard aMultiGuard( out() );
                     writeEmptyItem( aIt->maItemName );
@@ -836,21 +836,21 @@ void OcxPropertyObjectBase::dumpLargeProperties()
                     dumpDec< sal_Int32 >( "height", "CONV-HMM-TO-CM" );
                 }
                 break;
-                case PROPTYPE_GUID:
+                case LargeProperty::PROPTYPE_GUID:
                 {
                     OUString aGuid = dumpGuid( aIt->maItemName );
                     if( aIt->mpItemValue )
                         *aIt->mpItemValue = cfg().getStringOption( aGuid, OUString() );
                 }
                 break;
-                case PROPTYPE_STRING:
+                case LargeProperty::PROPTYPE_STRING:
                 {
                     OUString aString = dumpString( aIt->maItemName, aIt->mnDataSize, false );
                     if( aIt->mpItemValue )
                         *aIt->mpItemValue = aString;
                 }
                 break;
-                case PROPTYPE_STRINGARRAY:
+                case LargeProperty::PROPTYPE_STRINGARRAY:
                 {
                     writeEmptyItem( aIt->maItemName );
                     IndentGuard aIndGuard2( out() );
@@ -879,7 +879,7 @@ void OcxPropertyObjectBase::dumpLargeProperties()
             writeEmptyItem( aIt->maItemName );
             if( ensureValid( aIt->mnData == 0xFFFF ) )
             {
-                IndentGuard aIndGuard( out() );
+                IndentGuard aIndGuard2( out() );
                 OUString aClassName = cfg().getStringOption( dumpGuid(), OUString() );
                 if( aClassName.equalsAscii( "StdFont" ) )
                     StdFontObject( *this ).dump();
diff --git a/oox/source/dump/olestoragedumper.cxx b/oox/source/dump/olestoragedumper.cxx
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/olestoragedumper.cxx
+++ /dev/null
diff --git a/oox/source/dump/olestoragedumperconfig.dat b/oox/source/dump/olestoragedumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/olestoragedumperconfig.dat
+++ /dev/null
diff --git a/oox/source/dump/pptxdumperconfig.dat b/oox/source/dump/pptxdumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/pptxdumperconfig.dat
+++ /dev/null
diff --git a/oox/source/dump/xlsbdumperconfig.dat b/oox/source/dump/xlsbdumperconfig.dat
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/dump/xlsbdumperconfig.dat
+++ /dev/null
diff --git a/oox/source/xls/validationpropertyhelper.cxx b/oox/source/xls/validationpropertyhelper.cxx
deleted file mode 100644
index e69de29bb..000000000
--- a/oox/source/xls/validationpropertyhelper.cxx
+++ /dev/null