[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 27 13:26:34 PDT 2012
oox/inc/oox/ole/axcontrol.hxx | 7 -------
oox/inc/oox/ole/vbacontrol.hxx | 2 --
oox/inc/oox/ole/vbamodule.hxx | 2 --
oox/source/ole/axcontrol.cxx | 10 ----------
oox/source/ole/vbacontrol.cxx | 5 -----
oox/source/ole/vbamodule.cxx | 26 --------------------------
unusedcode.easy | 4 ----
7 files changed, 56 deletions(-)
New commits:
commit c563ca3843387a2cc5a7a667856154ae2f13985b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Sep 27 22:02:40 2012 +0200
Bin some newly unused methods
Change-Id: I1bbbdbb68f073d19b7d99b5ccb4985efd5bde80c
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 285cb74..30187a4 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -812,9 +812,6 @@ public:
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
- /** Returns the caption with the specified zero-based index. */
- ::rtl::OUString getCaption( sal_Int32 nIndex ) const;
-
private:
AxStringArray maCaptions; ///< Captions of all tabs.
sal_uInt32 mnBackColor; ///< Fill color.
@@ -906,10 +903,6 @@ public:
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
- /** Sets the tabstrip control model related to this multipage control.
- Contains all formatting attributes of the page tabs. */
- void setTabStripModel( const AxTabStripModelRef& rxTabStrip );
-
private:
AxTabStripModelRef mxTabStrip;
};
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 8c56ac6..9edd454 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -123,8 +123,6 @@ public:
/** Returns the programmatical name of the control. */
::rtl::OUString getControlName() const;
- /** Returns the unique identifier of this control. */
- sal_Int32 getControlId() const;
/** Creates the UNO control model, inserts it into the passed container,
and converts all control properties. */
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 65cd41a..91f5b62 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -74,8 +74,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
private:
- void extractOleOverrideFromAttr( const rtl::OUString& rAttribute,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
/** Reads and returns the VBA source code from the passed storage. */
::rtl::OUString readSourceCode( StorageBase& rVbaStrg ) const;
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 0190f7f..8592ba6 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2319,11 +2319,6 @@ void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlCon
AxFontDataModel::convertProperties( rPropMap, rConv );
}
-OUString AxTabStripModel::getCaption( sal_Int32 nIndex ) const
-{
- return ContainerHelper::getVectorElement( maCaptions, nIndex, OUString() );
-}
-
// ============================================================================
AxContainerModelBase::AxContainerModelBase( bool bFontSupport ) :
@@ -2489,11 +2484,6 @@ void AxMultiPageModel::convertProperties( PropertyMap& rPropMap, const ControlCo
AxContainerModelBase::convertProperties( rPropMap, rConv );
}
-void AxMultiPageModel::setTabStripModel( const AxTabStripModelRef& rxTabStrip )
-{
- mxTabStrip = rxTabStrip;
-}
-
// ============================================================================
AxUserFormModel::AxUserFormModel()
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 8f68491..91474c6 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -363,11 +363,6 @@ OUString VbaFormControl::getControlName() const
return mxSiteModel.get() ? mxSiteModel->getName() : OUString();
}
-sal_Int32 VbaFormControl::getControlId() const
-{
- return mxSiteModel.get() ? mxSiteModel->getId() : -1;
-}
-
void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex,
const Reference< XNameContainer >& rxParentNC, const ControlConverter& rConv ) const
{
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 0766f97..1a404de 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -327,32 +327,6 @@ OUString VbaModule::readSourceCode( StorageBase& rVbaStrg ) const
return aSourceCode.makeStringAndClear();
}
-void VbaModule::extractOleOverrideFromAttr( const OUString& rAttribute,
- const Reference< container::XNameContainer >& rxOleNameOverrides ) const
-{
- // format of the attribute we are interested in is
- // Attribute VB_Control = "ControlName", intString, MSForms, ControlTypeAsString
- // e.g.
- // Attribute VB_Control = "CommandButton1, 201, 19, MSForms, CommandButton"
- OUString sControlAttribute = CREATE_OUSTRING( "Attribute VB_Control = \"" );
- if ( rxOleNameOverrides.is() && rAttribute.indexOf( sControlAttribute ) != -1 )
- {
- OUString sRest = rAttribute.copy( sControlAttribute.getLength() );
- sal_Int32 nPos = sRest.indexOf( ',' );
- OUString sCntrlName = sRest.copy( 0, nPos );
-
- sal_Int32 nCntrlId = sRest.copy( nPos + 1 ).copy( 0, sRest.indexOf( ',', nPos + 1) ).toInt32();
- OSL_TRACE("In module %s, assiging %d controlname %s",
- rtl::OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ).getStr(), nCntrlId,
- rtl::OUStringToOString( sCntrlName, RTL_TEXTENCODING_UTF8 ).getStr() );
- if ( !rxOleNameOverrides->hasByName( maName ) )
- rxOleNameOverrides->insertByName( maName, Any( Reference< container::XIndexContainer> ( new OleIdToNameContainer ) ) );
- Reference< container::XIndexContainer > xIdToOleName;
- if ( rxOleNameOverrides->getByName( maName ) >>= xIdToOleName )
- xIdToOleName->insertByIndex( nCntrlId, makeAny( sCntrlName ) );
- }
-}
-
void VbaModule::createModule( const OUString& rVBASourceCode,
const Reference< container::XNameContainer >& rxBasicLib,
const Reference< container::XNameAccess >& rxDocObjectNA ) const
diff --git a/unusedcode.easy b/unusedcode.easy
index 71c68b7..a4612b7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -87,11 +87,7 @@ jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
oox::ole::AxFormPageModel::AxFormPageModel()
oox::ole::AxMultiPageModel::AxMultiPageModel()
-oox::ole::AxMultiPageModel::setTabStripModel(boost::shared_ptr<oox::ole::AxTabStripModel> const&)
oox::ole::AxTabStripModel::AxTabStripModel()
-oox::ole::AxTabStripModel::getCaption(int) const
-oox::ole::VbaFormControl::getControlId() const
-oox::ole::VbaModule::extractOleOverrideFromAttr(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const&) const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
sd::ClientBox::GetMinOutputSizePixel() const
sd::ClientBox::RemoveUnlocked()
More information about the Libreoffice-commits
mailing list