diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svtools | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svtools')
92 files changed, 0 insertions, 945 deletions
diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx index 95b6d49d6ab8..c3729d7bb966 100644 --- a/svtools/inc/table/tablecontrolinterface.hxx +++ b/svtools/inc/table/tablecontrolinterface.hxx @@ -34,7 +34,6 @@ namespace svt { namespace table { - //= TableControlAction enum TableControlAction diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 61e17bd68a7e..870185098d0a 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -112,7 +112,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) } - BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) :Control( pParent, nBits | WB_3DLOOK ) ,DragSourceHelper( this ) @@ -123,7 +122,6 @@ BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) } - BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode ) :Control( pParent, rId ) ,DragSourceHelper( this ) @@ -169,14 +167,12 @@ void BrowseBox::dispose() } - short BrowseBox::GetCursorHideCount() const { return getDataWindow()->nCursorHidden; } - void BrowseBox::DoShowCursor( const char * ) { if (!getDataWindow()) @@ -195,7 +191,6 @@ void BrowseBox::DoShowCursor( const char * ) } - void BrowseBox::DoHideCursor( const char * ) { short nHiddenCount = ++getDataWindow()->nCursorHidden; @@ -212,14 +207,12 @@ void BrowseBox::DoHideCursor( const char * ) } - void BrowseBox::SetRealRowCount( const OUString &rRealRowCount ) { getDataWindow()->aRealRowCount = rRealRowCount; } - void BrowseBox::SetFont( const vcl::Font& rNewFont ) { pDataWin->SetFont( rNewFont ); @@ -227,14 +220,12 @@ void BrowseBox::SetFont( const vcl::Font& rNewFont ) } - sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const { return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } - void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) { @@ -265,7 +256,6 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) } - void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos ) { @@ -410,7 +400,6 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze ) } - void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) { // never set pos of the handle column @@ -529,7 +518,6 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) } - void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) { @@ -574,7 +562,6 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) } - void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) { @@ -682,7 +669,6 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) } - void BrowseBox::AutoSizeLastColumn() { if ( getDataWindow()->bAutoSizeLastCol && @@ -695,7 +681,6 @@ void BrowseBox::AutoSizeLastColumn() } - void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) { @@ -778,7 +763,6 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) } - void BrowseBox::RemoveColumns() { size_t nOldCount = pCols->size(); @@ -848,7 +832,6 @@ void BrowseBox::RemoveColumns() } - OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const { @@ -859,14 +842,12 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const } - long BrowseBox::GetRowCount() const { return nRowCount; } - sal_uInt16 BrowseBox::ColCount() const { @@ -874,7 +855,6 @@ sal_uInt16 BrowseBox::ColCount() const } - long BrowseBox::ImpGetDataRowHeight() const { @@ -886,7 +866,6 @@ long BrowseBox::ImpGetDataRowHeight() const } - void BrowseBox::SetDataRowHeight( long nPixel ) { @@ -896,7 +875,6 @@ void BrowseBox::SetDataRowHeight( long nPixel ) } - void BrowseBox::SetTitleLines( sal_uInt16 nLines ) { @@ -904,7 +882,6 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines ) } - long BrowseBox::ScrollColumns( long nCols ) { @@ -1047,7 +1024,6 @@ long BrowseBox::ScrollColumns( long nCols ) } - long BrowseBox::ScrollRows( long nRows ) { @@ -1104,7 +1080,6 @@ long BrowseBox::ScrollRows( long nRows ) } - void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) { @@ -1125,7 +1100,6 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) } - void BrowseBox::Clear() { @@ -1294,7 +1268,6 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep } - void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) { @@ -1466,14 +1439,12 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) } - bool BrowseBox::GoToRow( long nRow) { return GoToRow(nRow, false); } - bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) { @@ -1560,7 +1531,6 @@ bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) } - bool BrowseBox::GoToColumnId( sal_uInt16 nColId) { return GoToColumnId(nColId, true); @@ -1626,7 +1596,6 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol } - bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) { @@ -1657,7 +1626,6 @@ bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) } - void BrowseBox::SetNoSelection() { @@ -1697,7 +1665,6 @@ void BrowseBox::SetNoSelection() } - void BrowseBox::SelectAll() { @@ -1763,7 +1730,6 @@ void BrowseBox::SelectAll() } - void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) { @@ -1836,7 +1802,6 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) } - long BrowseBox::GetSelectRowCount() const { @@ -1845,7 +1810,6 @@ long BrowseBox::GetSelectRowCount() const } - void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMakeVisible ) { @@ -1910,7 +1874,6 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak } - sal_uInt16 BrowseBox::GetSelectColumnCount() const { @@ -1926,7 +1889,6 @@ long BrowseBox::FirstSelectedColumn( ) const } - long BrowseBox::FirstSelectedRow( bool bInverse ) { @@ -1934,7 +1896,6 @@ long BrowseBox::FirstSelectedRow( bool bInverse ) } - long BrowseBox::NextSelectedRow() { @@ -1942,7 +1903,6 @@ long BrowseBox::NextSelectedRow() } - long BrowseBox::LastSelectedRow() { @@ -1950,7 +1910,6 @@ long BrowseBox::LastSelectedRow() } - bool BrowseBox::IsRowSelected( long nRow ) const { @@ -1958,7 +1917,6 @@ bool BrowseBox::IsRowSelected( long nRow ) const } - bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const { @@ -1967,7 +1925,6 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const } - void BrowseBox::MakeFieldVisible ( long nRow, // line number of the field (starting with 0) @@ -2036,7 +1993,6 @@ void BrowseBox::MakeFieldVisible } - bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, bool bCompletely ) const { @@ -2062,7 +2018,6 @@ bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, } - Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, bool bRelToBrowser) const { @@ -2084,7 +2039,6 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, } - Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const { @@ -2112,7 +2066,6 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const } - Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const { @@ -2142,7 +2095,6 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const } - long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const { @@ -2162,7 +2114,6 @@ long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const } - Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const { @@ -2170,7 +2121,6 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const } - sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const { @@ -2190,7 +2140,6 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const } - void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) { @@ -2203,7 +2152,6 @@ void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) } - Rectangle BrowseBox::GetControlArea() const { @@ -2214,7 +2162,6 @@ Rectangle BrowseBox::GetControlArea() const } - void BrowseBox::SetMode( BrowserMode nMode ) { @@ -2341,7 +2288,6 @@ void BrowseBox::SetMode( BrowserMode nMode ) } - void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) { @@ -2357,7 +2303,6 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) } - bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const /* [Description] @@ -2377,14 +2322,12 @@ bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const } - long BrowseBox::GetDataRowHeight() const { return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight()); } - VclPtr<BrowserHeader> BrowseBox::CreateHeaderBar( BrowseBox* pParent ) { VclPtr<BrowserHeader> pNewBar = VclPtr<BrowserHeader>::Create( pParent ); @@ -2462,7 +2405,6 @@ void BrowseBox::LoseFocus() } - void BrowseBox::GetFocus() { OSL_TRACE( "BrowseBox: %p->GetFocus", this ); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 660cf9036123..2cbf05481044 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -33,14 +33,12 @@ using namespace ::com::sun::star::datatransfer; #define getDataWindow() (static_cast<BrowserDataWin*>(pDataWin.get())) - void BrowseBox::StartDrag( sal_Int8 /* _nAction */, const Point& /* _rPosPixel */ ) { // not interested in this event } - sal_Int8 BrowseBox::AcceptDrop( const AcceptDropEvent& _rEvt ) { BrowserDataWin* pDataWindow = static_cast<BrowserDataWin*>(pDataWin.get()); @@ -50,7 +48,6 @@ sal_Int8 BrowseBox::AcceptDrop( const AcceptDropEvent& _rEvt ) } - sal_Int8 BrowseBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { BrowserDataWin* pDataWindow = static_cast<BrowserDataWin*>(pDataWin.get()); @@ -60,7 +57,6 @@ sal_Int8 BrowseBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } - sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& ) { // not interested in this event @@ -68,7 +64,6 @@ sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& ) } - sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& ) { // not interested in this event @@ -76,7 +71,6 @@ sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& ) } - void* BrowseBox::implGetDataFlavors() const { if (static_cast<BrowserDataWin*>(pDataWin.get())->bCallingDropCallback) @@ -85,7 +79,6 @@ void* BrowseBox::implGetDataFlavors() const } - bool BrowseBox::IsDropFormatSupported( SotClipboardFormatId _nFormat ) { if ( static_cast< BrowserDataWin* >( pDataWin.get() )->bCallingDropCallback ) @@ -95,9 +88,6 @@ bool BrowseBox::IsDropFormatSupported( SotClipboardFormatId _nFormat ) } - - - void BrowseBox::Command( const CommandEvent& rEvt ) { if ( !getDataWindow()->bInCommand ) @@ -105,7 +95,6 @@ void BrowseBox::Command( const CommandEvent& rEvt ) } - void BrowseBox::StateChanged( StateChangedType nStateChange ) { Control::StateChanged( nStateChange ); @@ -181,76 +170,64 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) } - void BrowseBox::Select() { } - void BrowseBox::DoubleClick( const BrowserMouseEvent & ) { } - long BrowseBox::QueryMinimumRowHeight() { return CalcZoom( 5 ); } - void BrowseBox::ImplStartTracking() { } - void BrowseBox::ImplTracking() { } - void BrowseBox::ImplEndTracking() { } - void BrowseBox::RowHeightChanged() { } - long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth ) { return nWidth; } - void BrowseBox::ColumnResized( sal_uInt16 ) { } - void BrowseBox::ColumnMoved( sal_uInt16 ) { } - void BrowseBox::StartScroll() { DoHideCursor( "StartScroll" ); } - void BrowseBox::EndScroll() { UpdateScrollbars(); @@ -259,7 +236,6 @@ void BrowseBox::EndScroll() } - void BrowseBox::ToggleSelection( bool bForce ) { @@ -333,7 +309,6 @@ void BrowseBox::ToggleSelection( bool bForce ) } - void BrowseBox::DrawCursor() { bool bReallyHide = false; @@ -403,7 +378,6 @@ void BrowseBox::DrawCursor() } - sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const { @@ -414,7 +388,6 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const } - sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const { @@ -424,7 +397,6 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const } - sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const { @@ -435,7 +407,6 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const } - bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const { @@ -446,7 +417,6 @@ bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const } - void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) { @@ -511,7 +481,6 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) } - void BrowseBox::Resize() { if ( !bBootstrapped && IsReallyVisible() ) @@ -589,7 +558,6 @@ void BrowseBox::Resize() } - void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { @@ -681,7 +649,6 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect } - void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) { bool bDrawSelection = !(nFlags & DrawFlags::NoSelection); @@ -824,7 +791,6 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, } - void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections) { Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0); @@ -1257,7 +1223,6 @@ void BrowseBox::UpdateScrollbars() } - void BrowseBox::SetUpdateMode( bool bUpdate ) { @@ -1287,7 +1252,6 @@ void BrowseBox::SetUpdateMode( bool bUpdate ) } - bool BrowseBox::GetUpdateMode() const { @@ -1295,7 +1259,6 @@ bool BrowseBox::GetUpdateMode() const } - long BrowseBox::GetFrozenWidth() const { @@ -1308,7 +1271,6 @@ long BrowseBox::GetFrozenWidth() const } - void BrowseBox::ColumnInserted( sal_uInt16 nPos ) { @@ -1318,7 +1280,6 @@ void BrowseBox::ColumnInserted( sal_uInt16 nPos ) } - sal_uInt16 BrowseBox::FrozenColCount() const { sal_uInt16 nCol; @@ -1330,7 +1291,6 @@ sal_uInt16 BrowseBox::FrozenColCount() const } - IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) { @@ -1350,7 +1310,6 @@ IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) } - IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) { @@ -1362,7 +1321,6 @@ IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) } - IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); @@ -1425,7 +1383,6 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) } - void BrowseBox::MouseMove( const MouseEvent& rEvt ) { OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); @@ -1478,7 +1435,6 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) } - void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) { @@ -1514,7 +1470,6 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) } - bool bExtendedMode = false; bool bFieldMode = false; @@ -1664,7 +1619,6 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) } - void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) { @@ -1702,7 +1656,6 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) } - void BrowseBox::KeyInput( const KeyEvent& rEvt ) { if ( !ProcessKey( rEvt ) ) @@ -1710,7 +1663,6 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt ) } - bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) { @@ -1780,7 +1732,6 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) } - void BrowseBox::Dispatch( sal_uInt16 nId ) { @@ -1970,7 +1921,6 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) } - void BrowseBox::SetCursorColor(const Color& _rCol) { if (_rCol == m_aCursorColor) diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 6324169b0917..7e2af122454e 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -66,7 +66,6 @@ namespace svt } - Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType ) { if ( m_pAccessible && m_pAccessible->isAlive() ) @@ -84,7 +83,6 @@ namespace svt } - Reference< XAccessible > BrowseBox::CreateAccessible() { vcl::Window* pParent = GetAccessibleParentWindow(); @@ -319,7 +317,6 @@ OUString BrowseBox::GetColumnDescription( sal_uInt16 _nColumn ) const } - void BrowseBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, ::svt::AccessibleBrowseBoxObjType eObjType ) const diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index c0b99ef473ad..22691670b750 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -22,7 +22,6 @@ #include <svtools/brwbox.hxx> - BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits ) :HeaderBar( pParent, nWinBits ) ,_pBrowseBox( pParent ) @@ -48,7 +47,6 @@ void BrowserHeader::dispose() } - void BrowserHeader::Command( const CommandEvent& rCEvt ) { if ( !GetCurItemId() && CommandEventId::ContextMenu == rCEvt.GetCommand() ) @@ -63,14 +61,12 @@ void BrowserHeader::Command( const CommandEvent& rCEvt ) } - void BrowserHeader::Select() { HeaderBar::Select(); } - void BrowserHeader::EndDrag() { // call before other actions, it looks more nice in most cases @@ -113,7 +109,4 @@ void BrowserHeader::EndDrag() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 9a7e3cf24203..03b5bc97e0a0 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -179,7 +179,6 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos } - void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) { double n = (double)_nOriginalWidth; @@ -190,7 +189,6 @@ void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) } - BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) :Control( pParent, WinBits(WB_CLIPCHILDREN) ) ,DragSourceHelper( this ) @@ -320,7 +318,6 @@ void BrowserDataWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& } - BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel ) { BrowseBox *pBox = GetParent(); @@ -435,7 +432,6 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) } - bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent ) { if ( ! ( GetParent()->IsInteractiveRowHeightEnabled() @@ -451,7 +447,6 @@ bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent ) } - void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) { aLastMousePos = OutputToScreenPixel( rEvt.GetPosPixel() ); @@ -467,7 +462,6 @@ void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) } - void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) { // avoid pseudo MouseMoves @@ -502,7 +496,6 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) } - IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); @@ -525,7 +518,6 @@ void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt ) } - void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) { long nDataRowHeight = GetParent()->GetDataRowHeight(); @@ -550,7 +542,6 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) } - void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) { if ( !GetParent()->bRowDividerDrag ) @@ -595,7 +586,6 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) } - void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) { // pass to parent window @@ -604,7 +594,6 @@ void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) } - void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) { pEventWin = this; @@ -613,7 +602,6 @@ void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) } - BrowseEvent::BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): @@ -634,7 +622,6 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow, } - BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): @@ -644,7 +631,6 @@ BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rE } - BrowserAcceptDropEvent::BrowserAcceptDropEvent( BrowserDataWin *pWindow, const AcceptDropEvent& rEvt ) :AcceptDropEvent(rEvt) ,BrowseEvent( pWindow->CreateBrowseEvent( rEvt.maPosPixel ) ) @@ -652,7 +638,6 @@ BrowserAcceptDropEvent::BrowserAcceptDropEvent( BrowserDataWin *pWindow, const A } - BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const ExecuteDropEvent& rEvt ) :ExecuteDropEvent(rEvt) ,BrowseEvent( pWindow->CreateBrowseEvent( rEvt.maPosPixel ) ) @@ -660,9 +645,6 @@ BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const } - - - void BrowserDataWin::SetUpdateMode( bool bMode ) { DBG_ASSERT( !bUpdateMode || aInvalidRegion.empty(), "invalid region not empty" ); @@ -685,7 +667,6 @@ void BrowserDataWin::DoOutstandingInvalidations() } - void BrowserDataWin::Invalidate( InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) @@ -700,7 +681,6 @@ void BrowserDataWin::Invalidate( InvalidateFlags nFlags ) } - void BrowserDataWin::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) @@ -744,7 +724,6 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) } - void BrowserScrollBar::EndScroll() { if ( _nTip ) diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index ed882535c749..3eb884e6b9d5 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -28,13 +28,11 @@ #include <vector> - #define MIN_COLUMNWIDTH 2 typedef ::std::vector< Rectangle* > RectangleList; - class ButtonFrame { Rectangle aRect; @@ -64,7 +62,6 @@ public: }; - class BrowserColumn { sal_uInt16 _nId; @@ -94,7 +91,6 @@ public: }; - class BrowserDataWin :public Control ,public DragSourceHelper @@ -180,7 +176,6 @@ protected: }; - class BrowserScrollBar: public ScrollBar { sal_uLong _nTip; @@ -204,12 +199,10 @@ public: }; - void InitSettings_Impl( vcl::Window *pWin, bool bFont = true, bool bForeground = true, bool bBackground = true ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 47d6ab94aea2..ef1974a2f149 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -28,9 +28,6 @@ namespace svt { - - - //= ComboBoxControl ComboBoxControl::ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle) @@ -596,5 +593,4 @@ namespace svt } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c9cedc8e1299..1865e0d5a4bd 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -87,7 +87,6 @@ namespace svt } - //= EditBrowseBox @@ -1192,7 +1191,6 @@ namespace svt } - bool EditBrowseBox::SaveModified() { return true; @@ -1300,7 +1298,6 @@ namespace svt } - CellController::CellController(Control* pW) :pWindow( pW ) ,bSuspended( true ) diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 8c186d1bdccf..f0ab7d045c01 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -204,5 +204,4 @@ sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumn } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index bead1d82d232..338210c8309c 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -623,5 +623,4 @@ void SvtAccessibilityOptions::SetVCLSettings() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index ee4b1342340b..3ec697ff81c1 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -224,5 +224,4 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index bb6db6978998..80186fac8ea2 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -357,7 +357,6 @@ IMPL_LINK_TYPED( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rE } - /** updates the font color in the vcl window settings */ void ColorConfig_Impl::ImplUpdateApplicationSettings() { diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 3363ad978ff7..4d7ca00e9fbf 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -548,9 +548,6 @@ IMPL_LINK_TYPED( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEv } - - - ExtendedColorConfig::ExtendedColorConfig() { ::osl::MutexGuard aGuard( ColorMutex_Impl::get() ); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 93ca0dab715b..01bf0658ae15 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -117,8 +117,6 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() } - - SvtHelpOptions_Impl::SvtHelpOptions_Impl() : ConfigItem( OUString( "Office.Common/Help" ) ) , bExtendedHelp( false ) @@ -212,7 +210,6 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) } - void SvtHelpOptions_Impl::ImplCommit() { Sequence< OUString > aNames = GetPropertyNames(); @@ -248,7 +245,6 @@ void SvtHelpOptions_Impl::ImplCommit() } - void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames ) { Load( aPropertyNames ); @@ -269,7 +265,6 @@ SvtHelpOptions::SvtHelpOptions() } - SvtHelpOptions::~SvtHelpOptions() { // Global access, must be guarded (multithreading) @@ -303,7 +298,6 @@ bool SvtHelpOptions::IsHelpTips() const } - void SvtHelpOptions::SetWelcomeScreen( bool b ) { pImp->SetWelcomeScreen( b ); diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index db190b08bb3c..4372052e2751 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -264,18 +264,12 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize) } - - - - bool SvxHtmlOptions::IsImportUnknown() const { return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ; } - - void SvxHtmlOptions::SetImportUnknown(bool bSet) { if(bSet) @@ -286,24 +280,18 @@ void SvxHtmlOptions::SetImportUnknown(bool bSet) } - - sal_uInt16 SvxHtmlOptions::GetExportMode() const { return (sal_uInt16)pImp->nExportMode; } - - bool SvxHtmlOptions::IsStarBasic() const { return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ; } - - void SvxHtmlOptions::SetStarBasic(bool bSet) { if(bSet) diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 337f2b1f0d41..2113bcfb1308 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -681,37 +681,27 @@ void SvtOptionsDrawinglayer_Impl::Notify( const css::uno::Sequence<OUString>& ) // public method - // public method - // public method - // public method - // public method // #i73602# - // #i74769#, #i75172# - // #i4219# - - - - // helper bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const { @@ -740,11 +730,6 @@ bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const // primitives - - - - - void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( bool bState ) { if(m_bAntiAliasing != bState) diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index 3b01d07d19cf..362089fb4e66 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -18,7 +18,6 @@ */ - // switches // use it to enable test scenarios diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index d2e6c1699019..e0d17cf04869 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -343,7 +343,6 @@ namespace svt } - bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) { OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index 4484482e09e2..c287f3a64748 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -33,7 +33,6 @@ namespace svt { - //= SortingData_Impl struct SortingData_Impl diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 720b48b1e80e..b442cb2c9f4a 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -131,7 +131,6 @@ namespace } - void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters) { if( _rFilterList.getLength() ) @@ -534,7 +533,6 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, } - ViewTabListBox_Impl::~ViewTabListBox_Impl() { disposeOnce(); @@ -549,7 +547,6 @@ void ViewTabListBox_Impl::dispose() } - IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) { ::osl::MutexGuard aGuard( maMutex ); @@ -559,7 +556,6 @@ IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) } - void ViewTabListBox_Impl::Resize() { SvTabListBox::Resize(); @@ -586,7 +582,6 @@ void ViewTabListBox_Impl::Resize() } - void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; @@ -623,7 +618,6 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) } - std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() { bool bEnableDelete = mbEnableDelete; @@ -709,7 +703,6 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() } - void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { switch ( nSelectedPopupEntry ) @@ -725,7 +718,6 @@ void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEn } - void ViewTabListBox_Impl::ClearAll() { for ( sal_uLong i = 0; i < GetEntryCount(); ++i ) @@ -1029,7 +1021,6 @@ OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) } - OUString SvtFileView::GetCurrentURL() const { OUString aURL; @@ -1050,7 +1041,6 @@ void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolde } - FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDescriptor ) { FileViewResult eResult = eFailure; @@ -1063,7 +1053,6 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc } - bool SvtFileView::GetParentURL( OUString& rParentURL ) const { bool bRet = false; @@ -1091,21 +1080,18 @@ bool SvtFileView::GetParentURL( OUString& rParentURL ) const } - const OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } - void SvtFileView::SetHelpId( const OString& rHelpId ) { mpImp->mpView->SetHelpId( rHelpId ); } - void SvtFileView::SetSizePixel( const Size& rNewSize ) { Control::SetSizePixel( rNewSize ); @@ -1113,7 +1099,6 @@ void SvtFileView::SetSizePixel( const Size& rNewSize ) } - void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { SetPosPixel( rNewPos ); @@ -1194,7 +1179,6 @@ void SvtFileView::SetNoSelection() } - void SvtFileView::GetFocus() { Control::GetFocus(); @@ -1203,35 +1187,30 @@ void SvtFileView::GetFocus() } - void SvtFileView::SetSelectHdl( const Link<SvTreeListBox*,void>& rHdl ) { mpImp->SetSelectHandler( rHdl ); } - void SvtFileView::SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl ) { mpImp->mpView->SetDoubleClickHdl( rHdl ); } - sal_uLong SvtFileView::GetSelectionCount() const { return mpImp->mpView->GetSelectionCount(); } - SvTreeListEntry* SvtFileView::FirstSelected() const { return mpImp->mpView->FirstSelected(); } - SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const { return mpImp->mpView->NextSelected( pEntry ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index e35e5bec8354..e6b6fde47d3f 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -43,7 +43,6 @@ class IcnViewEdit_Impl; class IcnGridMap_Impl; - // some defines #define PAINTFLAG_HOR_CENTERED 0x0001 @@ -81,9 +80,6 @@ class IcnGridMap_Impl; #define VIEWMODE_MASK (WB_ICON | WB_SMALLICON | WB_DETAILS) - - - enum IcnViewFieldType { IcnViewFieldTypeDontknow = 0, @@ -92,7 +88,6 @@ enum IcnViewFieldType }; - // Data about the focus of entries struct LocalFocus @@ -105,7 +100,6 @@ struct LocalFocus }; - // Entry-List typedef ::std::vector< SvxIconChoiceCtrlEntry* > SvxIconChoiceCtrlEntryList_impl; @@ -147,8 +141,6 @@ public: }; - - // Implementation-class of IconChoiceCtrl @@ -577,7 +569,6 @@ public: }; - typedef sal_uLong GridId; #define GRID_NOT_FOUND ((GridId)ULONG_MAX) diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 5d80be7daacb..5cf55c7b220d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2775,7 +2775,6 @@ IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) } - // Function to align entries to the grid @@ -2902,7 +2901,6 @@ SvxIconChoiceCtrlTextMode SvxIconChoiceCtrl_Impl::GetEntryTextModeSmart( const S } - // Draw my own focusrect, because the focusrect of the outputdevice has got the inverted color // of the background. But what will we see, if the backgroundcolor is gray ? - We will see // a gray focusrect on a gray background !!! @@ -2957,8 +2955,6 @@ bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos } - - IMPL_LINK_TYPED(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) { if( nId == EVENTID_ADJUST_SCROLLBARS ) diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 66593313a3db..e001b3f3068c 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -98,8 +98,6 @@ void IcnCursor_Impl::ImplCreate() } - - void IcnCursor_Impl::Clear() { if( xColumns ) @@ -271,7 +269,6 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow, sal_uInt16 nL } - /* Searches, starting from the passed value, the next entry to the left/to the right. Example for bRight = sal_True: @@ -780,5 +777,4 @@ void IcnGridMap_Impl::GetGridCoord( GridId nId, sal_uInt16& rGridX, sal_uInt16& } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index afa032a08c6e..63b78868e30e 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -55,7 +55,6 @@ OUString SvxIconChoiceCtrlEntry::GetDisplayText() const } - SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& rInfo ) : aColText( rInfo.aColText ), aColImage( rInfo.aColImage ) { diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 146a0230e93a..e837ab6e4e45 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -537,7 +537,6 @@ void SvImpLBox::KeyDown( bool bPageDown, bool bNotifyScroll ) } - void SvImpLBox::InvalidateEntriesFrom( long nY ) const { if( !(nFlags & F_IN_PAINT )) @@ -701,7 +700,6 @@ void SvImpLBox::ShowCursor( bool bShow ) } - void SvImpLBox::UpdateAll( bool bInvalidateCompleteView, bool bUpdateVerScrollBar ) { @@ -1376,8 +1374,6 @@ void SvImpLBox::FillView() } - - void SvImpLBox::ShowVerSBar() { bool bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0; @@ -1498,7 +1494,6 @@ void SvImpLBox::SetEntryHeight( short /* nHeight */ ) } - // *********************************************************************** // Callback Functions // *********************************************************************** @@ -1823,7 +1818,6 @@ void SvImpLBox::EntryMoved( SvTreeListEntry* pEntry ) } - void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) { if( GetUpdateMode() ) @@ -1879,7 +1873,6 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) } - // ******************************************************************** // Event handler // ******************************************************************** @@ -3414,7 +3407,6 @@ void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData ) } - bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) { bool bRet = false; @@ -3430,7 +3422,6 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) } - bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry ) { if( pEntry ) diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index c77c2c595d1c..9eafa9168e63 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1391,7 +1391,6 @@ void SvListView::Impl::RemoveViewData( SvTreeListEntry* pParent ) } - void SvListView::Impl::ActionRemoving( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Remove:No Entry"); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index e7d19a0f4be6..c54a2a69d031 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -543,8 +543,6 @@ bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nActi } - - /* NotifyMoving/Copying ==================== @@ -1922,7 +1920,6 @@ void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry ) } - void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState eState) { if( nTreeFlags & SvTreeFlags::CHKBTN ) @@ -3417,7 +3414,6 @@ void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags, void* pUserData } - SvLBoxTab* SvTreeListBox::GetFirstDynamicTab( sal_uInt16& rPos ) const { sal_uInt16 nCurTab = 0; diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index a2ffa291658a..19c0b0df419c 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -103,7 +103,6 @@ sal_uLong SvTreeListEntry::GetChildListPos() const } - void SvTreeListEntry::Clone(SvTreeListEntry* pSource) { nListPos &= 0x80000000; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 1622d9dedc0e..ccc7e7e1561f 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; - //===== internal ============================================================ SvtRulerAccessible::SvtRulerAccessible( diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index eb345a30e139..26fc9a7d2e9f 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -23,11 +23,9 @@ #include <svtools/collatorres.hxx> - // wrapper for locale specific translations data of collator algorithm - class CollatorResourceData { friend class CollatorResource; @@ -55,11 +53,9 @@ class CollatorResourceData }; - // implementation of the collator-algorithm-name translation - #define COLLATOR_RESOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1) CollatorResource::CollatorResource() diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index d5442971c73f..c9ed32072914 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui; - FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode nFlags ) : Window( pParent, nStyle|WB_DIALOGCONTROL ), maEdit( VclPtr<Edit>::Create(this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP) ), @@ -54,7 +53,6 @@ FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode } - WinBits FileControl::ImplInitStyle( WinBits nStyle ) { if ( !( nStyle & WB_NOTABSTOP ) ) @@ -83,7 +81,6 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle ) } - FileControl::~FileControl() { disposeOnce(); @@ -104,14 +101,12 @@ void FileControl::SetText( const OUString& rStr ) } - OUString FileControl::GetText() const { return maEdit->GetText(); } - void FileControl::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::Enable ) @@ -151,7 +146,6 @@ void FileControl::StateChanged( StateChangedType nType ) } - void FileControl::Resize() { static long ButtonBorder = 10; @@ -185,7 +179,6 @@ void FileControl::Resize() } - IMPL_LINK_NOARG_TYPED(FileControl, ButtonHdl, Button*, void) { ImplBrowseFile( ); diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 8868747254d9..c4cc63cc4a7c 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -26,7 +26,6 @@ namespace svt { - //= FileURLBox diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 73077943d7b6..9b7203a91c39 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -24,7 +24,6 @@ #include <vcl/tabpage.hxx> - namespace svt { class HyperLabelImpl @@ -195,7 +194,6 @@ namespace svt } - void HyperLabel::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 85f2569c8b78..4fc91f00f106 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -23,11 +23,9 @@ #include <svtools/indexentryres.hxx> - // wrapper for locale specific translations data of indexentry algorithm - class IndexEntryResourceData { friend class IndexEntryResource; @@ -55,11 +53,9 @@ class IndexEntryResourceData }; - // implementation of the indexentry-algorithm-name translation - #define INDEXENTRY_RESOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1) IndexEntryResource::IndexEntryResource() diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 55c1015640b9..1f0bfc153e5c 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -31,8 +31,6 @@ using namespace ::std; using namespace ::com::sun::star; - - class SvtScriptedTextHelper_Impl { private: @@ -302,8 +300,6 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) } - - SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) : mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, nullptr, nullptr, nullptr ) ) { @@ -344,6 +340,4 @@ void SvtScriptedTextHelper::DrawText( const Point& _rPos ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 35a7f1e02321..892de72c7edd 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -21,7 +21,6 @@ #include <vcl/settings.hxx> - void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) { bHandleDragging = bool( nFlags & ScrollableWindowFlags::THUMBDRAGGING ); @@ -39,7 +38,6 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) } - ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits, ScrollableWindowFlags nFlags ) : Window( pParent, WinBits(nBits|WB_CLIPCHILDREN) ), @@ -89,7 +87,6 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt ) } - void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && @@ -103,7 +100,6 @@ void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - Size ScrollableWindow::GetOutputSizePixel() const { Size aSz( Window::GetOutputSizePixel() ); @@ -117,7 +113,6 @@ Size ScrollableWindow::GetOutputSizePixel() const } - IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling @@ -141,7 +136,6 @@ IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) } - IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling @@ -161,7 +155,6 @@ IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) } - void ScrollableWindow::Resize() { // get the new output-size in pixel @@ -285,7 +278,6 @@ void ScrollableWindow::Resize() } - void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) { MapMode aMap( rNewMapMode ); @@ -294,7 +286,6 @@ void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) } - MapMode ScrollableWindow::GetMapMode() const { MapMode aMap( Window::GetMapMode() ); @@ -303,7 +294,6 @@ MapMode ScrollableWindow::GetMapMode() const } - void ScrollableWindow::SetTotalSize( const Size& rNewSize ) { aTotPixSz = LogicToPixel( rNewSize ); @@ -311,7 +301,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize ) } - void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, ScrollFlags ) { // get the delta in pixel diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 08503e372f1a..66a0aad73276 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -63,7 +63,6 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) } - void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) { mnEntryId = nEntryId; @@ -78,7 +77,6 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -89,7 +87,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUSt } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -103,7 +100,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Imag } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -117,7 +113,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* p } - ToolbarMenuEntry::~ToolbarMenuEntry() { if( mxAccContext.is() ) @@ -131,7 +126,6 @@ ToolbarMenuEntry::~ToolbarMenuEntry() } - const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCreate /* = false */ ) { if( !mxAccContext.is() && bCreate ) @@ -150,7 +144,6 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCr } - sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) { if( mpControl ) @@ -165,7 +158,6 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) } - Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { const Reference< XAccessibleContext >& xContext = GetAccessible( true ); @@ -187,7 +179,6 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) } - ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Reference< css::frame::XFrame >& xFrame ) : mrMenu( rMenu ) , mxFrame( xFrame ) @@ -201,14 +192,12 @@ ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Referenc } - ToolbarMenu_Impl::~ToolbarMenu_Impl() { setAccessible( nullptr ); } - void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) { if( mxAccessible.get() != pAccessible ) @@ -221,7 +210,6 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) } - void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ) { if( mxAccessible.is() ) @@ -229,14 +217,12 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& } - bool ToolbarMenu_Impl::hasAccessibleListeners() { return( mxAccessible.is() && mxAccessible->HasAccessibleListeners() ); } - sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) { sal_Int32 nCount = 0; @@ -261,7 +247,6 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) } - Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -283,7 +268,6 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) } - Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -300,7 +284,6 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl } - void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -331,7 +314,6 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind } - bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -365,7 +347,6 @@ bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw } - void ToolbarMenu_Impl::clearAccessibleSelection() { if( mnHighlightedEntry != -1 ) @@ -376,8 +357,6 @@ void ToolbarMenu_Impl::clearAccessibleSelection() } - - void ToolbarMenu_Impl::notifyHighlightedEntry() { if( hasAccessibleListeners() ) @@ -414,7 +393,6 @@ void ToolbarMenu_Impl::notifyHighlightedEntry() } - ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const { if( (nEntry < 0) || (nEntry >= (int)maEntryVector.size() ) ) @@ -424,8 +402,6 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const } - - IMPL_LINK_NOARG_TYPED( ToolbarMenu, HighlightHdl, ValueSet*, void ) { mpImpl->notifyHighlightedEntry(); @@ -452,7 +428,6 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) } - ToolbarMenu::~ToolbarMenu() { disposeOnce(); @@ -485,7 +460,6 @@ void ToolbarMenu::dispose() } - int ToolbarMenu::getSelectedEntryId() const { ToolbarMenuEntry* pEntry = implGetEntry( mpImpl->mnSelectedEntry ); @@ -493,7 +467,6 @@ int ToolbarMenu::getSelectedEntryId() const } - int ToolbarMenu::getHighlightedEntryId() const { ToolbarMenuEntry* pEntry = implGetEntry( mpImpl->mnHighlightedEntry ); @@ -501,7 +474,6 @@ int ToolbarMenu::getHighlightedEntryId() const } - void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -513,7 +485,6 @@ void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) } - void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -532,7 +503,6 @@ void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) } - void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -546,7 +516,6 @@ void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) } - void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -560,7 +529,6 @@ void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) } - void ToolbarMenu::initWindow() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -576,7 +544,6 @@ void ToolbarMenu::initWindow() } - static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; @@ -742,14 +709,12 @@ Size ToolbarMenu::implCalcSize() } - void ToolbarMenu::highlightFirstEntry() { implChangeHighlightEntry( 0 ); } - void ToolbarMenu::GetFocus() { if( mpImpl->mnHighlightedEntry == -1 ) @@ -759,7 +724,6 @@ void ToolbarMenu::GetFocus() } - void ToolbarMenu::LoseFocus() { if( mpImpl && mpImpl->mnHighlightedEntry != -1 ) @@ -769,28 +733,24 @@ void ToolbarMenu::LoseFocus() } - void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rStr, nItemBits ) ); } - void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) ); } - void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, nItemBits ) ); } - void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) { mpImpl->maEntryVector.push_back(pEntry); @@ -800,14 +760,12 @@ void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) } - void ToolbarMenu::appendSeparator() { appendEntry( nullptr ); } - /** creates an empty ValueSet that is initialized and can be inserted with appendEntry. */ VclPtr<ValueSet> ToolbarMenu::createEmptyValueSetControl() { @@ -819,14 +777,12 @@ VclPtr<ValueSet> ToolbarMenu::createEmptyValueSetControl() } - ToolbarMenuEntry* ToolbarMenu::implGetEntry( int nEntry ) const { return mpImpl->implGetEntry( nEntry ); } - ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const { const int nEntryCount = mpImpl->maEntryVector.size(); @@ -844,7 +800,6 @@ ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const } - void ToolbarMenu::implHighlightEntry(vcl::RenderContext& rRenderContext, int nHighlightEntry, bool bHighlight) { Size aSz(GetOutputSizePixel()); @@ -940,7 +895,6 @@ void ToolbarMenu::implHighlightEntry(vcl::RenderContext& rRenderContext, int nHi } - void ToolbarMenu::implSelectEntry( int nSelectedEntry ) { mpImpl->mnSelectedEntry = nSelectedEntry; @@ -954,7 +908,6 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry ) } - void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) { implHighlightAtPosition(rMEvt, true); @@ -962,13 +915,11 @@ void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) } - void ToolbarMenu::MouseButtonUp( const MouseEvent& ) { } - void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) { if (!IsVisible()) @@ -978,7 +929,6 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) } - void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDown*/) { long nMouseY = rMEvt.GetPosPixel().Y(); @@ -1025,7 +975,6 @@ void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDow } - void ToolbarMenu::implChangeHighlightEntry(int nEntry) { mpImpl->mnHighlightedEntry = nEntry; @@ -1035,7 +984,6 @@ void ToolbarMenu::implChangeHighlightEntry(int nEntry) } - static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLastColumn ) { ValueSet* pValueSet = dynamic_cast< ValueSet* >( pControl ); @@ -1065,7 +1013,6 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa } - ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) { int n = 0, nLoop = 0; @@ -1143,7 +1090,6 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) } - void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl ) { ValueSet* pValueSet = dynamic_cast< ValueSet* >( pControl ); @@ -1176,7 +1122,6 @@ void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl } - void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) { Control* pForwardControl = nullptr; @@ -1469,14 +1414,12 @@ void ToolbarMenu::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt ) { DockingWindow::RequestHelp( rHEvt ); } - void ToolbarMenu::StateChanged( StateChangedType nType ) { DockingWindow::StateChanged( nType ); @@ -1489,7 +1432,6 @@ void ToolbarMenu::StateChanged( StateChangedType nType ) } - void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) { DockingWindow::DataChanged( rDCEvt ); @@ -1505,7 +1447,6 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) } - void ToolbarMenu::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == CommandEventId::Wheel ) @@ -1519,7 +1460,6 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt ) } - Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible() { mpImpl->setAccessible( new ToolbarMenuAcc( *mpImpl ) ); @@ -1527,7 +1467,6 @@ Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible() } - // todo: move to new base class that will replace SfxPopupWindo void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) { @@ -1536,13 +1475,11 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) } - void ToolbarMenu::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) throw ( css::uno::RuntimeException, std::exception ) { } - class ToolbarMenuStatusListener : public svt::FrameStatusListener { public: @@ -1556,7 +1493,6 @@ public: }; - ToolbarMenuStatusListener::ToolbarMenuStatusListener( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolbarMenu& rToolbarMenu ) @@ -1566,7 +1502,6 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener( } - void SAL_CALL ToolbarMenuStatusListener::dispose() throw (css::uno::RuntimeException, std::exception) { mpMenu.clear(); @@ -1574,7 +1509,6 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw (css::uno::RuntimeExcep } - void SAL_CALL ToolbarMenuStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) { if( mpMenu ) @@ -1582,7 +1516,6 @@ void SAL_CALL ToolbarMenuStatusListener::statusChanged( const css::frame::Featur } - void ToolbarMenu::initStatusListener() { if( !mpImpl->mxStatusListener.is() ) @@ -1590,35 +1523,30 @@ void ToolbarMenu::initStatusListener() } - bool ToolbarMenu::IsInPopupMode() { return GetDockingManager()->IsInPopupMode(this); } - void ToolbarMenu::EndPopupMode() { GetDockingManager()->EndPopupMode(this); } - const Size& ToolbarMenu::getMenuSize() const { return mpImpl->maSize; } - void ToolbarMenu::SetSelectHdl( const Link<ToolbarMenu*,void>& rLink ) { mpImpl->maSelectHdl = rLink; } - } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 5baf1374ff02..1bc217cf1520 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::accessibility; namespace svtools { - - ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent ) : ToolbarMenuAccComponentBase(m_aMutex) , mpParent( &rParent ) @@ -51,7 +49,6 @@ ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent ) } - ToolbarMenuAcc::~ToolbarMenuAcc() { if( mpParent ) @@ -59,7 +56,6 @@ ToolbarMenuAcc::~ToolbarMenuAcc() } - IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper @@ -77,7 +73,6 @@ IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, v } - void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -114,7 +109,6 @@ void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } - void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue ) { if( nEventId ) @@ -142,7 +136,6 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, } - Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -150,7 +143,6 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() } - sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -160,7 +152,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -170,7 +161,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -186,7 +176,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R } - sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -206,7 +195,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx } - sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -214,7 +202,6 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, } - OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -222,7 +209,6 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeExcep } - OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -243,7 +229,6 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s } - Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -251,7 +236,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelati } - Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -271,7 +255,6 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet( } - Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -291,7 +274,6 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta } - void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -316,7 +298,6 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce } - void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -331,7 +312,6 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA } - sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -343,7 +323,6 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -375,7 +354,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw } - awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -393,7 +371,6 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std } - awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -403,7 +380,6 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std:: } - awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -413,7 +389,6 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeExcepti } - awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -459,7 +434,6 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd } - void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -468,7 +442,6 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException } - void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -476,7 +449,6 @@ void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeExcept } - sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -486,7 +458,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -511,7 +482,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa } - void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -523,7 +493,6 @@ void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) t } - void SAL_CALL ToolbarMenuAcc::disposing() { EventListenerVector aListenerListCopy; @@ -567,8 +536,6 @@ void ToolbarMenuAcc::ThrowIfDisposed() throw (DisposedException) } - - ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent ) : ToolbarMenuEntryAccBase( m_aMutex ) , mpParent( pParent ) @@ -576,13 +543,11 @@ ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent ) } - ToolbarMenuEntryAcc::~ToolbarMenuEntryAcc() { } - void SAL_CALL ToolbarMenuEntryAcc::disposing() { EventListenerVector aListenerListCopy; @@ -624,21 +589,18 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleConte } - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) { return 0; } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -651,7 +613,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr } - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -683,21 +644,18 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt } - sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::LIST_ITEM; } - OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException, std::exception) { return OUString(); } - OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -718,14 +676,12 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti } - Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) { return Reference< XAccessibleRelationSet >(); } - Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -752,7 +708,6 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat } - Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { Locale aRet( "", "", "" ); @@ -770,7 +725,6 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone } - void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -789,7 +743,6 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< } - void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -803,7 +756,6 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc } - sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); @@ -814,7 +766,6 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -822,7 +773,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( con } - awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -846,7 +796,6 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException } - awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); @@ -854,7 +803,6 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, } - awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -872,7 +820,6 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc } - awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index cae14d6cdf85..825ebdfa8d12 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -56,8 +56,6 @@ const int BORDER_X = 0; const int BORDER_Y = 0; - - class ToolbarMenuEntry { public: @@ -99,8 +97,6 @@ public: }; - - typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleEventBroadcaster, @@ -186,8 +182,6 @@ private: }; - - typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleEventBroadcaster, css::accessibility::XAccessibleContext, @@ -242,7 +236,6 @@ private: }; - struct ToolbarMenu_Impl { ToolbarMenu& mrMenu; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 4ad7bfff6833..38628ea7e14f 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -32,8 +32,6 @@ using namespace ::com::sun::star; - - ValueSetItem::ValueSetItem( ValueSet& rParent ) : mrParent(rParent) , mnId(0) @@ -45,7 +43,6 @@ ValueSetItem::ValueSetItem( ValueSet& rParent ) } - ValueSetItem::~ValueSetItem() { if( mxAcc.is() ) @@ -55,7 +52,6 @@ ValueSetItem::~ValueSetItem() } - uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) { if( !mxAcc.is() ) @@ -65,8 +61,6 @@ uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool b } - - ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) : ValueSetAccComponentBase (m_aMutex), mpParent( pParent ), @@ -76,13 +70,11 @@ ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) } - ValueSetAcc::~ValueSetAcc() { } - void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { if( nEventId ) @@ -120,7 +112,6 @@ const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() } - ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { @@ -136,8 +127,6 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa } - - void ValueSetAcc::GetFocus() { mbIsFocused = true; @@ -151,7 +140,6 @@ void ValueSetAcc::GetFocus() } - void ValueSetAcc::LoseFocus() { mbIsFocused = false; @@ -165,7 +153,6 @@ void ValueSetAcc::LoseFocus() } - uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext() throw (uno::RuntimeException, std::exception) { @@ -174,7 +161,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc } - sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -188,7 +174,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -206,7 +191,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -222,7 +206,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { @@ -249,7 +232,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() } - sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -262,7 +244,6 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() } - OUString SAL_CALL ValueSetAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -274,7 +255,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription() } - OUString SAL_CALL ValueSetAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -301,7 +281,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() } - uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -332,7 +311,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge } - uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -354,7 +332,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc } - lang::Locale SAL_CALL ValueSetAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -375,7 +352,6 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() } - void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -401,7 +377,6 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc } - void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -419,7 +394,6 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< } - sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { @@ -432,7 +406,6 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { @@ -456,7 +429,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - awt::Rectangle SAL_CALL ValueSetAcc::getBounds() throw (uno::RuntimeException, std::exception) { @@ -475,7 +447,6 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds() } - awt::Point SAL_CALL ValueSetAcc::getLocation() throw (uno::RuntimeException, std::exception) { @@ -490,7 +461,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocation() } - awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { @@ -506,7 +476,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() } - awt::Size SAL_CALL ValueSetAcc::getSize() throw (uno::RuntimeException, std::exception) { @@ -561,7 +530,6 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) } - sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -579,7 +547,6 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex } - void SAL_CALL ValueSetAcc::clearAccessibleSelection() throw (uno::RuntimeException, std::exception) { @@ -589,7 +556,6 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection() } - void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() throw (uno::RuntimeException, std::exception) { @@ -598,7 +564,6 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() } - sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -618,7 +583,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -638,7 +602,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc } - void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -651,7 +614,6 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) } - sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -665,8 +627,6 @@ sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& r } - - void SAL_CALL ValueSetAcc::disposing() { ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy; @@ -734,8 +694,6 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const } - - void ValueSetAcc::ThrowIfDisposed() throw (css::lang::DisposedException) { @@ -789,7 +747,6 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu } - void ValueItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); @@ -807,7 +764,6 @@ const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() } - ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { @@ -823,7 +779,6 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter } - uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext() throw (uno::RuntimeException, std::exception) { @@ -831,7 +786,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAc } - sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -839,7 +793,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -847,7 +800,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -861,7 +813,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl } - sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { @@ -912,7 +863,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() } - sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -920,7 +870,6 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() } - OUString SAL_CALL ValueItemAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -928,7 +877,6 @@ OUString SAL_CALL ValueItemAcc::getAccessibleDescription() } - OUString SAL_CALL ValueItemAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -951,7 +899,6 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName() } - uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -959,7 +906,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::g } - uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -991,7 +937,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA } - lang::Locale SAL_CALL ValueItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -1011,7 +956,6 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() } - void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -1036,7 +980,6 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac } - void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -1053,7 +996,6 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< } - sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 9bd9272e2e89..7065e6dcf295 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -65,14 +65,12 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() } - void VCLXAccessibleHeaderBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); } - void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -88,7 +86,6 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel } - Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" }; diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 13883cc7c3de..ddbcb0bf357e 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class AccessibleTabBar @@ -147,7 +146,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE } - Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -159,7 +157,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In } - Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -174,7 +171,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro } - sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -182,7 +178,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (Runti } - sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -191,7 +186,6 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti } - OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -200,7 +194,6 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE } - OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -212,7 +205,6 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio } - Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -223,7 +215,6 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe } - Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -244,7 +235,6 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState } - css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -264,7 +254,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons } - sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -274,7 +263,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, } - sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -296,7 +284,6 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc } - OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -306,7 +293,6 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept } - OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 8c5386a893fa..5865140fa089 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -502,7 +502,6 @@ void AssignmentPersistentData::ImplCommit() // = AddressBookSourceDialog - AddressBookSourceDialog::AddressBookSourceDialog(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 70bed42125d7..483515c26c67 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -37,8 +37,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ui::dialogs; - - SvColorDialog::SvColorDialog( vcl::Window* pWindow ) : mpParent( pWindow ) , meMode( svtools::ColorPickerMode_SELECT ) @@ -55,17 +53,12 @@ void SvColorDialog::SetColor( const Color& rColor ) } - - - - void SvColorDialog::SetMode( sal_Int16 eMode ) { meMode = eMode; } - short SvColorDialog::Execute() { short ret = 0; diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 7a3cbf3b214f..25401950732c 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -24,7 +24,6 @@ #include <vcl/print.hxx> - void ImplFillPrnDlgListBox( const Printer* pPrinter, ListBox* pBox, PushButton* pPropBtn ) { @@ -44,7 +43,6 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, } - void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear ) { if ( bClear ) @@ -52,7 +50,6 @@ void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear ) } - Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, Printer* pPrinter, Printer* pTempPrinterIn ) { @@ -92,7 +89,6 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, } - Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn ) { VclPtr<Printer> pTempPrinter( pTempPrinterIn ); @@ -112,7 +108,6 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn ) } - void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) { if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) @@ -124,7 +119,6 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) } - static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddStr) { OUString aStr(rStr); @@ -134,14 +128,12 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt } - static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId) { return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId)); } - OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { OUString aStr; @@ -217,7 +209,6 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) } - PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) : ModalDialog(pParent, "PrinterSetupDialog", "svt/ui/printersetupdialog.ui") @@ -244,7 +235,6 @@ PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) } - PrinterSetupDialog::~PrinterSetupDialog() { disposeOnce(); @@ -292,7 +282,6 @@ void PrinterSetupDialog::ImplSetInfo() } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) { QueueInfo aInfo; @@ -301,7 +290,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) { if ( !mpTempPrinter ) @@ -310,7 +298,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) { mpTempPrinter = ImplPrnDlgListBoxSelect(m_pLbName, m_pBtnProperties, @@ -319,7 +306,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) } - bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) && IsReallyVisible() ) @@ -329,7 +315,6 @@ bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) } - void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DataChangedEventType::PRINTER ) @@ -348,7 +333,6 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) } - short PrinterSetupDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index ec4ce04f06e9..b39fba449589 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -30,7 +30,6 @@ namespace svt { - //= WizardPageImplData struct WizardPageImplData diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index ee6f7ec44dec..f04fcb9da442 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -23,14 +23,12 @@ #include <svtools/wizdlg.hxx> - #define WIZARDDIALOG_BUTTON_OFFSET_Y 6 #define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6 #define WIZARDDIALOG_VIEW_DLGOFFSET_X 6 #define WIZARDDIALOG_VIEW_DLGOFFSET_Y 6 - struct ImplWizPageData { ImplWizPageData* mpNext; @@ -38,7 +36,6 @@ struct ImplWizPageData }; - struct ImplWizButtonData { ImplWizButtonData* mpNext; @@ -47,7 +44,6 @@ struct ImplWizButtonData }; - void WizardDialog::ImplInitData() { mpFirstPage = nullptr; @@ -72,14 +68,12 @@ void WizardDialog::SetLeftAlignedButtonCount( sal_Int16 _nCount ) } - void WizardDialog::SetEmptyViewMargin() { mbEmptyViewMargin = true; } - void WizardDialog::ImplCalcSize( Size& rSize ) { // ButtonBar-Hoehe berechnen @@ -247,8 +241,6 @@ long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ } - - void WizardDialog::ImplPosTabPage() { if ( !mpCurTabPage ) @@ -304,7 +296,6 @@ void WizardDialog::ImplPosTabPage() } - void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) { if ( mpCurTabPage == pTabPage ) @@ -327,7 +318,6 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) } - TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const { sal_uInt16 nTempLevel = 0; @@ -353,7 +343,6 @@ WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) : } - WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) : ModalDialog( pParent, rID, rUIXMLDescription ) { @@ -385,7 +374,6 @@ void WizardDialog::dispose() } - void WizardDialog::Resize() { if ( IsReallyShown() && !IsInInitShow() ) @@ -398,7 +386,6 @@ void WizardDialog::Resize() } - void WizardDialog::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::InitShow ) @@ -436,7 +423,6 @@ void WizardDialog::StateChanged( StateChangedType nType ) } - bool WizardDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && mpPrevBtn && mpNextBtn ) @@ -482,28 +468,24 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt ) } - void WizardDialog::ActivatePage() { maActivateHdl.Call( this ); } - bool WizardDialog::DeactivatePage() { return true; } - bool WizardDialog::ShowNextPage() { return ShowPage( mnCurLevel+1 ); } - bool WizardDialog::ShowPrevPage() { if ( !mnCurLevel ) @@ -512,7 +494,6 @@ bool WizardDialog::ShowPrevPage() } - bool WizardDialog::ShowPage( sal_uInt16 nLevel ) { if ( DeactivatePage() ) @@ -527,7 +508,6 @@ bool WizardDialog::ShowPage( sal_uInt16 nLevel ) } - bool WizardDialog::Finish( long nResult ) { if ( DeactivatePage() ) @@ -546,7 +526,6 @@ bool WizardDialog::Finish( long nResult ) } - void WizardDialog::AddPage( TabPage* pPage ) { ImplWizPageData* pNewPageData = new ImplWizPageData; @@ -565,7 +544,6 @@ void WizardDialog::AddPage( TabPage* pPage ) } - void WizardDialog::RemovePage( TabPage* pPage ) { ImplWizPageData* pPrevPageData = nullptr; @@ -592,7 +570,6 @@ void WizardDialog::RemovePage( TabPage* pPage ) } - void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) { sal_uInt16 nTempLevel = 0; @@ -615,7 +592,6 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) } - TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const { sal_uInt16 nTempLevel = 0; @@ -632,7 +608,6 @@ TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const } - void WizardDialog::AddButton( Button* pButton, long nOffset ) { ImplWizButtonData* pNewBtnData = new ImplWizButtonData; @@ -652,7 +627,6 @@ void WizardDialog::AddButton( Button* pButton, long nOffset ) } - void WizardDialog::RemoveButton( Button* pButton ) { ImplWizButtonData* pPrevBtnData = nullptr; diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 86f43efe93f4..67a2fe35e3d6 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -18,7 +18,6 @@ */ - #include "unoiface.hxx" MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index c7e23232db51..31bf45cc34a4 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -123,20 +123,17 @@ SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XCompon } - SvFilterOptionsDialog::~SvFilterOptionsDialog() { } - void SAL_CALL SvFilterOptionsDialog::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL SvFilterOptionsDialog::release() throw() { OWeakObject::release(); diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index a3e55f46520b..b25e99ce6ed0 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -178,7 +178,6 @@ public: }; - #endif // INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 0f55ecfcf701..f9e64af9acef 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; namespace unographic { - - GraphicDescriptor::GraphicDescriptor() : ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ), mpGraphic( nullptr ), @@ -153,7 +151,6 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) } - OUString GraphicDescriptor::getImplementationName_Static() throw() { @@ -161,7 +158,6 @@ OUString GraphicDescriptor::getImplementationName_Static() } - uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { @@ -170,7 +166,6 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() } - uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -193,7 +188,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) } - uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -201,7 +195,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicDescriptor::acquire() throw() { @@ -209,7 +202,6 @@ void SAL_CALL GraphicDescriptor::acquire() } - void SAL_CALL GraphicDescriptor::release() throw() { @@ -217,7 +209,6 @@ void SAL_CALL GraphicDescriptor::release() } - OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -231,7 +222,6 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam } - uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -239,7 +229,6 @@ uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() } - uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -263,7 +252,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -289,7 +277,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -300,7 +287,6 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** } - void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index ccfea396b7d7..207f0de3293f 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -39,7 +39,6 @@ Graphic::Graphic() : } - Graphic::~Graphic() throw() { @@ -47,7 +46,6 @@ Graphic::~Graphic() } - void Graphic::init( const ::Graphic& rGraphic ) throw() { @@ -57,7 +55,6 @@ void Graphic::init( const ::Graphic& rGraphic ) } - uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) throw( uno::RuntimeException, std::exception ) { @@ -75,7 +72,6 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) } - uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -86,7 +82,6 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) } - void SAL_CALL Graphic::acquire() throw() { @@ -94,7 +89,6 @@ void SAL_CALL Graphic::acquire() } - void SAL_CALL Graphic::release() throw() { ::unographic::GraphicDescriptor::release(); @@ -107,7 +101,6 @@ OUString Graphic::getImplementationName_Static() } - uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() { @@ -156,7 +149,6 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() } - uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() throw(uno::RuntimeException, std::exception) { @@ -164,7 +156,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() } - ::sal_Int8 SAL_CALL Graphic::getType() throw (uno::RuntimeException, std::exception) { @@ -192,7 +183,6 @@ awt::Size SAL_CALL Graphic::getSize( ) throw (uno::RuntimeException, std::excep } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -211,7 +201,6 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeExce } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index dd6585c1c3c9..03d49086856e 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -22,8 +22,6 @@ #include <svtools/grfmgr.hxx> - - GraphicAttr::GraphicAttr() : mfGamma ( 1.0 ), mnMirrFlags ( BmpMirrorFlags::NONE ), @@ -44,13 +42,11 @@ GraphicAttr::GraphicAttr() : } - GraphicAttr::~GraphicAttr() { } - bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const { return( ( mfGamma == rAttr.mfGamma ) && @@ -71,5 +67,4 @@ bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 7af69062cd91..d8408554716e 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -25,8 +25,6 @@ #include <list> - - class GraphicAttr; class GraphicCacheEntry; class GraphicDisplayCacheEntry; diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 82e76b359d79..7ffb4676773d 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -36,14 +36,11 @@ #include <memory> - #define WATERMARK_LUM_OFFSET 50 #define WATERMARK_CON_OFFSET -70 #define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) - - GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) : mnUsedSize(0), mpCache( new GraphicCache( nCacheSize, nMaxObjCacheSize ) ) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index cce56d148ecb..57ed103ed18f 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -100,7 +100,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -142,7 +141,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -162,8 +160,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( } - - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -193,7 +189,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -227,7 +222,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -304,7 +298,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O } - uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -377,7 +370,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc } - uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -720,7 +712,6 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } - void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index d717522fb223..f40036cfb3d5 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -49,14 +49,12 @@ GraphicRendererVCL::GraphicRendererVCL() : } - GraphicRendererVCL::~GraphicRendererVCL() throw() { } - uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -81,7 +79,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType } - uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -89,7 +86,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicRendererVCL::acquire() throw() { @@ -97,7 +93,6 @@ void SAL_CALL GraphicRendererVCL::acquire() } - void SAL_CALL GraphicRendererVCL::release() throw() { @@ -105,7 +100,6 @@ void SAL_CALL GraphicRendererVCL::release() } - OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -119,7 +113,6 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa } - uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -128,7 +121,6 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames( } - uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -153,7 +145,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -174,7 +165,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -229,7 +219,6 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* } - void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException ) { @@ -268,7 +257,6 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* } - void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) throw (uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 8636fe3f7d48..fbfdfa30516e 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -39,20 +39,16 @@ using namespace com::sun::star; namespace unographic { - - GraphicTransformer::GraphicTransformer() { } - GraphicTransformer::~GraphicTransformer() { } - void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ) { BitmapWriteAccess* pWriteAccess = rAlpha.AcquireWriteAccess(); diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx index c6af0cc3b4b9..764daddfffa6 100644 --- a/svtools/source/graphic/transformer.hxx +++ b/svtools/source/graphic/transformer.hxx @@ -27,8 +27,6 @@ namespace unographic { - - typedef ::cppu::WeakAggImplHelper1< css::graphic::XGraphicTransformer > GraphicTransformer_UnoImplHelper1; diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 659b36383f6d..bbe2f6a17243 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -110,7 +110,6 @@ public: }; - // class VCLXFileControl class VCLXFileControl : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow @@ -215,8 +214,6 @@ protected: }; - - // class SVTXRoadmap @@ -283,8 +280,6 @@ protected: }; - - // class SVTXNumericField class SVTXNumericField : public css::awt::XNumericField, public SVTXFormattedField diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 13f4bf06a255..9720e16bf5f6 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; - TransferableClipboardListener::TransferableClipboardListener( const Link<TransferableDataHelper*,void>& rCallback ) : aLink( rCallback ) { diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 704839f02c63..7f4cbdd9f5c5 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -56,5 +56,4 @@ namespace svt } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 8ab29197b385..73a286c28968 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -28,7 +28,6 @@ namespace svt { - //= IWindowOperator diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index f98407097ae1..6f805ec303d6 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -141,7 +141,6 @@ static sal_uInt16 aWndFunc( } - SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) : lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( nullptr ) @@ -155,14 +154,12 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l } - SfxErrorHandler::~SfxErrorHandler() { delete pFreeMgr; } - bool SfxErrorHandler::CreateString( const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const @@ -207,7 +204,6 @@ bool SfxErrorHandler::CreateString( } - class ResString: public OUString /* [Description] @@ -226,7 +222,6 @@ class ResString: public OUString }; - ResString::ResString(ResId & rId): OUString(rId.SetAutoRelease(false).toString()), nFlags(0) @@ -240,7 +235,6 @@ ResString::ResString(ResId & rId): } - struct ErrorResource_Impl : private Resource /* [Description] @@ -286,7 +280,6 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const } - bool SfxErrorHandler::GetMessageString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -315,7 +308,6 @@ bool SfxErrorHandler::GetMessageString( } - bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -363,7 +355,6 @@ bool SfxErrorHandler::GetErrorString( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) @@ -373,7 +364,6 @@ SfxErrorContext::SfxErrorContext( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) @@ -385,7 +375,6 @@ SfxErrorContext::SfxErrorContext( } - bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) /* [Description] diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index a0a952388a1c..666e43a878fc 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -55,7 +55,6 @@ SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbe } - SvEmbedTransferHelper::~SvEmbedTransferHelper() { if ( m_pGraphic ) @@ -80,7 +79,6 @@ void SvEmbedTransferHelper::AddSupportedFormats() } - bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) { bool bRet = false; @@ -196,7 +194,6 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo } - void SvEmbedTransferHelper::ObjectReleased() { m_xObj.clear(); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 7f011fb29430..58ce528e57db 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -194,7 +194,6 @@ static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] = }; - static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) { INetURLObject aObj( rURL ); diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 31246d3caf28..49e8dd9b4aba 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -84,5 +84,4 @@ IMapCompat::~IMapCompat() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index fc8c7b8bcfdd..6b35a0d1953f 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -183,7 +183,6 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool bUs } - LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const { LanguageType eType = LANGUAGE_DONTKNOW; @@ -206,7 +205,6 @@ LanguageType SvtLanguageTable::GetLanguageType( const OUString& rStr ) } - sal_uInt32 SvtLanguageTableImpl::GetEntryCount() const { return Count(); @@ -218,7 +216,6 @@ sal_uInt32 SvtLanguageTable::GetLanguageEntryCount() } - LanguageType SvtLanguageTableImpl::GetTypeAtIndex( sal_uInt32 nIndex ) const { LanguageType nType = LANGUAGE_DONTKNOW; diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 671c9668fb9c..efbd8b6e2dc8 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -45,7 +45,6 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc } - OpenFileDropTargetListener::~OpenFileDropTargetListener() { m_xTargetFrame.clear(); @@ -55,7 +54,6 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() } - void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { m_xTargetFrame.clear(); @@ -63,7 +61,6 @@ void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObjec } - void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { const sal_Int8 nAction = dtde.DropAction; @@ -98,7 +95,6 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr } - void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException, std::exception ) { try @@ -113,7 +109,6 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn } - void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException, std::exception ) { try @@ -126,7 +121,6 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { try @@ -145,7 +139,6 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException, std::exception ) { } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 1bceffc6f5bf..dd56ccebb715 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -160,8 +160,6 @@ namespace svt }; - - TemplateContent::TemplateContent( const INetURLObject& _rURL ) :m_aURL( _rURL ) { @@ -504,7 +502,6 @@ namespace svt } - void TemplateFolderCacheImpl::normalize( TemplateFolderContent& _rState ) { SubContentSort()( _rState ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 3177a8c45126..72e4b52554ac 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -64,7 +64,6 @@ #include <memory> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -74,8 +73,6 @@ using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; - - #define TOD_SIG1 0x01234567 #define TOD_SIG2 0x89abcdef @@ -159,7 +156,6 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj } - static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, const DataFlavorEx& rFlavorEx ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -230,41 +226,33 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons } - - TransferableHelper::TerminateListener::TerminateListener( TransferableHelper& rTransferableHelper ) : mrParent( rTransferableHelper ) { } - TransferableHelper::TerminateListener::~TerminateListener() { } - void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException, std::exception ) { mrParent.ImplFlush(); } - - TransferableHelper::TransferableHelper() : mpFormats( new DataFlavorExVector ), mpObjDesc( nullptr ) @@ -272,7 +260,6 @@ TransferableHelper::TransferableHelper() : } - TransferableHelper::~TransferableHelper() { delete mpObjDesc; @@ -405,7 +392,6 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co } - Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -423,7 +409,6 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr } - sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -451,7 +436,6 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r } - void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -474,13 +458,11 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, } - void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -496,31 +478,26 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE } - void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception ) { sal_Int64 nRet; @@ -537,7 +514,6 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& } - void TransferableHelper::ImplFlush() { if( mxClipboard.is() ) @@ -558,7 +534,6 @@ void TransferableHelper::ImplFlush() } - void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -568,7 +543,6 @@ void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) { bool bAdd = true; @@ -625,7 +599,6 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) } - void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -635,7 +608,6 @@ void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ); @@ -650,7 +622,6 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) } - bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) { bool bRet = false; @@ -668,7 +639,6 @@ bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::ClearFormats() { mpFormats->clear(); @@ -676,7 +646,6 @@ void TransferableHelper::ClearFormats() } - bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) { maAny = rAny; @@ -684,7 +653,6 @@ bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) } - bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -707,7 +675,6 @@ bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& r } - bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) { if( !rBitmapEx.IsEmpty() ) @@ -736,7 +703,6 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo } - bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) { if( rMtf.GetActionSize() ) @@ -751,7 +717,6 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlav } - bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) { if( rGraphic.GetType() != GRAPHIC_NONE ) @@ -768,7 +733,6 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& } - bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -781,7 +745,6 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatran } - bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& ) { @@ -796,7 +759,6 @@ bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObje } - bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ) { @@ -886,7 +848,6 @@ bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, } - bool TransferableHelper::SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ) { @@ -901,7 +862,6 @@ bool TransferableHelper::SetINetImage( const INetImage& rINtImg, } - bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const DataFlavor& rFlavor ) { tools::SvRef<SotStorageStream> xStm( new SotStorageStream( OUString() ) ); @@ -932,7 +892,6 @@ bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUse } - bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, SotClipboardFormatId, const DataFlavor& ) { OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" ); @@ -940,19 +899,16 @@ bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, So } - void TransferableHelper::DragFinished( sal_Int8 ) { } - void TransferableHelper::ObjectReleased() { } - void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDesc ) { delete mpObjDesc; @@ -963,7 +919,6 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes } - void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -994,7 +949,6 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const } - void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1022,7 +976,6 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const } - void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) @@ -1066,7 +1019,6 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct } - void TransferableHelper::ClearSelection( vcl::Window *pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1077,7 +1029,6 @@ void TransferableHelper::ClearSelection( vcl::Window *pWindow ) } - Reference< XClipboard> TransferableHelper::GetSystemClipboard() { vcl::Window *pFocusWindow = Application::GetFocusWindow(); @@ -1099,8 +1050,6 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId() } - - class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< XClipboardListener > { private: @@ -1129,7 +1078,6 @@ public: }; - TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ) :mrMutex( _rMutex ) ,mxNotifier( _rxClipboard, UNO_QUERY ) @@ -1147,7 +1095,6 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X } - void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1161,7 +1108,6 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C } - void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException, std::exception) { // clipboard is being disposed. Hmm. Okay, become disfunctional myself. @@ -1169,7 +1115,6 @@ void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) thr } - void TransferableClipboardNotifier::dispose() { ::osl::MutexGuard aGuard( mrMutex ); @@ -1184,8 +1129,6 @@ void TransferableClipboardNotifier::dispose() } - - struct TransferableDataHelper_Impl { ::osl::Mutex maMutex; @@ -1198,8 +1141,6 @@ struct TransferableDataHelper_Impl }; - - TransferableDataHelper::TransferableDataHelper() : mpFormats( new DataFlavorExVector ), mpObjDesc( new TransferableObjectDescriptor ), @@ -1208,7 +1149,6 @@ TransferableDataHelper::TransferableDataHelper() : } - TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransfer::XTransferable >& rxTransferable ) : mxTransfer( rxTransferable ), mpFormats( new DataFlavorExVector ), @@ -1219,7 +1159,6 @@ TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransf } - TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rDataHelper ) : mxTransfer( rDataHelper.mxTransfer ), mxClipboard( rDataHelper.mxClipboard ), @@ -1230,7 +1169,6 @@ TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rD } - TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDataHelper& rDataHelper ) { if ( this != &rDataHelper ) @@ -1255,7 +1193,6 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat } - TransferableDataHelper::~TransferableDataHelper() { StopClipboardListening( ); @@ -1267,7 +1204,6 @@ TransferableDataHelper::~TransferableDataHelper() } - void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor >& rDataFlavorSeq, DataFlavorExVector& rDataFlavorExVector ) { @@ -1361,7 +1297,6 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor } - void TransferableDataHelper::InitFormats() { SolarMutexGuard aSolarGuard; @@ -1386,7 +1321,6 @@ void TransferableDataHelper::InitFormats() } - bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1407,7 +1341,6 @@ bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const } - bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1428,7 +1361,6 @@ bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const } - sal_uInt32 TransferableDataHelper::GetFormatCount() const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1436,8 +1368,6 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const } - - SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1446,7 +1376,6 @@ SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) con } - DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1461,7 +1390,6 @@ DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) con } - Reference< XTransferable > TransferableDataHelper::GetXTransferable() const { Reference< XTransferable > xRet; @@ -1486,7 +1414,6 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const } - Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const { Any aReturn; @@ -1499,8 +1426,6 @@ Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString } - - Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& rDestDoc ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1549,7 +1474,6 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r } - bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& rStr ) { DataFlavor aFlavor; @@ -1557,7 +1481,6 @@ bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& } - bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny = GetAny(rFlavor, OUString()); @@ -1593,7 +1516,6 @@ bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rSt } - bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmpEx ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1615,7 +1537,6 @@ bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx } - bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) { tools::SvRef<SotStorageStream> xStm; @@ -1719,7 +1640,6 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r } - bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions) { DataFlavor aFlavor; @@ -1729,7 +1649,6 @@ bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMet } - bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { tools::SvRef<SotStorageStream> xStm; @@ -1774,7 +1693,6 @@ bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaF } - bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1796,7 +1714,6 @@ bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& } - bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { DataFlavor aFlavor; @@ -1849,7 +1766,6 @@ bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rF } - bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ) { DataFlavor aFlavor; @@ -1857,7 +1773,6 @@ bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap } - bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { tools::SvRef<SotStorageStream> xStm; @@ -1873,7 +1788,6 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r } - bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ) { DataFlavor aFlavor; @@ -1881,7 +1795,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormat } - bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) { rDesc = *mpObjDesc; @@ -1889,7 +1802,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatra } - bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ) { DataFlavor aFlavor; @@ -1897,7 +1809,6 @@ bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INet } - bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) { bool bRet = false; @@ -2033,7 +1944,6 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo } - bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ) { @@ -2042,7 +1952,6 @@ bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ) @@ -2056,7 +1965,6 @@ bool TransferableDataHelper::GetINetImage( } - bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ) { @@ -2065,7 +1973,6 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetFileList( const css::datatransfer::DataFlavor&, FileList& rFileList ) @@ -2101,7 +2008,6 @@ bool TransferableDataHelper::GetFileList( } - Sequence<sal_Int8> TransferableDataHelper::GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ) { DataFlavor aFlavor; @@ -2126,7 +2032,6 @@ Sequence<sal_Int8> TransferableDataHelper::GetSequence( const DataFlavor& rFlavo } - bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rxStream ) { DataFlavor aFlavor; @@ -2134,7 +2039,6 @@ bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rxStream ) { Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString()); @@ -2176,7 +2080,6 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon } - bool TransferableDataHelper::StartClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2190,7 +2093,6 @@ bool TransferableDataHelper::StartClipboardListening( ) } - void TransferableDataHelper::StopClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2204,7 +2106,6 @@ void TransferableDataHelper::StopClipboardListening( ) } - TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::Window * pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -2237,8 +2138,6 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::W } - - TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 09d9a891e3d0..444476b4a66b 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -34,8 +34,6 @@ #include <svtools/transfer.hxx> - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; @@ -44,27 +42,22 @@ using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; - - DragSourceHelper::DragGestureListener::DragGestureListener( DragSourceHelper& rDragSourceHelper ) : mrParent( rDragSourceHelper ) { } - DragSourceHelper::DragGestureListener::~DragGestureListener() { } - void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -74,8 +67,6 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons } - - DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() ) { @@ -87,7 +78,6 @@ DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : } - DragSourceHelper::~DragSourceHelper() { if( mxDragGestureRecognizer.is() ) @@ -95,14 +85,11 @@ DragSourceHelper::~DragSourceHelper() } - void DragSourceHelper::StartDrag( sal_Int8, const Point& ) { } - - DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDropTargetHelper ) : mrParent( rDropTargetHelper ), mpLastDragOverEvent( nullptr ) @@ -110,20 +97,17 @@ DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDro } - DropTargetHelper::DropTargetListener::~DropTargetListener() { delete mpLastDragOverEvent; } - void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -173,7 +157,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv } - void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -190,7 +173,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD } - void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -215,7 +197,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr } - void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -238,15 +219,11 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv } - - void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException, std::exception ) { } - - DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : mxDropTarget( pWindow->GetDropTarget() ), mpFormats( new DataFlavorExVector ) @@ -255,7 +232,6 @@ DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : } - DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) : mxDropTarget( rxDropTarget ), mpFormats( new DataFlavorExVector ) @@ -264,7 +240,6 @@ DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget } - DropTargetHelper::~DropTargetHelper() { if( mxDropTarget.is() ) @@ -274,7 +249,6 @@ DropTargetHelper::~DropTargetHelper() } - void DropTargetHelper::ImplConstruct() { if( mxDropTarget.is() ) @@ -286,7 +260,6 @@ void DropTargetHelper::ImplConstruct() } - void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors ) { mpFormats->clear(); @@ -294,28 +267,24 @@ void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDa } - void DropTargetHelper::ImplEndDrag() { mpFormats->clear(); } - sal_Int8 DropTargetHelper::AcceptDrop( const AcceptDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); @@ -334,7 +303,6 @@ bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) } - // TransferDataContainer @@ -345,11 +313,9 @@ struct TDataCntnrEntry_Impl }; - typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; - struct TransferDataContainer_Impl { TDataCntnrEntryList aFmtList; @@ -370,27 +336,23 @@ struct TransferDataContainer_Impl }; - TransferDataContainer::TransferDataContainer() : pImpl( new TransferDataContainer_Impl ) { } - TransferDataContainer::~TransferDataContainer() { delete pImpl; } - void TransferDataContainer::AddSupportedFormats() { } - bool TransferDataContainer::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { @@ -438,7 +400,6 @@ bool TransferDataContainer::GetData( } - void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) { if( !pImpl->pBookmk ) @@ -455,7 +416,6 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) } - void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ) { @@ -473,7 +433,6 @@ void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ) { @@ -481,7 +440,6 @@ void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) { SvMemoryStream aMemStm( 1024, 1024 ); @@ -492,7 +450,6 @@ void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) } - void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -503,7 +460,6 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) } - void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) { GraphicType nType = rGrf.GetType(); @@ -529,7 +485,6 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) } - void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUString& rStr ) { if( !rStr.isEmpty() ) @@ -544,14 +499,12 @@ void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUStrin } - void TransferDataContainer::CopyString( const OUString& rStr ) { CopyString( SotClipboardFormatId::STRING, rStr ); } - void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny ) { @@ -563,7 +516,6 @@ void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, } - bool TransferDataContainer::HasAnyData() const { return pImpl->aFmtList.begin() != pImpl->aFmtList.end() || @@ -571,7 +523,6 @@ bool TransferDataContainer::HasAnyData() const } - void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link<sal_Int8,void>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) @@ -582,7 +533,6 @@ void TransferDataContainer::StartDrag( } - void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { pImpl->aFinshedLnk.Call( nDropAction ); diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 190cb0f8d05b..dd13dad23701 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -20,7 +20,6 @@ #include <svtools/unitconv.hxx> - void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) { sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); @@ -80,7 +79,6 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) } - void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll ) { sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) ); @@ -126,7 +124,6 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) } - long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) { sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM ); @@ -152,7 +149,6 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) } - long CalcToUnit( float nIn, SfxMapUnit eUnit ) { // nIn ist in Points @@ -184,7 +180,6 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) } - long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) { long nOut = 0; @@ -241,14 +236,12 @@ long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) } - long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } - FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) { switch ( eUnit ) @@ -278,7 +271,6 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) } - long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) { DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || @@ -317,7 +309,6 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) } - long CMToTwips( long nIn ) { long nRet = 0; @@ -328,7 +319,6 @@ long CMToTwips( long nIn ) } - long MMToTwips( long nIn ) { long nRet = 0; @@ -339,7 +329,6 @@ long MMToTwips( long nIn ) } - long InchToTwips( long nIn ) { long nRet = 0; @@ -350,7 +339,6 @@ long InchToTwips( long nIn ) } - long PointToTwips( long nIn ) { long nRet = 0; @@ -361,7 +349,6 @@ long PointToTwips( long nIn ) } - long PicaToTwips( long nIn ) { long nRet = 0; @@ -372,7 +359,6 @@ long PicaToTwips( long nIn ) } - long TwipsToCM( long nIn ) { long nRet = nIn / 567; @@ -380,7 +366,6 @@ long TwipsToCM( long nIn ) } - long InchToCM( long nIn ) { long nRet = 0; @@ -391,7 +376,6 @@ long InchToCM( long nIn ) } - long MMToCM( long nIn ) { long nRet = nIn / 10; @@ -399,7 +383,6 @@ long MMToCM( long nIn ) } - long PointToCM( long nIn ) { long nRet = 0; @@ -410,7 +393,6 @@ long PointToCM( long nIn ) } - long PicaToCM( long nIn) { long nRet = 0; @@ -421,7 +403,6 @@ long PicaToCM( long nIn) } - long TwipsToMM( long nIn ) { long nRet = 0; @@ -432,7 +413,6 @@ long TwipsToMM( long nIn ) } - long CMToMM( long nIn ) { long nRet = 0; @@ -443,7 +423,6 @@ long CMToMM( long nIn ) } - long InchToMM( long nIn ) { long nRet = 0; @@ -454,7 +433,6 @@ long InchToMM( long nIn ) } - long PointToMM( long nIn ) { long nRet = 0; @@ -465,7 +443,6 @@ long PointToMM( long nIn ) } - long PicaToMM( long nIn ) { long nRet = 0; @@ -476,7 +453,6 @@ long PicaToMM( long nIn ) } - long TwipsToInch( long nIn ) { long nRet = nIn / 1440; @@ -484,7 +460,6 @@ long TwipsToInch( long nIn ) } - long CMToInch( long nIn ) { long nRet = 0; @@ -495,7 +470,6 @@ long CMToInch( long nIn ) } - long MMToInch( long nIn ) { long nRet = 0; @@ -506,7 +480,6 @@ long MMToInch( long nIn ) } - long PointToInch( long nIn ) { long nRet = nIn / 72; @@ -514,7 +487,6 @@ long PointToInch( long nIn ) } - long PicaToInch( long nIn ) { long nRet = nIn / 6; @@ -522,7 +494,6 @@ long PicaToInch( long nIn ) } - long TwipsToPoint( long nIn ) { long nRet = nIn / 20; @@ -530,7 +501,6 @@ long TwipsToPoint( long nIn ) } - long InchToPoint( long nIn ) { long nRet = 0; @@ -541,7 +511,6 @@ long InchToPoint( long nIn ) } - long CMToPoint( long nIn ) { long nRet = 0; @@ -552,7 +521,6 @@ long CMToPoint( long nIn ) } - long MMToPoint( long nIn ) { long nRet = 0; @@ -563,7 +531,6 @@ long MMToPoint( long nIn ) } - long PicaToPoint( long nIn ) { long nRet = nIn / 12; @@ -571,7 +538,6 @@ long PicaToPoint( long nIn ) } - long TwipsToPica( long nIn ) { long nRet = nIn / 240; @@ -579,7 +545,6 @@ long TwipsToPica( long nIn ) } - long InchToPica( long nIn ) { long nRet = 0; @@ -590,7 +555,6 @@ long InchToPica( long nIn ) } - long PointToPica( long nIn ) { long nRet = 0; @@ -601,7 +565,6 @@ long PointToPica( long nIn ) } - long CMToPica( long nIn ) { long nRet = 0; @@ -612,7 +575,6 @@ long CMToPica( long nIn ) } - long MMToPica( long nIn ) { long nRet = 0; @@ -623,7 +585,6 @@ long MMToPica( long nIn ) } - long Nothing( long nIn ) { long nRet = nIn; @@ -642,7 +603,6 @@ FUNC_CONVERT ConvertTable[6][6] = }; - long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index fd862053606d..96ab3b4e8535 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; - - XWindowItem::XWindowItem() : SfxPoolItem() { @@ -61,7 +59,4 @@ bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index a907500c974c..f6f75eb73162 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -52,8 +52,6 @@ SvRTFParser::~SvRTFParser() } - - int SvRTFParser::_GetNextToken() { int nRet = 0; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 922d2ebbec12..250f9e6bb785 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -179,5 +179,4 @@ SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLe } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 657a35539a89..b5c377b72ea0 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -58,7 +58,6 @@ struct SvParser_Impl }; - // Construktor SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize ) : rInput( rIn ) diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx index 17163b6ef7f8..4688e3b06c7f 100644 --- a/svtools/source/table/cellvalueconversion.hxx +++ b/svtools/source/table/cellvalueconversion.hxx @@ -30,7 +30,6 @@ namespace svt { - //= CellValueConversion struct CellValueConversion_Data; diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx index ffd035e71725..3d88c1574e85 100644 --- a/svtools/source/table/mousefunction.cxx +++ b/svtools/source/table/mousefunction.cxx @@ -29,7 +29,6 @@ namespace svt { namespace table { - //= ColumnResize diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 3ac1cc7ce5df..a43b78fb58a9 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -120,7 +120,6 @@ namespace svt { namespace table } - void TableControl::StateChanged( StateChangedType i_nStateChange ) { Control::StateChanged( i_nStateChange ); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 169fda79b90b..43acca35fa69 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -475,7 +475,6 @@ namespace svt { namespace table }; - } } // namespace svt::table diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx index 3cb33db0ecb0..519162f1b428 100644 --- a/svtools/source/table/tablegeometry.cxx +++ b/svtools/source/table/tablegeometry.cxx @@ -26,7 +26,6 @@ namespace svt { namespace table { - //= TableRowGeometry diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 65b365bc0542..ad8d7ea903f0 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -45,7 +45,6 @@ namespace svt { - OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext) :OPropertyContainer(GetBroadcastHelper()) ,m_pDialog(nullptr) diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 37038d165c18..494b466fb529 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -671,7 +671,6 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (R } - void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception) { VCLXWindow::disposing( Source ); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index b45f5abff8bb..c58db093f33d 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -675,7 +675,6 @@ void ToolboxController::updateStatus( const OUString& aCommandURL ) } - void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequence< PropertyValue >& rArgs, const OUString &sTarget ) { try @@ -699,7 +698,6 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); @@ -762,7 +760,6 @@ throw( css::uno::Exception, std::exception) } - IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index c74af2eaec94..1403ed538051 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -68,8 +68,6 @@ public: }; - - class ImplContextGraphicItem : public SvLBoxContextBmp { public: @@ -81,7 +79,6 @@ public: }; - class UnoTreeListBoxImpl : public SvTreeListBox { public: @@ -105,7 +102,6 @@ private: }; - class UnoTreeListItem : public SvLBoxString { public: @@ -127,7 +123,6 @@ private: }; - class UnoTreeListEntry : public SvTreeListEntry { public: @@ -150,7 +145,6 @@ TreeControlPeer::TreeControlPeer() } - TreeControlPeer::~TreeControlPeer() { if( mpTreeImpl ) @@ -159,7 +153,6 @@ TreeControlPeer::~TreeControlPeer() } - void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) { if( pEntry && pEntry->mxNode.is() ) @@ -174,7 +167,6 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) { if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() ) @@ -188,7 +180,6 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) } - UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException ) { if( mpTreeNodeMap ) @@ -205,7 +196,6 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode } - vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ) { mpTreeImpl = VclPtr<UnoTreeListBoxImpl>::Create( this, pParent, nWinStyle ); @@ -213,7 +203,6 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 } - /** called from the UnoTreeListBoxImpl when it gets deleted */ void TreeControlPeer::disposeControl() { @@ -223,14 +212,12 @@ void TreeControlPeer::disposeControl() } - void TreeControlPeer::SetWindow( const VclPtr< vcl::Window > &pWindow ) { VCLXWindow::SetWindow( pWindow ); } - UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = TREELIST_APPEND */ ) { UnoTreeListEntry* pEntry = nullptr; @@ -270,7 +257,6 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN } - void TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) { bool bChanged = false; @@ -336,7 +322,6 @@ void TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::onSelectionChanged() { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -345,7 +330,6 @@ void TreeControlPeer::onSelectionChanged() } - void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) { try @@ -360,7 +344,6 @@ void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) } - bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -384,7 +367,6 @@ bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bEx } - void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -407,7 +389,6 @@ void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExp } - void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTreeDataModel >& xDataModel ) { rTree.Clear(); @@ -432,7 +413,6 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre } - void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParentEntry ) { if( xNode.is() ) @@ -445,7 +425,6 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree } - UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException ) { if( !mpTreeImpl ) @@ -454,7 +433,6 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim } - void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -524,7 +502,6 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega } - Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -560,14 +537,12 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep } - void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); @@ -584,14 +559,12 @@ sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw ( } - void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { ChangeNodesSelection( rSelection, false, false ); } - void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -599,7 +572,6 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::ex } - sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -607,7 +579,6 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, } - class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: @@ -620,7 +591,6 @@ public: }; - TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection ) { maSelection.swap( rSelection ); @@ -628,14 +598,12 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection } - sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException, std::exception) { return maIter != maSelection.end(); } - Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if( maIter == maSelection.end() ) @@ -645,7 +613,6 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -669,7 +636,6 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -703,7 +669,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::un } - void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -733,7 +698,6 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe } - OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -741,7 +705,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::u } - void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -771,7 +734,6 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD } - sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -782,7 +744,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& } - sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -790,7 +751,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode > } - void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -802,7 +762,6 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN } - sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -813,7 +772,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& } - void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -825,7 +783,6 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) } - void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -837,21 +794,18 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode } - void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.removeInterface( xListener ); } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -869,7 +823,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -887,7 +840,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ } - awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -900,7 +852,6 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode } - sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -910,7 +861,6 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::e } - sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -928,7 +878,6 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -938,7 +887,6 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1488,7 +1436,6 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pPa } - UnoTreeListBoxImpl::~UnoTreeListBoxImpl() { disposeOnce(); @@ -1502,7 +1449,6 @@ void UnoTreeListBoxImpl::dispose() } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) @@ -1510,7 +1456,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1523,7 +1468,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1534,7 +1478,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) } - void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) { if( pParent ) @@ -1544,7 +1487,6 @@ void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParen } - void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent ); @@ -1553,14 +1495,12 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) } - bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { return mxPeer.is() && mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ); } - bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { return mxPeer.is() && mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ); @@ -1576,20 +1516,17 @@ UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) } - UnoTreeListItem::UnoTreeListItem() : SvLBoxString() { } - UnoTreeListItem::~UnoTreeListItem() { } - void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { @@ -1606,14 +1543,12 @@ void UnoTreeListItem::Paint( } - SvLBoxItem* UnoTreeListItem::Create() const { return new UnoTreeListItem; } - void UnoTreeListItem::Clone( SvLBoxItem* pSource ) { UnoTreeListItem* pSourceItem = dynamic_cast< UnoTreeListItem* >( pSource ); @@ -1625,24 +1560,18 @@ void UnoTreeListItem::Clone( SvLBoxItem* pSource ) } - void UnoTreeListItem::SetImage( const Image& rImage ) { maImage = rImage; } - - - - void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL ) { maGraphicURL = rGraphicURL; } - void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) @@ -1664,7 +1593,6 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry } - UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ) : SvTreeListEntry() , mxNode( xNode ) @@ -1675,7 +1603,6 @@ UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeCon } - UnoTreeListEntry::~UnoTreeListEntry() { if( mpPeer ) diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index 2ffc749f97fa..0f859c8279cd 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -42,7 +42,6 @@ namespace svt { namespace table { - //= UnoControlTableModel class UnoGridColumnFacade; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index bfa752f49964..7c88245e3094 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -549,5 +549,4 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx index 2aa3091b7f4b..aed237624447 100644 --- a/svtools/source/uno/unogridcolumnfacade.hxx +++ b/svtools/source/uno/unogridcolumnfacade.hxx @@ -36,7 +36,6 @@ namespace svt { namespace table { - //= UnoGridColumnFacade class ColumnChangeMultiplexer; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index f8a7b3f1e7da..df5a473b5a7a 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -806,7 +806,6 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXFormattedField @@ -1296,8 +1295,6 @@ void SVTXFormattedField::SetValue(const css::uno::Any& rValue) } - - void SVTXFormattedField::setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier) { FormattedField* pField = GetAs< FormattedField >(); @@ -1401,7 +1398,6 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXRoadmap using namespace svt; @@ -1553,8 +1549,6 @@ void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent } - - void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1609,7 +1603,6 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any } - css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2058,7 +2051,6 @@ void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class VCLXProgressBar @@ -2306,7 +2298,6 @@ void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXDateField SVTXDateField::SVTXDateField() diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 75d18ce5a3db..d7fef225e35c 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -518,7 +518,6 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents() } - class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel > { public: |