diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-14 11:27:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-14 10:21:55 +0000 |
| commit | 06ea347b939895d3091ce747c26de58f4d4a766a (patch) | |
| tree | e93a25d2aadc36c263a8ccd8b593449b37fb8b6b /include/svtools | |
| parent | 9be8c4f21200aeec5b334d9536b3b7a0b72c24fa (diff) | |
loplugin:unusedmethods svtools
Change-Id: I04ad31055c04a247faddf4311943ca769051473c
Reviewed-on: https://gerrit.libreoffice.org/17032
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/svtools')
49 files changed, 33 insertions, 498 deletions
diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 017094cd6f63..66ddf499b229 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -56,8 +56,6 @@ public: void SetSelectionInReadonly(bool bSet); void SetAutoDetectSystemHC(bool bSet); - bool IsModified() const; - //SfxListener: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void SetVCLSettings(); diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 6b85734ed23c..d5d838f309d7 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -62,8 +62,6 @@ public: virtual sal_Int32 GetCurrentRow() const = 0; /** @return The position of the current column. */ virtual sal_Int32 GetCurrentColumn() const = 0; - /** Creates and returns the accessible object of the whole GridControl. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0; virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0; virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0; @@ -95,7 +93,6 @@ public: virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; virtual long GetRowCount() const= 0; virtual long GetColumnCount() const= 0; - virtual bool HasRowHeader() const= 0; virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; virtual Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0; @@ -108,7 +105,6 @@ public: virtual OUString GetRowName(sal_Int32 _nIndex) const = 0; virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; virtual OUString GetColumnName( sal_Int32 _nIndex ) const = 0; - virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; @@ -146,16 +142,6 @@ public: */ virtual bool isAlive() const = 0; - /** returns the accessible object for the row or the column header bar - */ - virtual css::uno::Reference< css::accessibility::XAccessible > - getTableHeader( ::svt::table::AccessibleTableControlObjType _eObjType ) = 0; - - /** returns the accessible object for the table representation - */ - virtual css::uno::Reference< css::accessibility::XAccessible > - getTable() = 0; - /** commits the event at all listeners of the cell @param nEventId the event id diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index 24549892db82..6e460ec11c0b 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -69,8 +69,6 @@ public: /** @return <TRUE/>, if the object has a row header. */ virtual bool HasRowHeader() const = 0; //GetColumnId - /** @return <TRUE/>, if the object can focus a cell. */ - virtual bool IsCellFocusable() const = 0; virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual void SetNoSelection() = 0; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 33bbeb6353c9..815d57d36468 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -116,7 +116,6 @@ namespace svt void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); static void implSelectField(ListBox* _pBox, const OUString& _rText); - void initalizeListBox(ListBox* _pList); void resetTables(); void resetFields(); diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 26a4413782a6..ae32a48c5d83 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -77,7 +77,6 @@ public: void SetApplicationDefaults ( Application* pApp ); - void SetMenuMouseFollow(bool bSet) {bMenuMouseFollow = bSet; SetModified();} bool IsMenuMouseFollow() const{return bMenuMouseFollow;} #if defined( UNX ) diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index 449a4db81b4c..862bd3fc0351 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -68,8 +68,6 @@ public: void operator=( const Link<>& rLink ) { _aLink = rLink; } void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false ); void ClearPendingCall( ); - bool IsSet() const { return _aLink.IsSet(); } - Link<> GetLink() const { return _aLink; } }; } diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 610eb57cc358..ca356d45ce26 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -402,10 +402,8 @@ protected: GetDataFlavors() const; bool IsDropFormatSupported( SotClipboardFormatId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... - bool IsDropFormatSupported( SotClipboardFormatId nFormat ) const; bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ... - bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ) const; private: void* implGetDataFlavors() const; @@ -471,11 +469,9 @@ public: const vcl::Font& GetFont() const { return pDataWin->GetFont(); } void SetTitleFont( const vcl::Font& rNewFont ) { Control::SetFont( rNewFont ); } - const vcl::Font& GetTitleFont() const { return Control::GetFont(); } // color for line painting void SetGridLineColor(const Color& rColor) {aGridLineColor = rColor;} - const Color& GetGridLineColor() const {return aGridLineColor;} // inserting, changing, removing and freezing of columns void InsertHandleColumn( sal_uLong nWidth ); @@ -486,7 +482,6 @@ public: void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth ); void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ); void FreezeColumn( sal_uInt16 nColumnId, bool bFreeze = true ); - void UnfreezeColumns(); void RemoveColumn( sal_uInt16 nColumnId ); void RemoveColumns(); @@ -494,7 +489,6 @@ public: void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; void SetTitleLines( sal_uInt16 nLines ); - sal_uInt16 GetTitleLines() const { return nTitleLines; } long GetTitleHeight() const; // access to dynamic values of cursor row @@ -506,7 +500,6 @@ public: bool IsFrozen( sal_uInt16 nColumnId ) const; // movement of visible area - void ResetScroll(); long ScrollColumns( long nColumns ); long ScrollRows( long nRows ); bool MakeFieldVisible( long nRow, sal_uInt16 nColId, bool bComplete = false ); @@ -569,8 +562,6 @@ public: BrowserMode GetMode( ) const { return m_nCurrentMode; } void SetCursorColor(const Color& _rCol); - Color GetCursorColor() const { return m_aCursorColor; } - void ResetSelecting() { bSelecting = false; } /** specifies that the user is allowed to interactively change the height of a row, by simply dragging an arbitrary row separator. @@ -799,7 +790,6 @@ public: virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; virtual bool HasRowHeader() const SAL_OVERRIDE; - virtual bool IsCellFocusable() const SAL_OVERRIDE; virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) SAL_OVERRIDE; virtual bool IsColumnSelected( long _nColumn ) const SAL_OVERRIDE; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 4bc14ad3b89e..c1b391c95266 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -283,80 +283,33 @@ public: void DoubleClick(); void Select(); - const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } - void SelectDate( const Date& rDate, bool bSelect = true ); void SetNoSelection(); bool IsDateSelected( const Date& rDate ) const; Date GetFirstSelectedDate() const; void EnableCallEverySelect( bool bEvery = true ) { mbAllSel = bEvery; } - bool IsCallEverySelectEnabled() const { return mbAllSel; } - sal_uInt16 GetRequestYear() const { return mnRequestYear; } void SetCurDate( const Date& rNewDate ); - Date GetCurDate() const { return maCurDate; } void SetFirstDate( const Date& rNewFirstDate ); Date GetFirstDate() const { return maFirstDate; } Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - sal_uLong GetDayCount() const { return mnDayCount; } Date GetFirstMonth() const; Date GetLastMonth() const; sal_uInt16 GetMonthCount() const; bool GetDate( const Point& rPos, Date& rDate ) const; Rectangle GetDateRect( const Date& rDate ) const; - long GetCurMonthPerLine() const { return mnMonthPerLine; } - long GetCurLines() const { return mnLines; } - - const Color& GetStandardColor() const; - const Color& GetSaturdayColor() const; - const Color& GetSundayColor() const; - void StartSelection(); void EndSelection(); bool IsTravelSelect() const { return mbTravelSelect; } - bool IsScrollDateRangeChanged() const { return mbScrollDateRange; } - bool IsSelectLeft() const { return mbSelLeft; } Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; - void SetSelectionChangingHdl( const Link<>& rLink ) { maSelectionChangingHdl = rLink; } - const Link<>& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } - void SetDateRangeChangedHdl( const Link<>& rLink ) { maDateRangeChangedHdl = rLink; } - const Link<>& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } - void SetRequestDateInfoHdl( const Link<>& rLink ) { maRequestDateInfoHdl = rLink; } - const Link<>& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } - void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } - const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const { return maSelectHdl; } }; -inline const Color& Calendar::GetStandardColor() const -{ - if ( mpStandardColor ) - return *mpStandardColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSaturdayColor() const -{ - if ( mpSaturdayColor ) - return *mpSaturdayColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSundayColor() const -{ - if ( mpSundayColor ) - return *mpSundayColor; - else - return GetFont().GetColor(); -} /************************************************************************* @@ -428,19 +381,8 @@ public: VclPtr<Calendar> CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); - void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } - Date GetDefaultDate() const { return maDefaultDate; } - void EnableToday( bool bToday = true ) { mbToday = bToday; } - bool IsTodayEnabled() const { return mbToday; } void EnableNone( bool bNone = true ) { mbNone = bNone; } - bool IsNoneEnabled() const { return mbNone; } - - void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } - WinBits GetCalendarStyle() const { return mnCalendarStyle; } - - void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const { return maSelectHdl; } protected: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index a38f00940fb2..5782394d030c 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -160,21 +160,20 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; using ListBox::InsertEntry; - sal_Int32 InsertEntry( const OUString& rStr, + sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); - sal_Int32 InsertEntry( const Color& rColor, const OUString& rStr, + sal_Int32 InsertEntry( const Color& rColor, const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); void InsertAutomaticEntryColor(const Color &rAutoColorValue); bool IsAutomaticSelected() { return !GetSelectEntryPos(); } using ListBox::RemoveEntry; - void RemoveEntry( sal_Int32 nPos ); - void Clear(); + void RemoveEntry( sal_Int32 nPos ); + void Clear(); void CopyEntries( const ColorListBox& rBox ); using ListBox::GetEntryPos; - sal_Int32 GetEntryPos( const Color& rColor ) const; - Color GetEntryColor( sal_Int32 nPos ) const; - Size GetImageSize() const { return aImageSize; } + sal_Int32 GetEntryPos( const Color& rColor ) const; + Color GetEntryColor( sal_Int32 nPos ) const; void SelectEntry( const OUString& rStr, bool bSelect = true ) { ListBox::SelectEntry( rStr, bSelect ); } @@ -197,9 +196,6 @@ public: private: ColorListBox( const ColorListBox& ) SAL_DELETED_FUNCTION; ColorListBox& operator =( const ColorListBox& ) SAL_DELETED_FUNCTION; - - void SetEntryData( sal_Int32 nPos, void* pNewData ); - void* GetEntryData( sal_Int32 nPos ) const; }; inline void ColorListBox::SelectEntry( const Color& rColor, bool bSelect ) @@ -328,29 +324,15 @@ public: ColorDistFunc pColorDistFn = &sameDistColor); using ListBox::GetEntryPos; - sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; - sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; + sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; + sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; - void SelectEntry( const OUString& rStr, bool bSelect = true ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, bool bSelect = true ); - sal_uInt16 GetSelectEntryStyle( sal_Int32 nSelIndex = 0 ) const; - bool IsEntrySelected(const OUString& rStr) const - { - return ListBox::IsEntrySelected(rStr); - } - bool IsEntrySelected( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const - { - sal_Int32 nPos = GetEntryPos( nStyle ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nPos ); - else - return false; - } + void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, bool bSelect = true ); + sal_uInt16 GetSelectEntryStyle( sal_Int32 nSelIndex = 0 ) const; inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - inline FieldUnit GetUnit() const { return eUnit; } + inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } - inline FieldUnit GetSourceUnit() const { return eSourceUnit; } void SetColor( const Color& rColor ); Color GetColor() const { return aColor; } @@ -365,8 +347,6 @@ protected: private: LineListBox( const LineListBox& ) SAL_DELETED_FUNCTION; LineListBox& operator =( const LineListBox& ) SAL_DELETED_FUNCTION; - void SetEntryData( sal_Int32 nPos, void* pNewData ); - void* GetEntryData( sal_Int32 nPos ) const; }; inline void LineListBox::SetColor( const Color& rColor ) @@ -417,7 +397,6 @@ public: void Fill( const FontList* pList ); void EnableWYSIWYG( bool bEnable = true ); - bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } private: void InitFontMRUEntriesFile(); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index c6be1c49acf7..edda87f8c4f7 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -164,8 +164,6 @@ public: FontList* Clone() const; - OutputDevice* GetDevice() const { return mpDev; } - OutputDevice* GetDevice2() const { return mpDev2; } OUString GetFontMapText( const vcl::FontInfo& rInfo ) const; const OUString& GetNormalStr() const { return maNormal; } diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index c46f6744baaf..c0841f13dafe 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -112,7 +112,6 @@ namespace svt void reset(); private: - void impl_Init(); void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 16338a8e7688..d2294f4ad074 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -140,7 +140,6 @@ namespace svt virtual void SetSelection( const Selection& _rSelection ) = 0; virtual void ReplaceSelected( const OUString& _rStr ) = 0; - virtual void DeleteSelected() = 0; virtual OUString GetSelected( LineEnd aSeparator ) const = 0; virtual void SetModified() = 0; @@ -176,7 +175,6 @@ namespace svt virtual void SetSelection( const Selection& _rSelection ) SAL_OVERRIDE; virtual void ReplaceSelected( const OUString& _rStr ) SAL_OVERRIDE; - virtual void DeleteSelected() SAL_OVERRIDE; virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; virtual void SetModified() SAL_OVERRIDE; @@ -297,10 +295,8 @@ namespace svt virtual void Resize() SAL_OVERRIDE; void SetClickHdl(const Link<>& rHdl) {m_aClickLink = rHdl;} - const Link<>& GetClickHdl() const {return m_aClickLink;} void SetModifyHdl(const Link<>& rHdl) {m_aModifyLink = rHdl;} - const Link<>& GetModifyHdl() const {return m_aModifyLink;} CheckBox& GetBox() {return *pBox;}; @@ -501,9 +497,7 @@ namespace svt protected: VclPtr<BrowserHeader> pHeader; - bool isGetCellFocusPending() const { return nStartEvent != 0; } void cancelGetCellFocus() { if (nStartEvent) Application::RemoveUserEvent(nStartEvent); nStartEvent = 0; } - void forceGetCellFocus() { cancelGetCellFocus(); LINK(this, EditBrowseBox, StartEditHdl).Call(nullptr); } BrowserMouseEventPtr& getMouseEvent() { return aMouseEvent; } diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index 4140388fcea4..f6a98a6ad80d 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -87,13 +87,6 @@ void GenericEditImplementation< EDIT >::ReplaceSelected( const OUString& _rStr ) template <class EDIT> -void GenericEditImplementation< EDIT >::DeleteSelected() -{ - m_rEdit.DeleteSelected(); -} - - -template <class EDIT> OUString GenericEditImplementation< EDIT >::GetSelected( LineEnd ) const { return m_rEdit.GetSelected( ); diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index a0340b86be8b..8038b78f7a73 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -85,23 +85,8 @@ public: void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - void SetOpenDialog( bool bOpen ) { mbOpenDlg = bOpen; } - bool IsOpenDialog() const { return mbOpenDlg; } - void SetText( const OUString& rStr ) SAL_OVERRIDE; OUString GetText() const SAL_OVERRIDE; - OUString GetSelectedText() const { return maEdit->GetSelected(); } - - void SetSelection( const Selection& rSelection ) { maEdit->SetSelection( rSelection ); } - Selection GetSelection() const { return maEdit->GetSelection(); } - - void SetReadOnly( bool bReadOnly = true ) { maEdit->SetReadOnly( bReadOnly ); } - bool IsReadOnly() const { return maEdit->IsReadOnly(); } - - - //use this to manipulate the dialog bevore executing it: - void SetDialogCreatedHdl( const Link<>& rLink ) { maDialogCreatedHdl = rLink; } - const Link<>& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } void SetEditModifyHdl( const Link<>& rLink ); }; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 09affbebaf75..6bb64157d74b 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -92,7 +92,6 @@ public: void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; void SetSortColumn( bool bValue ) { bSortColumn = bValue; } - bool GetSortColumn() { return bSortColumn; } /** initialize the view with the content of a folder given by URL, and apply an immediate filter diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 562cf5ca14f5..ce5e154ccfa5 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -112,8 +112,6 @@ public: double GetValue(); // The default implementation uses a formatter, if available - void GetColor() const; - void SetTextValue(const OUString& rText); // The String is transformed to a double (with a formatter) and SetValue is called afterwards @@ -202,7 +200,6 @@ public: // red), the text is painted with that color automatically. // The color used is the same as returned by GetLastOutputColor() void SetAutoColor(bool _bAutomatic); - bool GetAutoColor() const { return m_bAutoColor; } /** enables handling of not-a-number value. @@ -219,7 +216,6 @@ public: return NaN in subsequent calls. */ void EnableNotANumber( bool _bEnable ); - bool IsNotANumberEnabled( ) const { return m_bEnableNaN; } /** When being set to true, the strings in the field are formatted using the InputLine format. That's also what you get in Calc when you edit a cell diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index d585ec4b82c9..dee8a52d89cd 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -51,7 +51,6 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu void addStatusListener( const OUString& aCommandURL ); void bindListener(); void unbindListener(); - bool isBound() const; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 4aca5db8b269..70f635f6126a 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -209,7 +209,6 @@ private: const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplAutoSwapIn(); - bool SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } bool SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, @@ -343,7 +342,6 @@ public: bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); void SetSwapStreamHdl(const Link<>& rHdl); - sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } void FireSwapInRequest(); void FireSwapOutRequest(); @@ -414,7 +412,6 @@ public: const MapMode& GetPrefMapMode() const { return maPrefMapMode; } sal_uLong GetSizeBytes() const { return mnSizeBytes; } bool IsTransparent() const { return mbTransparent; } - bool IsAlpha() const { return mbAlpha; } bool IsAnimated() const { return mbAnimated; } bool IsEPS() const { return mbEPS; } diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index cbf057bfc86f..b7a75049bd20 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -313,9 +313,7 @@ public: void Clear(); void SetOffset( long nNewOffset = 0 ); - long GetOffset() const { return mnOffset; } inline void SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; } - long GetDragSize() const { return mnDragSize; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -324,9 +322,7 @@ public: Rectangle GetItemRect( sal_uInt16 nItemId ) const; sal_uInt16 GetCurItemId() const { return mnCurItemId; } long GetDragPos() const { return mnDragPos; } - sal_uInt16 GetItemDragPos() const { return mnItemDragPos; } bool IsItemMode() const { return mbItemMode; } - bool IsItemDrag() const { return mbItemDrag; } void SetItemSize( sal_uInt16 nItemId, long nNewSize ); long GetItemSize( sal_uInt16 nItemId ) const; @@ -341,23 +337,15 @@ public: Size CalcWindowSizePixel() const; - inline void SetHelpText( const OUString& rText ) { Window::SetHelpText( rText ); } - inline const OUString& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - inline const OString& GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } + inline void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; } - inline const Link<>& GetStartDragHdl() const { return maStartDragHdl; } inline void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; } - inline const Link<>& GetDragHdl() const { return maDragHdl; } inline void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; } - inline const Link<>& GetEndDragHdl() const { return maEndDragHdl; } inline void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - inline const Link<>& GetSelectHdl() const { return maSelectHdl; } inline void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } - inline const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } inline void SetCreateAccessibleHdl( const Link<>& rLink ) { maCreateAccessibleHdl = rLink; } - inline const Link<>& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; } inline bool IsDragable() const { return mbDragable; } diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 2ee42485b7df..ad61c58bf2f9 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -70,15 +70,10 @@ namespace svt void SetInteractive( bool _bInteractive ); void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } - const Link<>& GetClickHdl() const { return maClickHdl; } Size CalcMinimumSize( long nMaxWidth = 0 ) const; private: - - DECL_LINK(ImplClickHdl, HyperLabel*); - - private: using FixedText::CalcMinimumSize; }; } diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index 8b6b194019c3..92a28d7063f7 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -57,9 +57,6 @@ public: Point GetCenter( bool bPixelCoords = true ) const; sal_uLong GetRadius( bool bPixelCoords = true ) const; - // returns the BoundRect of the circle object in 1/100mm - virtual Rectangle GetBoundRect() const SAL_OVERRIDE; - void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 5fcd543e6383..f604b863cc71 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -95,8 +95,6 @@ public: void Write ( SvStream& rOStm, const OUString& rBaseURL ) const; void Read( SvStream& rIStm, const OUString& rBaseURL ); - virtual Rectangle GetBoundRect() const = 0; - const OUString& GetURL() const { return aURL; } void SetURL( const OUString& rURL ) { aURL = rURL; } @@ -120,26 +118,8 @@ public: // IMap-Events inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } - - inline const SvxMacro& GetEvent( sal_uInt16 nEvent ) const; - inline bool HasEvent( sal_uInt16 nEvent ) const; - void SetEvent( sal_uInt16 nEvent, const SvxMacro& ); - inline bool DelEvent( sal_uInt16 nEvent ); }; -inline bool IMapObject::HasEvent( sal_uInt16 nEvent ) const -{ - return aEventList.IsKeyValid( nEvent ); -} -inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const -{ - return *(aEventList.Get( nEvent )); -} -inline bool IMapObject::DelEvent( sal_uInt16 nEvent ) -{ - return aEventList.Erase( nEvent ); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 79ca52a0a1c7..547b3866958a 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -40,8 +40,6 @@ protected: virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; - bool ReadPreProLine( SvStream& rIStm, OUString& rStr ); - public: IMapPolygonObject() : bEllipse(false) {} IMapPolygonObject( const Polygon& rPoly, @@ -59,9 +57,6 @@ public: Polygon GetPolygon( bool bPixelCoords = true ) const; - // liefert das BoundRect des Polygon-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aPoly.GetBoundRect(); } - bool HasExtraEllipse() const { return bEllipse; } const Rectangle& GetExtraEllipse() const { return aEllipse; } void SetExtraEllipse( const Rectangle& rEllipse ); diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 632d38efcbc8..3b3f332a4caf 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -55,9 +55,6 @@ public: Rectangle GetRectangle( bool bPixelCoords = true ) const; - // returns the BoundRect of the rectangle object in 1/100mm - virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; } - void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index 22a4f5628165..db061d6a0d4e 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -35,16 +35,6 @@ class INetImage OUString aAlternateText; Size aSizePixel; -protected: - OUString CopyExchange() const; - void PasteExchange( const OUString& rString ); - - void SetImageURL( const OUString& rS ) { aImageURL = rS; } - void SetTargetURL( const OUString& rS ) { aTargetURL = rS; } - void SetTargetFrame( const OUString& rS ) { aTargetFrame = rS; } - void SetAlternateText( const OUString& rS ){ aAlternateText = rS; } - void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; } - public: INetImage( const OUString& rImageURL, @@ -64,8 +54,6 @@ public: const OUString& GetImageURL() const { return aImageURL; } const OUString& GetTargetURL() const { return aTargetURL; } const OUString& GetTargetFrame() const { return aTargetFrame; } - const OUString& GetAlternateText() const { return aAlternateText; } - const Size& GetSizePixel() const { return aSizePixel; } // Im-/Export bool Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 1fc1c9786837..136be9427ddb 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -121,7 +121,6 @@ public: SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, SvxIconViewFlags nFlags = SvxIconViewFlags::NONE ); ~SvxIconChoiceCtrlEntry () {} - void SetImage ( const Image& rImage ) { aImage = rImage; } Image GetImage () const { return aImage; } void SetText ( const OUString& rText ) { aText = rText; } OUString GetText () const { return aText; } @@ -131,23 +130,14 @@ public: void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } void* GetUserData () { return pUserData; } - const Rectangle & GetBoundRect() const { return aRect; } - - void SetFocus ( bool bSet ) - { nFlags = ( bSet ? nFlags | SvxIconViewFlags::FOCUSED : nFlags & ~SvxIconViewFlags::FOCUSED ); } - SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } SvxIconViewFlags GetFlags() const { return nFlags; } bool IsSelected() const { return bool(nFlags & SvxIconViewFlags::SELECTED); } bool IsFocused() const { return bool(nFlags & SvxIconViewFlags::FOCUSED); } - bool IsInUse() const { return bool(nFlags & SvxIconViewFlags::IN_USE); } bool IsCursored() const { return bool(nFlags & SvxIconViewFlags::CURSORED); } bool IsDropTarget() const { return bool(nFlags & SvxIconViewFlags::DROP_TARGET); } bool IsBlockingEmphasis() const { return bool(nFlags & SvxIconViewFlags::BLOCK_EMPHASIS); } bool IsPosLocked() const { return bool(nFlags & SvxIconViewFlags::POS_LOCKED); } - // Only set at AutoArrange. The head of the list is accessible via SvxIconChoiceCtrl::GetPredecessorHead - SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } - SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } }; enum SvxIconChoiceCtrlColumnAlign @@ -171,17 +161,8 @@ public: nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); - void SetText( const OUString& rText ) { aColText = rText; } - void SetImage( const Image& rImg ) { aColImage = rImg; } void SetWidth( long nWd ) { nWidth = nWd; } - void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } - void SetSubItem( sal_uInt16 nSub) { nSubItem = nSub; } - - const OUString& GetText() const { return aColText; } - const Image& GetImage() const { return aColImage; } long GetWidth() const { return nWidth; } - SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } - sal_uInt16 GetSubItem() const { return nSubItem; } }; @@ -326,7 +307,6 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); #endif - void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } bool AutoFontColor () { return _bAutoFontColor; } Point GetPixelPos( const Point& rPosLogic ) const; diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 6e321d26dfea..7c660e6f7e99 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -83,9 +83,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options sal_Int16 GetToolboxStyle() const; void SetToolboxStyle( sal_Int16 nStyle ); - bool IsModifyByPrinting() const; - void SetModifyByPrinting(bool bSet ); - bool UseSystemPrintDialog() const; void SetUseSystemPrintDialog( bool bSet ); diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 8195bea192ac..ee5c41979f89 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -167,15 +167,12 @@ public: bool IsNewDoc() const { return bNewDoc; } bool IsInHeader() const { return bIsInHeader; } - bool IsInBody() const { return bIsInBody; } bool IsReadListing() const { return bReadListing; } bool IsReadXMP() const { return bReadXMP; } bool IsReadPRE() const { return bReadPRE; } bool IsReadScript() const { return bReadScript; } bool IsReadStyle() const { return bReadStyle; } - void SetReadNextChar() { bReadNextChar = true; } - // start PRE-/LISTING or XMP mode or filter tags respectively inline void StartPRE( bool bRestart=false ); void FinishPRE() { bReadPRE = false; } @@ -200,10 +197,6 @@ public: // NextToken yourself, you should call this method beforehand. int FilterToken( int nToken ); - // end scanning of a script (should only be called right after - // reading of a <SCRIPT>) - void EndScanScript() { bReadScript = false; } - void ReadRawData( const OUString &rEndToken ) { aEndToken = rEndToken; } // Token without \-sequences diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 7a78c12591cb..6eb58d92a68a 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -64,16 +64,11 @@ protected: rtl_TextEncoding GetCodeSet() const { return eCodeSet; } void SetEncoding( rtl_TextEncoding eEnc ); - rtl_TextEncoding GetUNICodeSet() const { return eUNICodeSet; } - void SetUNICodeSet( rtl_TextEncoding eSet ) { eUNICodeSet = eSet; } - public: SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers - int GetOpenBrakets() const { return nOpenBrakets; } - // fuers asynchrone lesen aus dem SvStream virtual void Continue( int nToken ) SAL_OVERRIDE; }; diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 60dd06511029..c800470f4ccf 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -109,7 +109,6 @@ namespace svt static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); - virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); static OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 34c081b64e16..e1ca5db312c6 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -54,7 +54,6 @@ private: SVT_DLLPRIVATE void ImplSetInfo(); DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplOptionsHdl, void* ); DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 27b1380af08f..87908e1d8711 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -733,11 +733,9 @@ public: void Activate() SAL_OVERRIDE; void Deactivate() SAL_OVERRIDE; - bool IsActive() const { return mbActive; } void SetWinPos( long nOff = 0, long nWidth = 0 ); long GetWinOffset() const { return mnWinOff; } - long GetWinWidth() const { return mnWinWidth; } void SetPagePos( long nOff = 0, long nWidth = 0 ); long GetPageOffset() const; void SetBorderPos( long nOff = 0 ); @@ -747,16 +745,10 @@ public: void SetUnit( FieldUnit eNewUnit ); FieldUnit GetUnit() const { return meUnit; } void SetZoom( const Fraction& rNewZoom ); - Fraction GetZoom() const { return maZoom; } void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } - MapUnit GetSourceUnit() const { return meSourceUnit; } void SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle = 0 ); - RulerExtra GetExtraType() const { return meExtraType; } - sal_uInt16 GetExtraStyle() const { return mnExtraStyle; } - sal_uInt16 GetExtraClicks() const { return mnExtraClicks; } - sal_uInt16 GetExtraModifier() const { return mnExtraModifier; } bool StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType = RULER_TYPE_DONTKNOW ); @@ -771,7 +763,6 @@ public: void CancelDrag(); long GetClickPos() const { return mnDragPos; } RulerType GetClickType() const { return meDragType; } - sal_uInt16 GetClickAryPos() const { return mnDragAryPos; } RulerSelection GetHoverSelection() const { return maHoverSelection; } @@ -794,8 +785,6 @@ public: void SetIndents( sal_uInt32 n = 0, const RulerIndent* pIndentAry = NULL ); void SetTabs( sal_uInt32 n = 0, const RulerTab* pTabAry = NULL ); - sal_uInt32 GetTabCount() const; - const RulerTab* GetTabs() const; static void DrawTab(vcl::RenderContext& rRenderContext, const Color &rFillColor, const Point& rPos, sal_uInt16 nStyle); @@ -803,18 +792,8 @@ public: void SetStyle( WinBits nStyle ); WinBits GetStyle() const { return mnWinStyle; } - void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; } const Link<>& GetStartDragHdl() const { return maStartDragHdl; } - void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; } - const Link<>& GetDragHdl() const { return maDragHdl; } - void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; } - const Link<>& GetEndDragHdl() const { return maEndDragHdl; } - void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } - const Link<>& GetClickHdl() const { return maClickHdl; } void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } - const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetExtraDownHdl( const Link<>& rLink ) { maExtraDownHdl = rLink; } - const Link<>& GetExtraDownHdl() const { return maExtraDownHdl; } void SetTextRTL(bool bRTL); bool GetTextRTL(); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 90346fbba9b4..0914396394b2 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -119,18 +119,9 @@ public: CommandEvent GetCommandEvent()const { return aCEvt;} inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } - void SetCommandHdl( const Link<>& rLink ) { aCommandLink = rLink; } - const Link<>& GetCommandHdl() const { return aCommandLink; } void SetHeaderBarClickHdl( const Link<>& rLink ) { aHeaderBarClickLink = rLink; } - const Link<>& GetHeaderBarClickHdl() const { return aHeaderBarClickLink; } - - void SetHeaderBarDblClickHdl( const Link<>& rLink ) { aHeaderBarDblClickLink = rLink; } - const Link<>& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - - void SetHeaderBarHelpId(const OString& rHelpId) { aHeaderBar->SetHelpId(rHelpId); } - HeaderBar& GetTheHeaderBar() { return *aHeaderBar.get(); } }; diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index 8628411e0810..4e9c0fb6f096 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -117,9 +117,6 @@ public: const OUString& GetCurName() const { return maCurName; } void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; } - const Link<>& GetHighlightHdl() const { return maHighlightHdl; } }; class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu @@ -143,9 +140,6 @@ public: long GetCurHeight() const { return mnCurHeight; } void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; } - const Link<>& GetHighlightHdl() const { return maHighlightHdl; } }; #endif // INCLUDED_SVTOOLS_STDMENU_HXX diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 5811b1a8a5c0..2aa8e6355022 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -81,7 +81,6 @@ public: long Width(); long Height(); void SetLink( const Link<>& rLink) { aLink=rLink; } - const Link<>& GetLink() const { return aLink; } bool IsRadio(); // as buttons are not derived from LinkHdl void CallLink(); @@ -89,8 +88,6 @@ public: void StoreButtonState( SvTreeListEntry* pEntry, SvItemStateFlags nItemFlags ); static SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ); - SvButtonState GetActButtonState() const { return eState; } - SvTreeListEntry* GetActEntry() const; void SetImage(SvBmp nIndex, const Image& aImage) { aBmps[(int)nIndex] = aImage; } @@ -217,10 +214,6 @@ public: // Check whether this button can be modified via UI bool CheckModification() const; - SvLBoxButtonData* GetButtonData() const - { - return pData; - } }; inline void SvLBoxButton::SetStateChecked() @@ -276,7 +269,6 @@ public: bool SetModeImages(const Image& rBitmap1, const Image& rBitmap2); - void GetModeImages(Image& rBitmap1, Image& rBitmap2) const; inline void SetBitmap1(const Image& rImage); inline void SetBitmap2(const Image& rImage); diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 75ab3be3d83f..b15580e6fc47 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -95,7 +95,6 @@ protected: // methods for Token stack int SkipToken( short nCnt = -1 ); // "skip" n Tokens back TokenStackType* GetStackPtr( short nCnt ); - inline sal_uInt8 GetStackPos() const; // scan the next token: // work off Token stack and call _GetNextToken() if necessary. @@ -138,14 +137,11 @@ public: Link<> GetAsynchCallLink() const { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); } - long CallAsyncCallLink() { return NewDataRead( 0 ); } - // for asynchronous reading from the SvStream void SaveState( int nToken ); void RestoreState(); virtual void Continue( int nToken ); - inline void SetDownloadingFile( bool bSet ) { bDownloadingFile = bSet; } inline bool IsDownloadingFile() const { return bDownloadingFile; } // Set/get source encoding. The UCS2BEncoding flag is valid if source @@ -153,9 +149,6 @@ public: void SetSrcEncoding( rtl_TextEncoding eSrcEnc ); rtl_TextEncoding GetSrcEncoding() const { return eSrcEnc; } - void SetSrcUCS2BEncoding( bool bSet ) { bUCS2BSrcEnc = bSet; } - bool IsSrcUCS2BEncoding() const { return bUCS2BSrcEnc; } - // May the character set be switched to UCS/2, if a BOM // is in the first two characters of the stream? void SetSwitchToUCS2( bool bSet ) { bSwitchToUCS2 = bSet; } @@ -186,9 +179,6 @@ inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum ) inline sal_uLong SvParser::SetLinePos( sal_uLong nlPos ) { sal_uLong nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } -inline sal_uInt8 SvParser::GetStackPos() const -{ return nTokenStackPos; } - inline sal_uInt16 SvParser::GetCharSize() const { return (RTL_TEXTENCODING_UCS2 == eSrcEnc) ? 2 : 1; @@ -235,9 +225,6 @@ public: */ const OUString& GetKey() const { return m_aKey; } const OUString& GetValue() const { return m_aValue; } - - void SetKey (const OUString &rKey ) { m_aKey = rKey; } - void SetValue (const OUString &rValue) { m_aValue = rValue; } }; /*======================================================================== diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 0ec02ed53ad8..519196c79066 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -186,7 +186,6 @@ public: /** @return <TRUE/>, if the object has a row header. */ virtual bool HasRowHeader() const SAL_OVERRIDE; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual bool IsCellFocusable() const SAL_OVERRIDE; virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; virtual void SetNoSelection() SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 9d0ee92437c4..664738fbc857 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -315,8 +315,6 @@ class SVT_DLLPUBLIC TabBar : public vcl::Window private: std::unique_ptr<TabBar_Impl> mpImpl; - ImplTabBarList* mpItemList; - OUString maEditText; Color maSelColor; Color maSelTextColor; @@ -419,7 +417,6 @@ public: Color GetTabBgColor( sal_uInt16 nPageId ) const; void SetTabBgColor( sal_uInt16 nPageId, const Color& aTabBgColor ); - bool IsDefaultTabBgColor( sal_uInt16 nPageId ); void Clear(); @@ -440,22 +437,15 @@ public: sal_uInt16 GetCurPageId() const { return mnCurPageId; } void SetFirstPageId( sal_uInt16 nPageId ); - sal_uInt16 GetFirstPageId() const { return GetPageId( mnFirstPos ); } void MakeVisible( sal_uInt16 nPageId ); void SelectPage( sal_uInt16 nPageId, bool bSelect = true ); sal_uInt16 GetSelectPageCount() const; bool IsPageSelected( sal_uInt16 nPageId ) const; - void EnableAutoMaxPageWidth( bool bEnable = true ) { mbAutoMaxWidth = bEnable; } - bool IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } void SetMaxPageWidth( long nMaxWidth ); - long GetMaxPageWidth() const { return mnMaxPageWidth; } - void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } void EnableEditMode( bool bEnable = true ) { mbAutoEditMode = bEnable; } - bool IsEditModeEnabled() const { return mbAutoEditMode; } bool StartEditMode( sal_uInt16 nPageId ); void EndEditMode( bool bCancel = false ); void SetEditText( const OUString& rText ) { maEditText = rText; } @@ -485,12 +475,6 @@ public: void HideDropPos(); bool SwitchPage( const Point& rPos ); void EndSwitchPage(); - bool IsInSwitching() { return mbInSwitching; } - - const Color& GetSelectColor() const { return maSelColor; } - bool IsSelectColor() const { return mbSelColor; } - const Color& GetSelectTextColor() const { return maSelTextColor; } - bool IsSelectTextColor() const { return mbSelTextColor; } void SetPageText( sal_uInt16 nPageId, const OUString& rText ); OUString GetPageText( sal_uInt16 nPageId ) const; diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx index bfcc817efcc2..70bfe397a243 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/include/svtools/table/tableinputhandler.hxx @@ -55,10 +55,6 @@ namespace svt { namespace table virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ) = 0; virtual bool GetFocus ( ITableControl& _rControl ) = 0; virtual bool LoseFocus ( ITableControl& _rControl ) = 0; - virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ) = 0; - virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ) = 0; - virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ) = 0; - virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ) = 0; virtual ~ITableInputHandler() { } }; diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 136feacefafe..563ff884dc2e 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -165,32 +165,6 @@ namespace svt { namespace table class SAL_NO_VTABLE IColumnModel { public: - /** retrieves the ID of the column - - The semantics of a column id is not defined. It's up to the - implementor of the ->IColumnModel, respectively the ->ITableModel - which provides the column models, to define such a semantics. - - @return - the ID of the column. May be 0 if the table which the column - belongs to does not need and support column ids. - - @see setID - */ - virtual ::com::sun::star::uno::Any - getID() const = 0; - - /** sets a new column ID - - @return - <TRUE/> if setting the new ID was successful. A possible error - conditions is if you try to set an ID which is already used - by another column within the same table. - - @see getID - */ - virtual void setID( const ::com::sun::star::uno::Any& _nID ) = 0; - /** returns the name of the column Column names should be human-readable, but not necessarily unique @@ -200,20 +174,10 @@ namespace svt { namespace table */ virtual OUString getName() const = 0; - /** sets a new name for the column - - @see getName - */ - virtual void setName( const OUString& _rName ) = 0; - /** retrieves the help text to be displayed for the column. */ virtual OUString getHelpText() const = 0; - /** sets a new the help text to be displayed for the column. - */ - virtual void setHelpText( const OUString& i_helpText ) = 0; - /** determines whether the column can be interactively resized @see getMinWidth @@ -222,14 +186,6 @@ namespace svt { namespace table */ virtual bool isResizable() const = 0; - /** declares the column as resizable or fixed in width - - @see getMinWidth - @see getMaxWidth - @see getWidth - */ - virtual void setResizable( bool _bResizable ) = 0; - /** denotes the relative flexibility of the column This flexibility is taken into account when a table control auto-resizes its columns, because the available @@ -239,12 +195,6 @@ namespace svt { namespace table */ virtual sal_Int32 getFlexibility() const = 0; - /** sets a new flexibility value for the column - - @see getFlexibility - */ - virtual void setFlexibility( sal_Int32 const i_flexibility ) = 0; - /** returns the width of the column, in app-font units The returned value must be a positive ->TableMetrics value. @@ -273,14 +223,6 @@ namespace svt { namespace table */ virtual TableMetrics getMinWidth() const = 0; - /** sets the minimum width of the column, in app-font units - - @see getMinWidth - @see setMaxWidth - @see setWidth - */ - virtual void setMinWidth( TableMetrics _nMinWidth ) = 0; - /** returns the maximum width of the column, in app-font units, or 0 if the column does not have a minimal width @@ -290,22 +232,10 @@ namespace svt { namespace table */ virtual TableMetrics getMaxWidth() const = 0; - /** sets the maximum width of the column, in app-font units - - @see getMaxWidth - @see setMinWidth - @see setWidth - */ - virtual void setMaxWidth( TableMetrics _nMaxWidth ) = 0; - /** retrieves the horizontal alignment to be used for content in this cell */ virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() = 0; - /** sets a new the horizontal alignment to be used for content in this cell - */ - virtual void setHorizontalAlign(::com::sun::star::style::HorizontalAlignment _xAlign) = 0; - /// deletes the column model instance virtual ~IColumnModel() { } }; @@ -345,13 +275,6 @@ namespace svt { namespace table */ virtual bool hasRowHeaders() const = 0; - /** determines whether the given cell is editable - - @see ICellEditor - @todo - */ - virtual bool isCellEditable( ColPos col, RowPos row ) const = 0; - /** returns a model for a certain column @param column diff --git a/include/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx index 5074195a8602..b6bc252c1a36 100644 --- a/include/svtools/toolpanelopt.hxx +++ b/include/svtools/toolpanelopt.hxx @@ -65,8 +65,6 @@ class SVT_DLLPUBLIC SvtToolPanelOptions: public utl::detail::Options void SetVisibleHandoutView( bool bVisible ); bool GetVisibleSlideSorterView() const; void SetVisibleSlideSorterView( bool bVisible ); - bool GetVisibleDrawView() const; - void SetVisibleDrawView( bool bVisible ); private: diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index c58e6b3674c6..c19f4039dad8 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -225,19 +225,18 @@ protected: void RemoveFormat( SotClipboardFormatId nFormat ); void RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); bool HasFormat( SotClipboardFormatId nFormat ); - inline bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { return isDataFlavorSupported( rFlavor ); } void ClearFormats(); - bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); protected: @@ -365,8 +364,6 @@ public: css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); - bool GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf ); - public: static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 6092bcc6bae0..c12cf85caf9d 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -140,8 +140,6 @@ public: void InsertView( SvListView* ); void RemoveView( SvListView* ); - sal_uLong GetViewCount() const - { return aViewList.size(); } SvListView* GetView( sal_uLong nPos ) const { return ( nPos < aViewList.size() ) ? aViewList[ nPos ] : NULL; } @@ -180,7 +178,6 @@ public: // Creates ChildList if needed sal_uLong Move( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos); - void Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTarget ); sal_uLong Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos); bool Remove( const SvTreeListEntry* pEntry ); @@ -233,7 +230,6 @@ public: SvSortMode GetSortMode() const { return eSortMode; } sal_Int32 Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const; void SetCompareHdl( const Link<>& rLink ) { aCompareLink = rLink; } - const Link<>& GetCompareHdl() const { return aCompareLink; } void Resort(); void Reverse(); }; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index f0d112d3e07a..1c89cec84750 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -144,13 +144,11 @@ public: SvLBoxTabFlags nFlags; void SetUserData( void* pPtr ) { pUserData = pPtr; } - void* GetUserData() const { return pUserData; } bool IsDynamic() const { return bool(nFlags & SvLBoxTabFlags::DYNAMIC); } void SetPos( long nNewPos) { nPos = nNewPos; } long GetPos() const { return nPos; } long CalcOffset( long nItemLength, long nTabWidth ); bool IsEditable() const { return bool(nFlags & SvLBoxTabFlags::EDITABLE); } - bool IsPushable() const { return bool(nFlags & SvLBoxTabFlags::PUSHABLE); } }; // ********************************************************************* @@ -330,7 +328,6 @@ protected: SvInplaceEdit2* pEdCtrl; void EditText( const OUString&, const Rectangle&,const Selection&); void EditText( const OUString&, const Rectangle&,const Selection&, bool bMulti); - void EditTextMultiLine( const OUString&, const Rectangle&,const Selection&); void CancelTextEditing(); bool EditingCanceled() const; bool IsEmptyTextAllowed() const; @@ -485,16 +482,13 @@ public: const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; } void SetExpandingHdl(const Link<>& rNewHdl){aExpandingHdl=rNewHdl;} void SetExpandedHdl(const Link<>& rNewHdl){aExpandedHdl=rNewHdl;} - const Link<>& GetExpandingHdl() const { return aExpandingHdl; } virtual void ExpandedHdl(); virtual bool ExpandingHdl(); virtual void SelectHdl(); virtual void DeselectHdl(); virtual bool DoubleClickHdl(); - bool IsTravelSelect() const { return bool(nImpFlags&SvTreeListBoxFlags::IS_TRAVELSELECT);} SvTreeListEntry* GetHdlEntry() const { return pHdlEntry; } - SvLBoxItem* GetHdlItem() const; // Is called for an Entry that gets expanded with the Flag // ENTRYFLAG_CHILDREN_ON_DEMAND set. @@ -511,7 +505,6 @@ public: virtual bool NotifyAcceptDrop( SvTreeListEntry* ); void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } - sal_Int8 GetDragOptions() const { return nDragOptions; } static SvTreeListBox* GetSourceView(); @@ -595,7 +588,6 @@ protected: // Recalculate all tabs depending on TreeListStyle and Bitmap sizes // Is called automatically when inserting/changing Bitmaps, changing the Model etc. virtual void SetTabs(); - void SetTabs_Impl(); void AddTab( long nPos, SvLBoxTabFlags nFlags=SvLBoxTabFlags::ADJUST_LEFT, void* pUserData = 0 ); sal_uInt16 TabCount() const { return aTabs.size(); } @@ -611,7 +603,6 @@ protected: virtual void NotifyEndScroll(); virtual void NotifyScrolled(); void SetScrolledHdl( const Link<>& rLink ) { aScrolledHdl = rLink; } - const Link<>& GetScrolledHdl() const { return aScrolledHdl; } long GetXOffset() const { return GetMapMode().GetOrigin().X(); } virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; @@ -814,7 +805,6 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetAlternatingRowColors( const bool bEnable ); - bool IsAlternatingRowColors() const { return mbAlternatingRowColors; } }; #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT" diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx index 530dab1b8deb..839ffd34e824 100644 --- a/include/svtools/treelistentry.hxx +++ b/include/svtools/treelistentry.hxx @@ -107,7 +107,6 @@ public: SvTLEntryFlags GetFlags() const { return nEntryFlags;} void SetFlags( SvTLEntryFlags nFlags ); - bool GetIsMarked() const { return bIsMarked; } void SetMarked( bool IsMarked ) { bIsMarked = IsMarked; } void SetBackColor( const Color& aColor ) { maBackColor = aColor; } diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8c2cd2aa5106..7b4684c06e6e 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -320,42 +320,27 @@ public: size_t GetItemCount() const; size_t GetItemPos( sal_uInt16 nItemId ) const; - sal_uInt16 GetItemId( size_t nPos ) const; - sal_uInt16 GetItemId( const Point& rPos ) const; + sal_uInt16 GetItemId( size_t nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; Rectangle GetItemRect( sal_uInt16 nItemId ) const; - void EnableFullItemMode( bool bFullMode = true ); - bool IsFullItemModeEnabled() const - { - return mbFullMode; - } + void SetColCount( sal_uInt16 nNewCols = 1 ); - sal_uInt16 GetColCount() const + sal_uInt16 GetColCount() const { return mnUserCols; } void SetLineCount( sal_uInt16 nNewLines = 0 ); - sal_uInt16 GetLineCount() const + sal_uInt16 GetLineCount() const { return mnUserVisLines; } - void SetItemWidth( long nItemWidth = 0 ); - long GetItemWidth() const - { - return mnUserItemWidth; - } - void SetItemHeight( long nLineHeight = 0 ); - long GetItemHeight() const - { - return mnUserItemHeight; - } - sal_uInt16 GetFirstLine() const - { - return mnFirstLine; - } + void SetItemWidth( long nItemWidth = 0 ); - void SelectItem( sal_uInt16 nItemId ); - sal_uInt16 GetSelectItemId() const + void SetItemHeight( long nLineHeight = 0 ); + + void SelectItem( sal_uInt16 nItemId ); + sal_uInt16 GetSelectItemId() const { return mnSelItemId; } @@ -382,20 +367,12 @@ public: { SetColor(Color(COL_TRANSPARENT)); } - Color GetColor() const - { - return maColor; - } bool IsColor() const { return maColor.GetTransparency() == 0; } void SetExtraSpacing( sal_uInt16 nNewSpacing ); - sal_uInt16 GetExtraSpacing() - { - return mnSpacing; - } void Format(vcl::RenderContext& rRenderContext); void SetFormat(bool bFormat = true); @@ -413,18 +390,10 @@ public: { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const - { - return maSelectHdl; - } void SetDoubleClickHdl(const Link<>& rLink) { maDoubleClickHdl = rLink; } - const Link<>& GetDoubleClickHdl() const - { - return maDoubleClickHdl; - } void SetHighlightHdl(const Link<>& rLink); diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index a1281b493235..673f3f8717d6 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -151,7 +151,6 @@ namespace svt private: // restrict access to some aspects of our base class SVT_DLLPRIVATE void AddPage( TabPage* pPage ) { WizardDialog::AddPage(pPage); } - SVT_DLLPRIVATE void RemovePage( TabPage* pPage ) { WizardDialog::RemovePage(pPage); } SVT_DLLPRIVATE void SetPage( sal_uInt16 nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); } // TabPage* GetPage( sal_uInt16 nLevel ) const { return WizardDialog::GetPage(nLevel); } // TODO: probably the complete page handling (next, previous etc.) should be prohibited ... @@ -172,8 +171,6 @@ namespace svt // hold members in this structure to allow keeping compatible when members are added WizardMachineImplData* m_pImpl; - SVT_DLLPRIVATE void addButtons(vcl::Window* _pParent, sal_uInt32 _nButtonFlags); - public: OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ); OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ); diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 70d7cb196628..6ae5c03773f0 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -268,22 +268,15 @@ public: void RemoveButton( Button* pButton ); void SetPrevButton( PushButton* pButton ) { mpPrevBtn = pButton; } - PushButton* GetPrevButton() const { return mpPrevBtn; } void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; } - PushButton* GetNextButton() const { return mpNextBtn; } void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } - vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } - WindowAlign GetViewAlign() const { return meViewAlign; } void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; } - const Link<>& GetActivatePageHdl() const { return maActivateHdl; } - void SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } - const Link<>& GetDeactivatePageHdl() const { return maDeactivateHdl; } }; #endif // INCLUDED_SVTOOLS_WIZDLG_HXX diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index a6117baf6c5a..921ab112ba2b 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -47,7 +47,6 @@ public: virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } - com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } }; |