accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx | 7 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 3 accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx | 1 accessibility/source/extended/AccessibleGridControlHeader.cxx | 15 - accessibility/source/standard/vclxaccessiblelist.cxx | 34 -- accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 6 basic/source/sbx/sbxobj.cxx | 79 ------ cui/source/factory/dlgfact.cxx | 9 cui/source/factory/dlgfact.hxx | 5 editeng/source/accessibility/AccessibleImageBullet.cxx | 6 editeng/source/accessibility/AccessibleStaticTextBase.cxx | 66 ----- editeng/source/misc/splwrap.cxx | 51 --- editeng/source/outliner/outlundo.cxx | 20 - editeng/source/outliner/outlundo.hxx | 11 editeng/source/uno/unopracc.cxx | 6 embeddedobj/source/general/intercept.cxx | 32 -- embeddedobj/source/general/xcreator.cxx | 33 -- embeddedobj/source/inc/intercept.hxx | 11 embeddedobj/source/inc/xcreator.hxx | 3 framework/inc/classes/propertysethelper.hxx | 12 framework/source/fwi/classes/propertysethelper.cxx | 15 - include/basic/sbxobj.hxx | 4 include/editeng/AccessibleImageBullet.hxx | 3 include/editeng/AccessibleStaticTextBase.hxx | 40 --- include/editeng/splwrap.hxx | 2 include/editeng/unopracc.hxx | 2 include/oox/ppt/dgmimport.hxx | 1 include/oox/ppt/dgmlayout.hxx | 1 include/sfx2/objsh.hxx | 3 include/sfx2/templdlg.hxx | 2 include/sfx2/viewfrm.hxx | 11 include/sfx2/viewsh.hxx | 1 include/sot/factory.hxx | 1 include/sot/storage.hxx | 12 include/svl/cintitem.hxx | 24 - include/svl/instrm.hxx | 4 include/svl/intitem.hxx | 6 include/svl/style.hxx | 5 include/svtools/accessibleruler.hxx | 15 - include/svtools/ivctrl.hxx | 1 include/svtools/svtabbx.hxx | 1 include/svtools/treelistbox.hxx | 4 include/svx/AccessibleTextHelper.hxx | 39 --- include/svx/chrtitem.hxx | 5 include/svx/e3dundo.hxx | 1 include/svx/sdr/contact/viewcontactoftextobj.hxx | 4 include/svx/svdpage.hxx | 1 include/toolkit/awt/vclxgraphics.hxx | 6 include/toolkit/controls/accessiblecontrolcontext.hxx | 1 include/tools/inetmime.hxx | 32 -- include/vcl/printerinfomanager.hxx | 3 include/vcl/window.hxx | 1 lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 8 lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx | 2 lotuswordpro/source/filter/xfilter/xflist.cxx | 25 - lotuswordpro/source/filter/xfilter/xflist.hxx | 4 oox/source/ppt/dgmimport.cxx | 6 oox/source/ppt/dgmlayout.cxx | 9 reportdesign/source/core/api/Section.cxx | 41 --- reportdesign/source/core/inc/Section.hxx | 2 reportdesign/source/filter/xml/xmlfilter.cxx | 13 - reportdesign/source/filter/xml/xmlfilter.hxx | 5 sc/inc/cellsuno.hxx | 7 sc/inc/formulacell.hxx | 3 sc/source/core/data/formulacell.cxx | 4 sc/source/filter/excel/xeescher.cxx | 64 ---- sc/source/filter/inc/xeescher.hxx | 1 sc/source/ui/drawfunc/chartsh.cxx | 6 sc/source/ui/drawfunc/fupoor.cxx | 33 -- sc/source/ui/drawfunc/oleobjsh.cxx | 6 sc/source/ui/inc/chartsh.hxx | 1 sc/source/ui/inc/fupoor.hxx | 4 sc/source/ui/inc/gridwin.hxx | 3 sc/source/ui/inc/navipi.hxx | 2 sc/source/ui/inc/oleobjsh.hxx | 1 sc/source/ui/inc/preview.hxx | 2 sc/source/ui/navipi/navipi.cxx | 34 -- sc/source/ui/unoobj/cellsuno.cxx | 9 sc/source/ui/vba/vbaapplication.cxx | 39 --- sc/source/ui/vba/vbaapplication.hxx | 4 sc/source/ui/vba/vbadialogs.cxx | 5 sc/source/ui/vba/vbadialogs.hxx | 2 sc/source/ui/vba/vbaname.cxx | 12 sc/source/ui/vba/vbaname.hxx | 2 sc/source/ui/view/gridwin.cxx | 5 sc/source/ui/view/gridwin5.cxx | 12 sc/source/ui/view/preview.cxx | 11 sd/inc/stlpool.hxx | 1 sd/source/core/stlpool.cxx | 5 sd/source/ui/docshell/docshel4.cxx | 37 -- sd/source/ui/inc/DrawDocShell.hxx | 5 sd/source/ui/inc/DrawViewShell.hxx | 3 sd/source/ui/inc/OutlineView.hxx | 4 sd/source/ui/inc/OutlineViewShell.hxx | 5 sd/source/ui/inc/SdUnoOutlineView.hxx | 5 sd/source/ui/inc/SlideSorterViewShell.hxx | 4 sd/source/ui/inc/TextObjectBar.hxx | 2 sd/source/ui/inc/ViewShell.hxx | 2 sd/source/ui/inc/Window.hxx | 1 sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 8 sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2 sd/source/ui/sidebar/MasterPagesSelector.cxx | 24 - sd/source/ui/sidebar/MasterPagesSelector.hxx | 4 sd/source/ui/sidebar/PanelBase.cxx | 11 sd/source/ui/sidebar/PanelBase.hxx | 5 sd/source/ui/slideshow/slideshowimpl.cxx | 56 ---- sd/source/ui/slideshow/slideshowimpl.hxx | 6 sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 18 - sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 18 - sd/source/ui/unoidl/SdUnoOutlineView.cxx | 5 sd/source/ui/unoidl/unoobj.cxx | 7 sd/source/ui/unoidl/unoobj.hxx | 1 sd/source/ui/view/drtxtob.cxx | 8 sd/source/ui/view/drviews3.cxx | 10 sd/source/ui/view/outlnvsh.cxx | 56 ---- sd/source/ui/view/outlview.cxx | 7 sd/source/ui/view/sdwindow.cxx | 11 sd/source/ui/view/viewshel.cxx | 4 sfx2/source/appl/appdde.cxx | 58 ---- sfx2/source/control/thumbnailviewacc.cxx | 13 - sfx2/source/control/thumbnailviewacc.hxx | 2 sfx2/source/dialog/templdlg.cxx | 47 --- sfx2/source/doc/objmisc.cxx | 10 sfx2/source/view/viewfrm2.cxx | 5 sfx2/source/view/viewsh.cxx | 13 - slideshow/source/engine/slide/slideanimations.cxx | 5 slideshow/source/engine/slide/slideanimations.hxx | 3 sot/source/base/factory.cxx | 14 - sot/source/sdstor/storage.cxx | 84 ------ starmath/inc/document.hxx | 1 starmath/inc/view.hxx | 1 starmath/source/document.cxx | 8 starmath/source/view.cxx | 8 svl/source/items/cintitem.cxx | 72 ----- svl/source/items/intitem.cxx | 18 - svl/source/items/style.cxx | 17 - svl/source/misc/strmadpt.cxx | 16 - svtools/inc/vclxaccessibleheaderbaritem.hxx | 1 svtools/source/contnr/imivctl1.cxx | 15 - svtools/source/contnr/ivctrl.cxx | 5 svtools/source/contnr/treelistbox.cxx | 8 svtools/source/control/accessibleruler.cxx | 42 --- svtools/source/control/toolbarmenuacc.cxx | 31 -- svtools/source/control/toolbarmenuimp.hxx | 2 svtools/source/control/valueacc.cxx | 43 --- svtools/source/control/valueimp.hxx | 2 svtools/source/control/vclxaccessibleheaderbaritem.cxx | 13 - svtools/source/table/tabledatawindow.cxx | 13 - svtools/source/table/tabledatawindow.hxx | 2 svx/source/accessibility/AccessibleFrameSelector.cxx | 130 ---------- svx/source/accessibility/AccessibleTextHelper.cxx | 60 ---- svx/source/accessibility/GraphCtlAccessibleContext.cxx | 47 --- svx/source/accessibility/charmapacc.cxx | 28 -- svx/source/accessibility/svxrectctaccessiblecontext.cxx | 77 ----- svx/source/engine3d/e3dundo.cxx | 6 svx/source/form/fmvwimp.cxx | 16 - svx/source/inc/AccessibleFrameSelector.hxx | 8 svx/source/inc/GraphCtlAccessibleContext.hxx | 3 svx/source/inc/charmapacc.hxx | 3 svx/source/inc/fmvwimp.hxx | 3 svx/source/inc/svxrectctaccessiblecontext.hxx | 34 -- svx/source/items/chrtitem.cxx | 28 -- svx/source/sdr/contact/viewcontactoftextobj.cxx | 5 svx/source/svdraw/svdpage.cxx | 28 -- sw/inc/dcontact.hxx | 3 sw/inc/dlelstnr.hxx | 3 sw/inc/doc.hxx | 1 sw/inc/docsh.hxx | 3 sw/inc/redline.hxx | 1 sw/inc/shellio.hxx | 1 sw/source/core/access/acccontext.cxx | 7 sw/source/core/access/acccontext.hxx | 2 sw/source/core/crsr/bookmrk.cxx | 11 sw/source/core/doc/docbm.cxx | 5 sw/source/core/doc/docedt.cxx | 6 sw/source/core/doc/docredln.cxx | 4 sw/source/core/draw/dcontact.cxx | 16 - sw/source/core/inc/MarkManager.hxx | 1 sw/source/core/inc/SwXMLTextBlocks.hxx | 1 sw/source/core/inc/bookmrk.hxx | 2 sw/source/core/inc/unoport.hxx | 9 sw/source/core/swg/SwXMLTextBlocks.cxx | 5 sw/source/core/unocore/unoport.cxx | 50 --- sw/source/filter/basflt/fltini.cxx | 2 sw/source/filter/ww8/docxexport.cxx | 10 sw/source/filter/ww8/docxexport.hxx | 6 sw/source/filter/ww8/wrtww8.hxx | 3 sw/source/ui/vba/vbaapplication.cxx | 5 sw/source/ui/vba/vbaapplication.hxx | 2 sw/source/ui/vba/vbatable.cxx | 8 sw/source/ui/vba/vbatable.hxx | 1 sw/source/uibase/app/docsh.cxx | 19 - sw/source/uibase/cctrl/popbox.cxx | 8 sw/source/uibase/docvw/edtwin.cxx | 17 - sw/source/uibase/inc/conttree.hxx | 1 sw/source/uibase/inc/edtwin.hxx | 3 sw/source/uibase/inc/navipi.hxx | 3 sw/source/uibase/inc/popbox.hxx | 1 sw/source/uibase/inc/pview.hxx | 1 sw/source/uibase/uiview/pview.cxx | 16 - sw/source/uibase/uno/dlelstnr.cxx | 25 - sw/source/uibase/utlui/content.cxx | 14 - sw/source/uibase/utlui/navipi.cxx | 49 --- toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java | 1 toolkit/source/awt/vclxgraphics.cxx | 48 --- toolkit/source/controls/accessiblecontrolcontext.cxx | 7 tools/source/inet/inetmime.cxx | 19 - unoxml/source/dom/element.cxx | 21 - unoxml/source/dom/element.hxx | 6 unusedcode.easy | 120 ++++++++- vcl/null/printerinfomanager.cxx | 5 vcl/source/window/paint.cxx | 4 vcl/unx/generic/printer/printerinfomanager.cxx | 20 - writerfilter/source/dmapper/TableManager.cxx | 5 writerfilter/source/dmapper/TableManager.hxx | 7 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 31 -- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 5 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 92 ------- xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 5 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 91 ------- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 5 222 files changed, 119 insertions(+), 3131 deletions(-)
New commits: commit 309574394bd4ae3e9e10e5ff0d64bdd7bbbc8b83 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jan 29 09:07:25 2015 +0000 callcatcher: large newly detected unused methods post de-virtualization i.e lots now able to be detected after... commit b44cbb26efe1d0b0950b1e1613e131b506dc3876 Author: Noel Grandin <n...@peralex.com> Date: Tue Jan 20 12:38:10 2015 +0200 new loplugin: change virtual methods to non-virtual Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I605e2fa56f7186c3d3a764f3cd30f5cf7f881f9d diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 6259d29..e65df64 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -169,13 +169,6 @@ protected: @return The bounding box (VCL rect.) in screen coordinates. */ virtual Rectangle implGetBoundingBoxOnScreen() SAL_OVERRIDE; - /** @attention This method requires locked mutex's and a living object. - @return The count of used rows. */ - sal_Int32 implGetRowCount() const; - /** @attention This method requires locked mutex's and a living object. - @return The count of used columns. */ - sal_Int32 implGetColumnCount() const; - // internal helper methods ------------------------------------------------ /** @return <TRUE/>, if the objects is a header bar for rows. */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index 4c04432..21f2f3e 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -113,9 +113,6 @@ public: // XAccessibleComponent bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleAt (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); // XServiceInfo diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 1b7972a..b7d3c15 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -134,7 +134,6 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index bfb5a21..3e133bb 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -234,18 +234,7 @@ Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen() return Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight())); } -sal_Int32 AccessibleGridControlHeader::implGetRowCount() const -{ - return 1; -} - -sal_Int32 AccessibleGridControlHeader::implGetColumnCount() const -{ - return 1; -} - // internal helper methods ---------------------------------------------------- - Reference< XAccessible > AccessibleGridControlHeader::implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos ) { @@ -263,10 +252,6 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild( return xChild; } - - } // namespace accessibility - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index f5b1034..6b85039 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -670,45 +670,13 @@ bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (Ru return bInside; } - -Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint ) - throw (RuntimeException) -{ - SolarMutexGuard aSolarGuard; - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - Reference< XAccessible > xChild; - if ( m_pListBoxHelper ) - { - UpdateVisibleLineCount(); - if ( contains( rPoint ) && m_nVisibleLineCount > 0 ) - { - Point aPos = VCLPoint( rPoint ); - sal_uInt16 nEndPos = m_pListBoxHelper->GetTopEntry() + (sal_uInt16)m_nVisibleLineCount; - for ( sal_uInt16 i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i ) - { - if ( m_pListBoxHelper->GetBoundingRectangle(i).IsInside( aPos ) ) - { - xChild = getAccessibleChild(i); - break; - } - } - } - } - - return xChild; -} - - //===== XServiceInfo ========================================================== - OUString VCLXAccessibleList::getImplementationName (void) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } - Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) throw (RuntimeException, std::exception) { @@ -719,7 +687,6 @@ Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) return aNames; } - void VCLXAccessibleList::UpdateVisibleLineCount() { if ( m_pListBoxHelper ) @@ -736,7 +703,6 @@ void VCLXAccessibleList::UpdateVisibleLineCount() } } - void VCLXAccessibleList::UpdateEntryRange_Impl() { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 3d2fb8d..8d3b455 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -584,17 +584,11 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx } // XAccessibleExtendedComponent - Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException, std::exception) { return uno::Reference< awt::XFont >(); } -awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Reference< awt::XFont >& xFont ) throw (RuntimeException) -{ - return xFont->getFontDescriptor(); -} - OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index e677d7d..46e37ba 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -427,31 +427,6 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp return pVar; } -SbxObject* SbxObject::MakeObject( const OUString& rName, const OUString& rClass ) -{ - // Is the object already available? - if( !ISA(SbxCollection) ) - { - SbxVariable* pRes = pObjs->Find( rName, SbxCLASS_OBJECT ); - if( pRes ) - { - return PTR_CAST(SbxObject,pRes); - } - } - SbxObject* pVar = CreateObject( rClass ); - if( pVar ) - { - pVar->SetName( rName ); - pVar->SetParent( this ); - pObjs->Put( pVar, pObjs->Count() ); - SetModified( true ); - // The object listen always - StartListening( pVar->GetBroadcaster(), true ); - Broadcast( SBX_HINT_OBJECTCHANGED ); - } - return pVar; -} - void SbxObject::Insert( SbxVariable* pVar ) { sal_uInt16 nIdx; @@ -708,60 +683,6 @@ bool SbxObject::StoreData( SvStream& rStrm ) const return true; } -OUString SbxObject::GenerateSource( const OUString &rLinePrefix, - const SbxObject* ) -{ - // Collect the properties in a String - OUString aSource; - SbxArrayRef xProps( GetProperties() ); - bool bLineFeed = false; - for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp ) - { - SbxPropertyRef xProp = static_cast<SbxProperty*>( xProps->Get(nProp) ); - OUString aPropName( xProp->GetName() ); - if ( xProp->CanWrite() && - !( xProp->GetHashCode() == nNameHash && - aPropName.equalsIgnoreAsciiCase(pNameProp))) - { - // Insert a break except in front of the first property - if ( bLineFeed ) - { - aSource += "\n"; - } - else - { - bLineFeed = true; - } - aSource += rLinePrefix; - aSource += "."; - aSource += aPropName; - aSource += " = "; - - // convert the property value to text - switch ( xProp->GetType() ) - { - case SbxEMPTY: - case SbxNULL: - // no value - break; - - case SbxSTRING: - // Strings in quotation mark - aSource += "\""; - aSource += xProp->GetOUString(); - aSource += "\""; - break; - - default: - // miscellaneous, such as e.g. numbers directly - aSource += xProp->GetOUString(); - break; - } - } - } - return aSource; -} - static bool CollectAttrs( const SbxBase* p, OUString& rRes ) { OUString aAttrs; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 63d3c71..69ebc3a 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1273,15 +1273,6 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd return 0; } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, - vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& , - const SfxItemSet* pAttrSet ) -{ - SfxModalDialog* pDlg = new SvxCharacterMap( pParent, true, pAttrSet ); - return new CuiAbstractSfxDialog_Impl( pDlg ); -} - SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) { diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 0f12a21..6737b94 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -511,10 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory public: virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; - SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, - vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, - const SfxItemSet* pAttrSet=0 ); + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 7fa0924..cac43b3 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -376,12 +376,6 @@ namespace accessibility return uno::Sequence< OUString > (&sServiceName, 1); } - OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException) - { - - return OUString("com.sun.star.accessibility.AccessibleContext"); - } - void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex ) { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index e6d52b9..a149799 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -133,11 +133,6 @@ namespace accessibility mxThis = rInterface; } - uno::Reference< XAccessible > GetEventSource() const - { - - return mxThis; - } void SetOffset( const Point& ); Point GetOffset() const @@ -505,21 +500,6 @@ namespace accessibility { } - const SvxEditSource& AccessibleStaticTextBase::GetEditSource() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - const SvxEditSource& aEditSource = mpImpl->GetEditSource(); - - mpImpl->CheckInvariants(); - - return aEditSource; -#else - return mpImpl->GetEditSource(); -#endif - } - void AccessibleStaticTextBase::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ) { #ifdef DBG_UTIL @@ -549,21 +529,6 @@ namespace accessibility #endif } - uno::Reference< XAccessible > AccessibleStaticTextBase::GetEventSource() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - uno::Reference< XAccessible > xRet( mpImpl->GetEventSource() ); - - mpImpl->CheckInvariants(); - - return xRet; -#else - return mpImpl->GetEventSource(); -#endif - } - void AccessibleStaticTextBase::SetOffset( const Point& rPoint ) { #ifdef DBG_UTIL @@ -580,37 +545,6 @@ namespace accessibility #endif } - Point AccessibleStaticTextBase::GetOffset() const - { -#ifdef DBG_UTIL - mpImpl->CheckInvariants(); - - Point aPoint( mpImpl->GetOffset() ); - - mpImpl->CheckInvariants(); - - return aPoint; -#else - return mpImpl->GetOffset(); -#endif - } - - void AccessibleStaticTextBase::UpdateChildren() - { -#ifdef DBG_UTIL - // precondition: solar mutex locked - DBG_TESTSOLARMUTEX(); - - mpImpl->CheckInvariants(); - - mpImpl->UpdateChildren(); - - mpImpl->CheckInvariants(); -#else - mpImpl->UpdateChildren(); -#endif - } - void AccessibleStaticTextBase::Dispose() { #ifdef DBG_UTIL diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 6844974..69b2bac 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -272,88 +272,37 @@ void SvxSpellWrapper::SpellEnd() ShowLanguageErrors(); } - - - bool SvxSpellWrapper::SpellContinue() { return false; } - - void SvxSpellWrapper::AutoCorrect( const OUString&, const OUString& ) { } - - - void SvxSpellWrapper::ScrollArea() { // Set Scroll area } - - - void SvxSpellWrapper::ChangeWord( const OUString&, const sal_uInt16 ) { // Insert Word } - - - void SvxSpellWrapper::ChangeThesWord( const OUString& ) { // replace word due to Thesaurus. } - - -void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguage ) -{ - Reference< XThesaurus > xThes( SvxGetThesaurus() ); - if (!xThes.is()) - { - MessageDialog(pWin, EE_RESSTR(RID_SVXSTR_HMERR_THESAURUS), - VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute(); - return; - } - - WAIT_ON(); // while looking up for initial word - EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractThesaurusDialog> pDlg(pFact->CreateThesaurusDialog( pWin, xThes, rWord, nLanguage )); - WAIT_OFF(); - if ( pDlg->Execute()== RET_OK ) - { - ChangeThesWord( pDlg->GetWord() ); - } -} - - - void SvxSpellWrapper::ReplaceAll( const OUString &, sal_Int16 ) { // Replace Word from the Replace list } - - - -void SvxSpellWrapper::SetLanguage( const sal_uInt16 ) -{ // Set Language -} - - - - void SvxSpellWrapper::InsertHyphen( const sal_uInt16 ) { // inserting and deleting Hyphae } - // Testing of the document areas in the order specified by the flags - - void SvxSpellWrapper::SpellDocument( ) { if ( bOtherCntnt ) diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx index e0fb6e3..1803dd0 100644 --- a/editeng/source/outliner/outlundo.cxx +++ b/editeng/source/outliner/outlundo.cxx @@ -118,12 +118,6 @@ void OutlinerUndoChangeDepth::Redo() GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, false ); } -void OutlinerUndoChangeDepth::Repeat() -{ - OSL_FAIL( "Repeat not implemented!" ); -} - - OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, sal_Int32 nPara ) : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner ) { @@ -144,12 +138,6 @@ void OutlinerUndoCheckPara::Redo() GetOutliner()->ImplCalcBulletText( mnPara, false, false ); } -void OutlinerUndoCheckPara::Repeat() -{ - OSL_FAIL( "Repeat not implemented!" ); -} - - OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId ) : EditUndo( _nId, 0 ) { @@ -197,22 +185,14 @@ void OLUndoExpand::Restore( bool bUndo ) } } - void OLUndoExpand::Undo() { Restore( true ); } - void OLUndoExpand::Redo() { Restore( false ); } - -void OLUndoExpand::Repeat() -{ - OSL_FAIL("Not implemented"); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index 5e60060..e3b1af5 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -77,7 +77,6 @@ public: class OutlinerUndoChangeDepth : public OutlinerUndoBase { - using SfxUndoAction::Repeat; private: sal_Int32 mnPara; sal_Int16 mnOldDepth; @@ -88,7 +87,6 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; // Help-Undo: If it does not exist an OutlinerUndoAction for a certain action @@ -96,7 +94,6 @@ public: // to be recalculated. class OutlinerUndoCheckPara : public OutlinerUndoBase { - using SfxUndoAction::Repeat; private: sal_Int32 mnPara; @@ -105,24 +102,16 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; - - - - - class OLUndoExpand : public EditUndo { - using SfxUndoAction::Repeat; void Restore( bool bUndo ); public: OLUndoExpand( Outliner* pOut, sal_uInt16 nId ); virtual ~OLUndoExpand(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); sal_uInt16* pParas; // 0 == nCount contains paragraph number Outliner* pOutliner; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index e0d082f..59baa24 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -47,12 +47,6 @@ uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() t return uno::Reference< text::XText > (); } -uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryAggregation( const uno::Type & ) throw(uno::RuntimeException) -{ - // TODO (empty?) - return uno::Any(); -} - uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 3f0afee..ce0551d 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; #define IUL 6 - uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); class StatusChangeListenerContainer @@ -41,40 +40,12 @@ public: } }; - void Interceptor::DisconnectDocHolder() { osl::MutexGuard aGuard( m_aMutex ); m_pDocHolder = NULL; } -void SAL_CALL -Interceptor::addEventListener( - const uno::Reference<lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( ! m_pDisposeEventListeners ) - m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); - - m_pDisposeEventListeners->addInterface( Listener ); -} - - -void SAL_CALL -Interceptor::removeEventListener( - const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( m_pDisposeEventListeners ) - m_pDisposeEventListeners->removeInterface( Listener ); -} - - Interceptor::Interceptor( DocumentHolder* pDocHolder ) : m_pDocHolder( pDocHolder ), m_pDisposeEventListeners(0), @@ -89,7 +60,6 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) } - Interceptor::~Interceptor() { if( m_pDisposeEventListeners ) @@ -99,8 +69,6 @@ Interceptor::~Interceptor() delete m_pStatCL; } - - //XDispatch void SAL_CALL Interceptor::dispatch( diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index b3db0f0..4f301d4 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -393,38 +393,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta return xResult; } - -uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit( - const uno::Sequence< sal_Int8 >& aClassID, - const OUString& aClassName, - const uno::Reference< embed::XStorage >& xStorage, - const OUString& sEntName, - const uno::Sequence< beans::PropertyValue >& lArguments, - const uno::Sequence< beans::PropertyValue >& lObjArgs ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException ) -{ - uno::Reference< uno::XInterface > xResult; - - OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); - uno::Reference< embed::XLinkFactory > xLinkFactory( - m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), - uno::UNO_QUERY ); - if ( !xLinkFactory.is() ) - throw uno::RuntimeException(); // TODO: - - return xLinkFactory->createInstanceLinkUserInit( aClassID, - aClassName, - xStorage, - sEntName, - lArguments, - lObjArgs ); - -} - - OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() throw ( uno::RuntimeException, std::exception ) { @@ -437,7 +405,6 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& Ser return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index f08135f..6578219 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -41,17 +41,6 @@ public: virtual ~Interceptor(); void DisconnectDocHolder(); - // overwritten to release the statuslistner. - - // XComponent - void SAL_CALL - addEventListener( - const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); //XDispatch virtual void SAL_CALL diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 22dfcae..6d15528 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -63,9 +63,6 @@ public: // XLinkCreator virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XLinkFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 1e022a3..a81499f 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -112,18 +112,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet throw(css::beans::PropertyExistException, css::uno::Exception ); - /** remove an existing property info from the set of supported ones. - * - * @param sProperty - * the name of the property. - * - * @throw [com::sun::star::beans::UnknownPropertyException] - * if no property with the specified name exists. - */ - void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) - throw(css::beans::UnknownPropertyException, - css::uno::Exception ); - /** mark the object as "useable for working" or "dead". * * This correspond to the lifetime handling implemented by the base class TransactionBase. diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 9e7b04b..ce83b59 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -63,21 +63,6 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property m_lProps[aProperty.Name] = aProperty; } -void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) - throw(css::beans::UnknownPropertyException, - css::uno::Exception ) -{ - TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); - - SolarMutexGuard g; - - PropertySetHelper::TPropInfoHash::iterator pIt = m_lProps.find(sProperty); - if (pIt == m_lProps.end()) - throw css::beans::UnknownPropertyException(); - - m_lProps.erase(pIt); -} - void SAL_CALL PropertySetHelper::impl_enablePropertySet() { } diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index e6240ddb..b9c86e3 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -69,7 +69,6 @@ public: // Manage elements bool GetAll( SbxClassType ) { return true; } SbxVariable* Make( const OUString&, SbxClassType, SbxDataType, bool bIsRuntimeFunction = false ); - SbxObject* MakeObject( const OUString&, const OUString& ); virtual void Insert( SbxVariable* ); // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and // without Broadcasts, only used in SO2/auto.cxx @@ -77,9 +76,6 @@ public: void Remove( const OUString&, SbxClassType ); virtual void Remove( SbxVariable* ); - // Macro-Recording - OUString GenerateSource( const OUString &rLinePrefix, - const SbxObject *pRelativeTo ); // Direct access on arrays SbxArray* GetMethods() { return pMethods; } SbxArray* GetProperties() { return pProps; } diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index fa78d5a..9090811 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -93,9 +93,6 @@ namespace accessibility virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceName - OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); - /** Set the current index in the accessibility parent @attention This method does not lock the SolarMutex, diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 3ce0c4b..a6c8440 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -113,15 +113,6 @@ namespace accessibility EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ); public: - /** Query the current edit source - - @attention This method returns by reference, so you are - responsible for serialization (typically, you acquired the - solar mutex when calling this method). Thus, the method - should only be called from the main office thread. - - */ - const SvxEditSource& GetEditSource() const; /** Set the current edit source @@ -164,13 +155,6 @@ namespace accessibility */ void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - /** Set offset of EditEngine from parent @attention You are required to have the solar mutex @@ -186,30 +170,6 @@ namespace accessibility */ void SetOffset( const Point& rPoint ); - /** Query offset of EditEngine from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - Point GetOffset() const; - - /** Update the visible children - - As this class currently does not represent any content - using children, this does nothing at the moment. - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - This method reevaluates the visibility of all - children. Call this method if your visibility state has - changed somehow, e.g. if the visible area has changed and - the AccessibleStaticTextHelper isn't notified - internally. Normally, there should not be a need to call - this method. - */ - void UpdateChildren(); - /** Drop all references and enter disposed state This method drops all references to external objects (also diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index b09bff6..18547e9 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -125,7 +125,6 @@ protected: virtual bool SpellContinue(); // Check Areas // Result available through GetLast virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list - void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetAllRightDic() const; @@ -135,7 +134,6 @@ protected: virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ); // Wort via Thesaurus ersetzen virtual void ChangeThesWord( const OUString& rNewWord ); - void SetLanguage( const sal_uInt16 nLang ); // Change Language virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index 162c613..ba0e79a 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -42,8 +42,6 @@ public: // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 0591f5e..83ec960 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -44,7 +44,6 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 74c7186..8cc4802 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -44,7 +44,6 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index ddec482..c41583b 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -497,8 +497,6 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; // Only temporarily for the applications! @@ -518,7 +516,6 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a563763..9db1a35 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,10 +45,8 @@ public: SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); - void Update(); virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void FreeResource (void); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 18a3158..6dfe638 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -119,7 +119,6 @@ public: SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } vcl::Window& GetWindow() const; - void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -140,16 +139,6 @@ public: virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; - // DDE-Interface - long DdeExecute( const OUString& rCmd ); - bool DdeGetData( const OUString& rItem, - const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); - bool DdeSetData( const OUString& rItem, - const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); - ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); - void UpdateTitle(); static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 39bebee..31e2d68 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -256,7 +256,6 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 078a32b..75ab09a 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,6 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 830faf8..b25345f 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -76,7 +76,6 @@ public: sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); bool Commit(); - bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -159,7 +158,6 @@ public: if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } @@ -169,19 +167,14 @@ public: void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - void SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong bOriginalClipFormat, - const OUString & rUserTypeName ); SvGlobalName GetClassName(); // type of data in the storage sal_uLong GetFormat(); OUString GetUserName(); - bool ShouldConvert(); // list of all elements void FillInfoList( SvStorageInfoList * ) const; bool CopyTo( SotStorage * pDestStg ); bool Commit(); - bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -197,13 +190,8 @@ public: bool IsContained( const OUString & rEleName ) const; // remove element bool Remove( const OUString & rEleName ); - // change element's name - bool Rename( const OUString & rEleName, - const OUString & rNewName ); bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - bool MoveTo( const OUString & rEleName, SotStorage * pDest, - const OUString & rNewName ); bool IsOLEStorage() const; static bool IsOLEStorage( const OUString & rFileName ); diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 29c97958..710e5e4 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -63,12 +63,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt8 GetMin() const; - - sal_uInt8 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt8 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt8 nTheValue); @@ -122,12 +116,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt16 GetMin() const; - - sal_uInt16 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt16 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt16 nTheValue); @@ -181,12 +169,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_Int32 GetMin() const; - - sal_Int32 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_Int32 GetValue() const { return m_nValue; } inline void SetValue(sal_Int32 nTheValue); @@ -240,12 +222,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt32 GetMin() const; - - sal_uInt32 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_uInt32 GetValue() const { return m_nValue; } inline void SetValue(sal_uInt32 nTheValue); diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 6c4e4fb..210c0ee 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -60,10 +60,6 @@ public: rTheStream); virtual ~SvInputStream(); - - void AddMark(sal_uLong nPos); - - void RemoveMark(sal_uLong nPos); }; #endif // INCLUDED_SVL_INSTRM_HXX diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 70879b3..12536c4 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -80,12 +80,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_Int16 GetMin() const; - - sal_Int16 GetMax() const; - - SfxFieldUnit GetUnit() const; - sal_Int16 GetValue() const { return m_nValue; } inline void SetValue(sal_Int16 nTheValue); diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 75bef0d..82091f1 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -116,9 +116,6 @@ public: If the display name is empty, this method returns the internal name. */ OUString GetDisplayName() const; - // sets the display name of this style - void SetDisplayName( const OUString& ); - virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); virtual const OUString& GetFollow() const; @@ -146,7 +143,6 @@ public: virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); - sal_uInt16 GetVersion() const; }; /* Class to iterate and search on a SfxStyleSheetBasePool */ @@ -304,7 +300,6 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool protected: using SfxStyleSheetBasePool::Create; virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; - SfxStyleSheetBase* Create(const SfxStyleSheet &); public: SfxStyleSheetPool( SfxItemPool const& ); diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 73d97f1..85a1dda 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -74,19 +74,6 @@ public: bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException ); - bool SAL_CALL - isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - addFocusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeFocusListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); - //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL @@ -115,8 +102,6 @@ public: virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL - getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 84ec8d8..402e946 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -322,7 +322,6 @@ public: bool HasBackground() const; bool HasFont() const; - bool HasFontTextColor() const; bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 807eef9..b923940 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -225,7 +225,6 @@ public: virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; - using SvTreeListBox::FillAccessibleStateSet; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; virtual void GrabTableFocus() SAL_OVERRIDE; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 96c501d..5f3401f 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -489,9 +489,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - /** Fills the StateSet with all states (except DEFUNC, done by the accessible object). */ - void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; - /** Fills the StateSet of one entry. */ void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -577,7 +574,6 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 08585d1..d114217 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -206,13 +206,6 @@ namespace accessibility */ void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - /** Set offset of EditEngine/Outliner from parent If the origin of the underlying EditEngine/Outliner does @@ -229,12 +222,6 @@ namespace accessibility */ void SetOffset( const Point& rPoint ); - /** Query offset of EditEngine/Outliner from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - Point GetOffset() const; - /** Set offset the object adds to all children's indices This can be used if the owner of this object has children @@ -338,23 +325,6 @@ namespace accessibility @attention Fires state change events, therefore, don't hold any mutex - @param nEventId - Id of the event to send, @see AccessibleEventId - - @param rNewValue - The value we've changed into - - @param rOldValue - The old value before the change - */ - void FireEvent( const sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), - const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; - - /** Call this method to invoke all event listeners with the given event - - @attention Fires state change events, therefore, don't hold any mutex - @param rEvent The event to send, @see AccessibleEventObject @@ -362,15 +332,6 @@ namespace accessibility // TODO: make that virtual next time void FireEvent( const ::com::sun::star::accessibility::AccessibleEventObject& rEvent ) const; - /** Query select state of the text managed by this object - - @attention Don't call with locked mutexes. You may hold - the solar mutex, but this method acquires it anyway. - - @return sal_True, if the text or parts of it are currently selected - */ - bool IsSelected() const; - // XAccessibleContext child handling methods /** Implements getAccessibleChildCount diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 3371a15..9a19a18 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -323,11 +323,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const SAL_OVERRIDE; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - double GetMin() const; - double GetMax() const; - - SfxFieldUnit GetUnit() const; - double GetValue() const { return fVal; } void SetValue(double fNewVal) { fVal = fNewVal; } }; diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index 0d87726..40a22fa 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -104,7 +104,6 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - void Repeat(); }; #endif // INCLUDED_SVX_E3DUNDO_HXX diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 56c4722..418ce16 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -28,10 +28,6 @@ namespace sdr { namespace contact { class ViewContactOfTextObj : public ViewContactOfSdrObj { -protected: - // internal access to SdrTextObj - const SdrTextObj& GetTextObj() const; - public: // basic constructor, used from SdrObject. explicit ViewContactOfTextObj(SdrTextObj& rTextObj); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 3f2cc06..c05a5b8 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -150,7 +150,6 @@ public: virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum); virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum); /// Modify ZOrder of an SdrObject - SdrObject* NbcSetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); void SetRectsDirty(); diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index a180a92..627b675 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -94,17 +94,11 @@ public: // ::com::sun::star::awt::XGraphics Attributes virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index f882b3f..78fdfe7 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -100,7 +100,6 @@ namespace toolkit // XAccessibleComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 2e1911f..020e16a 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -718,19 +718,6 @@ protected: /** Write a sequence of octets. - @descr The supplied sequence of UCS-4 characters is interpreted as a - sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - void writeSequence(const sal_uInt32 * pBegin, - const sal_uInt32 * pEnd); - - /** Write a sequence of octets. - @descr The supplied sequence of Unicode characters is interpreted as a sequence of octets. It is an error if any of the elements of the sequence has a numerical value greater than 255. @@ -782,18 +769,6 @@ public: /** Write a sequence of octets. - @descr The supplied sequence of UCS-4 characters is interpreted as a - sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - inline void write(const sal_uInt32 * pBegin, const sal_uInt32 * pEnd); - - /** Write a sequence of octets. - @descr The supplied sequence of Unicode characters is interpreted as a sequence of octets. It is an error if any of the elements of the sequence has a numerical value greater than 255. @@ -879,13 +854,6 @@ inline void INetMIMEOutputSink::write(const sal_Char * pBegin, m_nColumn += pEnd - pBegin; } -inline void INetMIMEOutputSink::write(const sal_uInt32 * pBegin, - const sal_uInt32 * pEnd) -{ - writeSequence(pBegin, pEnd); - m_nColumn += pEnd - pBegin; -} - inline void INetMIMEOutputSink::write(const sal_Unicode * pBegin, const sal_Unicode * pEnd) { diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index c761429..97e68d1 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -180,9 +180,6 @@ public: // returns the printer queue names const std::list< SystemPrintQueue >& getSystemPrintQueues(); - // similar but returnse whole commandlines - void getSystemPrintCommands( std::list< OUString >& rCommands ); - // abstract print command // returns a stdio FILE* that a postscript file may be written to // this may either be a regular file or the result of popen() diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 72fc3cc..e9c272d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,6 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index a4a0c89..ece407e 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -73,14 +73,6 @@ void XFContentContainer::Add(XFContent *pContent) m_aContents.push_back(pContent); } -void XFContentContainer::InsertAtBegin(XFContent * pContent) -{ - m_aContents.insert(m_aContents.begin(), pContent); -} -void XFContentContainer::RemoveAt(sal_uInt32 nPos) -{ - m_aContents.erase(m_aContents.begin()+nPos); -} void XFContentContainer::Add(const OUString& text) { XFTextContent *pTC = new XFTextContent(); diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index d6f3c99..7abdf63 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -89,8 +89,6 @@ public: */ virtual void Add(XFContent *pContent); - void InsertAtBegin(XFContent *pContent); - void RemoveAt(sal_uInt32 nPos); rtl::Reference<XFContent> GetLastContent(); void RemoveLastContent(); /** diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx index e3f102c..a5b4722 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.cxx +++ b/lotuswordpro/source/filter/xfilter/xflist.cxx @@ -101,29 +101,4 @@ void XFList::ToXml(IXFStream *pStrm) pStrm->EndElement( "text:unordered-list" ); } -void XFList::StartList(IXFStream *pStrm, bool bContinueNumber) -{ - IXFAttrList *pAttrList = pStrm->GetAttrList(); - assert(NULL!=pAttrList); - - pAttrList->Clear(); - if( !GetStyleName().isEmpty() ) - pAttrList->AddAttribute( "text:style-name", GetStyleName() ); - if( bContinueNumber ) - pAttrList->AddAttribute( "text:continue-numbering", "true" ); - - if( m_bOrdered ) - pStrm->StartElement( "text:ordered-list" ); - else - pStrm->StartElement( "text:unordered-list" ); -} - -void XFList::EndList(IXFStream *pStrm) -{ - if( m_bOrdered ) - pStrm->EndElement( "text:ordered-list" ); - else - pStrm->EndElement( "text:unordered-list" ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx index 05531cc..b8b065c 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.hxx +++ b/lotuswordpro/source/filter/xfilter/xflist.hxx @@ -92,10 +92,6 @@ public: */ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - void StartList(IXFStream *pStrm, bool bContinueNumber = false); - - void EndList(IXFStream *pStrm); - private: bool m_bOrdered; bool m_bContinueNumber; diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index a64b576..91a46bd 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -97,12 +97,6 @@ const ::oox::drawingml::Theme* QuickDiagrammingImport::getCurrentTheme() const return 0; } -sal_Int32 QuickDiagrammingImport::getSchemeClr( sal_Int32 /*nColorSchemeToken*/ ) const -{ - // TODO - return 0; -} - const oox::drawingml::table::TableStyleListPtr QuickDiagrammingImport::getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 678fb71..9937b3f 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -148,15 +148,6 @@ const ::oox::drawingml::Theme* QuickDiagrammingLayout::getCurrentTheme() const return mpThemePtr.get(); } -sal_Int32 QuickDiagrammingLayout::getSchemeClr( sal_Int32 nColorSchemeToken ) const -{ - sal_Int32 nColor = 0; - if( mpThemePtr ) - mpThemePtr->getClrScheme().getColor( nColorSchemeToken, - nColor ); - return nColor; -} - const oox::drawingml::table::TableStyleListPtr QuickDiagrammingLayout::getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 9f68bc3..d25f0e2d 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -437,47 +437,6 @@ const ::std::vector< OUString >& lcl_getControlModelMap() } -uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) -{ - ::osl::ResettableMutexGuard aGuard(m_aMutex); - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - ::std::vector< OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier); - if ( aFind == aRet.end() ) - throw lang::IllegalArgumentException(); - - uno::Reference< report::XReportComponent > xRet; - uno::Reference< lang::XMultiServiceFactory> xFac(getReportDefinition(),uno::UNO_QUERY_THROW); - switch( aFind - aRet.begin() ) - { - case 0: - xRet.set(xFac->createInstance("com.sun.star.form.component.FixedText"),uno::UNO_QUERY); - break; - case 1: - xRet.set(xFac->createInstance("com.sun.star.awt.UnoControlFixedLineModel"),uno::UNO_QUERY); - break; - case 2: - xRet.set(xFac->createInstance("com.sun.star.form.component.DatabaseImageControl"),uno::UNO_QUERY); - break; - case 3: - xRet.set(xFac->createInstance("com.sun.star.form.component.FormattedField"),uno::UNO_QUERY); - break; - case 4: - xRet.set(xFac->createInstance("com.sun.star.drawing.ControlShape"),uno::UNO_QUERY); - break; - default: - break; - } - return xRet; -} - -uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - return uno::Sequence< OUString >(aRet.data(), aRet.size()); -} - // XChild uno::Reference< uno::XInterface > SAL_CALL OSection::getParent( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 8ba80c1..3bf846d 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -187,8 +187,6 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 39a3801..77a2358 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -945,19 +945,6 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, return pContext; } -SvXMLImport& ORptFilter::getGlobalContext() -{ - return *this; -} - -void ORptFilter::enterEventContext() -{ -} - -void ORptFilter::leaveEventContext() -{ -} - SvXMLImportContext *ORptFilter::CreateFontDeclsContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 5ad1c29..4fa25c6 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -168,11 +168,6 @@ public: void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } - SvXMLImport& getGlobalContext(); - - void enterEventContext(); - void leaveEventContext(); - bool isOldFormat() const; }; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index d733a93..ba9dedb 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -673,13 +673,6 @@ public: virtual void RefChanged() SAL_OVERRIDE; - // via getImplementation() - void SetArrayFormulaWithGrammar( const OUString& rFormula, - const OUString& rFormulaNmsp, - const formula::FormulaGrammar::Grammar ) - throw (css::uno::RuntimeException, - std::exception); - // XCellRangeAddressable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 0ed021f..3803a46 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -78,8 +78,9 @@ public: ScFormulaCellGroup(); ~ScFormulaCellGroup(); - +#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION void scheduleCompilation(); +#endif void setCode( const ScTokenArray& rCode ); void setCode( ScTokenArray* pCode ); diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 579b1e7..0d81056 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -495,16 +495,16 @@ ScFormulaCellGroup::~ScFormulaCellGroup() delete mpImpl; } +#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION void ScFormulaCellGroup::scheduleCompilation() { -#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION meKernelState = sc::OpenCLKernelCompilationScheduled; sc::CLBuildKernelWorkItem aWorkItem; aWorkItem.meWhatToDo = sc::CLBuildKernelWorkItem::COMPILE; aWorkItem.mxGroup = this; sxCompilationThread->push(aWorkItem); -#endif } +#endif void ScFormulaCellGroup::setCode( const ScTokenArray& rCode ) { diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index f22d129..acf29b8 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1109,70 +1109,6 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm ) pDrawing->endElement( FSNS( XML_xdr, XML_twoCellAnchor ) ); } -void XclExpChartObj::WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ) -{ - pDrawing->startElement( FSNS( XML_xdr, XML_graphicFrame ), FSEND ); - - pDrawing->startElement( FSNS( XML_xdr, XML_nvGraphicFramePr ), FSEND ); - - // TODO: get the correct chart name chart id - OUString sName = "Object 1"; - Reference< XNamed > xNamed( mxShape, UNO_QUERY ); - if (xNamed.is()) - { - sName = xNamed->getName(); - } - sal_Int32 nID = rStrm.GetUniqueId(); - - pDrawing->singleElement( FSNS( XML_xdr, XML_cNvPr ), - XML_id, I32S( nID ), - XML_name, USS( sName ), - FSEND ); - - pDrawing->singleElement( FSNS( XML_xdr, XML_cNvGraphicFramePr ), - FSEND ); - - pDrawing->endElement( FSNS( XML_xdr, XML_nvGraphicFramePr ) ); - - // visual chart properties - WriteShapeTransformation( pDrawing, mxShape ); - - // writer chart object - pDrawing->startElement( FSNS( XML_a, XML_graphic ), FSEND ); - pDrawing->startElement( FSNS( XML_a, XML_graphicData ), - XML_uri, "http://schemas.openxmlformats.org/drawingml/2006/chart", - FSEND ); - OUString sId; - // TODO: - static sal_Int32 nChartCount = 0; - nChartCount++; - sax_fastparser::FSHelperPtr pChart = rStrm.CreateOutputStream( - XclXmlUtils::GetStreamName( "xl/", "charts/chart", nChartCount ), - XclXmlUtils::GetStreamName( "../", "charts/chart", nChartCount ), - rStrm.GetCurrentStream()->getOutputStream(), - "application/vnd.openxmlformats-officedocument.drawingml.chart+xml", - "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", - &sId ); - - pDrawing->singleElement( FSNS( XML_c, XML_chart ), - FSNS( XML_xmlns, XML_c ), "http://schemas.openxmlformats.org/drawingml/2006/chart", - FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), - FSEND ); - - rStrm.PushStream( pChart ); - Reference< XModel > xModel( mxChartDoc, UNO_QUERY ); - ChartExport aChartExport( XML_xdr, pChart, xModel, &rStrm, DrawingML::DOCUMENT_XLSX ); - aChartExport.ExportContent(); - - rStrm.PopStream(); - - pDrawing->endElement( FSNS( XML_a, XML_graphicData ) ); - pDrawing->endElement( FSNS( XML_a, XML_graphic ) ); - pDrawing->endElement( FSNS( XML_xdr, XML_graphicFrame ) ); - -} - void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH, bool bFlipV, sal_Int32 nRotation ) { ::com::sun::star::awt::Point aPos = rXShape->getPosition(); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 4db040f..87bf7c3 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -300,7 +300,6 @@ public: /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 84a26ce..07752f6 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -105,10 +105,4 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) Invalidate(); } -void ScChartShell::HandleSelectionChange (void) -{ - // Do not call the implementation in the base class. Let - // Activate()/Deactivate() handle context switches. -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index ea7759e..074987b 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -198,42 +198,11 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) return pView->Command(rCEvt,pWindow); } -void FuPoor::DoCut() -{ - if (pView) - { -//! pView->DoCut(pWindow); - } -} - -/************************************************************************* -|* -|* Copy object to clipboard -|* -\************************************************************************/ - -void FuPoor::DoCopy() -{ - if (pView) - { -//! pView->DoCopy(pWindow); - } -} - -void FuPoor::DoPaste() -{ - if (pView) - { -//! pView->DoPaste(pWindow); - } -} - /************************************************************************* |* |* Timer-Handler fuer Drag&Drop |* \************************************************************************/ - IMPL_LINK_NOARG(FuPoor, DragTimerHdl) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer @@ -255,8 +224,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) { pWindow->ReleaseMouse(); bIsInDragMode = true; - -// pView->BeginDrag(pWindow, aMDPos); pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos); } return 0; diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index 5fc452e..7791299 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -64,10 +64,4 @@ ScOleObjectShell::~ScOleObjectShell() { } -void ScOleObjectShell::HandleSelectionChange (void) -{ - // Do not call the implementation in the base class. Let - // Activate()/Deactivate() handle context switches. -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 4900d783..4dde7d0 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -45,7 +45,6 @@ public: void ExecuteExportAsGraphic(SfxRequest& rReq); void GetExportAsGraphicState(SfxItemSet &rSet); - void HandleSelectionChange(void); }; #endif diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 692090e..9ad121f 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -75,10 +75,6 @@ public: void Paint(const Rectangle&, vcl::Window*) {} - void DoCut(); - void DoCopy(); - void DoPaste(); - // Mouse- & Key-Events; return value=TRUE: Event was processed virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent&) { return false; } diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b187826..e7f9c41 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -286,8 +286,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); protected: - using Window::Resize; - void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +381,6 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index d3b374d..c6192a4 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -314,8 +314,6 @@ public: void CursorPosChanged(); - SfxChildAlignment - CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index b451e730..2262cd9 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -43,7 +43,6 @@ public: ScOleObjectShell(ScViewData* pData); virtual ~ScOleObjectShell(); - void HandleSelectionChange(); }; #endif diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index ca46dca..bcf4fbc 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -158,8 +158,6 @@ public: FmFormView* GetDrawView() { return pDrawView; } - void SwitchView(); - SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } }; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 85b7d0e..5acbf26 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -1326,38 +1326,4 @@ void ScNavigatorDlg::EndOfDataArea() } } -SfxChildAlignment ScNavigatorDlg::CheckAlignment( - SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) -{ - SfxChildAlignment eRetAlign; - - //! no docking, if Listbox not exists ??? - - switch (eAlign) - { - case SFX_ALIGN_TOP: - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_LOWESTTOP: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_HIGHESTBOTTOM: - eRetAlign = eActAlign; // illegal - break; - - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_FIRSTLEFT: - case SFX_ALIGN_LASTLEFT: - case SFX_ALIGN_FIRSTRIGHT: - case SFX_ALIGN_LASTRIGHT: - eRetAlign = eAlign; // legal - break; - - default: - eRetAlign = eAlign; - break; - } - return eRetAlign; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5f1c7ee..546083a 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5128,16 +5128,7 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } -void ScCellRangeObj::SetArrayFormulaWithGrammar(const OUString& rFormula, - const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) - throw (uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); -} - // XArrayFormulaTokens - uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 31d2b20..46f9ecb 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -141,11 +141,6 @@ ScVbaApplication::~ScVbaApplication() return ScVbaStaticAppSettings::get().mbEnableEvents; } -SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) -{ - return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) ); -} - OUString SAL_CALL ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException, std::exception) { @@ -1280,40 +1275,6 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep return aRet; } -uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( - const uno::Any& rFileFilter, const uno::Any& rFilterIndex, const uno::Any& rTitle, - const uno::Any& rButtonText, const uno::Any& rMultiSelect ) throw (uno::RuntimeException) -{ - uno::Sequence< uno::Any > aArgs( 6 ); - aArgs[ 0 ] <<= getThisExcelDoc( mxContext ); - aArgs[ 1 ] = rFileFilter; - aArgs[ 2 ] = rFilterIndex; - aArgs[ 3 ] = rTitle; - aArgs[ 4 ] = rButtonText; - aArgs[ 5 ] = rMultiSelect; - uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); - return xFilePicker->execute(); -} - -uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( - const uno::Any& rInitialFileName, const uno::Any& rFileFilter, const uno::Any& rFilterIndex, - const uno::Any& rTitle, const uno::Any& rButtonText ) throw (uno::RuntimeException) -{ - uno::Sequence< uno::Any > aArgs( 6 ); - aArgs[ 0 ] <<= getThisExcelDoc( mxContext ); - aArgs[ 1 ] = rInitialFileName; - aArgs[ 2 ] = rFileFilter; - aArgs[ 3 ] = rFilterIndex; - aArgs[ 4 ] = rTitle; - aArgs[ 5 ] = rButtonText; - uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); - return xFilePicker->execute(); -} - uno::Reference< frame::XModel > ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 7910209..76aa029 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -49,8 +49,6 @@ public: /** Returns true, if VBA document events are enabled. */ static bool getDocumentEventsEnabled(); - SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); - // XExactName virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -130,8 +128,6 @@ public: virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); - css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index f6633af..93460c2 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -23,11 +23,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -void -ScVbaDialogs::Dummy() throw (uno::RuntimeException) -{ -} - uno::Any ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 79fd5e0..06ae7c4 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -37,8 +37,6 @@ public: // XCollection virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDialogs - void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 4949384..6230344 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -55,13 +55,6 @@ ScVbaName::~ScVbaName() { } -css::uno::Reference< ov::excel::XWorksheet > -ScVbaName::getWorkSheet() throw (css::uno::RuntimeException) -{ - uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); - return xApplication->getActiveSheet(); -} - OUString ScVbaName::getName() throw (css::uno::RuntimeException, std::exception) { @@ -215,11 +208,6 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::setRefersToRange( const css::uno::Reference< ov::excel::XRange > /*rRange*/ ) throw (css::uno::RuntimeException) -{ -} - -void ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception) { mxNames->removeByName( mxNamedRange->getName() ); diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 11189a2..69e2919 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -38,7 +38,6 @@ class ScVbaName : public NameImpl_BASE void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar, bool removeEquals = true ); protected: css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); public: ScVbaName( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName , const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); @@ -62,7 +61,6 @@ public: virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 436bc15..eaaa620 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -524,11 +524,6 @@ ScGridWindow::~ScGridWindow() delete pNoteMarker; } -void ScGridWindow::Resize( const Size& ) -{ - // gar nix -} - void ScGridWindow::ClickExtern() { do diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 4d82db1..531127b 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -467,18 +467,6 @@ com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > pAccessibleDocument->Init(); return xAcc; - } - -// MT: Removed Windows::SwitchView() introduced with IA2 CWS. -// There are other notifications for this when the active view has chnaged, so -// please update the code to use that event mechanism -void ScGridWindow::SwitchView() -{ - ScAccessibleDocumentBase* pAccDoc = static_cast<ScAccessibleDocumentBase*>(GetAccessible(false).get()); - if (pAccDoc) - { - pAccDoc->SwitchViewFireFocus(); - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 455534c..14e16b3 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1527,17 +1527,6 @@ com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPre return xAcc; } -// MT: Removed Windows::SwitchView() introduced with IA2 CWS. -// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism -void ScPreview::SwitchView() -{ - ScAccessibleDocumentBase* pAccDoc = static_cast<ScAccessibleDocumentBase*>(GetAccessible(false).get()); - if (pAccDoc) - { - pAccDoc->SwitchViewFireFocus(); - } -} - void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags ) { Fraction aPreviewZoom( nZoom, 100 ); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 0824515..3325537 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -130,7 +130,6 @@ protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE; - SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; virtual ~SdStyleSheetPool(); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 5e41ba3..564d7d3 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -138,11 +138,6 @@ SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamil return new SdStyleSheet(rName, *this, eFamily, _nMask); } -SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle) -{ - return new SdStyleSheet( rStyle ); -} - SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) { OUString aName(rLayoutName); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 6f3fcbb..1709b19 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1167,43 +1167,6 @@ SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pPar return pDlg; } -void DrawDocShell::setDocAccTitle( const OUString& rTitle ) -{ - if (mpDoc ) - { - mpDoc->setDocAccTitle( rTitle ); - } -} - -const OUString DrawDocShell::getDocAccTitle() const -{ - OUString sRet; - if (mpDoc) - { - sRet = mpDoc->getDocAccTitle(); - } - - return sRet; -} - -void DrawDocShell::setDocReadOnly( bool bReadOnly) -{ - if (mpDoc ) - { - mpDoc->setDocReadOnly( bReadOnly ); - } -} - -bool DrawDocShell::getDocReadOnly() const -{ - if (mpDoc) - { - return mpDoc->getDocReadOnly(); - } - - return false; -} - void DrawDocShell::setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage) { // Set the edit mode to either the normal edit mode or the diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 7f7cfee..f72acbc 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -226,11 +226,6 @@ protected: bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; -public: - void setDocAccTitle( const OUString& rTitle ); - const OUString getDocAccTitle() const; - void setDocReadOnly( bool bReadOnly); - bool getDocReadOnly() const; private: void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); }; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 56dbc5f..1eb4498 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -140,9 +140,6 @@ public: void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); - void AddWindow(::sd::Window* pWin); - void RemoveWindow(::sd::Window* pWin); - virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); virtual void SetZoom( long nZoom ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 9d67d5c..516d2da 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -93,10 +93,6 @@ public: void SetActualPage( SdPage* pActual ); void Paint (const Rectangle& rRect, ::sd::Window* pWin); - void AdjustPosSizePixel( - const Point &rPos, - const Size &rSize, - ::sd::Window* pWindow); // Callbacks fuer LINKs DECL_LINK( ParagraphInsertedHdl, Outliner * ); ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits