Skip to content

C
core
Kaydet (Commit) 5e47d8ca authored tarafından Julien Nabet's avatar Julien Nabet
Dosyalara gözat
Seçenekler

Remove 3 oox::ole elements: 

oox::ole::AxFormPageModel::AxFormPageModel()
oox::ole::AxMultiPageModel::AxMultiPageModel()
oox::ole::AxTabStripModel::AxTabStripModel()

Change-Id: I09c0993c2b6e98eed5536ac1c2a8b5559a3dcac6
üst 190bfac4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 151 deletions
oox/inc/oox/ole/axcontrol.hxx
Dosyayı görüntüle @ 5e47d8ca
......@@ -801,31 +801,6 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 tabstrip control. */
class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
{
public:
explicit AxTabStripModel();
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
private:
AxStringArray maCaptions; ///< Captions of all tabs.
sal_uInt32 mnBackColor; ///< Fill color.
sal_uInt32 mnTextColor; ///< Text color.
sal_uInt32 mnFlags; ///< Various flags.
sal_Int32 mnSelectedTab; ///< The index of the selected tab.
sal_uInt32 mnTabStyle; ///< Visual style of the tabs.
sal_Int32 mnTabFlagCount; ///< Number of entries in tab flag array.
};
typedef ::boost::shared_ptr< AxTabStripModel > AxTabStripModelRef;
// ============================================================================
typedef ::std::vector< ::rtl::OUString > AxClassTable;
/** Base class for ActiveX container controls. */
......@@ -881,33 +856,6 @@ public:
// ============================================================================
/** Model for a Forms 2.0 formpage control (a single page in a multipage control). */
class OOX_DLLPUBLIC AxFormPageModel : public AxContainerModelBase
{
public:
explicit AxFormPageModel();
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
};
// ============================================================================
/** Model for a Forms 2.0 multipage control. Contains the tabstrip control
(class AxTabStripModel) and the single pages (class AxFormPageModel). */
class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase
{
public:
explicit AxMultiPageModel();
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
private:
AxTabStripModelRef mxTabStrip;
};
// ============================================================================
/** Model for a Forms 2.0 user form. */
class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase
......
oox/source/ole/axcontrol.cxx
Dosyayı görüntüle @ 5e47d8ca
......@@ -2263,64 +2263,6 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr
// ============================================================================
AxTabStripModel::AxTabStripModel() :
AxFontDataModel( false ), // no support for alignment properties
mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
mnTextColor( AX_SYSCOLOR_BUTTONTEXT ),
mnFlags( AX_TABSTRIP_DEFFLAGS ),
mnSelectedTab( -1 ),
mnTabStyle( AX_TABSTRIP_TABS ),
mnTabFlagCount( 0 )
{
}
bool AxTabStripModel::importBinaryModel( BinaryInputStream& rInStrm )
{
AxBinaryPropertyReader aReader( rInStrm );
aReader.readIntProperty< sal_Int32 >( mnSelectedTab );
aReader.readIntProperty< sal_uInt32 >( mnBackColor );
aReader.readIntProperty< sal_uInt32 >( mnTextColor );
aReader.skipUndefinedProperty();
aReader.readPairProperty( maSize );
aReader.readStringArrayProperty( maCaptions );
aReader.skipIntProperty< sal_uInt8 >(); // mouse pointer
aReader.skipUndefinedProperty();
aReader.skipIntProperty< sal_uInt32 >(); // tab orientation
aReader.readIntProperty< sal_uInt32 >( mnTabStyle );
aReader.skipBoolProperty(); // multiple rows
aReader.skipIntProperty< sal_uInt32 >(); // fixed width
aReader.skipIntProperty< sal_uInt32 >(); // fixed height
aReader.skipBoolProperty(); // tooltips
aReader.skipUndefinedProperty();
aReader.skipStringArrayProperty(); // tooltip strings
aReader.skipUndefinedProperty();
aReader.skipStringArrayProperty(); // tab names
aReader.readIntProperty< sal_uInt32 >( mnFlags );
aReader.skipBoolProperty(); // new version
aReader.skipIntProperty< sal_uInt32 >(); // tabs allocated
aReader.skipStringArrayProperty(); // tags
aReader.readIntProperty< sal_uInt32 >( mnTabFlagCount );
aReader.skipStringArrayProperty(); // accelerators
aReader.skipPictureProperty(); // mouse icon
return aReader.finalizeImport() && AxFontDataModel::importBinaryModel( rInStrm );
}
ApiControlType AxTabStripModel::getControlType() const
{
return API_CONTROL_TABSTRIP;
}
void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
{
rPropMap.setProperty( PROP_Decoration, mnTabStyle != AX_TABSTRIP_NONE );
// adjust for openoffice ( 1 based )
rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab + 1);
rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
AxFontDataModel::convertProperties( rPropMap, rConv );
}
// ============================================================================
AxContainerModelBase::AxContainerModelBase( bool bFontSupport ) :
AxFontDataModel( false ), // no support for alignment properties
maLogicalSize( AX_CONTAINER_DEFWIDTH, AX_CONTAINER_DEFHEIGHT ),
......@@ -2448,44 +2390,6 @@ void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConver
// ============================================================================
AxFormPageModel::AxFormPageModel()
{
}
ApiControlType AxFormPageModel::getControlType() const
{
return API_CONTROL_PAGE;
}
void AxFormPageModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
{
rPropMap.setProperty( PROP_Title, maCaption );
rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) );
rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
AxContainerModelBase::convertProperties( rPropMap, rConv );
}
// ============================================================================
AxMultiPageModel::AxMultiPageModel()
{
}
ApiControlType AxMultiPageModel::getControlType() const
{
return API_CONTROL_MULTIPAGE;
}
void AxMultiPageModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
{
rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) );
if( mxTabStrip.get() )
mxTabStrip->convertProperties( rPropMap, rConv );
AxContainerModelBase::convertProperties( rPropMap, rConv );
}
// ============================================================================
AxUserFormModel::AxUserFormModel()
{
}
......
unusedcode.easy
Dosyayı görüntüle @ 5e47d8ca
......@@ -83,9 +83,6 @@ formula::FormulaTokenIterator::First()
framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
oox::ole::AxFormPageModel::AxFormPageModel()
oox::ole::AxMultiPageModel::AxMultiPageModel()
oox::ole::AxTabStripModel::AxTabStripModel()
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment