making sc/source/filter compile again

25 files changed, 89 insertions, 126 deletions

diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 4b9f51e078ab..21da6840be6e 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -68,6 +68,7 @@ class ScDocument;
 class ScUserListData;
 class ScProgress;
 
+struct ScDPLabelData;
 typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef;
 
 // -----------------------------------------------------------------------
@@ -192,28 +193,6 @@ typedef ::std::vector< ScPivotField > ScPivotFieldVector;
 
 // ============================================================================
 
-struct ScPivotParam
-{
-    SCCOL           nCol;           // Cursor Position /
-    SCROW           nRow;           // bzw. Anfang des Zielbereiches
-    SCTAB           nTab;
-    ScDPLabelDataVector maLabelArray;
-    ScPivotFieldVector maPageArr;
-    ScPivotFieldVector maColArr;
-    ScPivotFieldVector maRowArr;
-    ScPivotFieldVector maDataArr;
-    bool            bIgnoreEmptyRows;
-    bool            bDetectCategories;
-    bool            bMakeTotalCol;
-    bool            bMakeTotalRow;
-
-    ScPivotParam();
-
-    bool            operator==( const ScPivotParam& r ) const;
-};
-
-// ============================================================================
-
 struct ScPivotFuncData
 {
     SCCOL               mnCol;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index faacdb368368..ad479d7ab1b4 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -570,8 +570,8 @@ public:
 
     sal_Bool        IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
 
-    bool        ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
-    bool        RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
+    bool        ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
+    bool        RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
 
     void        ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
     void        DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 9c25d346becf..cb930ff3a298 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -93,8 +93,8 @@ public:
     virtual const ScRefList*    GetRefList() const;
     virtual       ScRefList*    GetRefList();
 
-    virtual sal_Bool                TextEqual( const formula::FormulaToken& rToken ) const;
-    virtual sal_Bool                Is3DRef() const;    // reference with 3D flag set
+    virtual bool                TextEqual( const formula::FormulaToken& rToken ) const;
+    virtual bool                Is3DRef() const;    // reference with 3D flag set
 
     /** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge
         ranges as needed for ocRange.
@@ -134,7 +134,7 @@ public:
     virtual ScSingleRefData&      GetSingleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScSingleRefToken(*this); }
 
     DECL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken );
@@ -163,7 +163,7 @@ public:
     virtual ScSingleRefData&      GetSingleRef2();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScDoubleRefToken(*this); }
 
     DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken );
@@ -180,7 +180,7 @@ public:
                                     ScToken( r ), pMatrix( r.pMatrix ) {}
     virtual const ScMatrix*     GetMatrix() const;
     virtual ScMatrix*           GetMatrix();
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixToken(*this); }
 };
 
@@ -204,7 +204,7 @@ public:
     virtual ScSingleRefData&          GetSingleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalSingleRefToken(*this); }
 };
 
@@ -232,7 +232,7 @@ public:
     virtual ScComplexRefData&      GetDoubleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalDoubleRefToken(*this); }
 };
 
@@ -250,7 +250,7 @@ public:
     virtual                     ~ScExternalNameToken();
     virtual sal_uInt16              GetIndex() const;
     virtual const String&       GetString() const;
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalNameToken(*this); }
 };
 
@@ -268,7 +268,7 @@ public:
                                     ScToken( r ), pJumpMatrix( r.pJumpMatrix ) {}
     virtual                     ~ScJumpMatrixToken();
     virtual ScJumpMatrix*       GetJumpMatrix() const;
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScJumpMatrixToken(*this); }
 };
 
@@ -288,7 +288,7 @@ public:
     virtual void                CalcRelFromAbs( const ScAddress& );
     virtual const ScRefList*    GetRefList() const;
     virtual       ScRefList*    GetRefList();
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScRefListToken(*this); }
 };
 
@@ -310,7 +310,7 @@ public:
             bool                IsDisplayedAsString() const { return bDisplayedAsString; }
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScEmptyCellToken(*this); }
 };
 
@@ -335,7 +335,7 @@ public:
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
     virtual const ScMatrix*     GetMatrix() const;
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixCellResultToken(*this); }
     formula::StackVar           GetUpperLeftType() const
                                     {
@@ -372,7 +372,7 @@ public:
                                         if (xUpperLeft)
                                             xUpperLeft = xUpperLeft->Clone();
                                     }
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixFormulaCellToken(*this); }
             void                SetMatColsRows( SCCOL nC, SCROW nR )
                                     {
@@ -436,7 +436,7 @@ public:
             const String &      GetFormula() const  { return aFormula; }
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
-    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
+    virtual bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScHybridCellToken(*this); }
 };
 
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 1b2491ae15dd..dad9397d488f 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -87,10 +87,11 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <boost/shared_ptr.hpp>
 
 using ::rtl::OString;
+using namespace oox;
 
 static String lcl_GetVbaTabName( SCTAB n )
 {
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index beb64b9b30ca..246a1bc6d1af 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -325,6 +325,7 @@ void ImportExcel8::ReadBasic( void )
 {
     SfxObjectShell* pShell = GetDocShell();
     SotStorageRef xRootStrg = GetRootStorage();
+    SvtFilterOptions* pFilterOpt = SvtFilterOptions::Get();
     if( pShell && xRootStrg.Is() ) try
     {
         bool bLoadCode = pFilterOpt->IsLoadExcelBasicCode();
@@ -392,12 +393,6 @@ void ImportExcel8::ReadBasic( void )
         catch( uno::Exception& )
         {
         }
-        aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
-        aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler();
-
-        // call the filter
-        uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
-        xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
     }
     catch( uno::Exception& )
     {
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index 2b442a240bb8..4cfedccea8f5 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -185,7 +185,7 @@ void XclImpOutlineBuffer::SetButtonMode( bool bRightOrUnder )
     mbButtonAfter = bRightOrUnder;
 }
 
-ExcScenarioCell::ExcScenarioCell( const UINT16 nC, const UINT16 nR )
+ExcScenarioCell::ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR )
     : nCol( nC ), nRow( nR )
 {
 }
@@ -261,8 +261,8 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const sal_Bool bLast )
     boost::ptr_vector<ExcScenarioCell>::const_iterator iter;
     for (iter = aEntries.begin(); iter != aEntries.end(); ++iter)
     {
-        UINT16 nCol = iter->nCol;
-        UINT16 nRow = iter->nRow;
+        sal_uInt16 nCol = iter->nCol;
+        sal_uInt16 nRow = iter->nRow;
         String aVal = iter->GetValue();
 
         r.ApplyFlagsTab( nCol, nRow, nCol, nRow, nNewTab, SC_MF_SCENARIO );
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 0b34736d8c8f..3cc62c5e71c8 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -160,7 +160,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCsTAB nTab, const sal_Bool b
     }
 }
 
-const ScRange* _ScRangeListTabs::First( const UINT16 n )
+const ScRange* _ScRangeListTabs::First( const sal_uInt16 n )
 {
     DBG_ASSERT( ValidTab(n), "-_ScRangeListTabs::First(): Und tschuessssssss!" );
 
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 07a8ba1aaf03..70feaa4e4e22 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -89,9 +89,9 @@ FltError ImportExcel::Read( void )
 
     Zustand             eAkt = Z_BiffNull, ePrev = Z_BiffNull;
 
-    FltError            eLastErr = eERR_OK;
-    UINT16              nOpcode;
-    UINT16              nBofLevel = 0;
+    FltError        eLastErr = eERR_OK;
+    sal_uInt16      nOpcode;
+    sal_uInt16      nBofLevel = 0;
 
     DBG_ASSERT( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
 
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index c7cfe136bff2..747e681d0b7f 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -85,7 +85,7 @@
 #include "svx/xlnstit.hxx"
 #include "svx/sxmspitm.hxx"
 
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <oox/export/drawingml.hxx>
 #include <oox/export/chartexport.hxx>
 #include <oox/export/utils.hxx>
@@ -115,6 +115,7 @@ using ::com::sun::star::chart2::XChartDocument;
 using ::com::sun::star::container::XNamed;
 using ::oox::drawingml::DrawingML;
 using ::oox::drawingml::ChartExport;
+using namespace oox;
 
 #define  HMM2XL(x)        ((x)/26.5)+0.5
 
@@ -172,11 +173,11 @@ static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, Rectan
 }
 #endif
 
-static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect, INT32 nTab, Rectangle &aFrom, Rectangle &aTo )
+static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect, sal_Int32 nTab, Rectangle &aFrom, Rectangle &aTo )
 {
     bool bTo = false;
-    INT32 nCol = 0, nRow = 0;
-    INT32 nColOff = 0, nRowOff= 0;
+    sal_Int32 nCol = 0, nRow = 0;
+    sal_Int32 nColOff = 0, nRowOff= 0;
 
     while(1)
     {
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index d8fe4bed9234..89eca3871186 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -53,13 +53,15 @@
 #include <../../ui/inc/viewdata.hxx>
 #include <excdoc.hxx>
 
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <formula/grammar.hxx>
 #include <oox/export/drawingml.hxx>
+#include <oox/xls/excelvbaproject.hxx>
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
+#include <cppuhelper/implementationentry.hxx>
 
 #define DEBUG_XL_ENCRYPTION 0
 
@@ -985,8 +987,8 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
 
 // ============================================================================
 
-XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr )
-    : XmlFilterBase( rSMgr ),
+XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC )
+    : XmlFilterBase( rCC ),
       mpRoot( NULL )
 {
 }
@@ -1173,9 +1175,9 @@ Sequence< OUString > SAL_CALL XlsxExport_getSupportedServiceNames() throw()
     return aSeq;
 }
 
-Reference< XInterface > SAL_CALL XlsxExport_createInstance(const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception )
+Reference< XInterface > SAL_CALL XlsxExport_createInstance(const Reference< XComponentContext > & rCC ) throw( Exception )
 {
-    return (cppu::OWeakObject*) new XclExpXmlStream( rSMgr );
+    return (cppu::OWeakObject*) new XclExpXmlStream( rCC );
 }
 
 #ifdef __cplusplus
@@ -1215,30 +1217,20 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceMan
 // ------------------------
 // - component_getFactory -
 // ------------------------
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+::cppu::ImplementationEntry entries [] =
 {
-    Reference< XSingleServiceFactory > xFactory;
-    void* pRet = 0;
-
-    if ( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
     {
-        const OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM(IMPL_NAME));
-
-        xFactory = Reference< XSingleServiceFactory >( ::cppu::createSingleFactory(
-                    reinterpret_cast< XMultiServiceFactory* >( pServiceManager ),
-                    XlsxExport_getImplementationName(),
-                    XlsxExport_createInstance,
-                    XlsxExport_getSupportedServiceNames() ) );
-    }
+        XlsxExport_createInstance, XlsxExport_getImplementationName,
+        XlsxExport_getSupportedServiceNames, ::cppu::createSingleComponentFactory,
+        0, 0
+    },
+    { 0, 0, 0, 0, 0, 0 }
+};
 
-    if ( xFactory.is() )
-    {
-        xFactory->acquire();
-        pRet = xFactory.get();
-    }
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, XMultiServiceFactory* pServiceManager, XRegistryKey*  pRegistryKey )
+{
+    return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries );
 
-    return pRet;
 }
 
 #ifdef __cplusplus
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 79b4d1949507..8b988f379da1 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -57,11 +57,12 @@
 #include "globstr.hrc"
 #include "xestring.hxx"
 
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 using ::rtl::OString;
 using ::rtl::OUString;
+using namespace oox;
 
 // PALETTE record - color information =========================================
 
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 40a3e7ab9d23..184940fcb5bd 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -1131,7 +1131,7 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
 
     // request and verify a password (decrypter implements IDocPasswordVerifier)
     if( xDecr )
-        rStrm.GetRoot().RequestPassword( *xDecr );
+        rStrm.GetRoot().RequestEncryptionData( *xDecr );
 
     // return error code (success, wrong password, etc.)
     return xDecr ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 418ae1d0f689..56c5dd242d6e 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -254,14 +254,6 @@ double XclRoot::GetPixelYFromHmm( sal_Int32 nY ) const
     return static_cast< double >( (nY - 0.5) / mrData.mfScreenPixelY );
 }
 
-
-String XclRoot::RequestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const
-{
-    ::std::vector< OUString > aDefaultPasswords;
-    aDefaultPasswords.push_back( mrData.maDefPassword );
-    return ScfApiHelper::QueryEncryptionDataForMedium( mrData.mrMedium, rVerifier, &aDefaultPasswords );
-}
-
 bool XclRoot::HasVbaStorage() const
 {
     SotStorageRef xRootStrg = GetRootStorage();
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index b1c671b956e6..5b7e3f0d2f59 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -47,7 +47,7 @@ public:
     const sal_uInt16                nCol;
     const sal_uInt16                nRow;
 
-    ExcScenarioCell( const UINT16 nC, const UINT16 nR );
+    ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR );
 
     inline void SetValue( const String& rVal ) { aValue = rVal; }
 
@@ -69,8 +69,8 @@ protected:
     String* pName;
     String* pComment;
     String* pUserName;
-    UINT8 nProtected;
-    const UINT16 nTab;
+    sal_uInt8 nProtected;
+    const sal_uInt16 nTab;
     boost::ptr_vector<ExcScenarioCell> aEntries;
 };
 
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 9cf88b17ac26..9dc55a65c996 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -72,7 +72,7 @@ class _ScRangeListTabs
     sal_Bool                        bHasRanges;
     _ScRangeList**              ppTabLists;
     _ScRangeList*               pAct;
-    UINT16                      nAct;
+    sal_uInt16                      nAct;
 
 public:
 
@@ -83,7 +83,7 @@ public:
     void Append( ScSingleRefData aSRD, SCsTAB nTab, const sal_Bool bLimit = true );
     void Append( ScComplexRefData aCRD, SCsTAB nTab, const sal_Bool bLimit = true );
 
-    const ScRange* First ( const UINT16 nTab = 0 );
+    const ScRange* First ( const sal_uInt16 nTab = 0 );
     const ScRange* Next ();
 
     inline bool HasRanges () const { return bHasRanges; }
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index eecd4c11916f..f882e07680db 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -46,10 +46,10 @@ class LotAttrTable;
 
 struct LotAttrWK3
 {
-    UINT8 nFont;
-    UINT8 nLineStyle;
-    UINT8 nFontCol;
-    UINT8 nBack;
+    sal_uInt8 nFont;
+    sal_uInt8 nLineStyle;
+    sal_uInt8 nFontCol;
+    sal_uInt8 nBack;
 
     inline bool HasStyles () const
     {
@@ -95,17 +95,17 @@ private:
 
     inline static void  MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
     {
-        ( ( UINT8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F;
-        ( ( UINT8* ) &rOut )[ 1 ] = rAttr.nLineStyle;
-        ( ( UINT8* ) &rOut )[ 2 ] = rAttr.nFontCol;
-        ( ( UINT8* ) &rOut )[ 3 ] = rAttr.nBack;
+        ( ( sal_uInt8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F;
+        ( ( sal_uInt8* ) &rOut )[ 1 ] = rAttr.nLineStyle;
+        ( ( sal_uInt8* ) &rOut )[ 2 ] = rAttr.nFontCol;
+        ( ( sal_uInt8* ) &rOut )[ 3 ] = rAttr.nBack;
     }
 
-    static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& );
+    static void LotusToScBorderLine( sal_uInt8 nLine, SvxBorderLine& );
 
-    const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const;
+    const SvxColorItem& GetColorItem( const sal_uInt8 nLotIndex ) const;
 
-    const Color& GetColor( const UINT8 nLotIndex ) const;
+    const Color& GetColor( const sal_uInt8 nLotIndex ) const;
 
     ScDocumentPool*     pDocPool;
     SvxColorItem*       ppColorItems[6];        // 0 und 7 fehlen!
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index b60e9ea4f178..6b08ffa0e2ca 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -85,8 +85,8 @@ protected:
         XclExpMsoDrawing*   pClientTextbox;
         XclTxo*             pTxo;
         sal_uInt16          mnObjType;
-        UINT16              nObjId;
-        UINT16              nGrbit;
+        sal_uInt16              nObjId;
+        sal_uInt16              nGrbit;
         SCTAB               mnScTab;
         sal_Bool                bFirstOnSheet;
 
@@ -108,7 +108,7 @@ public:
 
     inline sal_uInt16           GetObjType() const { return mnObjType; }
 
-    inline  void                SetId( UINT16 nId ) { nObjId = nId; }
+    inline  void                SetId( sal_uInt16 nId ) { nObjId = nId; }
     inline  sal_uInt16          GetId() const       { return nObjId; }
 
     inline  void                SetTab( SCTAB nScTab )  { mnScTab = nScTab; }
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 8e18bf6e3644..0af3d7227779 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -310,7 +310,7 @@ public:
 class XclExpXmlStream : public oox::core::XmlFilterBase
 {
 public:
-    XclExpXmlStream( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr );
+    XclExpXmlStream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCC );
     virtual ~XclExpXmlStream();
 
     /** Returns the filter root data. */
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 928b06fe0378..5a8bb17623c3 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -89,7 +89,7 @@ LotAttrCache::LotAttrCache ()
 
 LotAttrCache::~LotAttrCache()
 {
-    for( UINT16 nCnt = 0 ; nCnt < 6 ; nCnt++ )
+    for( sal_uInt16 nCnt = 0 ; nCnt < 6 ; nCnt++ )
         delete ppColorItems[ nCnt ];
 
     delete pBlack;
@@ -168,9 +168,9 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
 }
 
 
-void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL )
+void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, SvxBorderLine& aBL )
 {
-    static const UINT16 pPara[ 4 ][ 3 ] =
+    static const sal_uInt16 pPara[ 4 ][ 3 ] =
     {
         { 0,0,0 },
         { DEF_LINE_WIDTH_1, 0, 0 },
@@ -188,7 +188,7 @@ void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL )
     }
 }
 
-const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const
+const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) const
 {
     DBG_ASSERT( nLotIndex > 0 && nLotIndex < 7,
         "-LotAttrCache::GetColorItem(): so nicht!" );
@@ -196,7 +196,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const
     return *ppColorItems[ nLotIndex - 1 ];
 }
 
-const Color& LotAttrCache::GetColor( const UINT8 nLotIndex ) const
+const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
 {
     // Farbe <-> Index passt fuer Background, nicht aber fuer Fonts (0 <-> 7)!
     DBG_ASSERT( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7!" );
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 4284ac68b4c6..589b291864cb 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -183,7 +183,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
             // [Parameter{;Parameter}]
             aPool << eParam[ nLast ];
 
-            INT16 nNull = -1;   // gibt einen auszulassenden Parameter an
+            sal_Int16 nNull = -1;   // gibt einen auszulassenden Parameter an
             for( nLauf = nLast - 1 ; nLauf >= 0 ; nLauf-- )
             {
                 if( nLauf != nNull )
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index e5e780355eeb..f0a69cae3358 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -168,7 +168,7 @@ void OP_Label( SvStream& r, sal_uInt16 n )
     delete [] pText;
 }
 
-void OP_Formula( SvStream& r, UINT16 /*n*/ )
+void OP_Formula( SvStream& r, sal_uInt16 /*n*/ )
 {
     sal_uInt8               nFormat;
     sal_uInt16              nCol, nRow, nFormulaSize;
@@ -254,7 +254,7 @@ void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ )
 void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ )
 {
     // POST:    waren Koordinaten ungueltig, wird nicht gespeichert
-    UINT16              nColSt, nRowSt, nColEnd, nRowEnd;
+    sal_uInt16              nColSt, nRowSt, nColEnd, nRowEnd;
     sal_uInt8               nType;
     sal_Char            cPuffer[ 32 ];
 
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 7495199fb704..b3c17cd5becd 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -152,7 +152,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
 
     if( nArgs> 0 )
     {
-        INT16 nLast = nArgs- 1;
+        sal_Int16 nLast = nArgs- 1;
 
         if( eOc == ocZGZ )
             aPool << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ];
@@ -160,7 +160,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
             aPool << eParam[ 3 ] << ocSep << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ];
         else
         {
-            INT16 nNull = -1;
+            sal_Int16 nNull = -1;
             aPool << eParam[ nLast ];
             for( nCount = nLast - 1 ; nCount >= 0 ; nCount-- )
             {
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index fbb81b220ae0..21541cf5e3d7 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1212,7 +1212,7 @@ void Sc10Import::LoadPatternCollection()
                 else if( ( OJustify & ojTopBottom ) == ojTopBottom )
                     rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
 
-                INT16 Margin = Max( ( sal_uInt16 ) 20, ( sal_uInt16 ) ( EJustify * 20 ) );
+                sal_Int16 Margin = Max( ( sal_uInt16 ) 20, ( sal_uInt16 ) ( EJustify * 20 ) );
                 if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
                     rItemSet.Put( SvxMarginItem( 20, Margin, 20, Margin, ATTR_MARGIN ) );
                 else
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 7168e46dd995..cab208e7dc21 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -39,12 +39,13 @@
 #include "cell.hxx"
 #include "xcl97rec.hxx"
 
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <rtl/strbuf.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OString;
 using ::rtl::OStringBuffer;
+using namespace oox;
 
 static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] )
 {
@@ -1379,7 +1380,7 @@ class ExcXmlRecord : public ExcRecord
 {
 public:
     virtual sal_Size    GetLen() const;
-    virtual UINT16      GetNum() const;
+    virtual sal_uInt16  GetNum() const;
     virtual void        Save( XclExpStream& rStrm );
     virtual void        SaveXml( XclExpXmlStream& rStrm ) = 0;
 };
@@ -1389,7 +1390,7 @@ sal_Size ExcXmlRecord::GetLen() const
     return 0;
 }
 
-UINT16 ExcXmlRecord::GetNum() const
+sal_uInt16 ExcXmlRecord::GetNum() const
 {
     return 0;
 }
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 69ae4eadbaa9..7459ebc6cf3b 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -80,7 +80,7 @@
 
 #include <com/sun/star/sheet/XCellAddressable.hpp>
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
 #include <oox/export/shapes.hxx>
 #include <oox/export/utils.hxx>
 #include <oox/export/vmlexport.hxx>
@@ -95,6 +95,7 @@ using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::drawing::XShape;
 using ::oox::drawingml::ShapeExport;
 using ::oox::vml::VMLExport;
+using namespace oox;
 
 // ============================================================================