diff options
-rw-r--r-- | oox/inc/oox/dump/dumperbase.hxx | 2 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 19 | ||||
-rw-r--r-- | sc/inc/dbdata.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/dbdata.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/inc/pivotcachebuffer.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/stylesbuffer.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/oox/pivotcachebuffer.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 35 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 13 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 8 | ||||
-rw-r--r-- | slideshow/qa/debug/nodetree.sh | 2 | ||||
-rw-r--r-- | slideshow/source/engine/animationnodes/nodetools.cxx | 8 | ||||
-rw-r--r-- | slideshow/source/engine/animationnodes/nodetools.hxx | 3 | ||||
-rwxr-xr-x | unusedcode.easy | 53 |
15 files changed, 51 insertions, 132 deletions
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index fb1ede5e9a0a..10b1e11290e3 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -381,10 +381,8 @@ public: static void appendAddress( ::rtl::OUStringBuffer& rStr, const Address& rPos ); static void appendRange( ::rtl::OUStringBuffer& rStr, const Range& rRange ); - static void appendRangeList( ::rtl::OUStringBuffer& rStr, const RangeList& rRanges ); static void appendAddress( ::rtl::OUStringBuffer& rStr, const TokenAddress& rPos, bool bR1C1 ); - static void appendRange( ::rtl::OUStringBuffer& rStr, const TokenRange& rRange, bool bR1C1 ); // encoded text output ---------------------------------------------------- diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 0d8039d684ac..62a6d4c5a3d2 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -511,18 +511,6 @@ void StringHelper::appendRange( OUStringBuffer& rStr, const Range& rRange ) appendAddress( rStr, rRange.maLast ); } -void StringHelper::appendRangeList( OUStringBuffer& rStr, const RangeList& rRanges ) -{ - OUStringBuffer aData; - for( RangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt ) - { - OUStringBuffer aRange; - appendRange( aRange, *aIt ); - appendToken( aData, aRange.makeStringAndClear(), OOX_DUMP_LISTSEP ); - } - rStr.append( aData.makeStringAndClear() ); -} - void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& rPos, bool bR1C1 ) { if( bR1C1 && (rPos.mbRelCol || rPos.mbRelRow) ) @@ -537,13 +525,6 @@ void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& rPos } } -void StringHelper::appendRange( OUStringBuffer& rStr, const TokenRange& rRange, bool bR1C1 ) -{ - appendAddress( rStr, rRange.maFirst, bR1C1 ); - rStr.append( OOX_DUMP_RANGESEP ); - appendAddress( rStr, rRange.maLast, bR1C1 ); -} - // encoded text output -------------------------------------------------------- void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix ) diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index cef02e1effcc..9dcd457b471d 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -243,7 +243,6 @@ public: ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly); const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - const ScDBData* GetFilterDBAtTable(SCTAB nTab) const; ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab ); void DeleteOnTab( SCTAB nTab ); diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 4c14735815fc..36d19143df6f 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -974,22 +974,6 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO return NULL; } -const ScDBData* ScDBCollection::GetFilterDBAtTable(SCTAB nTab) const -{ - NamedDBs::DBsType::const_iterator itr = find_if( - maNamedDBs.begin(), maNamedDBs.end(), FindFilterDBByTable(nTab)); - - const ScDBData* pData = itr == maNamedDBs.end() ? NULL : &(*itr); - if (pData) - return pData; - - pData = pDoc->GetAnonymousDBData(nTab); - if (pData) - return pData; - - return getAnonDBs().findByTable(nTab); -} - void ScDBCollection::DeleteOnTab( SCTAB nTab ) { FindByTable func(nTab); diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 2fd32fe65648..cb57fef25e36 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -459,8 +459,6 @@ private: void importDConRef( BiffInputStream& rStrm ); /** Reads the defined name used for source data from the DCONNAME record. */ void importDConName( BiffInputStream& rStrm ); - /** Reads the built-in defined name used for source data from the DCONBINAME record. */ - void importDConBIName( BiffInputStream& rStrm ); /** Reads the sheet name and URL from the DCONREF, DCONNAME, or DCONBINAME records. */ void importDConUrl( BiffInputStream& rStrm ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 01ce04970cb2..185ba98b732e 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -798,11 +798,6 @@ public: /** Writes all formatting attributes to the passed property set. */ void writeToPropertySet( PropertySet& rPropSet ) const; - /** Converts formatting information from BIFF2 cell record data directly. */ - static void writeBiff2CellFormatToPropertySet( - const WorkbookHelper& rHelper, PropertySet& rPropSet, - sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 ); - const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false ); private: diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 94845df042ef..2a07a615e6e0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1349,14 +1349,6 @@ void PivotCache::importDConName( BiffInputStream& rStrm ) importDConUrl( rStrm ); } -void PivotCache::importDConBIName( BiffInputStream& rStrm ) -{ - sal_uInt8 nNameId = rStrm.readuInt8(); - rStrm.skip( 3 ); - maSheetSrcModel.maDefName = OUString( sal_Unicode( nNameId ) ); - importDConUrl( rStrm ); -} - void PivotCache::importDConUrl( BiffInputStream& rStrm ) { // the URL with sheet name and optional URL of an external document diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 57486c2226a9..5b11f7a6d23b 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2627,41 +2627,6 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) const rPropSet.setProperties( aPropMap ); } -/*static*/ void Xf::writeBiff2CellFormatToPropertySet( const WorkbookHelper& rHelper, - PropertySet& rPropSet, sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 ) -{ - /* Create an XF object and let it do the work. We will have access to its - private members here. Also, create temporary border and fill objects, - this prevents polluting the border and fill buffers with new temporary - objects per imported cell. */ - Xf aXf( rHelper ); - Border aBorder( rHelper, false ); - Fill aFill( rHelper, false ); - - // no used flags available in BIFF2 (always true) - aXf.setAllUsedFlags( true ); - - // set the attributes - aXf.maModel.mnFontId = extractValue< sal_Int32 >( nFlags2, 6, 2 ); - aXf.maModel.mnNumFmtId = extractValue< sal_Int32 >( nFlags2, 0, 6 ); - aXf.maAlignment.setBiff2Data( nFlags3 ); - aXf.maProtection.setBiff2Data( nFlags1 ); - aBorder.setBiff2Data( nFlags3 ); - aFill.setBiff2Data( nFlags3 ); - - // finalize the objects (convert model to API attributes) - aXf.finalizeImport(); - aBorder.finalizeImport(); - aFill.finalizeImport(); - - // write the properties to the property set - PropertyMap aPropMap; - aXf.writeToPropertyMap( aPropMap ); - aBorder.writeToPropertyMap( aPropMap ); - aFill.writeToPropertyMap( aPropMap ); - rPropSet.setProperties( aPropMap ); -} - void Xf::setBiffUsedFlags( sal_uInt8 nUsedFlags ) { /* Notes about finding the used flags: diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 736c5bd7510a..627854ff72bb 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -233,8 +233,6 @@ public: inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; } /** Sets the text encoding to import/export byte strings. */ void setTextEncoding( rtl_TextEncoding eTextEnc ); - /** Sets text encoding from the default application font, if CODEPAGE record is missing. */ - void setAppFontEncoding( rtl_TextEncoding eAppFontEnc ); /** Returns the codec helper that stores the encoder/decoder object. */ inline BiffCodecHelper& getCodecHelper() { return *mxCodecHelper; } @@ -511,12 +509,6 @@ void WorkbookGlobals::setTextEncoding( rtl_TextEncoding eTextEnc ) meTextEnc = eTextEnc; } -void WorkbookGlobals::setAppFontEncoding( rtl_TextEncoding eAppFontEnc ) -{ - if( !mbHasCodePage ) - setTextEncoding( eAppFontEnc ); -} - // private -------------------------------------------------------------------- void WorkbookGlobals::initialize( bool bWorkbookFile ) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 7b841652fdb0..e40c7bdf2c5a 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -231,19 +231,6 @@ void QueueProcessor::ProcessOneRequest ( } } - - - -void QueueProcessor::RemoveRequest (CacheKey aKey) -{ - (void)aKey; - // See the method declaration above for an explanation why this makes sense. - ::osl::MutexGuard aGuard (maMutex); -} - - - - void QueueProcessor::SetBitmapCache ( const ::boost::shared_ptr<BitmapCache>& rpCache) { diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 643b8db17b5a..000094f9961f 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -94,14 +94,6 @@ public: const Size& rSize, const bool bDoSuperSampling); - /** As we can not really terminate the rendering of a preview bitmap for - a request in midair this method acts more like a semaphor. It - returns only when it is save for the caller to delete the request. - For this to work it is important to remove the request from the - queue before calling this method. - */ - void RemoveRequest (CacheKey aKey); - /** Use this method when the page cache is (maybe) using a different BitmapCache. This is usually necessary after calling PageCacheManager::ChangeSize(). diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh index da323ec316c0..906318118c24 100644 --- a/slideshow/qa/debug/nodetree.sh +++ b/slideshow/qa/debug/nodetree.sh @@ -25,7 +25,7 @@ # grep for the DEBUG_NODES_SHOWTREE macros in the slideshow source: # Each such place dumps the current node tree to the trace output. Thus, # if you need to check the tree state at other places or times, just add -# a DEBUG_NODES_SHOWTREE (or DEBUG_NODES_SHOWTREE_WITHIN, that is). +# a DEBUG_NODES_SHOWTREE # ################################################### diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index b4b0bbc364fa..4fac68ccd3e4 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -58,14 +58,6 @@ namespace slideshow ++debugGetCurrentOffset(); } - - void debugNodesShowTreeWithin( const BaseNode* pNode ) - { - if( pNode ) - pNode->showTreeFromWithin(); - - ++debugGetCurrentOffset(); - } #endif AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index 44109a175235..4882a2a35660 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -41,10 +41,8 @@ #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) # define DEBUG_NODES_SHOWTREE(a) debugNodesShowTree(a); -# define DEBUG_NODES_SHOWTREE_WITHIN(a) debugNodesShowTreeWithin(a); #else # define DEBUG_NODES_SHOWTREE(a) -# define DEBUG_NODES_SHOWTREE_WITHIN(a) #endif namespace slideshow @@ -58,7 +56,6 @@ namespace slideshow #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) int& debugGetCurrentOffset(); void debugNodesShowTree( const BaseNode* ); - void debugNodesShowTreeWithin( const BaseNode* ); #endif /** Look up an AttributableShape from ShapeManager. diff --git a/unusedcode.easy b/unusedcode.easy index 6504e38b7309..acb0b6c7e445 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,3 +1,4 @@ +AboutDialog::LinkStubCancelHdl(void*, void*) CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) CharAttribList::Clear() Dialog::Dialog(Window*, ResId const&) @@ -765,10 +766,57 @@ oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) const oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&) -oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, oox::dump::TokenRange const&, bool) -oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&) +oox::xls::Alignment::setBiff3Data(unsigned short) +oox::xls::Alignment::setBiff4Data(unsigned short) +oox::xls::Alignment::setBiff5Data(unsigned short) +oox::xls::Alignment::setBiff8Data(unsigned short, unsigned short) +oox::xls::BiffDecoder_RCF::BiffDecoder_RCF(unsigned char*, unsigned char*, unsigned char*) +oox::xls::BiffDecoder_XOR::BiffDecoder_XOR(unsigned short, unsigned short) +oox::xls::BiffDrawingObjectBase::importObjBiff3(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&) +oox::xls::BiffDrawingObjectBase::importObjBiff4(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&) +oox::xls::BiffDrawingObjectBase::importObjBiff5(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&) +oox::xls::BiffHelper::calcTextEncodingFromCodePage(unsigned short) +oox::xls::BiffWorkbookContextBase::BiffWorkbookContextBase(oox::xls::WorkbookHelper const&) +oox::xls::Border::setBiff3Data(unsigned int) +oox::xls::Border::setBiff5Data(unsigned int, unsigned int) +oox::xls::Border::setBiff8Data(unsigned int, unsigned int) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) oox::xls::CellStyleBuffer::importStyle(oox::xls::BiffInputStream&) +oox::xls::Comment::importNoteBiff2(oox::xls::BiffInputStream&) +oox::xls::Comment::importNoteBiff8(oox::xls::BiffInputStream&) +oox::xls::Comment::importNoteSound(oox::xls::BiffInputStream&) +oox::xls::CondFormat::importCfHeader(oox::xls::BiffInputStream&) +oox::xls::DefinedNamesBuffer::importDefinedName(oox::xls::BiffInputStream&) +oox::xls::DefinedNamesBuffer::setLocalCalcSheet(short) +oox::xls::ExternalLink::importExternalName(oox::xls::BiffInputStream&) +oox::xls::ExternalLinkBuffer::importExternSheet(oox::xls::BiffInputStream&) +oox::xls::ExternalLinkBuffer::importExternSheet8(oox::xls::BiffInputStream&) +oox::xls::ExternalLinkBuffer::importExternalBook(oox::xls::BiffInputStream&) +oox::xls::Fill::setBiff3Data(unsigned short) +oox::xls::Fill::setBiff5Data(unsigned int) +oox::xls::Fill::setBiff8Data(unsigned int, unsigned short) +oox::xls::FilterColumn::importFilterColumn(oox::xls::BiffInputStream&) +oox::xls::Font::importFontColor(oox::xls::BiffInputStream&) +oox::xls::Font::importFontData2(oox::xls::BiffInputStream&) +oox::xls::Font::importFontData5(oox::xls::BiffInputStream&) +oox::xls::Font::importFontName2(oox::xls::BiffInputStream&) +oox::xls::Font::importFontName8(oox::xls::BiffInputStream&) +oox::xls::PivotCache::importDConName(oox::xls::BiffInputStream&) +oox::xls::PivotCache::importDConRef(oox::xls::BiffInputStream&) +oox::xls::PivotTable::importPTDataField(oox::xls::BiffInputStream&) +oox::xls::PivotTable::importPTDefinition(oox::xls::BiffInputStream&, short) +oox::xls::PivotTable::importPTDefinition2(oox::xls::BiffInputStream&) +oox::xls::PivotTable::importPTPageFields(oox::xls::BiffInputStream&) +oox::xls::PivotTable::importPTRowColFields(oox::xls::BiffInputStream&) +oox::xls::PivotTableField::importPTField(oox::xls::BiffInputStream&) +oox::xls::Protection::setBiff3Data(unsigned short) +oox::xls::QueryTable::importQueryTable(oox::xls::BiffInputStream&) +oox::xls::QueryTable::importQueryTableRefresh(oox::xls::BiffInputStream&) +oox::xls::QueryTable::importQueryTableSettings(oox::xls::BiffInputStream&) +oox::xls::RichString::importByteString(oox::xls::BiffInputStream&, unsigned short, int) +oox::xls::RichString::importUniString(oox::xls::BiffInputStream&, int) +oox::xls::Scenario::importScenario(oox::xls::BiffInputStream&) +oox::xls::Xf::setBiffUsedFlags(unsigned char) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&) @@ -780,7 +828,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*) sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&) sd::slidesorter::model::VisualState::SetVisualStateBlend(double) sd::slidesorter::view::Button::IsDown() const |