summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorElton Chung <elton@layerjet.com>2012-02-13 16:16:34 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-13 16:16:34 +0000
commit0536df54d531e2d5e45dfea52c8377701a6a1fda (patch)
tree436e4a522cd2def2efd11ec081f362ace1536f13 /oox
parent60397e849731db0dd9492975e134dc0f905b6390 (diff)
Remove unused code
Diffstat (limited to 'oox')
-rw-r--r--oox/inc/oox/drawingml/chart/objectformatter.hxx8
-rw-r--r--oox/inc/oox/dump/dumperbase.hxx1
-rw-r--r--oox/inc/oox/ole/vbahelper.hxx7
-rw-r--r--oox/inc/oox/ole/vbaproject.hxx4
-rw-r--r--oox/inc/oox/xls/addressconverter.hxx20
-rw-r--r--oox/inc/oox/xls/stylesbuffer.hxx4
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx11
-rw-r--r--oox/source/dump/dumperbase.cxx6
-rw-r--r--oox/source/ole/vbahelper.cxx14
-rw-r--r--oox/source/ole/vbaproject.cxx10
-rw-r--r--oox/source/xls/addressconverter.cxx8
-rw-r--r--oox/source/xls/stylesbuffer.cxx11
12 files changed, 0 insertions, 104 deletions
diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/oox/inc/oox/drawingml/chart/objectformatter.hxx
index 8c24abc771b8..e13cef897cd3 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 8debfa561e45..7cba7ae90d41 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 1f67a7759aa6..ad227aae2f75 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 ca6c8adc92c7..f4af24a2eb21 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 681c2bb2b89f..47de4bab1a32 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 0ab97dd7e072..365474a5edde 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 7aca5b8f958c..076aa41a7e78 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 eacbba362d71..f109168e7a09 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 e78ec21ff313..a545c578c9e0 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 4237d2a21cca..19defae81a9a 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 9fd9c387d49a..3f4567803870 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 a09c4eb0bd51..53125499db08 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() )