[Libreoffice-commits] .: 2 commits - oox/inc oox/source unusedcode.easy
Michael Meeks
michael at kemper.freedesktop.org
Mon Feb 13 08:19:55 PST 2012
oox/inc/oox/core/filterbase.hxx | 8 ----
oox/inc/oox/core/relations.hxx | 2 -
oox/inc/oox/drawingml/chart/objectformatter.hxx | 8 ----
oox/inc/oox/drawingml/drawingmltypes.hxx | 10 ------
oox/inc/oox/dump/dumperbase.hxx | 1
oox/inc/oox/helper/binaryinputstream.hxx | 7 ----
oox/inc/oox/ole/vbahelper.hxx | 7 ----
oox/inc/oox/ole/vbaproject.hxx | 4 --
oox/inc/oox/xls/addressconverter.hxx | 20 ------------
oox/inc/oox/xls/stylesbuffer.hxx | 4 --
oox/source/core/filterbase.cxx | 10 ------
oox/source/core/relations.cxx | 6 ---
oox/source/drawingml/chart/objectformatter.cxx | 11 ------
oox/source/drawingml/diagram/diagram.cxx | 10 ------
oox/source/drawingml/diagram/diagram.hxx | 1
oox/source/drawingml/drawingmltypes.cxx | 39 ------------------------
oox/source/dump/dumperbase.cxx | 6 ---
oox/source/helper/binaryinputstream.cxx | 5 ---
oox/source/ole/vbahelper.cxx | 14 --------
oox/source/ole/vbaproject.cxx | 10 ------
oox/source/xls/addressconverter.cxx | 8 ----
oox/source/xls/stylesbuffer.cxx | 11 ------
unusedcode.easy | 17 ----------
23 files changed, 219 deletions(-)
New commits:
commit 0536df54d531e2d5e45dfea52c8377701a6a1fda
Author: Elton Chung <elton at layerjet.com>
Date: Mon Feb 13 16:16:34 2012 +0000
Remove unused code
diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/oox/inc/oox/drawingml/chart/objectformatter.hxx
index 8c24abc..e13cef8 100644
--- a/oox/inc/oox/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/oox/drawingml/chart/objectformatter.hxx
@@ -142,20 +142,12 @@ public:
const NumberFormat& rNumberFormat,
bool bPercentFormat = false );
- /** Sets automatic line properties to the passed property set. */
- void convertAutomaticLine(
- PropertySet& rPropSet,
- ObjectType eObjType,
- sal_Int32 nSeriesIdx = -1 );
-
/** Sets automatic fill properties to the passed property set. */
void convertAutomaticFill(
PropertySet& rPropSet,
ObjectType eObjType,
sal_Int32 nSeriesIdx = -1 );
- /** Returns true, if the passed shape properties have automatic line mode. */
- static bool isAutomaticLine( const ModelRef< Shape >& rxShapeProp );
/** Returns true, if the passed shape properties have automatic fill mode. */
static bool isAutomaticFill( const ModelRef< Shape >& rxShapeProp );
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 8debfa5..7cba7ae 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1405,7 +1405,6 @@ protected:
void writeCharItem( const String& rName, sal_Unicode cData );
void writeStringItem( const String& rName, const ::rtl::OUString& rData );
void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
- void writeBoolItem( const String& rName, bool bData );
double writeRkItem( const String& rName, sal_Int32 nRk );
void writeColorABGRItem( const String& rName, sal_Int32 nColor );
void writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime );
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx
index 1f67a77..ad227aa 100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/oox/inc/oox/ole/vbahelper.hxx
@@ -64,13 +64,6 @@ const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009;
class VbaHelper
{
public:
- /** Returns the full Basic script URL from a VBA module and macro name.
- The script is assumed to be in a document library. */
- static ::rtl::OUString getBasicScriptUrl(
- const ::rtl::OUString& rLibraryName,
- const ::rtl::OUString& rModuleName,
- const ::rtl::OUString& rMacroName );
-
/** Reads the next record from the VBA directory stream 'dir'.
@param rnRecId (out parameter) The record identifier of the new record.
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index ca6c8ad..f4af24a 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -140,13 +140,9 @@ public:
/** Returns true, if the document contains at least one code module. */
bool hasModules() const;
- /** Returns true, if the document contains the specified code module. */
- bool hasModule( const ::rtl::OUString& rModuleName ) const;
/** Returns true, if the document contains at least one dialog. */
bool hasDialogs() const;
- /** Returns true, if the document contains the specified dialog. */
- bool hasDialog( const ::rtl::OUString& rDialogName ) const;
void setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
diff --git a/oox/inc/oox/xls/addressconverter.hxx b/oox/inc/oox/xls/addressconverter.hxx
index 681c2bb..47de4ba 100644
--- a/oox/inc/oox/xls/addressconverter.hxx
+++ b/oox/inc/oox/xls/addressconverter.hxx
@@ -579,26 +579,6 @@ public:
// ------------------------------------------------------------------------
- /** Checks the passed cell range list if it fits into the spreadsheet limits.
-
- @param rRanges The cell range list to be checked.
- @param bAllowOverflow true = Allow ranges that start inside the
- supported sheet limits but may end outside of these limits.
- false = Do not allow ranges that overflow the supported limits.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the passed range list contains cells outside of the supported sheet
- limits.
- @return true = All cell ranges are valid. This function returns also
- true, if overflowing ranges are allowed via parameter bAllowOverflow
- and only parts of the ranges are outside the current sheet limits.
- Returns false, if one of the ranges is completely outside the sheet
- limits or if overflowing ranges are not allowed via parameter
- bAllowOverflow.
- */
- bool checkCellRangeList(
- const ApiCellRangeList& rRanges,
- bool bAllowOverflow, bool bTrackOverflow );
-
/** Tries to restrict the passed cell range list to current sheet limits.
@param orRanges (in-out-parameter) Restricts the cell range addresses
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx
index 0ab97dd..365474a 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/oox/inc/oox/xls/stylesbuffer.hxx
@@ -1040,8 +1040,6 @@ public:
XfRef getCellXf( sal_Int32 nXfId ) const;
/** Returns the specified style format object. */
XfRef getStyleXf( sal_Int32 nXfId ) const;
- /** Returns the specified diferential cell format object. */
- DxfRef getDxf( sal_Int32 nDxfId ) const;
/** Returns the font object of the specified cell XF. */
FontRef getFontFromCellXf( sal_Int32 nXfId ) const;
@@ -1072,8 +1070,6 @@ public:
void writeFillToPropertyMap( PropertyMap& rPropMap, sal_Int32 nFillId ) const;
/** Writes the cell formatting attributes of the specified XF to the passed property map. */
void writeCellXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const;
- /** Writes the cell formatting attributes of the specified style XF to the passed property map. */
- void writeStyleXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const;
/** Writes the cell formatting attributes of the specified XF to the passed property set. */
void writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const;
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 7aca5b8..076aa41 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1161,23 +1161,12 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
}
}
-void ObjectFormatter::convertAutomaticLine( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx )
-{
- if( ObjectTypeFormatter* pFormat = mxData->getTypeFormatter( eObjType ) )
- pFormat->convertAutomaticLine( rPropSet, nSeriesIdx );
-}
-
void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx )
{
if( ObjectTypeFormatter* pFormat = mxData->getTypeFormatter( eObjType ) )
pFormat->convertAutomaticFill( rPropSet, nSeriesIdx );
}
-/*static*/ bool ObjectFormatter::isAutomaticLine( const ModelRef< Shape >& rxShapeProp )
-{
- return !rxShapeProp || !rxShapeProp->getLineProperties().maLineFill.moFillType.has();
-}
-
/*static*/ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp )
{
return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has();
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index eacbba3..f109168 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -2384,12 +2384,6 @@ void OutputObjectBase::writeArrayItem( const String& rName, const sal_uInt8* pnD
mxOut->writeArray( pnData, nSize, cSep );
}
-void OutputObjectBase::writeBoolItem( const String& rName, bool bData )
-{
- ItemGuard aItem( mxOut, rName );
- mxOut->writeBool( bData );
-}
-
double OutputObjectBase::writeRkItem( const String& rName, sal_Int32 nRk )
{
MultiItemsGuard aMultiGuard( mxOut );
diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx
index e78ec21..a545c57 100644
--- a/oox/source/ole/vbahelper.cxx
+++ b/oox/source/ole/vbahelper.cxx
@@ -42,20 +42,6 @@ using ::rtl::OUStringBuffer;
// ============================================================================
-/*static*/ OUString VbaHelper::getBasicScriptUrl(
- const OUString& rLibraryName, const OUString& rModuleName, const OUString& rMacroName )
-{
- OSL_ENSURE( !rLibraryName.isEmpty(), "VbaHelper::getBasicScriptUrl - library name is empty" );
- OSL_ENSURE( !rModuleName.isEmpty(), "VbaHelper::getBasicScriptUrl - module name is empty" );
- OSL_ENSURE( !rMacroName.isEmpty(), "VbaHelper::getBasicScriptUrl - macro name is empty" );
- const sal_Unicode cDot = '.';
- return OUStringBuffer().
- appendAscii( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.script:" ) ).
- append( rLibraryName ).append( cDot ).append( rModuleName ).append( cDot ).append( rMacroName ).
- appendAscii( RTL_CONSTASCII_STRINGPARAM( "?language=Basic&location=document" ) ).
- makeStringAndClear();
-}
-
/*static*/ bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm )
{
// read the record header
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 4237d2a..19defae 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -212,21 +212,11 @@ bool VbaProject::hasModules() const
return mxBasicLib.is() && mxBasicLib->hasElements();
}
-bool VbaProject::hasModule( const OUString& rModuleName ) const
-{
- return mxBasicLib.is() && mxBasicLib->hasByName( rModuleName );
-}
-
bool VbaProject::hasDialogs() const
{
return mxDialogLib.is() && mxDialogLib->hasElements();
}
-bool VbaProject::hasDialog( const OUString& rDialogName ) const
-{
- return mxDialogLib.is() && mxDialogLib->hasByName( rDialogName );
-}
-
// protected ------------------------------------------------------------------
void VbaProject::addDummyModule( const OUString& rName, sal_Int32 nType )
diff --git a/oox/source/xls/addressconverter.cxx b/oox/source/xls/addressconverter.cxx
index 9fd9c38..3f45678 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/oox/source/xls/addressconverter.cxx
@@ -687,14 +687,6 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange,
// ----------------------------------------------------------------------------
-bool AddressConverter::checkCellRangeList( const ApiCellRangeList& rRanges, bool bAllowOverflow, bool bTrackOverflow )
-{
- for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt )
- if( !checkCellRange( *aIt, bAllowOverflow, bTrackOverflow ) )
- return false;
- return true;
-}
-
void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow )
{
for( size_t nIndex = orRanges.size(); nIndex > 0; --nIndex )
diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx
index a09c4eb..5312549 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/oox/source/xls/stylesbuffer.cxx
@@ -3329,11 +3329,6 @@ XfRef StylesBuffer::getStyleXf( sal_Int32 nXfId ) const
return maStyleXfs.get( nXfId );
}
-DxfRef StylesBuffer::getDxf( sal_Int32 nDxfId ) const
-{
- return maDxfs.get( nDxfId );
-}
-
FontRef StylesBuffer::getFontFromCellXf( sal_Int32 nXfId ) const
{
FontRef xFont;
@@ -3470,12 +3465,6 @@ void StylesBuffer::writeCellXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nX
pXf->writeToPropertyMap( rPropMap );
}
-void StylesBuffer::writeStyleXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const
-{
- if( Xf* pXf = maStyleXfs.get( nXfId ).get() )
- pXf->writeToPropertyMap( rPropMap );
-}
-
void StylesBuffer::writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const
{
if( Xf* pXf = maCellXfs.get( nXfId ).get() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 4976b81..0f8acc1 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1288,8 +1288,6 @@ oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
oox::drawingml::Theme::getEffectStyle(int) const
oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
-oox::drawingml::chart::ObjectFormatter::convertAutomaticLine(oox::PropertySet&, oox::drawingml::chart::ObjectType, int)
-oox::drawingml::chart::ObjectFormatter::isAutomaticLine(oox::drawingml::chart::ModelRef<oox::drawingml::Shape> const&)
oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
@@ -1307,7 +1305,6 @@ oox::dump::Output::resetIndent()
oox::dump::Output::writeAddress(oox::dump::Address const&)
oox::dump::Output::writeRange(oox::dump::Range const&)
oox::dump::Output::writeRangeList(std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&)
-oox::dump::OutputObjectBase::writeBoolItem(oox::dump::String const&, bool)
oox::dump::StorageIterator::getElementCount() const
oox::dump::StringHelper::prependToken(rtl::OUStringBuffer&, long, unsigned short)
oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short)
@@ -1316,12 +1313,8 @@ oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool)
oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short)
oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
oox::formulaimport::XmlStream::skipElement(int)
-oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-oox::ole::VbaProject::hasDialog(rtl::OUString const&) const
-oox::ole::VbaProject::hasModule(rtl::OUString const&) const
oox::ole::VbaSiteModel::isVisible() const
oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
-oox::xls::AddressConverter::checkCellRangeList(oox::xls::ApiCellRangeList const&, bool, bool)
oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
@@ -1359,8 +1352,6 @@ oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress con
oox::xls::SheetDataBuffer::XfIdRange::tryExpand(com::sun::star::table::CellAddress const&, int, int)
oox::xls::SheetDataBuffer::XfIdRange::tryMerge(oox::xls::SheetDataBuffer::XfIdRange const&)
oox::xls::SheetDataBuffer::XfIdRowRange::intersects(com::sun::star::table::CellRangeAddress const&) const
-oox::xls::StylesBuffer::getDxf(int) const
-oox::xls::StylesBuffer::writeStyleXfToPropertyMap(oox::PropertyMap&, int) const
oox::xls::WorkbookHelper::getBiffFilter() const
oox::xls::WorkbookHelper::getCellFromDoc(com::sun::star::table::CellAddress const&) const
oox::xls::WorkbookHelper::setTextEncoding(unsigned short)
commit 60397e849731db0dd9492975e134dc0f905b6390
Author: Elton Chung <elton at layerjet.com>
Date: Sat Feb 11 19:13:44 2012 +0800
Remove unused code
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index cbc9379..7c09707 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 64027ef..1b504f0 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 c66d729..600b1bc 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 7c8783d..5add5f4 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 c8acd4d..40288ef 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 f1e39d4..ef9510c 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 9194001..58c8de8 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 6dc9c61..633f452 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 b0135bb..ac88533 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 541b319..21229ae 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;
diff --git a/unusedcode.easy b/unusedcode.easy
index 4661170..4976b81 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1267,18 +1267,14 @@ ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet()
oox::AttributeList::getHyperHex(int, long) const
oox::AttributeList::getUnsignedHex(int, unsigned int) const
-oox::BinaryInputStream::readNulCharArrayUC(unsigned short)
oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
oox::ObjectContainer::getObject(rtl::OUString const&) const
oox::PropertyMap::dump()
oox::PropertyMap::getProperty(int) const
oox::PropertySet::getProperties(com::sun::star::uno::Sequence<com::sun::star::uno::Any>&, com::sun::star::uno::Sequence<rtl::OUString> const&) const
-oox::core::FilterBase::getComponentFactory() const
-oox::core::FilterBase::getInteractionHandler() const
oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
-oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const
oox::core::XmlFilterBase::getChartConverter()
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
@@ -1286,11 +1282,7 @@ oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ColorPropertySet::getColor()
oox::drawingml::ColorPropertySet::setColor(int)
oox::drawingml::CustomShapeProperties::getValue(std::__debug::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const
-oox::drawingml::Diagram::getLayoutId() const
oox::drawingml::DiagramLayout::layout(std::__debug::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&)
-oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&)
-oox::drawingml::GetTextMargin(rtl::OUString const&)
-oox::drawingml::GetTextVerticalAdjust(int)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
More information about the Libreoffice-commits
mailing list