move OCX_Control ( and subclasses ) and OCX control export to oox

1 files changed, 0 insertions, 70 deletions

diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index af3076477c56..af9ed4fc040f 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -121,76 +121,6 @@ void AxAlignedInputStream::align( size_t nSize )
 
 // ============================================================================
 
-AxFontData::AxFontData() :
-    mnFontEffects( 0 ),
-    mnFontHeight( 160 ),
-    mnFontCharSet( WINDOWS_CHARSET_DEFAULT ),
-    mnHorAlign( AX_FONTDATA_LEFT ),
-    mbDblUnderline( false )
-{
-}
-
-sal_Int16 AxFontData::getHeightPoints() const
-{
-    /*  MSO uses weird font sizes:
-        1pt->30, 2pt->45, 3pt->60, 4pt->75, 5pt->105, 6pt->120, 7pt->135,
-        8pt->165, 9pt->180, 10pt->195, 11pt->225, ... */
-    return getLimitedValue< sal_Int16, sal_Int32 >( (mnFontHeight + 10) / 20, 1, SAL_MAX_INT16 );
-}
-
-void AxFontData::setHeightPoints( sal_Int16 nPoints )
-{
-    mnFontHeight = getLimitedValue< sal_Int32, sal_Int32 >( ((nPoints * 4 + 1) / 3) * 15, 30, 4294967 );
-}
-
-bool AxFontData::importBinaryModel( BinaryInputStream& rInStrm )
-{
-    AxBinaryPropertyReader aReader( rInStrm );
-    aReader.readStringProperty( maFontName );
-    aReader.readIntProperty< sal_uInt32 >( mnFontEffects );
-    aReader.readIntProperty< sal_Int32 >( mnFontHeight );
-    aReader.skipIntProperty< sal_Int32 >(); // font offset
-    aReader.readIntProperty< sal_uInt8 >( mnFontCharSet );
-    aReader.skipIntProperty< sal_uInt8 >(); // font pitch/family
-    aReader.readIntProperty< sal_uInt8 >( mnHorAlign );
-    aReader.skipIntProperty< sal_uInt16 >(); // font weight
-    mbDblUnderline = false;
-    return aReader.finalizeImport();
-}
-
-bool AxFontData::importStdFont( BinaryInputStream& rInStrm )
-{
-    StdFontInfo aFontInfo;
-    if( OleHelper::importStdFont( aFontInfo, rInStrm, false ) )
-    {
-        maFontName = aFontInfo.maName;
-        mnFontEffects = 0;
-        setFlag( mnFontEffects, AX_FONTDATA_BOLD,      aFontInfo.mnWeight >= OLE_STDFONT_BOLD );
-        setFlag( mnFontEffects, AX_FONTDATA_ITALIC,    getFlag( aFontInfo.mnFlags, OLE_STDFONT_ITALIC ) );
-        setFlag( mnFontEffects, AX_FONTDATA_UNDERLINE, getFlag( aFontInfo.mnFlags, OLE_STDFONT_UNDERLINE ) );
-        setFlag( mnFontEffects, AX_FONTDATA_STRIKEOUT, getFlag( aFontInfo.mnFlags,OLE_STDFONT_STRIKE ) );
-        mbDblUnderline = false;
-        // StdFont stores font height in 1/10,000 of points
-        setHeightPoints( getLimitedValue< sal_Int16, sal_Int32 >( aFontInfo.mnHeight / 10000, 0, SAL_MAX_INT16 ) );
-        mnFontCharSet = aFontInfo.mnCharSet;
-        mnHorAlign = AX_FONTDATA_LEFT;
-        return true;
-    }
-    return false;
-}
-
-bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
-{
-    OUString aGuid = OleHelper::importGuid( rInStrm );
-    if( aGuid.equalsAscii( AX_GUID_CFONT ) )
-        return importBinaryModel( rInStrm );
-    if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) )
-        return importStdFont( rInStrm );
-    return false;
-}
-
-// ============================================================================
-
 namespace {
 
 bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32 nSize, bool bArrayString )