summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorElton Chung <elton@layerjet.com>2012-02-11 19:13:44 +0800
committerMichael Meeks <michael.meeks@suse.com>2012-02-13 16:11:51 +0000
commit60397e849731db0dd9492975e134dc0f905b6390 (patch)
tree2cdd795ccf712da0825fdea9474de617fe9f742c /oox
parentabc235e73e70ffba83240759a8500a08becc9d71 (diff)
Remove unused code
Diffstat (limited to 'oox')
-rw-r--r--oox/inc/oox/core/filterbase.hxx8
-rw-r--r--oox/inc/oox/core/relations.hxx2
-rw-r--r--oox/inc/oox/drawingml/drawingmltypes.hxx10
-rw-r--r--oox/inc/oox/helper/binaryinputstream.hxx7
-rw-r--r--oox/source/core/filterbase.cxx10
-rw-r--r--oox/source/core/relations.cxx6
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx10
-rw-r--r--oox/source/drawingml/diagram/diagram.hxx1
-rw-r--r--oox/source/drawingml/drawingmltypes.cxx39
-rw-r--r--oox/source/helper/binaryinputstream.cxx5
10 files changed, 0 insertions, 98 deletions
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index cbc93791b089..7c09707f940b 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -128,10 +128,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
getComponentContext() const;
- /** Returns the component service factory (always existing). */
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >&
- getComponentFactory() const;
-
/** Returns the multi service factory of the component (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
getServiceFactory() const;
@@ -156,10 +152,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >&
getStatusIndicator() const;
- /** Returns the status interaction handler (may be null). */
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >&
- getInteractionHandler() const;
-
/** Returns the media descriptor. */
::comphelper::MediaDescriptor& getMediaDescriptor() const;
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 64027ef361a8..1b504f04c949 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -87,8 +87,6 @@ public:
/** Returns the external target of the relation with the passed relation identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& rRelId ) const;
- /** Returns the external target of the first relation with the passed type. */
- ::rtl::OUString getExternalTargetFromFirstType( const ::rtl::OUString& rType ) const;
/** Returns the full fragment path for the target of the passed relation. */
::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const;
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/oox/inc/oox/drawingml/drawingmltypes.hxx
index c66d729c8aa3..600b1bc6c906 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -89,9 +89,6 @@ typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr;
// ============================================================================
-/** converts the attributes from an CT_Point2D into an awt Point with 1/100th mm */
-com::sun::star::awt::Point GetPoint2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
-
/** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs );
@@ -102,11 +99,6 @@ com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::c
/** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */
com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
-/** converts an emu string into 1/100th mmm but constrain as per ST_TextMargin
- * see 5.1.12.73
- */
-sal_Int32 GetTextMargin( const ::rtl::OUString& sValue );
-
/** converts EMUs into 1/100th mmm */
sal_Int32 GetCoordinate( sal_Int32 nValue );
@@ -126,8 +118,6 @@ float GetTextSize( const ::rtl::OUString& rValue );
sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue );
sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue );
-::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
-
/** */
::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index 7c8783dbc379..5add5f413afc 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -168,13 +168,6 @@ public:
*/
::rtl::OString readNulCharArray();
- /** Reads a NUL-terminated byte character array and returns a Unicode string.
-
- @param eTextEnc
- The text encoding used to create the Unicode string.
- */
- ::rtl::OUString readNulCharArrayUC( rtl_TextEncoding eTextEnc );
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
::rtl::OUString readNulUnicodeArray();
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index c8acd4d01ade..40288ef1d640 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -259,11 +259,6 @@ const Reference< XComponentContext >& FilterBase::getComponentContext() const
return mxImpl->mxComponentContext;
}
-const Reference< XMultiComponentFactory >& FilterBase::getComponentFactory() const
-{
- return mxImpl->mxComponentFactory;
-}
-
const Reference< XMultiServiceFactory >& FilterBase::getServiceFactory() const
{
return mxImpl->mxServiceFactory;
@@ -294,11 +289,6 @@ const Reference< XStatusIndicator >& FilterBase::getStatusIndicator() const
return mxImpl->mxStatusIndicator;
}
-const Reference< XInteractionHandler >& FilterBase::getInteractionHandler() const
-{
- return mxImpl->mxInteractionHandler;
-}
-
MediaDescriptor& FilterBase::getMediaDescriptor() const
{
return mxImpl->maMediaDesc;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index f1e39d4ce08e..ef9510ce54b7 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -92,12 +92,6 @@ OUString Relations::getExternalTargetFromRelId( const OUString& rRelId ) const
return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : OUString();
}
-OUString Relations::getExternalTargetFromFirstType( const OUString& rType ) const
-{
- const Relation* pRelation = getRelationFromFirstType( rType );
- return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : OUString();
-}
-
OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 919400191f52..58c8de8237ef 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -344,16 +344,6 @@ void Diagram::addTo( const ShapePtr & pParentShape )
mpLayout->getNode()->accept( aCreationVisitor );
}
-OUString Diagram::getLayoutId() const
-{
- OUString sLayoutId;
- if( mpLayout )
- {
- sLayoutId = mpLayout->getUniqueId();
- }
- return sLayoutId;
-}
-
uno::Reference<xml::dom::XDocument> loadFragment(
core::XmlFilterBase& rFilter,
const rtl::Reference< core::FragmentHandler >& rxHandler )
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 6dc9c6108d71..633f4524f163 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -302,7 +302,6 @@ public:
const DiagramColorMap& getColors() const { return maColors; }
void addTo( const ShapePtr & pShape );
- ::rtl::OUString getLayoutId() const;
private:
void build( );
DiagramDataPtr mpData;
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index b0135bb331b9..ac88533ba0fd 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -47,23 +47,6 @@ namespace drawingml {
// ============================================================================
-/** converts an emu string into 1/100th mmm but constrain as per ST_TextMargin
- * see 5.1.12.73
- */
-sal_Int32 GetTextMargin( const OUString& sValue )
-{
- sal_Int32 nRet = 0;
- if( !::sax::Converter::convertNumber( nRet, sValue ) )
- nRet = 0;
- else if( nRet < 0 )
- nRet = 0;
- else if( nRet > 51206400 )
- nRet = 51206400;
-
- nRet /= 360;
- return nRet;
-}
-
/** converts EMUs into 1/100th mmm */
sal_Int32 GetCoordinate( sal_Int32 nValue )
{
@@ -97,12 +80,6 @@ double GetPositiveFixedPercentage( const OUString& sValue )
// --------------------------------------------------------------------
-/** converts the attributes from an CT_Point2D into an awt Point with 1/100thmm */
-Point GetPoint2D( const Reference< XFastAttributeList >& xAttribs )
-{
- return Point( GetCoordinate( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) );
-}
-
/** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs )
{
@@ -136,22 +113,6 @@ sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue )
return ( nValue * 254 + 360 ) / 720;
}
-TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken )
-{
- TextVerticalAdjust rVal = TextVerticalAdjust_TOP;
-
- switch( nToken ) {
- case XML_b:
- rVal = TextVerticalAdjust_BOTTOM;
- break;
- case XML_ctr:
- rVal = TextVerticalAdjust_CENTER;
- break;
- }
-
- return rVal;
-}
-
float GetFontHeight( sal_Int32 nHeight )
{
// convert 1/100 points to points
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 541b3196de13..21229ae686f6 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -65,11 +65,6 @@ OString BinaryInputStream::readNulCharArray()
return aBuffer.makeStringAndClear();
}
-OUString BinaryInputStream::readNulCharArrayUC( rtl_TextEncoding eTextEnc )
-{
- return OStringToOUString( readNulCharArray(), eTextEnc );
-}
-
OUString BinaryInputStream::readNulUnicodeArray()
{
OUStringBuffer aBuffer;