Merge branch 'master' into feature/gnumake4

Conflicts:
	starmath/JunitTest_sm_unoapi.mk
	starmath/Library_sm.mk
	starmath/Library_smd.mk
	starmath/Makefile
	starmath/prj/build.lst
	starmath/prj/makefile.mk
	starmath/qa/unoapi/Test.java
	starmath/source/detreg.cxx
	starmath/source/register.cxx
	starmath/source/smdetect.cxx
	sw/Library_sw.mk
	sw/Library_swd.mk
	sw/Library_swui.mk
	sw/Library_vbaswobj.mk
	sw/inc/iodetect.hxx
	sw/inc/swddllapi.h
	sw/source/filter/basflt/iodetect.cxx

1 files changed, 0 insertions, 102 deletions

diff --git a/sw/source/filter/ww8/dump/msvbasic.hxx b/sw/source/filter/ww8/dump/msvbasic.hxx
deleted file mode 100644
index 9b5128a70e7c..000000000000
--- a/sw/source/filter/ww8/dump/msvbasic.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _MSVBASIC_HXX
-#define _MSVBASIC_HXX
-
-#ifdef _SOLAR_H
-#include <tools/solar.h>
-#endif
-#include <tools/debug.hxx>
-#include <sot/storage.hxx>
-
-
-/* class VBA:
- * The VBA class provides a set of methods to handle Visual Basic For
- * Applications streams, the constructor is given the root ole2 stream
- * of the document, Open reads the VBA project file and figures out
- * the number of VBA streams, and the offset of the data within them.
- * Decompress decompresses a particular numbered stream, NoStreams returns
- * this number, and StreamName can give you the streams name. Decompress
- * will return a string with the decompressed data. The optional extra
- * argument will be set if not NULL to 1 in the case of a string overflow,
- * if I can figure out how to do that.
- *
- * Otherwise it is possible to inherit from VBA and implement a Output
- * member which gets called with each 4096 output sized block.
- *
- * cmc
- * */
-
-#define WINDOWLEN 4096
-
-class VBA_Impl
-{
-public:
-        VBA_Impl( SvStorage &rIn, sal_Bool bCmmntd = sal_True )
-            : xStor(&rIn), pOffsets(0), nOffsets(0), bCommented(bCmmntd)
-            {}
-        ~VBA_Impl() {if (nOffsets) delete [] pOffsets;}
-        //0 for failure, 1 for success
-        sal_Bool Open( const String &rToplevel, const String &rSublevel);
-        const String & Decompress( sal_uInt16 nIndex, int *pOverflow=0);
-        sal_uInt16 GetNoStreams() const                 { return nOffsets; }
-        const String &GetStreamName( sal_uInt16 nIndex ) const
-            {
-                DBG_ASSERT( nIndex < nOffsets, "Index out of range" );
-                return pOffsets[ nIndex ].sName;
-            }
-        virtual void Output(int len,const sal_uInt8 *data);
-private:
-        struct VBAOffset_Impl
-        {
-            String sName;
-            sal_uInt32 nOffset;
-        };
-
-        SvStorageRef xVBA;
-        String sVBAString;
-        SvStorageRef xStor;
-        VBAOffset_Impl *pOffsets;
-        sal_uInt16 nOffsets;
-        sal_uInt8 aHistory[ WINDOWLEN ];
-        sal_Bool bCommented;
-
-        //0 for failure, anything else for success
-        int ReadVBAProject(const SvStorageRef &rxVBAStorage);
-        int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
-        void Confirm12Zeros(SvStorageStreamRef &xVBAProject);
-        void ConfirmHalfWayMarker(SvStorageStreamRef &xVBAProject);
-        void ConfirmFixedMiddle(SvStorageStreamRef &xVBAProject);
-        void ConfirmFixedMiddle2(SvStorageStreamRef &xVBAProject);
-        void ConfirmFixedOctect(SvStorageStreamRef &xVBAProject);
-        sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject);
-};
-
-
-
-
-#endif