diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 09:21:53 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:11:34 +0000 |
commit | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch) | |
tree | efbfb952f3236a6f56540ddae6a896c8c73774a0 /vcl | |
parent | f12e483589888f87843026ceff5ae3c1e615ca02 (diff) |
Formatting changes across all modules
+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs
Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl')
33 files changed, 3 insertions, 58 deletions
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 37c13d66975f..30662128b25d 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -30,7 +30,6 @@ class ImplGlyphFallbackFontSubstitution; class ImplPreMatchFontSubstitution; -// - PhysicalFontCollection - // TODO: merge with ImplFontCache // TODO: rename to LogicalFontManager diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index ebc0d8270dba..f4b1c1ada339 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -40,7 +40,6 @@ public: const OUString* mpTargetStyleName; }; -// - PhysicalFontFace - // TODO: no more direct access to members // TODO: add reference counting diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index 948ce1b793c9..79f097a7351b 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -34,7 +34,6 @@ namespace vcl { class Window; } class ToolBox; class DocumentFocusListener; -// - AquaA11yFocusTracker - class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker> { diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index da7f0926c26e..525446c259c0 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -28,7 +28,6 @@ #include <set> #include <com/sun/star/awt/Rectangle.hpp> -// - AquaA11yEventListener - class AquaA11yEventListener : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index 8512231133b9..8f1e3130bb90 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -25,7 +25,6 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> -// - KeyboardFocusListener - class KeyboardFocusListener : public salhelper::SimpleReferenceObject { diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 1c0d8b7a56b7..360a2e9b39dd 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -45,7 +45,6 @@ class AquaBlinker; typedef struct SalFrame::SalPointerState SalPointerState; -// - AquaSalFrame - class AquaSalFrame : public SalFrame { diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index be7f84417047..c963ead06be2 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -26,7 +26,6 @@ class AquaSalFrame; class AquaSalObject; -// - SalObjectData - struct SalObjectData { diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 94340f3725a4..363c137be121 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -26,7 +26,6 @@ #include <boost/shared_array.hpp> -// - AquaSalInfoPrinter - class AquaSalGraphics; @@ -113,7 +112,6 @@ class AquaSalInfoPrinter : public SalInfoPrinter AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) = delete; }; -// - AquaSalPrinter - class AquaSalPrinter : public SalPrinter { diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h index 863c73e4635c..50c3fc0b2f75 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -24,7 +24,6 @@ #include <list> -// - SalSystemData - class VCL_DLLPUBLIC AquaSalSystem : public SalSystem { diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index afe79863777d..3166fd595b34 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -32,7 +32,6 @@ #include <boost/shared_array.hpp> -// - SalBitmap - struct BitmapBuffer; class BitmapPalette; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 73e959216ca4..a4a2608f3399 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -113,7 +113,6 @@ private: CFMutableDictionaryRef GetStyleDict( void ) const { return mpStyleDict; } }; -// - SystemFontList - // TODO: move into cross-platform headers class SystemFontList @@ -136,7 +135,6 @@ private: CTFontContainer maFontContainer; }; -// - AquaSalGraphics - class AquaSalGraphics : public SalGraphics { diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index f68af82cda42..fe7aea15fbcb 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -34,7 +34,6 @@ class SalGraphics; class ImplSalDDB; class ImplSalBitmapCache; -// - SalBitmap - class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap { @@ -148,7 +147,6 @@ public: virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; }; -// - ImplSalDDB - class ImplSalDDB { @@ -214,7 +212,6 @@ public: ) const; }; -// - ImplSalBitmapCache - struct ImplBmpObj; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index b38d604a35f6..0a698e5eae46 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -25,7 +25,6 @@ #include <salbmp.hxx> #include <memory> -// - SalBitmap - struct BitmapBuffer; class BitmapColor; diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 600946f4b878..5b8edcb0c67c 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -26,7 +26,6 @@ class WinSalGraphics; -// - WinSalFrame - class WinSalFrame : public SalFrame { diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index 78da55fa515c..d172d2fad9e8 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -22,7 +22,6 @@ #include <salobj.hxx> -// - SalObjectData - class WinSalObject : public SalObject { diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 7d0a0fd1bc6a..33795a4a6e57 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -22,7 +22,6 @@ #include <salprn.hxx> -// - SalDriverData - // WNT3 #define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433) @@ -38,7 +37,6 @@ struct SalDriverData #pragma pack() -// - WinSalInfoPrinter - class WinSalGraphics; @@ -71,7 +69,6 @@ public: virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override; }; -// - WinSalPrinter - class WinSalPrinter : public SalPrinter { diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h index e19e88d9d096..1b57feacd2f2 100644 --- a/vcl/inc/win/salvd.h +++ b/vcl/inc/win/salvd.h @@ -24,7 +24,6 @@ class WinSalGraphics; -// - SalVirDevData - class WinSalVirtualDevice : public SalVirtualDevice { diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index e92095c95bae..b1f0fa73b334 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -22,7 +22,6 @@ #include <string.h> -// - Strict - // Anpassungen fuer TypeChecking @@ -171,7 +170,6 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE ); } -// - ZMouse Erweiterungen - #define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG" @@ -199,7 +197,6 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #define WHEEL_PAGESCROLL (UINT_MAX) #endif -// - SystemAgent Erweiterungen - #define ENABLE_AGENT 1 #define DISABLE_AGENT 2 diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 9f8949206863..f48cb1ad7ae7 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -28,7 +28,6 @@ #include <set> -// - DocumentFocusListener - class DocumentFocusListener : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 0bc86667f09d..22fa582114c5 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -97,7 +97,6 @@ void TimerTest::testWatchdog() } #endif -// -------------------------------------------------------------------- class IdleBool : public Idle { @@ -146,7 +145,6 @@ void TimerTest::testIdleMainloop() #endif } -// -------------------------------------------------------------------- class TimerBool : public Timer { @@ -181,7 +179,6 @@ void TimerTest::testDurations() } } -// -------------------------------------------------------------------- class AutoTimerCount : public AutoTimer { @@ -302,7 +299,6 @@ void TimerTest::testMultiAutoTimers() } #endif // TEST_TIMERPRECISION -// -------------------------------------------------------------------- class YieldTimer : public Timer { @@ -329,7 +325,6 @@ void TimerTest::testRecursiveTimer() Application::Yield(); } -// -------------------------------------------------------------------- class SlowCallbackTimer : public Timer { diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 931629879787..c456d4ed1877 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -633,7 +633,6 @@ bool XPMReader::ImplGetString() return mbStatus; } -// - ImportXPM - VCL_DLLPUBLIC bool ImportXPM( SvStream& rStm, Graphic& rGraphic ) { diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 84904bdb0f38..bfcafe184c9b 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -31,7 +31,6 @@ #include <vcl/outdev.hxx> #include <memory> -// - Defines - #define DIBCOREHEADERSIZE ( 12UL ) #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index 7ad02ea1bffa..2a756887606d 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -24,7 +24,6 @@ namespace tools { class PolyPolygon; } -// - Vectorizer - namespace ImplVectorizer { bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 302ecc732d63..fc5878399235 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <numeric> -// - ImplLineInfo - ImplLineInfo::ImplLineInfo() : mnRefCount ( 1 ), @@ -69,7 +68,6 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const && meLineCap == rB.meLineCap); } -// - LineInfo - LineInfo::LineInfo( LineStyle eStyle, long nWidth ) { diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 860742648ea7..67ed3f595978 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -26,7 +26,6 @@ #include <tools/debug.hxx> -// - ImplMapMode - struct MapMode::ImplMapMode { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 22f32eb2ad10..3ad54a518a01 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2270,7 +2270,6 @@ LogicalFontInstance* PdfBuiltinFontFace::CreateFontInstance( FontSelectPattern& return pEntry; } -// - PDFWriterImpl - sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation ) { diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index fc804faf24d7..dc925985ab84 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -147,7 +147,6 @@ static void ImplDrawBrdWinSymbolButton( vcl::RenderContext* pDev, ImplDrawBrdWinSymbol( pDev, aTempRect, eSymbol ); } -// - ImplBorderWindowView - ImplBorderWindowView::~ImplBorderWindowView() { @@ -412,7 +411,6 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData return nTitleWidth; } -// - ImplNoBorderWindowView - ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* ) { @@ -440,7 +438,6 @@ void ImplNoBorderWindowView::DrawWindow(vcl::RenderContext&, sal_uInt16, const P { } -// - ImplSmallBorderWindowView - ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ) : mpBorderWindow(pBorderWindow) , mpOutDev(nullptr) @@ -790,7 +787,6 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, s } } -// - ImplStdBorderWindowView - ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 2e7499ed2188..8fe500112a5c 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2466,7 +2466,6 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } } -// - MenuBar - MenuBarWindow* MenuBar::getMenuBarWindow() { // so far just a dynamic_cast, hopefully to be turned into something saner diff --git a/vcl/unx/generic/app/gendisp.cxx b/vcl/unx/generic/app/gendisp.cxx index 129a83baf16e..6713403d0f9c 100644 --- a/vcl/unx/generic/app/gendisp.cxx +++ b/vcl/unx/generic/app/gendisp.cxx @@ -74,9 +74,9 @@ bool SalGenericDisplay::DispatchInternalEvent() osl::MutexGuard g( m_aEventGuard ); if( !m_aUserEvents.empty() ) { - pFrame = m_aUserEvents.front().m_pFrame; - pData = m_aUserEvents.front().m_pData; - nEvent = m_aUserEvents.front().m_nEvent; + pFrame = m_aUserEvents.front().m_pFrame; + pData = m_aUserEvents.front().m_pData; + nEvent = m_aUserEvents.front().m_nEvent; m_aUserEvents.pop_front(); } diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 052c60647137..e9833d3d6869 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -51,7 +51,6 @@ #include <memory> -// - SalBitmap - SalBitmap* X11SalInstance::CreateSalBitmap() { @@ -887,7 +886,6 @@ bool X11SalBitmap::Replace( const Color& /*rSearchColor*/, const Color& /*rRepla return false; } -// - ImplSalDDB - ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, SalX11Screen nXScreen, const SalTwoRect& rTwoRect ) @@ -1041,7 +1039,6 @@ void ImplSalDDB::ImplDraw( } } -// - ImplSalBitmapCache - struct ImplBmpObj { diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 3e10ab9fafe0..c5b2a74eef46 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -43,7 +43,6 @@ #include <gdiplus.h> #include "postwin.h" -// - Inlines - inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex ) { @@ -184,7 +183,6 @@ public: static GdiPlusBuffer aGdiPlusBuffer; -// - WinSalBitmap - WinSalBitmap::WinSalBitmap() : maSize(), diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index ea352b0483e3..7cfff0e8fbc3 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -56,7 +56,6 @@ using namespace vcl; static const int MAXFONTHEIGHT = 2048; -// - Inlines - inline FIXED FixedFromDouble( double d ) { diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index ae2d9237f5bf..174a1a327bfa 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -156,7 +156,6 @@ static PrintQueueFlags ImplWinQueueStatusToSal( DWORD nWinStatus ) return nStatus; } -// - WinSalInstance - void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { @@ -1070,7 +1069,6 @@ static bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetu return TRUE; } -// - WinSalInstance - SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) @@ -1109,7 +1107,6 @@ void WinSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) delete pPrinter; } -// - WinSalInfoPrinter - WinSalInfoPrinter::WinSalInfoPrinter() : mpGraphics( NULL ), @@ -1302,7 +1299,6 @@ void WinSalInfoPrinter::GetPageInfo( const ImplJobSetup*, rPageHeight = GetDeviceCaps( hDC, PHYSICALHEIGHT ); } -// - WinSalInstance - SalPrinter* WinSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { @@ -1379,7 +1375,6 @@ static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, bool return pNewDevMode; } -// - WinSalPrinter - WinSalPrinter::WinSalPrinter() : mpGraphics( NULL ), |