diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:22:57 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:11 +0200 |
commit | ca362d6348e4d0a29317492b3c8ef9637a656f4f (patch) | |
tree | 80e13761f3d287077dfb0620638fd0397087c9e4 /oox/source/ole | |
parent | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (diff) |
remove whitespaces
Change-Id: Ie14ba3dcb97f20479a04538748ef2c1c9e6c5dac
Diffstat (limited to 'oox/source/ole')
-rw-r--r-- | oox/source/ole/axbinaryreader.cxx | 12 | ||||
-rw-r--r-- | oox/source/ole/axbinarywriter.cxx | 12 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 54 | ||||
-rw-r--r-- | oox/source/ole/axcontrolfragment.cxx | 8 | ||||
-rw-r--r-- | oox/source/ole/axfontdata.cxx | 4 | ||||
-rw-r--r-- | oox/source/ole/olehelper.cxx | 14 | ||||
-rw-r--r-- | oox/source/ole/oleobjecthelper.cxx | 8 | ||||
-rw-r--r-- | oox/source/ole/olestorage.cxx | 12 | ||||
-rw-r--r-- | oox/source/ole/vbacontrol.cxx | 16 | ||||
-rw-r--r-- | oox/source/ole/vbahelper.cxx | 6 | ||||
-rw-r--r-- | oox/source/ole/vbainputstream.cxx | 6 | ||||
-rw-r--r-- | oox/source/ole/vbamodule.cxx | 4 | ||||
-rw-r--r-- | oox/source/ole/vbaproject.cxx | 14 |
13 files changed, 0 insertions, 170 deletions
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index 16e65f5d1a73..9df00e7672a2 100644 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx @@ -24,8 +24,6 @@ namespace oox { namespace ole { - - namespace { const sal_uInt32 AX_STRING_SIZEMASK = 0x7FFFFFFF; @@ -33,8 +31,6 @@ const sal_uInt32 AX_STRING_COMPRESSED = 0x80000000; } // namespace - - AxAlignedInputStream::AxAlignedInputStream( BinaryInputStream& rInStrm ) : BinaryStreamBase( false ), mpInStrm( &rInStrm ), @@ -106,8 +102,6 @@ void AxAlignedInputStream::align( size_t nSize ) skip( static_cast< sal_Int32 >( (nSize - (mnStrmPos % nSize)) % nSize ) ); } - - namespace { bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32 nSize, bool bArrayString ) @@ -127,8 +121,6 @@ bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32 } // namespace - - AxBinaryPropertyReader::ComplexProperty::~ComplexProperty() { } @@ -175,8 +167,6 @@ bool AxBinaryPropertyReader::PictureProperty::readProperty( AxAlignedInputStream return OleHelper::importStdPic( mrPicData, rInStrm, true ); } - - AxBinaryPropertyReader::AxBinaryPropertyReader( BinaryInputStream& rInStrm, bool b64BitPropFlags ) : maInStrm( rInStrm ), mbValid( true ) @@ -285,8 +275,6 @@ bool AxBinaryPropertyReader::startNextProperty() return ensureValid() && bHasProp; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index 076dfff8aead..eaa336e10a36 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -13,16 +13,12 @@ namespace oox { namespace ole { - - namespace { const sal_uInt32 AX_STRING_COMPRESSED = 0x80000000; } // namespace - - AxAlignedOutputStream::AxAlignedOutputStream( BinaryOutputStream& rOutStrm ) : BinaryStreamBase( false ), mpOutStrm( &rOutStrm ), @@ -88,8 +84,6 @@ void AxAlignedOutputStream::align( size_t nSize ) pad( static_cast< sal_Int32 >( (nSize - (mnStrmPos % nSize)) % nSize ) ); } - - namespace { void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt32 nSize, bool bArrayString ) @@ -100,8 +94,6 @@ void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt } // namespace - - AxBinaryPropertyWriter::ComplexProperty::~ComplexProperty() { } @@ -118,8 +110,6 @@ bool AxBinaryPropertyWriter::StringProperty::writeProperty( AxAlignedOutputStrea return true; } - - AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bool b64BitPropFlags ) : maOutStrm( rOutStrm ), mnPropFlags( 0x0 ), @@ -212,8 +202,6 @@ bool AxBinaryPropertyWriter::startNextProperty( bool bSkip ) return true; } - - } // namespace exp } // namespace ole diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index f767fb340659..d4426c08c897 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -90,8 +90,6 @@ const sal_uInt32 COMCTL_SCROLLBAR_HOR = 0x00000010; const sal_uInt32 COMCTL_ID_PROGRESSBAR_50 = 0xE6E17E84; const sal_uInt32 COMCTL_ID_PROGRESSBAR_60 = 0x97AB8A01; - - const sal_uInt32 AX_CMDBUTTON_DEFFLAGS = 0x0000001B; const sal_uInt32 AX_LABEL_DEFFLAGS = 0x0080001B; const sal_uInt32 AX_IMAGE_DEFFLAGS = 0x0000001B; @@ -150,8 +148,6 @@ const sal_Int32 AX_CONTAINER_CYCLEALL = 0; const sal_Int32 AX_CONTAINER_SCR_NONE = 0x00; - - const sal_Int16 API_BORDER_NONE = 0; const sal_Int16 API_BORDER_SUNKEN = 1; const sal_Int16 API_BORDER_FLAT = 2; @@ -160,8 +156,6 @@ const sal_Int16 API_STATE_UNCHECKED = 0; const sal_Int16 API_STATE_CHECKED = 1; const sal_Int16 API_STATE_DONTKNOW = 2; - - /** Tries to extract a range address from a defined name. */ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XModel >& rxDocModel, const OUString& rAddressString ) { @@ -217,8 +211,6 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx } // namespace - - ControlConverter::ControlConverter( const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) : mxDocModel( rxDocModel ), @@ -578,8 +570,6 @@ void ControlConverter::convertToAxOrientation( PropertySet& rPropSet, nOrientation = AX_ORIENTATION_VERTICAL; } - - ControlModelBase::ControlModelBase() : maSize( 0, 0 ), mbAwtModel( false ) @@ -654,8 +644,6 @@ void ControlModelBase::convertSize( PropertyMap& rPropMap, const ControlConverte rConv.convertSize( rPropMap, maSize ); } - - ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ) : maFontData( "Tahoma", 82500 ), @@ -768,8 +756,6 @@ bool ComCtlModelBase::importComplexPart( BinaryInputStream& rInStrm ) return false; } - - ComCtlScrollBarModel::ComCtlScrollBarModel( sal_uInt16 nVersion ) : ComCtlModelBase( SAL_MAX_UINT32, COMCTL_ID_SCROLLBAR_60, nVersion, true, true ), mnScrollBarFlags( 0x00000011 ), @@ -799,8 +785,6 @@ void ComCtlScrollBarModel::importControlData( BinaryInputStream& rInStrm ) rInStrm >> mnScrollBarFlags >> mnLargeChange >> mnSmallChange >> mnMin >> mnMax >> mnPosition; } - - ComCtlProgressBarModel::ComCtlProgressBarModel( sal_uInt16 nVersion ) : ComCtlModelBase( COMCTL_ID_PROGRESSBAR_50, COMCTL_ID_PROGRESSBAR_60, nVersion, true, true ), mfMin( 0.0 ), @@ -833,8 +817,6 @@ void ComCtlProgressBarModel::importControlData( BinaryInputStream& rInStrm ) rInStrm >> mnVertical >> mnSmooth; } - - AxControlModelBase::AxControlModelBase() { } @@ -858,8 +840,6 @@ void AxControlModelBase::importProperty( sal_Int32 nPropId, const OUString& rVal } } - - AxFontDataModel::AxFontDataModel( bool bSupportsAlign ) : mbSupportsAlign( bSupportsAlign ) { @@ -961,8 +941,6 @@ void AxFontDataModel::convertFromProperties( PropertySet& rPropSet, const Contro } } - - AxCommandButtonModel::AxCommandButtonModel() : mnTextColor( AX_SYSCOLOR_BUTTONTEXT ), mnBackColor( AX_SYSCOLOR_BUTTONFACE ), @@ -1013,7 +991,6 @@ bool AxCommandButtonModel::importBinaryModel( BinaryInputStream& rInStrm ) return aReader.finalizeImport() && AxFontDataModel::importBinaryModel( rInStrm ); } - void AxCommandButtonModel::exportBinaryModel( BinaryOutputStream& rOutStrm ) { AxBinaryPropertyWriter aWriter( rOutStrm ); @@ -1094,7 +1071,6 @@ void AxCommandButtonModel::convertFromProperties( PropertySet& rPropSet, const C AxFontDataModel::convertFromProperties( rPropSet, rConv ); } - AxLabelModel::AxLabelModel() : mnTextColor( AX_SYSCOLOR_BUTTONTEXT ), mnBackColor( AX_SYSCOLOR_BUTTONFACE ), @@ -1225,8 +1201,6 @@ void AxLabelModel::convertProperties( PropertyMap& rPropMap, const ControlConver AxFontDataModel::convertProperties( rPropMap, rConv ); } - - AxImageModel::AxImageModel() : mnBackColor( AX_SYSCOLOR_BUTTONFACE ), mnFlags( AX_IMAGE_DEFFLAGS ), @@ -1346,8 +1320,6 @@ void AxImageModel::convertProperties( PropertyMap& rPropMap, const ControlConver AxControlModelBase::convertProperties( rPropMap, rConv ); } - - AxTabStripModel::AxTabStripModel() : mnListIndex( 0 ), mnTabStyle( 0 ), @@ -1575,8 +1547,6 @@ void AxMorphDataModelBase::convertProperties( PropertyMap& rPropMap, const Contr AxFontDataModel::convertProperties( rPropMap, rConv ); } - - AxToggleButtonModel::AxToggleButtonModel() { mnDisplayStyle = AX_DISPLAYSTYLE_TOGGLE; @@ -1639,8 +1609,6 @@ void AxToggleButtonModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - - AxCheckBoxModel::AxCheckBoxModel() { mnDisplayStyle = AX_DISPLAYSTYLE_CHECKBOX; @@ -1703,7 +1671,6 @@ void AxCheckBoxModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxOptionButtonModel::AxOptionButtonModel() { mnDisplayStyle = AX_DISPLAYSTYLE_OPTBUTTON; @@ -1767,8 +1734,6 @@ void AxOptionButtonModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - - AxTextBoxModel::AxTextBoxModel() { mnDisplayStyle = AX_DISPLAYSTYLE_TEXT; @@ -1846,7 +1811,6 @@ void AxTextBoxModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxNumericFieldModel::AxNumericFieldModel() { mnDisplayStyle = AX_DISPLAYSTYLE_TEXT; @@ -1909,7 +1873,6 @@ void AxNumericFieldModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxListBoxModel::AxListBoxModel() { mnDisplayStyle = AX_DISPLAYSTYLE_LISTBOX; @@ -1966,7 +1929,6 @@ void AxListBoxModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxComboBoxModel::AxComboBoxModel() { mnDisplayStyle = AX_DISPLAYSTYLE_COMBOBOX; @@ -2054,7 +2016,6 @@ void AxComboBoxModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxSpinButtonModel::AxSpinButtonModel() : mnArrowColor( AX_SYSCOLOR_BUTTONTEXT ), mnBackColor( AX_SYSCOLOR_BUTTONFACE ), @@ -2197,7 +2158,6 @@ void AxSpinButtonModel::exportCompObj( BinaryOutputStream& rOutStream ) rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) ); } - AxScrollBarModel::AxScrollBarModel() : mnArrowColor( AX_SYSCOLOR_BUTTONTEXT ), mnBackColor( AX_SYSCOLOR_BUTTONFACE ), @@ -2349,8 +2309,6 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr } - - AxContainerModelBase::AxContainerModelBase( bool bFontSupport ) : AxFontDataModel( false ), // no support for alignment properties maLogicalSize( AX_CONTAINER_DEFWIDTH, AX_CONTAINER_DEFHEIGHT ), @@ -2454,8 +2412,6 @@ bool AxContainerModelBase::importClassTable( BinaryInputStream& rInStrm, AxClass return bValid; } - - AxFrameModel::AxFrameModel() : AxContainerModelBase( true ) { @@ -2501,7 +2457,6 @@ ApiControlType AxMultiPageModel::getControlType() const return API_CONTROL_MULTIPAGE; } - bool AxMultiPageModel::importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ) { // PageProperties @@ -2540,9 +2495,6 @@ void AxMultiPageModel::convertProperties( PropertyMap& rPropMap, const ControlCo AxContainerModelBase::convertProperties( rPropMap, rConv ); } - - - AxUserFormModel::AxUserFormModel() { } @@ -2629,7 +2581,6 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) return true; } - void HtmlSelectModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const { @@ -2658,7 +2609,6 @@ HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm ) return true; } - EmbeddedControl::EmbeddedControl( const OUString& rName ) : maName( rName ) { @@ -2731,8 +2681,6 @@ bool EmbeddedControl::convertFromProperties( const Reference< XControlModel >& r return false; } - - EmbeddedForm::EmbeddedForm( const Reference< XModel >& rxDocModel, const Reference< XDrawPage >& rxDrawPage, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) : maControlConv( rxDocModel, rGraphicHelper, bDefaultColorBgr ), @@ -2796,8 +2744,6 @@ Reference< XIndexContainer > EmbeddedForm::createXForm() return mxFormIC; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index 6704eff5f4ce..9f4d81267997 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -29,8 +29,6 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -39,8 +37,6 @@ using ::oox::core::ContextHandlerRef; using ::oox::core::FragmentHandler2; using ::oox::core::XmlFilterBase; - - AxControlPropertyContext::AxControlPropertyContext( FragmentHandler2& rFragment, ControlModelBase& rModel ) : ContextHandler2( rFragment ), mrModel( rModel ), @@ -84,8 +80,6 @@ ContextHandlerRef AxControlPropertyContext::onCreateContext( sal_Int32 nElement, return 0; } - - AxControlFragment::AxControlFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, EmbeddedControl& rControl ) : FragmentHandler2( rFilter, rFragmentPath, true ), mrControl( rControl ) @@ -145,8 +139,6 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const return 0; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx index ba93c7014482..ea31b3d1b9d0 100644 --- a/oox/source/ole/axfontdata.cxx +++ b/oox/source/ole/axfontdata.cxx @@ -25,8 +25,6 @@ namespace oox { namespace ole { - - AxFontData::AxFontData() : mnFontEffects( 0 ), mnFontHeight( 160 ), @@ -111,8 +109,6 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm ) return false; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 8b393ea0dc91..420a80dc4158 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -44,8 +44,6 @@ namespace oox { namespace ole { - - using ::com::sun::star::form::XFormComponent; using ::com::sun::star::form::XForm; using ::com::sun::star::awt::XControlModel; @@ -70,8 +68,6 @@ using ::com::sun::star::lang::XServiceInfo; using namespace ::com::sun::star::form; - - namespace { const sal_uInt32 OLE_COLORTYPE_MASK = 0xFF000000; @@ -83,7 +79,6 @@ const sal_uInt32 OLE_COLORTYPE_SYSCOLOR = 0x80000000; const sal_uInt32 OLE_PALETTECOLOR_MASK = 0x0000FFFF; const sal_uInt32 OLE_SYSTEMCOLOR_MASK = 0x0000FFFF; - /** Swaps the red and blue component of the passed color. */ inline sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor ) { @@ -96,8 +91,6 @@ inline sal_Int32 lclDecodeBgrColor( sal_uInt32 nOleColor ) return static_cast< sal_Int32 >( lclSwapRedBlue( nOleColor ) & 0xFFFFFF ); } - - const sal_uInt32 OLE_STDPIC_ID = 0x0000746C; struct GUIDCNamePair @@ -197,8 +190,6 @@ GUIDCNamePairMap& classIdToGUIDCNamePairMap::get() return theInst.mnIdToGUIDCNamePairMap; } - - template< typename Type > void lclAppendHex( OUStringBuffer& orBuffer, Type nValue ) { @@ -211,8 +202,6 @@ void lclAppendHex( OUStringBuffer& orBuffer, Type nValue ) } // namespace - - StdFontInfo::StdFontInfo() : mnHeight( 0 ), mnWeight( OLE_STDFONT_NORMAL ), @@ -231,8 +220,6 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight, { } - - sal_Int32 OleHelper::decodeOleColor( const GraphicHelper& rGraphicHelper, sal_uInt32 nOleColor, bool bDefaultColorBgr ) { @@ -548,7 +535,6 @@ bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg, SvStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents")); BinaryXInputStream aInStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true ); - SvStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj")); BinaryXInputStream aClsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper(*pClsStrm ) ), true ); aClsStrm.skip(12); diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index efa94eb56a05..a2c008a917f5 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -32,8 +32,6 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star; using namespace ::com::sun::star::container; using namespace ::com::sun::star::embed; @@ -41,8 +39,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - - OleObjectInfo::OleObjectInfo() : mbLinked( false ), mbShowAsIcon( false ), @@ -50,8 +46,6 @@ OleObjectInfo::OleObjectInfo() : { } - - OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) : maEmbeddedObjScheme( "vnd.sun.star.EmbeddedObject:" ), mnObjectId( 100 ) @@ -124,8 +118,6 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf return bRet; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 9ff7bc883630..0b6c51cbd9db 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -38,8 +38,6 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::embed; @@ -47,8 +45,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - - namespace { typedef ::cppu::WeakImplHelper2< XSeekable, XOutputStream > OleOutputStreamBase; @@ -85,8 +81,6 @@ private: OUString maElementName; }; - - OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext, const Reference< XNameContainer >& rxStorage, const OUString& rElementName ) : mxStorage( rxStorage ), @@ -169,8 +163,6 @@ void OleOutputStream::ensureConnected() const throw( NotConnectedException ) } // namespace - - OleStorage::OleStorage( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) : StorageBase( rxInStream, bBaseStreamAccess ), @@ -214,8 +206,6 @@ OleStorage::~OleStorage() { } - - void OleStorage::initStorage( const Reference< XInputStream >& rxInStream ) { // if stream is not seekable, create temporary copy @@ -390,8 +380,6 @@ void OleStorage::implCommit() const } } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 818f8789b802..c60007b5aeea 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -77,8 +77,6 @@ const sal_uInt32 VBA_SITE_DEFFLAGS = 0x00000033; const sal_uInt8 VBA_SITEINFO_COUNT = 0x80; const sal_uInt8 VBA_SITEINFO_MASK = 0x7F; - - /** Collects names of all controls in a user form or container control. Allows to generate unused names for dummy controls separating option groups. */ @@ -124,8 +122,6 @@ OUString VbaControlNamesSet::generateDummyName() return aCtrlName; } - - /** Functor that inserts the name of a control into a VbaControlNamesSet. */ struct VbaControlNameInserter { @@ -135,8 +131,6 @@ public: inline void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); } }; - - /** A dummy invisible form control (fixed label without text) that is used to separate two groups of option buttons. */ @@ -159,8 +153,6 @@ VbaDummyFormControl::VbaDummyFormControl( const OUString& rName ) } // namespace - - VbaSiteModel::VbaSiteModel() : maPos( 0, 0 ), mnId( 0 ), @@ -318,8 +310,6 @@ void VbaSiteModel::convertProperties( PropertyMap& rPropMap, } } - - VbaFormControl::VbaFormControl() { } @@ -722,8 +712,6 @@ bool VbaFormControl::compareByTabIndex( const VbaFormControlRef& rxLeft, const V return nLeftTabIndex < nRightTabIndex; } - - namespace { OUString lclGetQuotedString( const OUString& rCodeLine ) @@ -776,8 +764,6 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword ) } // namespace - - VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) : mxContext( rxContext ), @@ -868,8 +854,6 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, } } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx index 4219ceeda462..18a1416d086f 100644 --- a/oox/source/ole/vbahelper.cxx +++ b/oox/source/ole/vbahelper.cxx @@ -24,12 +24,8 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star::uno; - - bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm ) { // read the record header @@ -57,8 +53,6 @@ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUStrin return false; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx index 56b4d12eaea6..01ad7bc80cfe 100644 --- a/oox/source/ole/vbainputstream.cxx +++ b/oox/source/ole/vbainputstream.cxx @@ -23,8 +23,6 @@ namespace oox { namespace ole { - - namespace { const sal_uInt8 VBASTREAM_SIGNATURE = 1; @@ -36,8 +34,6 @@ const sal_uInt16 VBACHUNK_LENMASK = 0x0FFF; } // namespace - - VbaInputStream::VbaInputStream( BinaryInputStream& rInStrm ) : BinaryStreamBase( false ), mpInStrm( &rInStrm ), @@ -208,8 +204,6 @@ bool VbaInputStream::updateChunk() return !mbEof; } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 465d9652cffc..b6794f319e39 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -36,8 +36,6 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::script::vba; using namespace ::com::sun::star::uno; @@ -338,8 +336,6 @@ void VbaModule::createModule( const OUString& rVBASourceCode, } } - - } // namespace ole } // namespace oox diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 99f07c5e88af..6bffdd7a20ee 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -47,8 +47,6 @@ namespace oox { namespace ole { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::embed; @@ -61,8 +59,6 @@ using namespace ::com::sun::star::uno; using ::comphelper::ConfigurationHelper; - - namespace { bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUString& rItemName ) @@ -81,8 +77,6 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS } // namespace - - VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContext, const OUString& rConfigCompName ) { OSL_ENSURE( rxContext.is(), "VbaFilterConfig::VbaFilterConfig - missing component context" ); @@ -117,8 +111,6 @@ bool VbaFilterConfig::isExportVba() const return lclReadConfigItem( mxConfigAccess, "Save" ); } - - VbaMacroAttacherBase::VbaMacroAttacherBase( const OUString& rMacroName ) : maMacroName( rMacroName ) { @@ -140,8 +132,6 @@ void VbaMacroAttacherBase::resolveAndAttachMacro( const Reference< XVBAMacroReso } } - - VbaProject::VbaProject( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxDocModel, const OUString& rConfigCompName ) : VbaFilterConfig( rxContext, rConfigCompName ), @@ -157,7 +147,6 @@ VbaProject::~VbaProject() { } - bool VbaProject::importVbaProject( StorageBase& rVbaPrjStrg ) { // create GraphicHelper @@ -294,7 +283,6 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg ) sal_uInt16 nModuleCount = 0; bool bExecutable = isImportVbaExecutable(); - sal_uInt16 nRecId = 0; StreamDataSequence aRecData; while( VbaHelper::readDirRecord( nRecId, aRecData, aDirStrm ) && (nRecId != VBA_ID_PROJECTEND) ) @@ -562,8 +550,6 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg ) } } - - } // namespace ole } // namespace oox |