diff options
32 files changed, 15 insertions, 203 deletions
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index 21f2f3e05a31..d96ffc617f32 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -110,11 +110,6 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XAccessibleComponent - bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); - - // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 6b85039d537c..f9aed93e95be 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -600,7 +600,6 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) return nCount; } - Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { @@ -624,7 +623,6 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3 return xChild; } - Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) throw (RuntimeException, std::exception) { @@ -633,7 +631,6 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) return m_xParent; } - sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -643,33 +640,12 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) return VCLXAccessibleComponent::getAccessibleIndexInParent(); } - sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) throw (RuntimeException, std::exception) { return AccessibleRole::LIST; } - -//===== XAccessibleComponent ================================================ - -bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) -{ - SolarMutexGuard aSolarGuard; - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - bool bInside = false; - - vcl::Window* pListBox = GetWindow(); - if ( pListBox ) - { - Rectangle aRect( Point(0,0), pListBox->GetSizePixel() ); - bInside = aRect.IsInside( VCLPoint( rPoint ) ); - } - - return bInside; -} - //===== XServiceInfo ========================================================== OUString VCLXAccessibleList::getImplementationName (void) throw (RuntimeException, std::exception) diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 1fcf49d2ee04..ab9058c0c975 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -33,10 +33,6 @@ short SvxNewTableDialog::Execute(void) return ModalDialog::Execute(); } -void SvxNewTableDialog::Apply(void) -{ -} - sal_Int32 SvxNewTableDialog::getRows() const { return sal::static_int_cast< sal_Int32 >( mpNumRows->GetValue() ); diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 91d13a0f963f..778457aec69e 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -36,7 +36,6 @@ public: SvxNewTableDialog( vcl::Window* pWindow ); virtual short Execute(void) SAL_OVERRIDE; - void Apply(void); virtual sal_Int32 getRows() const SAL_OVERRIDE; virtual sal_Int32 getColumns() const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 86be630d8080..e11f08d7184d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2362,13 +2362,6 @@ sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId return GetDataWindow().LogicToPixel(Size(GetDataWindow().GetTextWidth(strText),0)).Width(); } -sal_uInt16 OSelectionBrowseBox::GetDefaultColumnWidth(const OUString& /*rName*/) const -{ - // the base class makes it dependent on the text. I have no column headers, therefore I - // like to have a new Default-value - return static_cast<sal_uInt16>(DEFAULT_SIZE); -} - bool OSelectionBrowseBox::isCutAllowed() { bool bCutAllowed = false; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 59807d0dfbba..6d3901e8d4ca 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -204,7 +204,6 @@ namespace dbaui virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; - sal_uInt16 GetDefaultColumnWidth(const OUString& rName) const; // if you want to have an own header ... virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index ae383fba144d..966eb4723f97 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -446,14 +446,6 @@ uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes() } - -uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getImplementationId() - throw( uno::RuntimeException ) -{ - return css::uno::Sequence<sal_Int8>(); -} - - uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() throw ( uno::RuntimeException, std::exception ) { @@ -463,7 +455,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() return m_aClassID; } - OUString SAL_CALL OCommonEmbeddedObject::getClassName() throw ( uno::RuntimeException, std::exception ) { @@ -473,7 +464,6 @@ OUString SAL_CALL OCommonEmbeddedObject::getClassName() return m_aClassName; } - void SAL_CALL OCommonEmbeddedObject::setClassInfo( const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ ) throw ( lang::NoSupportException, diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index ddaf55aaec66..0b713e0fd7e8 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -263,9 +263,6 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ) ; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ) ; - // XEmbeddedObject virtual void SAL_CALL changeState( sal_Int32 nNewState ) diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c41583bbf5bd..0c18edd1eff5 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -452,6 +452,7 @@ public: OUString GetTitle( sal_uInt16 nMaxLen = 0 ) const; void InvalidateName(); // Re-set to unnamed +#if defined WNT // DDE-Interface long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, @@ -460,6 +461,7 @@ public: virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); +#endif virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); virtual void ReconnectDdeLink(SfxObjectShell& rServer); diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 54166cd234b4..2428fadc147d 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -164,7 +164,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow void ApplyImageList(); protected: - void Zoom(); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) SAL_OVERRIDE; diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 946b6774d86a..46ef312e5163 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1109,23 +1109,6 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm ) pDrawing->endElement( FSNS( XML_xdr, XML_twoCellAnchor ) ); } -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(); - ::com::sun::star::awt::Size aSize = rXShape->getSize(); - - pFS->startElementNS( XML_xdr, XML_xfrm, - XML_flipH, bFlipH ? "1" : NULL, - XML_flipV, bFlipV ? "1" : NULL, - XML_rot, nRotation ? I32S( nRotation ) : NULL, - FSEND ); - - pFS->singleElementNS( XML_a, XML_off, XML_x, IS( oox::drawingml::convertHmmToEmu( aPos.X ) ), XML_y, IS( oox::drawingml::convertHmmToEmu( aPos.Y ) ), FSEND ); - pFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( oox::drawingml::convertHmmToEmu( aSize.Width ) ), XML_cy, IS( oox::drawingml::convertHmmToEmu( aSize.Height ) ), FSEND ); - - pFS->endElementNS( XML_xdr, XML_xfrm ); -} - const css::uno::Reference<css::chart::XChartDocument>& XclExpChartObj::GetChartDoc() const { return mxChartDoc; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 87bf7c362013..2279b002dc54 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 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/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 08b4dedf1c37..2078e7ba4d58 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2051,6 +2051,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, rbFooter = static_cast<const SfxBoolItem&>(pSet->Get(ATTR_PAGE_ON)).GetValue(); } +#if defined WNT bool ScDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ) @@ -2135,6 +2136,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem, ScImportExport aObj( &aDocument, rItem ); return aObj.IsRef() && aObj.ImportData( rMimeType, rValue ); } +#endif ::sfx2::SvLinkSource* ScDocShell::DdeCreateLinkSource( const OUString& rItem ) { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 5e7dd488662d..e70ac443c221 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -373,10 +373,13 @@ public: bool& rbHeader, bool& rbFooter ); +#if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; +#endif + virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE; const OUString& GetDdeTextFmt() const { return aDdeTextFmt; } diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 1dca0337b0b9..398abdd7d816 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -200,12 +200,6 @@ void SAL_CALL //===== protected internal ================================================== -void AccessibleOutlineView::FireEvent(const AccessibleEventObject& aEvent ) -{ - // delegate listener handling to children manager. - maTextHelper.FireEvent(aEvent); -} - void AccessibleOutlineView::Activated (void) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 196b4b87a6cc..a11734f42fb0 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -108,9 +108,6 @@ public: protected: - // overridden, as we hold the listeners ourselves - void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); - // overridden to detect focus changes virtual void Activated (void) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index a9167b148763..ff2d6624f7b7 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -168,7 +168,6 @@ public: void ArrangeGUIElements ( const Point& rOffset, const Size& rSize); - SvBorder GetBorder (void); bool RelocateToWindow (::vcl::Window* pWindow); diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index efeca382d336..659727588b1e 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -120,8 +120,6 @@ public: void StartDrag ( const Point& rDragPt, ::vcl::Window* pWindow ); - void DragFinished ( - sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index e5a3d39d97f7..ec7852cde50e 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -115,13 +115,6 @@ void MasterPagesSelector::LateInit (void) { } -sal_Int32 MasterPagesSelector::GetPreferredWidth (sal_Int32 nHeight) -{ - const ::osl::MutexGuard aGuard (maMutex); - - return PreviewValueSet::GetPreferredWidth (nHeight); -} - sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 4e088d5eef25..46e6f72c95d1 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -79,7 +79,6 @@ public: SdPage* pMasterPage, sal_uInt16 nInsertionIndex); - sal_Int32 GetPreferredWidth (sal_Int32 nHeight); sal_Int32 GetPreferredHeight (sal_Int32 nWidth); /** Update the selection of previews according to whatever diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index cc2c96894b99..071f2819af94 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -372,7 +372,6 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) ProcessMouseEvent(BUTTON_UP, rEvent); mbProcessingMouseButtonDown = false; -// mpWindow->ReleaseMouse(); return true; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 04a1de11f9fa..37b9c1008651 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -385,21 +385,6 @@ void SlideSorter::ArrangeGUIElements ( } } -SvBorder SlideSorter::GetBorder (void) -{ - SvBorder aBorder; - - ::boost::shared_ptr<ScrollBar> pScrollBar = GetVerticalScrollBar(); - if (pScrollBar.get() != NULL && pScrollBar->IsVisible()) - aBorder.Right() = pScrollBar->GetOutputSizePixel().Width(); - - pScrollBar = GetHorizontalScrollBar(); - if (pScrollBar.get() != NULL && pScrollBar->IsVisible()) - aBorder.Bottom() = pScrollBar->GetOutputSizePixel().Height(); - - return aBorder; -} - bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow) { // Stop all animations for they have been started for the old window. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 3a6e58428645..f16260c809b3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -648,13 +648,6 @@ void SlideSorterViewShell::StartDrag ( pWindow); } -void SlideSorterViewShell::DragFinished ( - sal_Int8 nDropAction) -{ - OSL_ASSERT(mpSlideSorter.get()!=NULL); - mpSlideSorter->GetController().GetClipboard().DragFinished (nDropAction); -} - sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index a1b7f8595a34..d2bf891e2c59 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -229,7 +229,7 @@ public: }; -#if defined( WNT ) +#if defined WNT namespace { @@ -338,8 +338,6 @@ long SfxApplication::DdeExecute( const OUString& rCmd ) // Expressed in our B return 1; } -#endif - /* [Description] This method can be overridden by application developers, to receive @@ -364,8 +362,6 @@ long SfxObjectShell::DdeExecute( const OUString& rCmd ) // Expressed in our B return 1; } - - /* [Description] This method can be overridden by application developers, to receive @@ -396,6 +392,8 @@ bool SfxObjectShell::DdeSetData( const OUString&, // the Item return false; } +#endif + /* [Description] This method can be overridden by application developers, to establish diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 22d5020ab05d..4684c2ade5c5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2395,9 +2395,6 @@ void SfxTemplateDialog_Impl::Resize() pTreeBox->SetSizePixel(aFmtSize); } - - - Size SfxTemplateDialog_Impl::GetMinOutputSizePixel() { if (m_pFloat != NULL) @@ -2414,21 +2411,6 @@ Size SfxTemplateDialog_Impl::GetMinOutputSizePixel() return Size(0,0); } - - -void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt ) -{ - if (m_pFloat != NULL) - { - if(COMMAND_CONTEXTMENU == rCEvt.GetCommand()) - ExecuteContextMenu_Impl( rCEvt.GetMousePosPixel(), m_pFloat ); - else - m_pFloat->Command(rCEvt); - } -} - - - void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck) { OUString aEmpty; @@ -2445,8 +2427,6 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck) } } - - void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, bool bCheck) { switch(nMesId) diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index da743c778e82..5af3fd7a7e4b 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -323,7 +323,6 @@ private: DECL_LINK( MenuSelectHdl, Menu* ); protected: - void Command( const CommandEvent& rMEvt ); virtual void EnableEdit( bool = true ) SAL_OVERRIDE; virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 33abee5ebfb3..029435df0ebf 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -292,11 +292,6 @@ SvxFontWorkDialog::~SvxFontWorkDialog() DELETEZ(pCtrlItems[i]); } -void SvxFontWorkDialog::Zoom() -{ - SfxDockingWindow::Roll(); -} - SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 294bfa79bf7e..780883b3b6ad 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -232,10 +232,12 @@ public: Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0); +#if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; +#endif virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE; virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE; diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 9deec3e5d24b..ba1b02378e71 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1142,35 +1142,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } } - // #FIXME - align with NEW event stuff ( if possible ) -#if 0 -void lcl_processCompatibleSfxHint( const uno::Reference< document::XVbaEventsHelper >& xVbaEventsHelper, const SfxHint& rHint ) -{ - if ( rHint.ISA( SfxEventHint ) ) - { - uno::Sequence< uno::Any > aArgs; - sal_uLong nEventId = static_cast<SfxEventHint&>(rHint).GetEventId(); - switch( nEventId ) - { - case SFX_EVENT_CREATEDOC: - { - xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_DOCUMENT_NEW, aArgs ); - break; - } - case SFX_EVENT_OPENDOC: - { - xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_DOCUMENT_OPEN, aArgs ); - break; - } - default: - { - //do nothing - } - } - } -} -#endif - +#if defined WNT bool SwDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType, uno::Any & rValue ) { @@ -1183,6 +1155,8 @@ bool SwDocShell::DdeSetData( const OUString& rItem, const OUString& rMimeType, return mpDoc->getIDocumentLinksAdministration().SetData( rItem, rMimeType, rValue ); } +#endif + ::sfx2::SvLinkSource* SwDocShell::DdeCreateLinkSource( const OUString& rItem ) { return mpDoc->getIDocumentLinksAdministration().CreateLinkSource( rItem ); diff --git a/unusedcode.easy b/unusedcode.easy index fed45859eee2..c2887936adfc 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -5,7 +5,6 @@ FontCharMap::GetDefaultMap(bool) LineListBox::Clear() LineListBox::InsertEntry(rtl::OUString const&, int) LineListBox::RemoveEntry(int) -OCommonEmbeddedObject::getImplementationId() OOoEmbeddedObjectFactory::createInstanceLinkUserInit(com::sun::star::uno::Sequence<signed char> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int) OpenGLContext::renderToFile() @@ -65,10 +64,8 @@ SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxBoolItem::GetValueCount() const SfxFrameItem::GetValueText() const -SfxObjectShell::DdeExecute(rtl::OUString const&) SfxObjectShellItem::GetValueText() const SfxProgress::SetText(rtl::OUString const&) -SfxTemplateDialog_Impl::Command(CommandEvent const&) SfxViewFrameItem::GetValueText() const SotObject::GetInterface(SvGlobalName const&) StylePool::getCount() const @@ -89,11 +86,9 @@ SvxColorTabPage::GetPropertyList(XPropertyListType) SvxColumnItem::GetValueText() const SvxDummyTextSource::SetNotifyHdl(Link const&) SvxFontListBox::GetSelectEntry() const -SvxFontWorkDialog::Zoom() SvxFormatCellsDialog::Apply() SvxLongLRSpaceItem::GetValueText() const SvxLongULSpaceItem::GetValueText() const -SvxNewTableDialog::Apply() SvxObjectItem::GetValueText() const SvxOpenGLObject::getRenderer() SvxOpenGLObject::setRenderer(IOpenGLRenderer*) @@ -104,13 +99,9 @@ Test::testPerf() Test::testSharedFormulaMoveBlock() ToolBox::UserDraw(UserDrawEvent const&) UnxPluginComm::NPP_GetMIMEDescription() -VCLXAccessibleList::contains(com::sun::star::awt::Point const&) X11SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&) -XclExpChartObj::WriteShapeTransformation(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, bool, bool, int) XclXmlUtils::ToOString(XclRange const&) XmlTestTools::parseXml(utl::TempFile&) -accessibility::AccessibleOutlineView::FireEvent(com::sun::star::accessibility::AccessibleEventObject const&) -accessibility::AccessibleTextHelper_Impl::IsSelected() const apitest::CellProperties::testRotateReference() apitest::CellProperties::testVertJustify() apitest::DataPilotField::testAutoShowInfo() @@ -253,7 +244,6 @@ dbaui::OPropEditCtrl::SetSpecialReadOnly(bool) dbaui::OPropListBoxCtrl::SetSpecialReadOnly(bool) dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&) dbaui::OQueryViewSwitch::setReadOnly(bool) -dbaui::OSelectionBrowseBox::GetDefaultColumnWidth(rtl::OUString const&) const dbaui::OTableController::Load(com::sun::star::uno::Reference<com::sun::star::io::XObjectInputStream> const&) dbaui::OTableController::Save(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> const&) dbaui::OTableEditorCtrl::Redo() @@ -282,10 +272,6 @@ sc::FormulaGroupAreaListener::isEndFixed() const sc::FormulaGroupAreaListener::isStartFixed() const sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sd::sidebar::MasterPagesSelector::GetPreferredWidth(int) -sd::slidesorter::SlideSorter::GetBorder() -sd::slidesorter::SlideSorterViewShell::DragFinished(signed char) std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long) vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) -writerfilter::ooxml::OOXMLFastContextHandler::getUnoTunnelId() diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index fe716446d28a..509637dea6d8 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -271,16 +271,6 @@ throw (uno::RuntimeException, xml::sax::SAXException) OOXMLFactory::getInstance()->characters(this, rString); } -namespace -{ - class theOOXMLFastContextHandlerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theOOXMLFastContextHandlerUnoTunnelId > {}; -} - -const uno::Sequence< sal_Int8 > & OOXMLFastContextHandler::getUnoTunnelId() -{ - return theOOXMLFastContextHandlerUnoTunnelId::get().getSeq(); -} - void OOXMLFastContextHandler::setStream(Stream * pStream) { mpStream = pStream; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 4c980ce6240c..190bf28341a7 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -82,8 +82,6 @@ public: virtual void SAL_CALL characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - // local void setStream(Stream * pStream); |