connectivity/source/drivers/mozab/MCatalog.cxx | 6 - connectivity/source/drivers/mozab/MCatalog.hxx | 1 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 18 --- connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 3 sc/source/filter/inc/condformatbuffer.hxx | 3 sc/source/filter/inc/defnamesbuffer.hxx | 3 sc/source/filter/inc/externallinkbuffer.hxx | 5 sc/source/filter/oox/condformatbuffer.cxx | 34 ----- sc/source/filter/oox/defnamesbuffer.cxx | 6 - sc/source/filter/oox/externallinkbuffer.cxx | 58 ---------- sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 29 ----- sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx | 1 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 8 - sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 8 - sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 29 ----- unusedcode.easy | 11 - 16 files changed, 223 deletions(-)
New commits: commit 5e26d135dac662d2cc2c448a851ef4b9f6c6133f Author: Santiago Martinez <smvar...@gmail.com> Date: Mon Apr 16 21:39:46 2012 +0100 Remove unused code in sd diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 5849b1c..54aa95b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -139,9 +139,6 @@ public: const AcceptDropEvent& rEvent, const sal_Int8 nDragAction, SlideSorter& rSlideSorter); - EventDescriptor ( - const KeyEvent& rEvent, - SlideSorter& rSlideSorter); private: /** Compute a numerical code that describes a mouse event and that can @@ -977,32 +974,6 @@ SelectionFunction::EventDescriptor::EventDescriptor ( -SelectionFunction::EventDescriptor::EventDescriptor ( - const KeyEvent& rEvent, - SlideSorter& rSlideSorter) - : maMousePosition(), - maMouseModelPosition(), - mpHitDescriptor(), - mpHitPage(), - mnEventCode(KEY_EVENT), - mbIsOverButton(rSlideSorter.GetView().GetButtonBar().IsMouseOverButton()), - meDragMode(InsertionIndicatorHandler::MoveMode), - mbMakeSelectionVisible(true), - mbIsLeaving(false) -{ - model::SharedPageDescriptor pHitDescriptor ( - rSlideSorter.GetController().GetFocusManager().GetFocusedPageDescriptor()); - if (pHitDescriptor.get() != NULL) - { - mpHitPage = pHitDescriptor->GetPage(); - mpHitDescriptor = pHitDescriptor; - } - - mnEventCode |= EncodeKeyEvent(rEvent) | EncodeState(); -} - - - sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( const MouseEvent& rEvent) const diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx index a6a3482..6bb273f 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx @@ -224,7 +224,6 @@ public: virtual Size GetSize (void) const; virtual Size GetSize (const IconSize eIconSize) const; ::rtl::OUString GetHelpText (void) const; - bool IsDown (void) const; void SetActiveState (const bool bIsActive); bool IsActive (void) const; void SetIconSize (const IconSize eIconSize); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 8248747..2e2513c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -54,14 +54,6 @@ public: */ static FontProvider& Instance (void); - /** Return a font that is scaled according to the current map mode of - the given device. Repeated calls with a device, not necessarily the - same device, with the same map mode will return the same font. The - first call with a different map mode will release the old font and - create a new one that is correctly scaled. - */ - SharedFontPointer GetFont (const OutputDevice& rDevice); - /** Call this method to tell an object to release its currently used font. The next call to GetFont() will then create a new one. Typically called after a DataChange event when for instance a system diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 28c5a26..0304f25 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -924,14 +924,6 @@ Rectangle Button::GetBoundingBox (void) const -bool Button::IsDown (void) const -{ - return mbIsActive && meState==State_Down; -} - - - - void Button::SetActiveState (const bool bIsActive) { mbIsActive = bIsActive; diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 1e28546..9356d68 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -98,35 +98,6 @@ void FontProvider::Invalidate (void) - -FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevice) -{ - // Reset the font when the map mode has changed since its creation. - if (maMapMode != rDevice.GetMapMode()) - maFont.reset(); - - if (maFont.get() == NULL) - { - // Initialize the font from the application style settings. - maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont())); - maFont->SetTransparent(sal_True); - maFont->SetWeight(WEIGHT_NORMAL); - - // Transform the point size to pixel size. - MapMode aFontMapMode (MAP_POINT); - Size aFontSize (rDevice.LogicToPixel(maFont->GetSize(), aFontMapMode)); - - // Transform the font size to the logical coordinates of the device. - maFont->SetSize (rDevice.PixelToLogic(aFontSize)); - - // Remember the map mode of the given device to detect different - // devices or modified zoom scales on future calls. - maMapMode = rDevice.GetMapMode(); - } - - return maFont; -} - } } } // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 4faad33..de2277b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -764,9 +764,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&) -sd::slidesorter::view::Button::IsDown() const -sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&) sdr::animation::Scheduler::Reset(unsigned int) sdr::contact::ViewContactOfPageObj::GetReferencedPage() const sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const commit 727675e2948873dcfb97bff375f9a3ce662de23c Author: Santiago Martinez <smvar...@gmail.com> Date: Sat Apr 14 19:31:10 2012 +0200 Remove unused code in connectivity. diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index aed2de8..d2303c8 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -91,12 +91,6 @@ void OCatalog::refreshGroups() void OCatalog::refreshUsers() { } -// ------------------------------------------------------------------------- -const ::rtl::OUString& OCatalog::getDot() -{ - static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")); - return sDot; -} // ----------------------------------------------------------------------------- // XTablesSupplier diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx index d75774f..6ef0fec 100644 --- a/connectivity/source/drivers/mozab/MCatalog.hxx +++ b/connectivity/source/drivers/mozab/MCatalog.hxx @@ -56,7 +56,6 @@ namespace connectivity sdbcx::OCollection* getPrivateTables() const { return m_pTables;} sdbcx::OCollection* getPrivateViews() const { return m_pViews; } - static const ::rtl::OUString& getDot(); }; } } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index a8d828f..f727622 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -136,12 +136,6 @@ MQueryHelper::clear_results() } void -MQueryHelper::rewind() -{ - m_nIndex = 0; -} - -void MQueryHelper::reset() { m_nIndex = 0; @@ -256,18 +250,6 @@ MQueryHelper::getByIndex( sal_uInt32 nRow ) } sal_Bool -MQueryHelper::hasMore() const -{ - return m_bHasMore; -} - -sal_Bool -MQueryHelper::atEnd() const -{ - return m_bAtEnd; -} - -sal_Bool MQueryHelper::isError() const { return m_bErrorCondition; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 6884ddd..ce8091b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -103,7 +103,6 @@ namespace connectivity virtual ~MQueryHelper(); void reset(); - void rewind(); MQueryHelperResultEntry* next( ); @@ -112,8 +111,6 @@ namespace connectivity const ErrorDescriptor& getError() const { return m_aError; } sal_Bool isError() const; - sal_Bool hasMore() const; - sal_Bool atEnd() const; sal_Bool queryComplete() const; diff --git a/unusedcode.easy b/unusedcode.easy index f759c39..4faad33 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -717,10 +717,7 @@ connectivity::OSQLScanner::GetCurrentRule() const connectivity::SQLError::getSQLState(int) const connectivity::file::OStatement_Base::reset() connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&) -connectivity::mozab::MQueryHelper::atEnd() const -connectivity::mozab::MQueryHelper::hasMore() const connectivity::mozab::MQueryHelper::next() -connectivity::mozab::MQueryHelper::rewind() connectivity::mozab::OCatalog::getDot() connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) commit 9800f0c54c3832ef939e404eb84b9fc4a917669c Author: santi <santi@tartessos.(none)> Date: Mon Apr 16 20:05:42 2012 +0200 Remove unused code in sc. diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 3dd17b1..3f21fcc 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -89,9 +89,6 @@ public: /** Imports rule settings from a CFRULE record. */ void importCfRule( SequenceInputStream& rStrm ); - /** Imports rule settings from a CFRULE record. */ - void importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority ); - /** Creates a conditional formatting rule in the Calc document. */ void finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetConditionalEntries >& rxEntries ); diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 6704f19..61803b1 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -101,9 +101,6 @@ protected: /** Imports the BIFF formula from the passed stream. */ ApiTokenSequence importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 ); - /** Tries to convert the passed token sequence to a SingleReference or ComplexReference. */ - void extractReference( const ApiTokenSequence& rTokens ); - protected: DefinedNameModel maModel; /// Model data for this defined name. mutable ::rtl::OUString maUpModelName; /// Model name converted to uppercase ASCII. diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 2ea0e6b..72c3297 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -257,9 +257,6 @@ public: /** Returns the type of the external library if this is a library link. */ FunctionLibraryType getFuncLibraryType() const; - /** Returns the internal Calc sheet index or for the passed sheet. */ - sal_Int16 getCalcSheetIndex( sal_Int32 nTabId = 0 ) const; - /** Returns the token index of the external document. */ sal_Int32 getDocumentLinkIndex() const; /** Returns the external sheet cache index or for the passed sheet. */ @@ -278,7 +275,6 @@ private: void setExternalTargetUrl( const ::rtl::OUString& rTargetUrl, const ::rtl::OUString& rTargetType ); void setDdeOleTargetUrl( const ::rtl::OUString& rClassName, const ::rtl::OUString& rTargetUrl, ExternalLinkType eLinkType ); void parseExternalReference( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); - ::rtl::OUString parseBiffTargetUrl( const ::rtl::OUString& rBiffTargetUrl ); /** Creates an external locument link and the sheet cache for the passed sheet name. */ void insertExternalSheet( const ::rtl::OUString& rSheetName ); @@ -322,7 +318,6 @@ struct RefSheetsModel explicit RefSheetsModel(); void readBiff12Data( SequenceInputStream& rStrm ); - void readBiff8Data( BiffInputStream& rStrm ); }; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 2aff3e4..e7ec181 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -395,40 +395,6 @@ void CondFormatRule::importCfRule( SequenceInputStream& rStrm ) } } -void CondFormatRule::importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority ) -{ - sal_uInt8 nType, nOperator; - sal_uInt16 nFmla1Size, nFmla2Size; - sal_uInt32 nFlags; - rStrm >> nType >> nOperator >> nFmla1Size >> nFmla2Size >> nFlags; - rStrm.skip( 2 ); - - static const sal_Int32 spnTypeIds[] = { XML_TOKEN_INVALID, XML_cellIs, XML_expression }; - maModel.mnType = STATIC_ARRAY_SELECT( spnTypeIds, nType, XML_TOKEN_INVALID ); - - maModel.setBiffOperator( nOperator ); - maModel.mnPriority = nPriority; - maModel.mbStopIfTrue = true; - - DxfRef xDxf = getStyles().createDxf( &maModel.mnDxfId ); - xDxf->importCfRule( rStrm, nFlags ); - xDxf->finalizeImport(); - - // import the formulas - OSL_ENSURE( (nFmla1Size > 0) || (nFmla2Size == 0), "CondFormatRule::importCfRule - missing first formula" ); - if( nFmla1Size > 0 ) - { - CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress(); - ApiTokenSequence aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla1Size ); - maModel.maFormulas.push_back( aTokens ); - if( nFmla2Size > 0 ) - { - aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla2Size ); - maModel.maFormulas.push_back( aTokens ); - } - } -} - void CondFormatRule::finalizeImport( const Reference< XSheetConditionalEntries >& rxEntries ) { sal_Int32 eOperator = ::com::sun::star::sheet::ConditionOperator2::NONE; diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index ea767da..8d04f7a 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -288,12 +288,6 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); } -void DefinedNameBase::extractReference( const ApiTokenSequence& rTokens ) -{ - OSL_ENSURE( (getFilterType() == FILTER_BIFF) && (getBiff() <= BIFF4), "DefinedNameBase::extractReference - unexpected call" ); - maRefAny = getFormulaParser().extractReference( rTokens ); -} - // ============================================================================ DefinedName::DefinedName( const WorkbookHelper& rHelper ) : diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 61d2894..d9cd78c 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -484,14 +484,6 @@ FunctionLibraryType ExternalLink::getFuncLibraryType() const return (meLinkType == LINKTYPE_LIBRARY) ? meFuncLibType : FUNCLIB_UNKNOWN; } -sal_Int16 ExternalLink::getCalcSheetIndex( sal_Int32 nTabId ) const -{ - OSL_ENSURE( meLinkType == LINKTYPE_INTERNAL, "ExternalLink::getCalcSheetIndex - invalid link type" ); - OSL_ENSURE( (nTabId == 0) || (getFilterType() == FILTER_OOXML) || (getBiff() == BIFF8), - "ExternalLink::getCalcSheetIndex - invalid sheet index" ); - return ContainerHelper::getVectorElement( maCalcSheets, nTabId, -1 ); -} - sal_Int32 ExternalLink::getDocumentLinkIndex() const { OSL_ENSURE( meLinkType == LINKTYPE_EXTERNAL, "ExternalLink::getDocumentLinkIndex - invalid link type" ); @@ -627,49 +619,6 @@ void ExternalLink::parseExternalReference( const Relations& rRelations, const OU setExternalTargetUrl( pRelation->maTarget, pRelation->maType ); } -OUString ExternalLink::parseBiffTargetUrl( const OUString& rBiffTargetUrl ) -{ - meLinkType = LINKTYPE_UNKNOWN; - - OUString aClassName, aTargetUrl, aSheetName; - switch( getAddressConverter().parseBiffTargetUrl( aClassName, aTargetUrl, aSheetName, rBiffTargetUrl ) ) - { - case BIFF_TARGETTYPE_URL: - if( aTargetUrl.isEmpty() ) - { - meLinkType = aSheetName.isEmpty() ? LINKTYPE_SELF : LINKTYPE_INTERNAL; - } - else if( (aTargetUrl.getLength() == 1) && (aTargetUrl[ 0 ] == ':') ) - { - if( getBiff() >= BIFF4 ) - meLinkType = LINKTYPE_ANALYSIS; - } - else if( (aTargetUrl.getLength() > 1) || (aTargetUrl[ 0 ] != ' ') ) - { - setExternalTargetUrl( aTargetUrl, OOX_TARGETTYPE_EXTLINK ); - } - break; - - case BIFF_TARGETTYPE_SAMESHEET: - OSL_ENSURE( aTargetUrl.isEmpty() && aSheetName.isEmpty(), "ExternalLink::parseBiffTargetUrl - unexpected target or sheet name" ); - meLinkType = LINKTYPE_SAME; - break; - - case BIFF_TARGETTYPE_LIBRARY: - OSL_ENSURE( aSheetName.isEmpty(), "ExternalLink::parseBiffTargetUrl - unexpected sheet name" ); - setExternalTargetUrl( aTargetUrl, OOX_TARGETTYPE_LIBRARY ); - break; - - case BIFF_TARGETTYPE_DDE_OLE: - setDdeOleTargetUrl( aClassName, aTargetUrl, LINKTYPE_MAYBE_DDE_OLE ); - break; - - case BIFF_TARGETTYPE_UNKNOWN: - break; - } - return aSheetName; -} - void ExternalLink::insertExternalSheet( const OUString& rSheetName ) { OSL_ENSURE( !rSheetName.isEmpty(), "ExternalLink::insertExternalSheet - empty sheet name" ); @@ -702,13 +651,6 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm ) rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2; } -void RefSheetsModel::readBiff8Data( BiffInputStream& rStrm ) -{ - mnExtRefId = rStrm.readuInt16(); - mnTabId1 = rStrm.readInt16(); - mnTabId2 = rStrm.readInt16(); -} - // ---------------------------------------------------------------------------- ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) : diff --git a/unusedcode.easy b/unusedcode.easy index b016694..f759c39 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -758,11 +758,6 @@ oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPr oox::dump::RecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&) oox::xls::BiffGroupObject::BiffGroupObject(oox::xls::WorksheetHelper const&) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) -oox::xls::CondFormatRule::importCfRule(oox::xls::BiffInputStream&, int) -oox::xls::DefinedNameBase::extractReference(com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&) -oox::xls::ExternalLink::getCalcSheetIndex(int) const -oox::xls::ExternalLink::parseBiffTargetUrl(rtl::OUString const&) -oox::xls::RefSheetsModel::readBiff8Data(oox::xls::BiffInputStream&) 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&) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits