diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-16 11:24:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-16 12:18:56 +0000 |
| commit | 051e660b37549fec7cc42e4471ae65a4cefed495 (patch) | |
| tree | 720c439d57664224ec579e14a72b5f4ccce391a5 | |
| parent | 1d852b32d7ad89b2317c04958060f366f8922ca4 (diff) | |
loplugin:unusedmethods svx(part2)
Change-Id: I161360e2f3113c4814fe1c2c095e602b2c93dcd7
Reviewed-on: https://gerrit.libreoffice.org/17120
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
86 files changed, 8 insertions, 1027 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index 28fe99fa7b73..30e2acc7051f 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -40,11 +40,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder() // ________ IAccessibleViewforwarder ________ -bool AccessibleViewForwarder::IsValid() const -{ - return true; -} - Rectangle AccessibleViewForwarder::GetVisibleArea() const { Rectangle aVisibleArea; @@ -79,28 +74,6 @@ Size AccessibleViewForwarder::LogicToPixel( const Size& rSize ) const return aSize; } -Point AccessibleViewForwarder::PixelToLogic( const Point& rPoint ) const -{ - Point aPoint; - if ( m_pAccChartView && m_pWindow ) - { - awt::Point aLocation = m_pAccChartView->getLocationOnScreen(); - Point aTopLeft( aLocation.X, aLocation.Y ); - aPoint = m_pWindow->PixelToLogic( rPoint - aTopLeft, m_aMapMode ); - } - return aPoint; -} - -Size AccessibleViewForwarder::PixelToLogic( const Size& rSize ) const -{ - Size aSize; - if ( m_pWindow ) - { - aSize = m_pWindow->PixelToLogic( rSize, m_aMapMode ); - } - return aSize; -} - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index b2d55cb8784f..a1cbca5c9355 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -37,12 +37,9 @@ public: virtual ~AccessibleViewForwarder(); // ________ IAccessibleViewforwarder ________ - virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel( const Point& rPoint ) const SAL_OVERRIDE; virtual Size LogicToPixel( const Size& rSize ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint ) const SAL_OVERRIDE; - virtual Size PixelToLogic( const Size& rSize ) const SAL_OVERRIDE; private: AccessibleViewForwarder( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index 14be8b0499ac..d9f7ff9c2105 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -54,14 +54,6 @@ class IAccessibleViewForwarder public: virtual ~IAccessibleViewForwarder(){}; - /** This method informs you about the state of the forwarder. Do not - use it when the returned value is <false/>. - - @return - Return <true/> if the view forwarder is valid and <false/> else. - */ - virtual bool IsValid() const = 0; - /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -95,28 +87,6 @@ public: */ virtual Size LogicToPixel (const Size& rSize) const = 0; - /** Transform the specified point from absolute screen coordinates to - internal coordinates (100th of mm). - - @param rPoint - Point in screen coordinates relative to the upper left corner of - the (current) screen. - - @return - The same point but in internal coordinates (100th of mm). - */ - virtual Point PixelToLogic (const Point& rPoint) const = 0; - - /** Transform the specified size from screen coordinates to internal - coordinates (100th of mm). - - @param rSize - Size in screen coordinates. - - @return - The same size but in internal coordinates (100th of mm). - */ - virtual Size PixelToLogic (const Size& rSize) const = 0; }; } // end of namespace accessibility diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 29c8209494da..7c041edba584 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -123,20 +123,6 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) const; - /** Compatibility function. - */ - AccessibleShape* - CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - const AccessibleShapeTreeInfo& rShapeTreeInfo) const - { - AccessibleShapeInfo aShapeInfo(rxShape, rxParent); - return CreateAccessibleObject (aShapeInfo, rShapeTreeInfo); - } - /** Add new shape types to the internal tables. Each new shape type is described by one shape type descriptor. See ShapeTypeDescriptor for more details. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 6538ffd4c3a1..3615a2941af0 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -49,13 +49,9 @@ public: void SelectCharacter( sal_uInt32 cNew, bool bFocus = false ); sal_UCS4 GetSelectCharacter() const; - Link<> GetDoubleClickHdl() const { return aDoubleClkHdl; } void SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClkHdl = rLink; } - Link<> GetSelectHdl() const { return aSelectHdl; } void SetSelectHdl( const Link<>& rHdl ) { aSelectHdl = rHdl; } - Link<> GetHighlightHdl() const { return aHighHdl; } void SetHighlightHdl( const Link<>& rHdl ) { aHighHdl = rHdl; } - Link<> GetPreSelectHdl() const { return aHighHdl; } void SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; } static sal_uInt32& getSelectedChar(); void SetFont( const vcl::Font& rFont ); diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 4d51b032776c..83350b3000fa 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -174,8 +174,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHSTYLE_COUNT; } - SvxChartStyle GetValue() const - { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; @@ -207,8 +205,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHDESCR_COUNT; } - SvxChartDataDescr GetValue() const - { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrderItem : public SfxEnumItem @@ -242,8 +238,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHTXTORDER_COUNT; } - SvxChartTextOrient GetValue() const - { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartKindErrorItem : public SfxEnumItem @@ -308,7 +302,6 @@ public: virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; double GetValue() const { return fVal; } - void SetValue(double fNewVal) { fVal = fNewVal; } }; #endif // INCLUDED_SVX_CHRTITEM_HXX diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index cafb35358f1e..3f54aeba6263 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -108,9 +108,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) - { nLeftSlot = nLeft; nRightSlot = nRight; } - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 6c3cb9161f0a..9a00f6f92801 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -163,7 +163,6 @@ public: virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; void SetColCompareHdl(const Link<>& rLink ) { aColCompareLink = rLink; } - const Link<>& GetColCompareHdl() const { return aColCompareLink; } }; /// Tabpage with the filter text entries etc. @@ -249,8 +248,6 @@ public: void SetFocusToRange(); // } Methods for Calc - void DisableRef(bool bFlag); - bool IsDate(); bool IsAuthor(); bool IsRange(); @@ -268,27 +265,10 @@ public: ListBox* GetLbAction() { return m_pLbAction;} void SetReadyHdl( const Link<>& rLink ) { aReadyLink= rLink; } - const Link<>& GetReadyHdl() const { return aReadyLink; } - - void SetModifyHdl( const Link<>& rLink ) { aModifyLink = rLink; } - const Link<>& GetModifyHdl() const { return aModifyLink; } - - void SetModifyDateHdl( const Link<>& rLink ) { aModifyDateLink = rLink; } - const Link<>& GetModifyDateHdl() const { return aModifyDateLink; } - - void SetModifyAuthorHdl( const Link<>& rLink ) { aModifyAuthorLink = rLink; } - const Link<>& GetModifyAuthorHdl() const { return aModifyAuthorLink; } - - void SetModifyCommentHdl(const Link<>& rLink ) { aModifyComLink = rLink; } - const Link<>& GetModifyCommentHdl() const { return aModifyComLink; } // Methods for Calc { - void SetModifyRangeHdl( const Link<>& rLink ) { aModifyRefLink = rLink; } - const Link<>& GetModifyRangeHdl() const { return aModifyRefLink; } - void SetRefHdl( const Link<>& rLink ) { aRefLink = rLink; } - const Link<>& GetRefHdl() const { return aRefLink; } void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ); @@ -335,31 +315,18 @@ public: void EnableReject(bool nFlag=true); void EnableRejectAll(bool nFlag=true); void EnableUndo(bool nFlag=true); - - void DisableAccept() {EnableAccept(false);} - void DisableAcceptAll() {EnableAcceptAll(false);} - void DisableReject() {EnableReject(false);} - void DisableRejectAll() {EnableRejectAll(false);} void DisableUndo() {EnableUndo(false);} - void ShowUndo(bool nFlag=true); - void HideUndo() {ShowUndo(false);} - bool IsUndoVisible(); void SetAcceptClickHdl( const Link<>& rLink ) { AcceptClickLk = rLink; } - const Link<>& GetAcceptClickHdl() const { return AcceptClickLk; } void SetAcceptAllClickHdl( const Link<>& rLink ) { AcceptAllClickLk = rLink; } - const Link<>& GetAcceptAllClickHdl() const { return AcceptAllClickLk; } void SetRejectClickHdl( const Link<>& rLink ) { RejectClickLk = rLink; } - const Link<>& GetRejectClickHdl() const { return RejectClickLk; } void SetRejectAllClickHdl( const Link<>& rLink ) { RejectAllClickLk = rLink; } - const Link<>& GetRejectAllClickHdl() const { return RejectAllClickLk; } void SetUndoClickHdl( const Link<>& rLink ) { UndoClickLk = rLink; } - const Link<>& GetUndoAllClickHdl() const { return UndoClickLk; } virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index ca77be777db1..c6f5315c3ca6 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -57,7 +57,6 @@ public: virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void Reset(); virtual void SetObjectType(SvxPreviewObjectType nType); SvxPreviewObjectType GetObjectType() const { return mnObjectType; } SfxItemSet Get3DAttributes() const; @@ -113,8 +112,6 @@ public: virtual void SetObjectType(SvxPreviewObjectType nType) SAL_OVERRIDE; // register user callback - void SetUserInteractiveChangeCallback(Link<> aNew) { maUserInteractiveChangeCallback = aNew; } - void SetUserSelectionChangeCallback(Link<> aNew) { maUserSelectionChangeCallback = aNew; } void SetChangeCallback(Link<> aNew) { maChangeCallback = aNew; } void SetSelectionChangeCallback(Link<> aNew) { maSelectionChangeCallback = aNew; } diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 20d79a5058f0..5167fdc2f74f 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -206,8 +206,6 @@ public: void SetLineColor( const Color& rCol ) { aLineColor = rCol; } sal_uInt16 GetLineCount() const { return nLines; } - Color GetPixelColor() const { return aPixelColor; } - Color GetBackgroundColor() const { return aBackgroundColor; } sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber ); sal_uInt16* GetBitmapPixelPtr() { return pPixel; } @@ -289,7 +287,6 @@ public: void Append(const Size& rSize, const XBitmapEntry& rEntry); void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos); - void SelectEntryByList(const XBitmapList* pList, const OUString& rStr); private: BitmapEx maBitmapEx; @@ -342,7 +339,6 @@ public: void Append(const XDashEntry& rEntry, const Bitmap& rBitmap ); void Modify(const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); - void SelectEntryByList(const XDashList* pList, const OUString& rStr, const XDash& rDash, sal_uInt16 nDist = 0); }; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index e22cac825864..04592107b143 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -51,7 +51,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XColorListRef GetColorList() const { return pColorList; } - void SetColorList( const XColorListRef &pTable ) { pColorList = pTable; } }; // SvxGradientListItem @@ -77,8 +76,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XGradientListRef GetGradientList() const { return pGradientList; } - void SetGradientList( XGradientListRef pList ) { - pGradientList = pList; } }; @@ -107,8 +104,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XHatchListRef GetHatchList() const { return pHatchList; } - void SetHatchList( XHatchListRef pList ) { - pHatchList = pList; } }; @@ -138,8 +133,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XBitmapListRef GetBitmapList() const { return pBitmapList; } - void SetBitmapList( XBitmapListRef pList ) { - pBitmapList = pList; } }; @@ -197,8 +190,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XLineEndListRef GetLineEndList() const { return pLineEndList; } - void SetLineEndList( XLineEndListRef pList ) { - pLineEndList = pList; } }; diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 0784991ee8f7..405899f50f7e 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -127,23 +127,12 @@ public: operator const css::uno::Reference< css::sdbcx::XColumnsSupplier>& () const { return m_xColumnsSupplier; } const css::uno::Reference< css::beans::XPropertySet >& getPropertySet() const { return m_xPropertyAccess; } - const css::uno::Reference< css::sdbc::XResultSet >& getResultSet() const { return m_xMoveOperations; } - const css::uno::Reference< css::sdbcx::XRowLocate >& getRowLocate() const { return m_xBookmarkOperations; } - const css::uno::Reference< css::sdbcx::XColumnsSupplier >& getColumnsSupplier() const { return m_xColumnsSupplier; } - - // the usual queryInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException ) - { return m_xMoveOperations->queryInterface(type); } // css::uno::Reference< css::sdbcx::XRowLocate> css::uno::Any getBookmark() throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->getBookmark(); } bool moveToBookmark(const css::uno::Any& bookmark) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); } - bool moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveRelativeToBookmark(bookmark, rows); } - sal_Int32 compareBookmarks(const css::uno::Any& lhs, const css::uno::Any& rhs) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->compareBookmarks(lhs, rhs); } - bool hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } - sal_Int32 hashBookmark(const css::uno::Any& bookmark) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hashBookmark(bookmark); } // css::sdbc::XResultSet bool isBeforeFirst() const { return m_xMoveOperations->isBeforeFirst(); } @@ -159,10 +148,7 @@ public: bool previous() { return m_xMoveOperations->previous(); } bool next() { return m_xMoveOperations->next(); } void refreshRow() { m_xMoveOperations->refreshRow(); } - bool rowUpdated() { return m_xMoveOperations->rowUpdated(); } - bool rowInserted() { return m_xMoveOperations->rowInserted(); } bool rowDeleted() { return m_xMoveOperations->rowDeleted(); } - css::uno::Reference< css::uno::XInterface> getStatement() { return m_xMoveOperations->getStatement(); } // css::sdbcx::XColumnsSupplier css::uno::Reference< css::container::XNameAccess> getColumns() const throw( css::uno::RuntimeException ) { return m_xColumnsSupplier->getColumns(); } private: diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 4f4b16d78965..fa71862f191c 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -83,7 +83,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog DECL_LINK( DoubleClickFavoriteHdl, void * ); DECL_LINK( ClickOKHdl, void * ); - DECL_LINK( ClickTextDirectionHdl, ImageButton * ); SdrObject** mppSdrObject; SdrModel* mpDestModel; diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 76b3b242113e..19beeabc255d 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -56,8 +56,6 @@ public: /** Saves the currently selected frame direction. */ inline void SaveValue() { meSaveValue = GetSelectEntryValue(); } - /** Returns the frame direction saved with SaveValue(). */ - inline SvxFrameDirection GetSavedValue() const { return meSaveValue; } private: SvxFrameDirection meSaveValue; /// Saved value for later comparison. diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index a3bfdd837bcd..a73609caca6c 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -140,9 +140,6 @@ public: bool IsBorderSelected( FrameBorderType eBorder ) const; /** Selects or deselects the specified frame border. */ void SelectBorder( FrameBorderType eBorder, bool bSelect = true ); - /** Deselects the specified frame border. */ - inline void DeselectBorder( FrameBorderType eBorder ) { SelectBorder( eBorder, false ); } - /** Returns true, if any of the enabled frame borders is selected. */ bool IsAnyBorderSelected() const; /** Selects or deselects all frame borders. */ diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 31f62f718265..a5dc16db1953 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -85,7 +85,6 @@ public: virtual void dispose() SAL_OVERRIDE; void SetWinStyle( WinBits nWinBits ); - WinBits GetWinStyle() const { return nWinStyle; } void SetGraphic( const Graphic& rGraphic, bool bNewModel = true ); const Graphic& GetGraphic() const { return aGraphic; } @@ -94,13 +93,11 @@ public: const Point& GetMousePos() const { return aMousePos; } void SetEditMode( const bool bEditMode ); - bool IsEditMode() const { return bEditMode; } void SetPolyEditMode( const sal_uInt16 nPolyEdit ); sal_uInt16 GetPolyEditMode() const { return nPolyEdit; } void SetObjKind( const SdrObjKind eObjKind ); - SdrObjKind GetObjKind() const { return eObjKind; } SdrModel* GetSdrModel() const { return pModel; } SdrView* GetSdrView() const { return pView; } @@ -108,16 +105,10 @@ public: bool IsChanged() const { return bSdrMode && pModel->IsChanged(); } void SetMousePosLink( const Link<>& rLink ) { aMousePosLink = rLink; } - const Link<>& GetMousePosLink() const { return aMousePosLink; } void SetGraphSizeLink( const Link<>& rLink ) { aGraphSizeLink = rLink; } - const Link<>& GetGraphSizeLink() const { return aGraphSizeLink; } - - void SetMarkObjLink( const Link<>& rLink ) { aMarkObjLink = rLink; } - const Link<>& GetMarkObjLink() const { return aMarkObjLink; } void SetUpdateLink( const Link<>& rLink ) { aUpdateLink = rLink; } - const Link<>& GetUpdateLink() const { return aUpdateLink; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 31dd27089b75..a30dd0c9e296 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -390,8 +390,6 @@ public: void RemoveRows(bool bNewCursor); - void InvalidateStatus(); - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;} // the data source @@ -508,7 +506,6 @@ public: void copyCellText(sal_Int32 _nRow, sal_Int16 _nColId); // selectin listener handling - FmGridListener* getGridListener() const { return m_pGridListener; } void setGridListener( FmGridListener* _pListener ) { m_pGridListener = _pListener; } // helper class to grant access to selected methods from within the DbCellControl class @@ -578,8 +575,6 @@ protected: const DbGridRowRef& GetEmptyRow() const { return m_xEmptyRow; } const DbGridRowRef& GetSeekRow() const { return m_xSeekRow; } const DbGridRowRef& GetPaintRow() const { return m_xPaintRow; } - CursorWrapper* GetSeekCursor() const { return m_pSeekCursor; } - void ConnectToFields(); void DisconnectFromFields(); @@ -588,7 +583,6 @@ protected: // calls AdjustRows or AdjustDataSource, synchron if the caller is running in the solar thread, else asynchron protected: - void Construct(); void ImplInitWindow( const InitWindowFacet _eInitWhat ); DECL_LINK(OnDelete, void*); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 7df23df2dc70..78f3b9ef3e9c 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -55,7 +55,6 @@ public: virtual void dispose() SAL_OVERRIDE; void DisableDeleteQueryBox() { mbDisableQueryBox = true; } - void EnableBackgroundSelector(bool bNew) { mbEnableBackgroundSelector = bNew; } //UUUU virtual void PageCreated(const SfxAllItemSet&) SAL_OVERRIDE; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 046e956766b1..75d1a255d4e2 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -124,7 +124,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK( URLModifyHdl, void* ); DECL_LINK( URLLoseFocusHdl, void* ); DECL_LINK_TYPED(UpdateHdl, Idle *, void); - DECL_LINK( TbxUpdateHdl, Timer* ); DECL_LINK( StateHdl, IMapWindow* ); DECL_LINK( MiscHdl, void* ); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 646d6464c31e..6fed6ebd6d60 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -100,7 +100,6 @@ public: SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); void Selected() { bSelect = true; } - bool IsRelease() { return bRelease;} protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -121,8 +120,6 @@ class SVX_DLLPUBLIC SvxFillAttrBox : public FillAttrLB public: SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); - bool IsRelease() { return bRelease;} - protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 6f1fd0e16812..0f8374850efb 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -222,7 +222,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false)=0; virtual bool IsCustomized(sal_uInt16 nIndex)=0; static sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel); - const SfxItemSet* GetItems() { return pSet;} // store the attributes passed from pSet void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index a5b7ba4c84de..15bf28b6cb2a 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -148,7 +148,6 @@ public: void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); void SetCurNumFmtKey( sal_uInt32 nNew ) { nCurFormatKey = nNew; } - void SetCurLanguage( LanguageType eNew ) { eCurLanguage = eNew; } sal_uInt32 GetCurNumFmtKey() const { return nCurFormatKey; } LanguageType GetCurLanguage() const { return eCurLanguage; } @@ -178,7 +177,6 @@ public: OUString const& rFmtString); void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; } - bool IsUseStarFormat() { return bUseStarFormat; } private: static const double DEFAULT_NUMVALUE; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index a3aac9734431..75651786eeac 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -82,7 +82,6 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - void SetHTMLMode(bool bSet) {bHTMLMode = bSet;} void SetNumberingSettings( const css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> >& aNum, @@ -106,11 +105,6 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet protected: DECL_LINK_TYPED(FormatHdl_Impl, Idle *, void); - void SetGrfNotFound(bool bSet) {bGrfNotFound = bSet;} - bool IsGrfNotFound()const {return bGrfNotFound;} - - Idle& GetFormatIdle() {return aFormatIdle;} - public: SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); virtual ~SvxBmpNumValueSet(); diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 482f9fefadc0..9da08188480a 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -38,7 +38,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void* GetValue() const { return pPtr; } - void SetValue( void* pNewPtr ) { pPtr = pNewPtr; } }; // class OfaRefItem - for ref counting items diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index a830c1bed9eb..16d99a1463d3 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -72,8 +72,6 @@ public: /** Enables or disables the dial control and all dependent windows. */ void Enable( bool bEnable = true ); - /** Disables the dial control and all dependent windows. */ - inline void Disable() { Enable( false ); } /** Shows or hides the dial control and all dependent windows. */ void Show( bool bShow = true ); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index e0ec05b2884d..3d7475b8dd98 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -104,16 +104,6 @@ public: { return maPageFillAttributes; } - - void SetWidth(long nWidth) - { - aSize.Width() = nWidth; - } - void SetHeight(long nHeight) - { - aSize.Height() = nHeight; - } - void SetSize(const Size& rSize) { aSize = rSize; @@ -134,8 +124,6 @@ public: long GetLeft() const { return nLeft; } long GetRight() const { return nRight; } - const SvxBoxItem& GetBorder() const; - void SetHdLeft(long nNew) { nHdLeft = nNew; } void SetHdRight(long nNew) { nHdRight = nNew; } void SetHdDist(long nNew) { nHdDist = nNew; } @@ -147,8 +135,6 @@ public: long GetHdDist() const { return nHdDist; } long GetHdHeight() const { return nHdHeight; } - const SvxBoxItem& GetHdBorder() const { return *pHdBorder; } - void SetFtLeft(long nNew) { nFtLeft = nNew; } void SetFtRight(long nNew) { nFtRight = nNew; } void SetFtDist(long nNew) { nFtDist = nNew; } @@ -160,22 +146,14 @@ public: long GetFtDist() const { return nFtDist; } long GetFtHeight() const { return nFtHeight; } - const SvxBoxItem& GetFtBorder() const { return *pFtBorder; } - void SetUsage(sal_uInt16 eU) { eUsage = eU; } sal_uInt16 GetUsage() const { return eUsage; } void SetHeader( bool bNew ) { bHeader = bNew; } - bool GetHeader() const { return bHeader;} void SetFooter( bool bNew ) { bFooter = bNew; } - bool GetFooter() const { return bFooter;} - void SetTable( bool bNew ) { bTable = bNew; } - bool GetTable() const { return bTable;} void SetHorz( bool bNew ) { bHorz = bNew; } - bool GetHorz() const { return bHorz;} void SetVert( bool bNew ) { bVert = bNew; } - bool GetVert() const { return bVert;} void EnableFrameDirection(bool bEnable); //uses enum SvxFrameDirection diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 018395331984..b59a6cb21223 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -106,52 +106,10 @@ public: { aSize = aNew; } - - short GetFirstLineOfst() const - { - return nFirstLineOfst; - } - long GetLeftMargin() const - { - return nLeftMargin; - } - long GetRightMargin() const - { - return nRightMargin; - } - sal_uInt16 GetUpper() const - { - return nUpper; - } - sal_uInt16 GetLower() const - { - return nLower; - } - SvxAdjust GetAdjust() const - { - return eAdjust; - } - SvxPrevLineSpace GetLineEnum() const - { - return eLine; - } - sal_uInt16 GetLineValue() const - { - return nLineVal; - } OUString GetText() const SAL_OVERRIDE { return aText; } - Size GetSize() const - { - return aSize; - } - - void Draw(vcl::RenderContext& rRenderContext, bool bAll) - { - DrawParagraph(rRenderContext, bAll); - } }; #endif diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index d5825d7ffbe0..570791be64a5 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -44,7 +44,6 @@ public: void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, sal_uInt16 nStep = 5 ); - bool IsRelativeMode() const { return bRelativeMode; } void SetRelative( bool bRelative = false ); bool IsRelative() const { return bRelative; } void EnableNegativeMode() {bNegativeEnabled = true;} diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index f736732df774..c4bec963cb9b 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -210,7 +210,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void ApplyObject(); long GetFrameLeft() const; - void SetFrameLeft(long); long GetLeftMin() const; long GetRightMax() const; @@ -219,9 +218,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener DECL_LINK( MenuSelect, Menu * ); void PrepareProportional_Impl(RulerType); - sal_uInt16 GetNextVisible(sal_uInt16 nColumn); - sal_uInt16 GetPrevVisible(sal_uInt16 nColumn); - enum UpdateType { MOVE_ALL, @@ -268,28 +264,12 @@ public: virtual ~SvxRuler(); virtual void dispose() SAL_OVERRIDE; - void SetMinFrameSize(long lSize); - long GetMinFrameSize() const ; - - SvxRulerSupportFlags GetRulerFlags() const - { - return nFlags; - } - void SetDefTabDist(long); // set/get NullOffset in logic units void SetNullOffsetLogic(long lOff = 0); - long GetNullOffsetLogic() const - { - return lAppNullOffset; - } void SetActive(bool bOn = true); - bool IsActive() const - { - return bActive; - } void ForceUpdate() { diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index 846c6ba0ce12..4a93a8fa738c 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -67,7 +67,6 @@ namespace sdr virtual ~OverlaySelection(); // data read access - OverlayType getOverlayType() const { return meOverlayType; } const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } bool getBorder() const { return mbBorder; } diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 2ad8e2284118..153efff59575 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -112,8 +112,6 @@ public: bool isRowHeader(); bool isColumnHeader(); sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); } - //declare event notification method - void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos ); private: SvxTableController(SvxTableController &) SAL_DELETED_FUNCTION; void operator =(SvxTableController &) SAL_DELETED_FUNCTION; @@ -128,7 +126,6 @@ private: SVX_DLLPRIVATE bool PasteObject( SdrTableObj* pPasteTableObj ); SVX_DLLPRIVATE bool checkTableObject(); - SVX_DLLPRIVATE bool updateTableObject(); SVX_DLLPRIVATE const CellPos& getSelectionStart(); SVX_DLLPRIVATE void setSelectionStart( const CellPos& rPos ); SVX_DLLPRIVATE const CellPos& getSelectionEnd(); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 81728a9a670f..464c7bf604c2 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -133,11 +133,6 @@ public: const SearchAttrItemList* GetReplaceItemList() const { return pReplaceList; } - inline bool HasSearchAttributes() const; - inline bool HasReplaceAttributes() const; - - PushButton& GetReplaceBtn() { return *m_pReplaceBtn; } - sal_Int32 GetTransliterationFlags() const; void SetDocWin( vcl::Window* pDocWin ) { mpDocWin = pDocWin; } @@ -267,18 +262,6 @@ private: void ApplyTransliterationFlags_Impl( sal_Int32 nSettings ); }; -inline bool SvxSearchDialog::HasSearchAttributes() const -{ - bool bLen = !m_pSearchAttrText->GetText().isEmpty(); - return ( m_pSearchAttrText->IsEnabled() && bLen ); -} - -inline bool SvxSearchDialog::HasReplaceAttributes() const -{ - bool bLen = !m_pReplaceAttrText->GetText().isEmpty(); - return ( m_pReplaceAttrText->IsEnabled() && bLen ); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index f14646b20428..e6acf370331b 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -52,7 +52,6 @@ private: SVX_DLLPRIVATE void Reconnect_Impl(); SVX_DLLPRIVATE void AddListeners_Impl(); SVX_DLLPRIVATE void RemoveListeners_Impl(); - SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::datatransfer::XTransferable > GetTransferable_Impl() const; SVX_DLLPRIVATE void GetObjRef_Impl(); SVX_DLLPRIVATE void SetGraphic_Impl(const Graphic* pGrf); diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index c0213b30e140..d0006e6549ea 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -188,11 +188,7 @@ public: virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const SAL_OVERRIDE; virtual bool IsAutoGrowHeight() const SAL_OVERRIDE; - long GetMinTextFrameHeight() const; - long GetMaxTextFrameHeight() const; virtual bool IsAutoGrowWidth() const SAL_OVERRIDE; - long GetMinTextFrameWidth() const; - long GetMaxTextFrameWidth() const; virtual bool IsFontwork() const SAL_OVERRIDE; @@ -257,8 +253,6 @@ public: virtual void NbcReformatText() SAL_OVERRIDE; virtual void ReformatText() SAL_OVERRIDE; - void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } - virtual bool IsVerticalWriting() const SAL_OVERRIDE; virtual void SetVerticalWriting(bool bVertical) SAL_OVERRIDE; diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 2cefadbdbfcf..52d99f5c79ee 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -128,7 +128,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; - const OUString& GetUnoControlModelTypeName() const { return aUnoControlTypeName; } const OUString& GetUnoControlTypeName() const { return aUnoControlTypeName; } virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& xModel ); diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index 97fc71eef0df..b40b377e5dd9 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -49,10 +49,6 @@ namespace svx /** determines whether the toolbox is currently visible */ bool isToolboxVisible() const; - - /** forces that the toolbox is docked - */ - inline void forceDocking() { m_bDocking = true; } }; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 43f028bcaae7..52f8b1ddb6c7 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -84,9 +84,6 @@ public: */ void FillWithMimeAndSelectBest(); - const SvxTextEncodingTable* GetTextEncodingTable() const - { return m_pEncTable; } - void InsertTextEncoding( const rtl_TextEncoding nEnc, sal_Int32 nPos = LISTBOX_APPEND ); @@ -98,8 +95,6 @@ public: bool bSelect = true ); rtl_TextEncoding GetSelectTextEncoding() const; - - const OUString& GetSelectTextString() const; }; #endif diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx index ae5206d34f7b..55c2909381d5 100644 --- a/include/svx/unomaster.hxx +++ b/include/svx/unomaster.hxx @@ -60,8 +60,6 @@ public: virtual void dispose() = 0; virtual void modelChanged( SdrModel* pNewModel ) = 0; - virtual void pageChanged( SdrPage* pNewPage ) = 0; - virtual void objectChanged( SdrObject* pNewObj ) = 0; protected: ~SvxShapeMaster() {} diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index a4d4f9b13bb7..8aca84b8833e 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -185,7 +185,6 @@ public: void ChangeModel( SdrModel* pNewModel ); void InvalidateSdrObject() { mpObj.reset( NULL ); }; - const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index a1f0132d003d..606339bf020e 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -55,9 +55,7 @@ public: void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = true; } void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = true; } - XBitmapType GetBitmapType() const { return eType; } Bitmap GetBitmap() const; - Color GetPixelColor() const { return aPixelColor; } Color GetBackgroundColor() const { return aBckgrColor; } }; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 39e0e44030ee..7a780984a132 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -2105,13 +2105,6 @@ uno::Sequence<sal_Int8> SAL_CALL ///===== IAccessibleViewForwarder ======================================== -bool ScAccessibleDocument::IsValid() const -{ - SolarMutexGuard aGuard; - IsObjectValid(); - return (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose); -} - Rectangle ScAccessibleDocument::GetVisibleArea_Impl() const { Rectangle aVisRect(GetBoundingBox()); @@ -2163,31 +2156,6 @@ Size ScAccessibleDocument::LogicToPixel (const Size& rSize) const return aSize; } -Point ScAccessibleDocument::PixelToLogic (const Point& rPoint) const -{ - SolarMutexGuard aGuard; - IsObjectValid(); - Point aPoint; - ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos)); - if (pWin) - { - aPoint -= pWin->GetWindowExtentsRelative(NULL).TopLeft(); - aPoint = pWin->PixelToLogic(rPoint, pWin->GetDrawMapMode()); - } - return aPoint; -} - -Size ScAccessibleDocument::PixelToLogic (const Size& rSize) const -{ - SolarMutexGuard aGuard; - IsObjectValid(); - Size aSize; - ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos)); - if (pWin) - aSize = pWin->PixelToLogic(rSize, pWin->GetDrawMapMode()); - return aSize; -} - //===== internal ======================================================== utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScAddress* pAddress) const diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 7b2fbf12844a..b5e16946d373 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -491,12 +491,9 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; @@ -526,12 +523,6 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder() ///===== IAccessibleViewForwarder ======================================== -bool ScIAccessibleViewForwarder::IsValid() const -{ - SolarMutexGuard aGuard; - return mbValid; -} - Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const { SolarMutexGuard aGuard; @@ -572,29 +563,6 @@ Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const return aSize; } -Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const -{ - SolarMutexGuard aGuard; - Point aPoint; - vcl::Window* pWin = mpViewShell->GetWindow(); - if (pWin && mpAccDoc) - { - Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); - aPoint = pWin->PixelToLogic(rPoint - aRect.TopLeft(), maMapMode); - } - return aPoint; -} - -Size ScIAccessibleViewForwarder::PixelToLogic (const Size& rSize) const -{ - SolarMutexGuard aGuard; - Size aSize; - vcl::Window* pWin = mpViewShell->GetWindow(); - if (pWin) - aSize = pWin->PixelToLogic(rSize, maMapMode); - return aSize; -} - struct ScShapeChild { ScShapeChild() diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index b0285fd5d0c7..df29b57a1310 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -196,14 +196,6 @@ public: ///===== IAccessibleViewForwarder ======================================== - /** This method informs you about the state of the forwarder. Do not - use it when the returned value is <false/>. - - @return - Return <true/> if the view forwarder is valid and <false/> else. - */ - virtual bool IsValid() const SAL_OVERRIDE; - /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -236,29 +228,6 @@ public: */ virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - /** Transform the specified point from absolute screen coordinates to - internal coordinates. - - @param rPoint - Point in screen coordinates relative to the upper left corner of - the (current) screen. - - @return - The same point but in internal coordinates. - */ - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - - /** Transform the specified size from screen coordinates to internal - coordinates. - - @param rSize - Size in screen coordinates. - - @return - The same size but in internal coordinates. - */ - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; - ///======== internal ===================================================== utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index e4b3c46e8951..8809a743509f 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -55,11 +55,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder() // empty } -bool AccessibleViewForwarder::IsValid() const -{ - return true; -} - Rectangle AccessibleViewForwarder::GetVisibleArea() const { Rectangle aVisibleArea; @@ -104,36 +99,6 @@ Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const return Size(); } -/** First subtract the window origin to make the point coordinates relative - to the window and then transform them into internal coordinates. -*/ -Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const -{ - OSL_ASSERT (mpView != NULL); - if((sal_uInt32)mnWindowId < mpView->PaintWindowCount()) - { - SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); - OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - Rectangle aBBox (static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L)); - return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft()); - } - else - return Point(); -} - -Size AccessibleViewForwarder::PixelToLogic (const Size& rSize) const -{ - OSL_ASSERT (mpView != NULL); - if((sal_uInt32)mnWindowId < mpView->PaintWindowCount()) - { - SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); - OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - return rOutDev.PixelToLogic (rSize); - } - else - return Size(); -} - } // end of namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index d500eb992b4e..704dba20bd42 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -50,14 +50,6 @@ public: //===== IAccessibleViewforwarder ======================================== - /** This method informs you about the state of the forwarder. Do not - use it when the returned value is <false/>. - - @return - Return <true/> if the view forwarder is valid and <false/> else. - */ - virtual bool IsValid() const SAL_OVERRIDE; - /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -89,29 +81,6 @@ public: */ virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - /** Transform the specified point from absolute screen coordinates to - internal coordinates. - - @param rPoint - Point in screen coordinates relative to the upper left corner of - the (current) screen. - - @return - The same point but in internal coordinates. - */ - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - - /** Transform the specified Size from screen coordinates to internal - coordinates. - - @param rSize - Size in screen coordinates. - - @return - The same size but in internal coordinates. - */ - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; - protected: SdrPaintView* mpView; sal_uInt16 mnWindowId; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 6a37fef2f9bd..7ff746963d04 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1739,12 +1739,4 @@ void SdXShape::modelChanged( SdrModel* pNewModel ) } } -void SdXShape::pageChanged( SdrPage* ) -{ -} - -void SdXShape::objectChanged( SdrObject* ) -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 684a0a70b077..d28d97ba7a25 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -77,8 +77,6 @@ public: virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) SAL_OVERRIDE; virtual void dispose() SAL_OVERRIDE; virtual void modelChanged( SdrModel* pNewModel ) SAL_OVERRIDE; - virtual void pageChanged( SdrPage* pNewPage ) SAL_OVERRIDE; - virtual void objectChanged( SdrObject* pNewObj ) SAL_OVERRIDE; // XInterface 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; diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 2d023b551eae..f3c9c3b13314 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -64,7 +64,6 @@ namespace drawinglayer const ::basegfx::B2DPolygon& getTail() const { return maTail; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } - bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); } // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index ce160a28abdb..be6140d2c0cf 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -90,12 +90,6 @@ namespace drawinglayer bool bCloseSegment, bool bCloseUsingCenter); - // data access - double getStartAngle() const { return mfStartAngle; } - double getEndAngle() const { return mfEndAngle; } - bool getCloseSegment() const { return mbCloseSegment; } - bool getCloseUsingCenter() const { return mbCloseUsingCenter; } - // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 5c57140897bd..729b680c160f 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -62,7 +62,6 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } - bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); } bool getForceFillForHitTest() const { return mbForceFillForHitTest; } // compare operator diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 0a436533b97e..9c51bb421cbc 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -91,9 +91,7 @@ public: const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } OUString GetNewEntryValue() const { return pEditControl->GetText(); } void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; } - const Link<>& GetEntryChangedHdl() const { return aEntryChangedHdl; } void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; } - const Link<>& GetSetDirtyHdl() const { return aSetDirtyHdl; } }; #define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE) @@ -107,7 +105,6 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; - void Clear() { aBrowse->Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; @@ -126,10 +123,8 @@ private: public: SdrItemBrowser(SdrView& rView); void ForceParent(); - void SetView(SdrView& rView) { pView=&rView; ForceParent(); SetDirty(); } void SetDirty(); void Undirty(); - void ForceUndirty() { if (bDirty) Undirty(); } }; #endif // INCLUDED_SVX_INC_SVDIBROW_HXX diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index a833682f5442..21193684901e 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -816,13 +816,6 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } // IAccessibleViewforwarder -bool SvxGraphCtrlAccessibleContext::IsValid() const -{ - return true; -} - - - Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const { Rectangle aVisArea; @@ -863,22 +856,4 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const -Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const -{ - if( mpControl ) - return mpControl->PixelToLogic (rPoint); - else - return rPoint; -} - - - -Size SvxGraphCtrlAccessibleContext::PixelToLogic (const Size& rSize) const -{ - if( mpControl ) - return mpControl->PixelToLogic (rSize); - else - return rSize; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index b63b3b4c189a..d06e136e8ea1 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -104,12 +104,11 @@ public: void SetExecState( bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( bool bLinked ) { bGraphicLinked = bLinked; } const Graphic& GetGraphic() const { return aGraphic; } bool IsGraphicChanged() const { return nGrfChanged > 0UL; } void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); - tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); + tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 675ffd371939..664fc86698d8 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -45,8 +45,6 @@ protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void CreatePolyPolygon(); - public: ContourWindow(vcl::Window* pParent, WinBits nBits); @@ -55,14 +53,12 @@ public: const tools::PolyPolygon& GetPolyPolygon(); void SetPipetteMode( const bool bPipette ) { bPipetteMode = bPipette; } - bool IsPipetteMode() const { return bPipetteMode; } const Color& GetPipetteColor() const { return aPipetteColor; } bool IsClickValid() const { return bClickValid; } bool IsContourChanged() const; void SetWorkplaceMode( const bool bWorkplace ) { bWorkplaceMode = bWorkplace; } - bool IsWorkplaceMode() const { return bWorkplaceMode; } const Rectangle& GetWorkRect() const { return aWorkRect; } void SetPipetteHdl( const Link<>& rLink ) { aPipetteLink = rLink; } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index fa53b9579b6f..e772f875228f 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -84,7 +84,6 @@ public: virtual SdrObjUserData* Clone( SdrObject * ) const SAL_OVERRIDE { return new IMapUserData( *this ); } - void SetObject( const IMapObjectPtr& rIMapObj ) { mpObj = rIMapObj; } const IMapObjectPtr GetObject() const { return mpObj; } void ReplaceObject( const IMapObjectPtr& pNewIMapObject ) { mpObj = pNewIMapObject; } }; @@ -101,7 +100,6 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper mxDocumentFrame; DECL_LINK( MenuSelectHdl, Menu* ); - DECL_LINK( MouseTimerHdl, Timer* ); protected: @@ -119,11 +117,8 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - void CreateImageMap(); void ReplaceImageMap( const ImageMap& rNewImageMap, bool bScaleToGraphic ); - void ClearTargetList(); - SdrObject* CreateObj( const IMapObject* pIMapObj ); static IMapObject* GetIMapObj( const SdrObject* pSdrObj ); SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; @@ -146,10 +141,8 @@ public: void DoPropertyDialog(); void SetInfoLink( const Link<>& rLink ) { aInfoLink = rLink; } - const Link<>& GetInfoLink() const { return aInfoLink; } void SetTargetList( TargetList& rTargetList ); - const TargetList& GetTargetList() const { return aTargetList; } const NotifyInfo& GetInfo() const { return aInfo; } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 18b18aee6a05..39550b7217bf 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1283,23 +1283,6 @@ inline long SvxRuler::GetFrameLeft() const Ruler::GetNullOffset(); } -inline void SvxRuler::SetFrameLeft(long lFrameLeft) -{ - /* Set Left margin in Pixels */ - bool bProtectColumns = - mxRulerImpl->aProtectItem.IsSizeProtected() || - mxRulerImpl->aProtectItem.IsPosProtected(); - if(bAppSetNullOffset) - { - SetMargin1(lFrameLeft - ConvertSizePixel(lLogicNullOffset), - bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE); - } - else - { - Ruler::SetNullOffset(lFrameLeft); - } -} - long SvxRuler::GetFirstLineIndent() const { /* Get First-line indent in pixels */ diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 39868ffb1a55..f700bd1c23ae 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -70,7 +70,6 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage ) :m_rPage( _rPage ) ,m_bFirstActivation( true ) ,m_bAttemptedFormCreation( false ) - ,m_bInFind( false ) { } diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index a98122243570..db8bfcbcce0b 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -49,230 +49,6 @@ namespace svxform } } - // Reference< XPropertySet> - Reference< XPropertySetInfo> DataColumn::getPropertySetInfo() const throw( RuntimeException ) - { - return m_xPropertySet->getPropertySetInfo(); - } - - void DataColumn::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->setPropertyValue(aPropertyName, aValue); - } - - Any DataColumn::getPropertyValue(const OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - return m_xPropertySet->getPropertyValue(PropertyName); - } - - void DataColumn::addPropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener); - } - - void DataColumn::removePropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener); - } - - void DataColumn::addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->addVetoableChangeListener(PropertyName, aListener); - } - - void DataColumn::removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) - { - m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener); - } - - // XColumn - bool DataColumn::wasNull() throw( SQLException, RuntimeException ) - { - return m_xColumn->wasNull(); - } - - OUString DataColumn::getString() throw( SQLException, RuntimeException ) - { - return m_xColumn->getString(); - } - - bool DataColumn::getBoolean() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBoolean(); - } - - sal_Int8 DataColumn::getByte() throw( SQLException, RuntimeException ) - { - return m_xColumn->getByte(); - } - - sal_Int16 DataColumn::getShort() throw( SQLException, RuntimeException ) - { - return m_xColumn->getShort(); - } - - sal_Int32 DataColumn::getInt() throw( SQLException, RuntimeException ) - { - return m_xColumn->getInt(); - } - - sal_Int64 DataColumn::getLong() throw( SQLException, RuntimeException ) - { - return m_xColumn->getLong(); - } - - float DataColumn::getFloat() throw( SQLException, RuntimeException ) - { - return m_xColumn->getFloat(); - } - - double DataColumn::getDouble() throw( SQLException, RuntimeException ) - { - return m_xColumn->getDouble(); - } - - Sequence< sal_Int8 > DataColumn::getBytes() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBytes(); - } - - com::sun::star::util::Date DataColumn::getDate() throw( SQLException, RuntimeException ) - { - return m_xColumn->getDate(); - } - - com::sun::star::util::Time DataColumn::getTime() throw( SQLException, RuntimeException ) - { - return m_xColumn->getTime(); - } - - com::sun::star::util::DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException ) - { - return m_xColumn->getTimestamp(); - } - - Reference< XInputStream> DataColumn::getBinaryStream() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBinaryStream(); - } - - Reference< XInputStream> DataColumn::getCharacterStream() throw( SQLException, RuntimeException ) - { - return m_xColumn->getCharacterStream(); - } - - Any DataColumn::getObject(const Reference< XNameAccess>& typeMap) throw( SQLException, RuntimeException ) - { - return m_xColumn->getObject(typeMap); - } - - Reference< XRef> DataColumn::getRef() throw( SQLException, RuntimeException ) - { - return m_xColumn->getRef(); - } - - Reference< XBlob> DataColumn::getBlob() throw( SQLException, RuntimeException ) - { - return m_xColumn->getBlob(); - } - - Reference< XClob> DataColumn::getClob() throw( SQLException, RuntimeException ) - { - return m_xColumn->getClob(); - } - - Reference< XArray> DataColumn::getArray() throw( SQLException, RuntimeException ) - { - return m_xColumn->getArray(); - } - - // XColumnUpdate - void DataColumn::updateNull() throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateNull(); - } - - void DataColumn::updateBoolean(bool x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBoolean(x); - } - - void DataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateByte(x); - } - - void DataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateShort(x); - } - - void DataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateInt(x); - } - - void DataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateLong(x); - } - - void DataColumn::updateFloat(float x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateFloat(x); - } - - void DataColumn::updateDouble(double x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateDouble(x); - } - - void DataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateString(x); - } - - void DataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBytes(x); - } - - void DataColumn::updateDate(const com::sun::star::util::Date& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateDate(x); - } - - void DataColumn::updateTime(const com::sun::star::util::Time& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateTime(x); - } - - void DataColumn::updateTimestamp(const com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateTimestamp(x); - } - - void DataColumn::updateBinaryStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateBinaryStream(x, length); - } - - void DataColumn::updateCharacterStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateCharacterStream(x, length); - } - - void DataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateObject(x); - } - - void DataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException ) - { - m_xColumnUpdate->updateNumericObject(x, scale); - } - - } diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index f2aa23c9f2df..60e19a946685 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -155,12 +155,9 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleViewforwarder - virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; protected: void checkChildIndexOnSelection( long nIndexOfChild ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index f41a186c5c4f..b2562e023659 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -303,7 +303,6 @@ namespace svxform bool DoMenuAction( sal_uInt16 _nMenuID ); void EnableMenuItems( Menu* _pMenu ); - inline SvTreeListEntry* GetSelectedItem() const { return m_pItemList->FirstSelected(); } inline const OUString& GetInstanceName() const { return m_sInstanceName; } inline const OUString& GetInstanceURL() const { return m_sInstanceURL; } inline bool GetLinkOnce() const { return m_bLinkOnce; } @@ -644,13 +643,6 @@ namespace svxform virtual ~AddInstanceDialog(); virtual void dispose() SAL_OVERRIDE; - void SetRenameMode() - { - m_pURLFT->Disable(); - m_pURLED->Disable(); - m_pFilePickerBtn->Disable(); - m_pLinkInstanceCB->Disable(); - } OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} OUString GetURL() const { return m_pURLED->GetText(); } diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 5633f02ec3b8..16fbcba186dd 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -180,7 +180,6 @@ public: FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} void SetCurrentItems(FmFilterItems* pCurrent); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetControllers() const {return m_xControllers;} const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & GetCurrentController() const {return m_xController;} void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController); @@ -214,7 +213,6 @@ public: FmFormItem* getFormItem() const { return m_pFormItem; } void setFormItem( FmFormItem* _pItem ) { m_pFormItem = _pItem; } - void addSelectedItem( FmFilterItem* _pItem) { m_aDraggedEntries.push_back(_pItem); } protected: virtual void AddSupportedFormats() SAL_OVERRIDE; @@ -283,7 +281,6 @@ protected: void Remove(FmFilterData* pItem); DECL_LINK(OnRemove, SvTreeListEntry*); - DECL_LINK(OnEdited, SvTreeListEntry*); DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); private: diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index bcb1127f0d4c..bbce39c3ac35 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -95,13 +95,6 @@ namespace svxform :xControl( _rxControl ) { } - void clear() - { - BorderDescriptor::clear(); - UnderlineDescriptor::clear(); - xControl.clear(); - sOriginalHelpText.clear(); - } }; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 227cbd42b621..d8a7557c6509 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -186,7 +186,6 @@ namespace svxform // (es erfolgt KEINE Ueberpruefung, ob dadurch auch tatsaechlich nur hidden Controls bezeichnet werden, dass muss der // Aufrufer sicherstellen) - SvTreeListEntry* focused() const { return m_pFocusEntry; } const ListBoxEntrySet& selected() const { return m_aSelectedEntries; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > hiddenControls() const { return m_aHiddenControlModels; } diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 0e9afbcef127..604a5a49979e 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -250,13 +250,6 @@ public: FmFormData( const FmFormData& rFormData ); virtual ~FmFormData(); - void SetForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm ) - { - m_xForm = xForm; - m_xContainer.set(m_xForm, css::uno::UNO_QUERY); - newObject( m_xForm ); - } - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const { return m_xForm; } const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& GetContainer() const { return m_xContainer; } @@ -351,7 +344,6 @@ namespace svxform ImageList m_aNormalImages; void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& xForms ); - FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent ); void InsertForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm, sal_uInt32 nRelPos); void RemoveForm(FmFormData* pFormData); @@ -442,8 +434,6 @@ namespace svxform bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ? bool m_bKeyboardCut : 1; - - void UpdateContent(); FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName = true ); void NewForm( SvTreeListEntry* pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=TREELIST_APPEND ); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6e8860756f38..edb11f337972 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -58,10 +58,6 @@ class SVX_DLLPRIVATE FmFormPageImpl bool m_bFirstActivation; bool m_bAttemptedFormCreation; - bool m_bInFind; - -protected: - void Init(); public: explicit FmFormPageImpl( FmFormPage& _rPage ); @@ -94,7 +90,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true ); void SetFormsCreationHdl( const Link<>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } - const Link<>& GetFormsCreationHdl() const { return m_aFormsCreationHdl; } protected: /** finds a form with a given data source signature diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e7308fd76d46..12d302bb7819 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -393,7 +393,6 @@ public: SAL_DLLPRIVATE bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;} SAL_DLLPRIVATE bool hasDatabaseBar() const {return m_bDatabaseBar;} - SAL_DLLPRIVATE bool canNavigate() const {return m_xNavigationController.is();} SAL_DLLPRIVATE void ShowSelectionProperties( bool bShow ); SAL_DLLPRIVATE bool IsPropBrwOpen() const; diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 60134c9f3c5a..dc90e721dbe4 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -181,8 +181,6 @@ namespace svx */ void dispose(); - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >& - getFormOperations() const { return m_xFormOperations; } protected: /// dtor virtual ~FormControllerHelper(); @@ -209,10 +207,6 @@ namespace svx { return impl_operateForm_nothrow( _eWhat, 0, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); } - bool impl_operateForm_nothrow( const sal_Int16 _nFeature ) const - { - return impl_operateForm_nothrow( EXECUTE, _nFeature, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); - } private: FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION; diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index bd745d9dfa4e..0db4a8baa11c 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -56,13 +56,6 @@ namespace svxform */ SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const; - /** ensures that a given toolbox is visible - */ - inline void showToolbox( sal_uInt16 _SlotId ) const - { - if ( !isToolboxVisible( _SlotId ) ) - toggleToolbox( _SlotId ); - } }; } diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 441cb1e62b13..d03cb350ed0c 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -62,7 +62,6 @@ public: inline void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); } inline void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); } - inline void SetUIColorGap( bool bUseIt, const Color& rColor ) {maUIStyle.SetColorGap(bUseIt, rColor);} inline const frame::Style& GetUIStyle() const { return maUIStyle; } inline void ClearFocusArea() { maFocusArea.Clear(); } @@ -164,8 +163,6 @@ struct FrameSelectorImpl : public Resource void InitGlobalGeometry(); /** Initializes coordinates of all frame borders. */ void InitBorderGeometry(); - /** Initializes click areas of all enabled frame borders. */ - void InitClickAreas(); /** Draws the entire control into the internal virtual device. */ void InitVirtualDevice(); /** call this to recalculate based on parent size */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index d2af571ef927..e413fa136b86 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -126,13 +126,9 @@ public: sal_uInt16 GetId() const {return m_nId;} bool IsReadOnly() const {return m_bReadOnly;} bool IsAutoValue() const {return m_bAutoValue;} - bool IsUpdating() const {return m_bInSave;} sal_Int16 GetAlignment() const {return m_nAlign;} - sal_Int16 GetType() const {return m_nFieldType;} sal_Int16 GetFieldPos() const {return m_nFieldPos; } bool IsNumeric() const {return m_bNumeric;} - bool IsDateTime() const {return m_bDateTime;} - bool IsObject() const {return m_bObject;} bool IsHidden() const {return m_bHidden;} sal_Int32 GetKey() const {return m_nFormatKey;} const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;} @@ -705,7 +701,6 @@ public: void SetText(const OUString& rText); void SetCommitHdl( const Link<>& rLink ) { m_aCommitLink = rLink; } - const Link<>& GetCommitHdl() const { return m_aCommitLink; } protected: diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index d5270accec0b..4a4084b37e28 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -48,81 +48,14 @@ namespace svxform // (which is checked via the supported interfaces) _all_ members will be set to // void !, even if the object has some of the needed interfaces. - bool is() const { return m_xColumn.is(); } - bool Is() const { return m_xColumn.is(); } - bool supportsUpdate() const { return m_xColumnUpdate.is(); } - DataColumn* operator ->() { return this; } operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); } // 'conversions' - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getPropertySet() const - { - return m_xPropertySet; - } inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& getColumn() const { return m_xColumn; } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& getColumnUpdate() const - { - OSL_ENSURE(m_xColumnUpdate.is() , "DataColumn::getColumnUpdate: NULL!"); - return m_xColumnUpdate; - } - - // das normale queryInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ) - { return m_xColumn->queryInterface(type); } - - // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException ); - inline void setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Any getPropertyValue(const OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - - // ::com::sun::star::sdb::XColumn - inline bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline sal_Int64 getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline float getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline double getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Sequence< sal_Int8 > getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::Date getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::Time getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::util::DateTime getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Any getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - - // XColumnUpdate - inline void updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateString(const OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); }; #endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 1d45b4e35678..9e75dc0e3f08 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -43,23 +43,6 @@ namespace svx _rStrings = m_aStrings; } - - /** returns the OUString with a given local resource id - - @param _nResId - The resource id. It will not be checked if this id exists. - - @return OUString - The string. - */ - OUString getString( sal_uInt16 _nResId ) - { - return ResId(_nResId, *m_pResMgr).toString(); - } - - size_t size() const { return m_aStrings.size(); } - bool empty() const { return m_aStrings.empty(); } - const OUString& operator[]( size_t _index ) const { return m_aStrings[ _index ]; } private: diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index b87cd5299be9..c64309a09cae 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -70,7 +70,6 @@ class SvxPixelCtlAccessibleChild : { SvxPixelCtl& mrParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent; - void IsValid() throw (::com::sun::star::uno::RuntimeException); bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color Point maPoint; Rectangle* mpBoundingBox; @@ -235,19 +234,13 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - /// select child - void SelectChild( Point pos ); - void SelectChild( long nIndex); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild (long nIndex, Point mPoint); - void LoseFocus(); /// @returns true if it's disposed or in disposing inline bool IsAlive() const; - /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive() const; protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; @@ -260,11 +253,6 @@ inline bool SvxPixelCtlAccessible::IsAlive() const return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessible::IsNotAlive() const -{ - return rBHelper.bDisposed || rBHelper.bInDispose; -} - inline bool SvxPixelCtlAccessibleChild::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 88ac821d0560..90f612cd8fae 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -96,8 +96,6 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; - FmFieldWinData* GetData() const {return pData;} - void UpdateContent(FmFormShell*); void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index a1c479855d52..eaadd63ba0a7 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -148,7 +148,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } else if (rsResourceURL.endsWith("/StylesPropertyPanel")) { - pControl = StylesPropertyPanel::Create(pParentWindow, xFrame, pBindings); + pControl = StylesPropertyPanel::Create(pParentWindow, xFrame); } else if (rsResourceURL.endsWith("/ParaPropertyPanel")) { diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index b408123c8e91..7701b79c9639 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -47,7 +47,6 @@ public: void Rearrange(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem* pGradientItem); void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol ); - void SetControlState_Impl(css::awt::GradientStyle eXGS); private: VclPtr<FixedText> maFtTrgrCenterX; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 749070b91c66..87064e08febf 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -96,7 +96,6 @@ private: DECL_LINK( ModifyContrastHdl, void * ); DECL_LINK( ModifyTransHdl, void * ); DECL_LINK( ClickColorModeHdl, void * ); - DECL_LINK( ImplPopupModeEndHdl, FloatingWindow* ); DECL_LINK( RedHdl, void*); DECL_LINK( GreenHdl, void*); DECL_LINK( BlueHdl, void*); diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 9e39384031eb..ae6036c72fcb 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -152,7 +152,6 @@ private: void SelectEndStyle(bool bStart); void SelectLineStyle(); - DECL_LINK(ImplWidthPopupModeEndHdl, FloatingWindow* ); DECL_LINK(ChangeLineStyleHdl, void*); DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); DECL_LINK(ChangeTransparentHdl , void *); diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 12190cab81f4..9e310a9ad1c5 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -8,22 +8,18 @@ namespace svx { namespace sidebar { VclPtr<vcl::Window> StylesPropertyPanel::Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings) + const css::uno::Reference<css::frame::XFrame>& rxFrame) { if (pParent == NULL) throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", NULL, 0); if ( ! rxFrame.is()) throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to StylesPropertyPanel::Create", NULL, 2); - return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame,pBindings); + return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame); } -StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings ) - : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame), - mpBindings(pBindings) +StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame ) + : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame) { } @@ -43,13 +39,6 @@ void StylesPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) } -void StylesPropertyPanel::NotifyItemUpdate ( - const sal_uInt16 /*nSId*/, - const SfxItemState /*eState*/, - const SfxPoolItem* /*pState*/, - const bool /*bIsEnabled*/) -{ -} }} diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 73bc30c8b22c..7408bdf888a0 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -25,26 +25,13 @@ public: static VclPtr<vcl::Window> Create ( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void DataChanged( const DataChangedEvent& rEvent ) SAL_OVERRIDE; - virtual void NotifyItemUpdate( - const sal_uInt16 nSId, - const SfxItemState eState, - const SfxPoolItem* pState, - const bool bIsEnabled); //SAL_OVERRIDE; - StylesPropertyPanel( vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, - SfxBindings* pBindings); - SfxBindings* GetBindings() { return mpBindings; } - -private: - SfxBindings* mpBindings; - //more controls will be added later + const css::uno::Reference<css::frame::XFrame>& rxFrame); }; } } //end of namespace svx::sidebar diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 71da0f146c39..f4dd4f34b77d 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -664,15 +664,6 @@ SfxStyleSheet* Cell::GetStyleSheet() const return 0; } - - -const Rectangle& Cell::GetCurrentBoundRect() const -{ - return maCellRect; -} - - - void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const { rAnchorRect.Left() = maCellRect.Left() + GetTextLeftDistance(); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 66cc5a7427bd..4ddf5234604f 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -76,7 +76,6 @@ public: OutlinerParaObject* GetEditOutlinerParaObject() const; SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual const Rectangle& GetCurrentBoundRect() const; SVX_DLLPRIVATE virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const SAL_OVERRIDE; diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 0592f58637a1..793d7f641510 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -59,7 +59,6 @@ private: const OUString msExtrusionProjection; DECL_LINK( SelectHdl, void * ); - void FillValueSet(); void implSetDirection( sal_Int32 nSkew, bool bEnabled = true ); void implSetProjection( sal_Int32 nProjection, bool bEnabled = true ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index cb0715591e16..3b8140f7dce9 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -46,9 +46,7 @@ public: private: DECL_LINK( DictionaryHdl, void* ); - DECL_LINK( CommonTermsHdl, void* ); DECL_LINK( OkHdl, void* ); - void impl_UpdateVariantsCheckBox(); private: VclPtr<RadioButton> m_pRB_To_Simplified; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index bf9dcd1c613a..19453289d593 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -260,12 +260,9 @@ public: // IAccessibleViewForwarder - virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; - virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; - virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; // IAccessibleParent virtual bool ReplaceChild ( diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0716234e84fb..5bbf0db11f43 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -3115,11 +3115,6 @@ void SwAccessibleMap::FireEvents() } -bool SwAccessibleMap::IsValid() const -{ - return true; -} - Rectangle SwAccessibleMap::GetVisibleArea() const { MapMode aSrc( MAP_TWIP ); @@ -3164,40 +3159,6 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize ) const return aSize; } -Point SwAccessibleMap::PixelToLogic( const Point& rPoint ) const -{ - Point aPoint; - vcl::Window *pWin = GetShell()->GetWin(); - if( pWin ) - { - aPoint = pWin->ScreenToOutputPixel( rPoint ); - MapMode aMapMode; - GetMapMode( aPoint, aMapMode ); - aPoint = pWin->PixelToLogic( aPoint, aMapMode ); - MapMode aSrc( MAP_TWIP ); - MapMode aDest( MAP_100TH_MM ); - aPoint = OutputDevice::LogicToLogic( aPoint, aSrc, aDest ); - } - - return aPoint; -} - -Size SwAccessibleMap::PixelToLogic( const Size& rSize ) const -{ - Size aSize; - if( GetShell()->GetWin() ) - { - MapMode aMapMode; - GetMapMode( Point(0,0), aMapMode ); - aSize = GetShell()->GetWin()->PixelToLogic( rSize, aMapMode ); - MapMode aSrc( MAP_TWIP ); - MapMode aDest( MAP_100TH_MM ); - aSize = OutputDevice::LogicToLogic( aSize, aSrc, aDest ); - } - - return aSize; -} - bool SwAccessibleMap::ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, const uno::Reference< drawing::XShape >& _rxShape, |