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 /include/vcl | |
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 'include/vcl')
43 files changed, 0 insertions, 204 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index b370b025a152..da6d09111a61 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -416,7 +416,6 @@ inline T* VclBuilder::get(const OString& sID) } - //helper baseclass to ease retro fitting dialogs/tabpages that load a resource //to load a .ui file instead // diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index edf0e04f7deb..8bc10969ecfe 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -68,7 +68,6 @@ VCL_DLLPUBLIC sal_uInt64 SAL_CALL vcl_crc64 ( ) SAL_THROW_EXTERN_C(); - VCL_DLLPUBLIC const sal_uInt64* vcl_get_crc64_table(); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 803f2f5e0ef7..dede22f9d680 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -31,8 +31,6 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; } class StyleSettings; - - class VCL_DLLPUBLIC Control : public vcl::Window { protected: diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index e11cdeb22fad..a615951b5094 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -25,8 +25,6 @@ #include <vcl/salctype.hxx> - - struct ConvertData; class Graphic; diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index 4c1daa3aab1b..757fb0d450d0 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -56,7 +56,6 @@ bool VCL_DLLPUBLIC ReadDIBV5( SvStream& rIStm); - bool VCL_DLLPUBLIC WriteDIB( // WriteDIB(rBitmap, rOStm, false, true); const Bitmap& rSource, SvStream& rOStm, @@ -72,5 +71,4 @@ sal_uInt32 getDIBV5HeaderSize(); #endif // INCLUDED_VCL_DIBTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 3f8f2f6acdf7..7da7263ef868 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -209,8 +209,6 @@ public: }; - - class VCL_DLLPUBLIC DockingWindow : public vcl::Window , public VclBuilderContainer @@ -347,7 +345,6 @@ public: }; - inline void DockingWindow::RollDown() { if ( mpFloatWin ) diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 119027cf0fdc..da551edfeb66 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -81,8 +81,6 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode, } - - enum class MouseEventModifiers { NONE = 0, @@ -111,8 +109,6 @@ namespace o3tl #define MOUSE_RIGHT ((sal_uInt16)0x0004) - - class VCL_DLLPUBLIC MouseEvent { private: @@ -242,7 +238,6 @@ public: }; - enum class HelpEventMode { NONE = 0x0000, @@ -338,8 +333,6 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR } - - class VCL_DLLPUBLIC TrackingEvent { private: @@ -374,7 +367,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, } - enum class MouseNotifyEvent { NONE = 0, @@ -440,8 +432,6 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const } - - enum class DataChangedEventType { NONE = 0, SETTINGS = 1, diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 0741efdf2d37..641a3abeabe2 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -35,8 +35,6 @@ class LocaleDataWrapper; class LanguageTag; - - class VCL_DLLPUBLIC FormatterBase { private: @@ -89,9 +87,6 @@ public: }; - - - #define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) class VCL_DLLPUBLIC PatternFormatter : public FormatterBase @@ -128,8 +123,6 @@ public: }; - - class VCL_DLLPUBLIC NumericFormatter : public FormatterBase { private: @@ -206,8 +199,6 @@ public: }; - - class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter { private: @@ -262,9 +253,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter { private: @@ -287,9 +275,6 @@ public: }; - - - class VCL_DLLPUBLIC DateFormatter : public FormatterBase { private: @@ -340,7 +325,6 @@ public: const Date& GetMax() const { return maMax; } - // MT: Remove these methods too, ExtDateFormat should be enough! // What should happen if using DDMMYYYY, but ShowCentury=false? @@ -380,9 +364,6 @@ public: }; - - - class VCL_DLLPUBLIC TimeFormatter : public FormatterBase { private: @@ -457,9 +438,6 @@ public: }; - - - class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: @@ -472,9 +450,6 @@ public: }; - - - class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter { protected: @@ -501,9 +476,6 @@ public: }; - - - class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter { protected: @@ -571,9 +543,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { public: @@ -593,9 +562,6 @@ public: }; - - - class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter { private: @@ -627,8 +593,6 @@ public: }; - - class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter { private: @@ -662,9 +626,6 @@ public: }; - - - class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: @@ -680,9 +641,6 @@ public: }; - - - class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: @@ -703,9 +661,6 @@ public: }; - - - class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: @@ -736,9 +691,6 @@ public: }; - - - class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: @@ -757,8 +709,6 @@ public: }; - - class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: @@ -775,9 +725,6 @@ public: }; - - - class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 85188d288821..cfbddb5fbad2 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -30,8 +30,6 @@ class UserDrawEvent; - - class VCL_DLLPUBLIC FixedText : public Control { private: @@ -91,8 +89,6 @@ public: }; - - class VCL_DLLPUBLIC FixedLine : public Control { private: @@ -152,8 +148,6 @@ public: }; - - class VCL_DLLPUBLIC FixedImage : public Control { private: diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 01672f0b7650..2e9aa42f3fd0 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -28,8 +28,6 @@ class ToolBox; - - enum class FloatWinPopupFlags { NONE = 0x000000, diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index ea31f0dd5bb3..592c70714bfd 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -40,7 +40,6 @@ void VCL_DLLPUBLIC clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource); - #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 15461dcc2031..5c4b8acd1df4 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -40,8 +40,6 @@ namespace tools { class Gradient; - - #define GDI_METAFILE_END ((size_t)0xFFFFFFFF) #define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF) @@ -53,8 +51,6 @@ enum MtfConversion }; - - typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index f31824dfb8cd..3e1c8cbf9f17 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -29,8 +29,6 @@ class SvStream; - - struct ImpBuffer { sal_uLong mnRefCount; @@ -48,8 +46,6 @@ struct ImpBuffer }; - - struct ImpSwap { OUString maURL; @@ -67,8 +63,6 @@ struct ImpSwap }; - - struct ImpGfxLink { MapMode maPrefMapMode; @@ -87,8 +81,6 @@ struct ImpGfxLink //#endif // __PRIVATE - - enum GfxLinkType { GFX_LINK_TYPE_NONE = 0, @@ -111,8 +103,6 @@ enum GfxLinkType #define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP - - struct ImpBuffer; struct ImpSwap; struct ImpGfxLink; diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 5c44fc5486d6..b80c79f75c43 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -28,8 +28,6 @@ #include <o3tl/cow_wrapper.hxx> - - class Rectangle; class Point; class SvStream; @@ -59,8 +57,6 @@ public: }; - - class VCL_DLLPUBLIC Gradient { private: diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index bd83af4bb493..a090c557aa7c 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -130,7 +130,6 @@ enum class GraphicFileFormat }; - class VCL_DLLPUBLIC GraphicDescriptor { SvStream* pFileStm; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 0ba7e3ad77bd..3c44b8c1ca9d 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -25,8 +25,6 @@ #include <vcl/ctrl.hxx> - - class VCL_DLLPUBLIC GroupBox : public Control { private: diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 0dd3e8c3601d..0518b290bba3 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -26,8 +26,6 @@ #include <vcl/vclenum.hxx> - - class SvStream; struct ImplHatch @@ -46,8 +44,6 @@ struct ImplHatch }; - - class VCL_DLLPUBLIC Hatch { private: diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index 1970c21dd99a..2c0ec962b459 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -30,7 +30,6 @@ class Rectangle; namespace vcl { class Window; } - enum class QuickHelpFlags { NONE = 0x0000, diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx index f24c49a633b4..c7cbbefe1cd5 100644 --- a/include/vcl/imagerepository.hxx +++ b/include/vcl/imagerepository.hxx @@ -30,7 +30,6 @@ namespace vcl { - //= ImageRepository // provides access to the application's image repository (image.zip) diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 582b73274fdb..656bc8321c06 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -26,8 +26,6 @@ #include <vcl/bitmapex.hxx> - - class VCL_DLLPUBLIC ImageControl : public FixedImage { private: diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index ced1d2903bc3..49f0c8f260b3 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -26,8 +26,6 @@ #include <o3tl/typed_flags_set.hxx> - - enum class InputContextFlags { NONE = 0x0000, @@ -42,8 +40,6 @@ namespace o3tl } - - class VCL_DLLPUBLIC InputContext { private: diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 3495bb28dd33..82a7e8cc28c1 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/drawing/LineCap.hpp> - - class SvStream; namespace basegfx { class B2DPolyPolygon; } @@ -56,8 +54,6 @@ struct ImplLineInfo }; - - class VCL_DLLPUBLIC LineInfo { private: diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index d159d9255b67..8b40478d904b 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -27,8 +27,6 @@ class LocaleDataWrapper; - - class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase { private: @@ -72,8 +70,6 @@ public: }; - - class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter { friend void ImplNewLongCurrencyFieldValue(LongCurrencyField*, const BigInt&); @@ -104,8 +100,6 @@ public: }; - - class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { public: diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 1fef4f749864..508bdd82c8e5 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -29,8 +29,6 @@ class SvStream; class OutputDevice; - - class VCL_DLLPUBLIC MapMode { friend class OutputDevice; diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 3e47a87df4fd..9822db32b458 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -26,8 +26,6 @@ #include <vcl/dllapi.h> - - // Mnemonic Chars, which we want support // Latin 0-9 #define MNEMONIC_RANGE_1_START 0x30 @@ -51,8 +49,6 @@ #define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) - - class VCL_DLLPUBLIC MnemonicGenerator { private: diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx index acecf5e62a6c..1574704158ed 100644 --- a/include/vcl/mnemonicengine.hxx +++ b/include/vcl/mnemonicengine.hxx @@ -35,7 +35,6 @@ namespace vcl { - //= IMnemonicEntryList /// callback for a MnemonicEngine diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 5e96c3a9eb5a..3da26df19225 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -28,8 +28,6 @@ struct ImplMoreButtonData; - - class VCL_DLLPUBLIC MoreButton : public PushButton { private: diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 37165181fbb7..dbbed2dff45c 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -53,7 +53,6 @@ struct VCL_DLLPUBLIC PPDValue }; - /* * PPDKey - a container for the available options (=values) of a PPD keyword */ @@ -112,7 +111,6 @@ struct PPDKeyhash }; - /* * PPDParser - parses a PPD file and contains all available keys from it */ @@ -241,7 +239,6 @@ public: }; - /* * PPDContext - a class to manage user definable states based on the * contents of a PPDParser. diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 884e8076edc7..85b1e24d5b53 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -46,13 +46,9 @@ ************************************************************************/ - - #define WB_STDPROGRESSBAR WB_BORDER - - class VCL_DLLPUBLIC ProgressBar : public vcl::Window { private: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 376fad492278..84fef6fde74e 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -50,7 +50,6 @@ namespace vcl { } - enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN, @@ -72,7 +71,6 @@ public: }; - class VCL_DLLPUBLIC QueueInfo { friend class Printer; @@ -106,7 +104,6 @@ enum PrinterTransparencyMode }; - enum PrinterGradientMode { PRINTER_GRADIENT_STRIPES = 0, @@ -114,7 +111,6 @@ enum PrinterGradientMode }; - enum PrinterBitmapMode { PRINTER_BITMAP_OPTIMAL = 0, @@ -123,7 +119,6 @@ enum PrinterBitmapMode }; - class VCL_DLLPUBLIC PrinterOptions { private: diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 2d5d9b969e10..06cf3f800196 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -25,17 +25,12 @@ #include <o3tl/typed_flags_set.hxx> - - enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE }; - - enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; - enum class PrintQueueFlags { NONE = 0x00000000, @@ -73,7 +68,6 @@ namespace o3tl #define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) - enum class PrinterCapType { SupportDialog = 1, diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 63664484a413..2940dda12779 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -29,12 +29,10 @@ #include <vcl/dllapi.h> - typedef sal_uInt8* Scanline; typedef const sal_uInt8* ConstScanline; - #define BMP_FORMAT_BOTTOM_UP 0x00000000UL #define BMP_FORMAT_TOP_DOWN 0x80000000UL @@ -64,7 +62,6 @@ typedef const sal_uInt8* ConstScanline; #define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) - #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ const sal_uInt8 _def_cR = static_cast<sal_uInt8>( d_RS < 0 ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ const sal_uInt8 _def_cG = static_cast<sal_uInt8>( d_GS < 0 ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ @@ -74,7 +71,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO (sal_uInt8) ( _def_cB | ( ( _def_cB & maB.mnOr ) >> maB.mnOrShift ) ) ); - #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_ALPHA ) \ ( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ @@ -407,9 +403,6 @@ inline sal_uInt8 BitmapColor::GetLuminance() const } - - - inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); @@ -422,7 +415,6 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn } - inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index e9864609280c..b4fa3e79c326 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -27,13 +27,10 @@ class AutoTimer; - - enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN, SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET }; - struct ImplScrollBarData; class VCL_DLLPUBLIC ScrollBar : public Control @@ -139,8 +136,6 @@ public: }; - - class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window { private: diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 7576c61dfba5..2f3ee27f0ce7 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -37,8 +37,6 @@ class CommandEvent; enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION }; - - class VCL_DLLPUBLIC FunctionSet { public: @@ -61,7 +59,6 @@ public: }; - enum class SelectionEngineFlags { DRG_ENAB = 0x0001, IN_SEL = 0x0002, diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index aa6f4d51e77f..932bb9c2de08 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -175,9 +175,6 @@ struct FrameStyle }; - - - enum class StyleSettingsOptions { NONE = 0x0000, @@ -624,8 +621,6 @@ public: }; - - class VCL_DLLPUBLIC MiscSettings { void CopyData(); @@ -651,7 +646,6 @@ public: }; - class VCL_DLLPUBLIC HelpSettings { void CopyData(); @@ -671,7 +665,6 @@ public: }; - enum class AllSettingsFlags { NONE = 0x0000, MOUSE = 0x0001, diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index d99b4ff9a431..868365efbae0 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -25,8 +25,6 @@ namespace vcl { class Window; } - - class VCL_DLLPUBLIC Sound { public: diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 68392f0f15fb..d381fd1cf33d 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -26,8 +26,6 @@ #include <vcl/timer.hxx> - - class VCL_DLLPUBLIC SpinButton : public Control { private: diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 23339b164dc6..057cccbbc709 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -29,20 +29,15 @@ struct ImplStatusItem; typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; - void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize); - - typedef sal_uInt16 StatusBarItemBits; - - #define SIB_LEFT ((StatusBarItemBits)0x0001) #define SIB_CENTER ((StatusBarItemBits)0x0002) #define SIB_RIGHT ((StatusBarItemBits)0x0004) @@ -53,15 +48,11 @@ typedef sal_uInt16 StatusBarItemBits; #define SIB_USERDRAW ((StatusBarItemBits)0x0080) - - #define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) #define STATUSBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define STATUSBAR_OFFSET ((long)5) - - class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 58771f29da92..81de7439a617 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -43,8 +43,6 @@ class VclContainer; #define ICON_MACROLIBRARY 1 - - #define WINDOWSTATE_MASK_X ((sal_uInt32)0x00000001) #define WINDOWSTATE_MASK_Y ((sal_uInt32)0x00000002) #define WINDOWSTATE_MASK_WIDTH ((sal_uInt32)0x00000004) @@ -119,8 +117,6 @@ public: }; - - enum class MenuBarMode { Normal, Hide diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 734607a450b5..b1c16e0d5560 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -26,8 +26,6 @@ #include <vcl/window.hxx> - - class VCL_DLLPUBLIC TabPage : public vcl::Window , public VclBuilderContainer diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 43a6adc9a65d..ee6862ced477 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -59,7 +59,6 @@ public: }; - class VCL_DLLPUBLIC TextAttribFontColor : public TextAttrib { private: diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 060c068ead4e..c9a6d0b76164 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -121,8 +121,6 @@ namespace o3tl } - - // Type fuer GetWindow() enum class GetWindowType { @@ -429,8 +427,6 @@ enum class GetDlgWindowType }; - - #ifdef DBG_UTIL const char* ImplDbgCheckWindow( const void* pObj ); #endif diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 507de99dddbe..0fb812c8fde6 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -29,8 +29,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} struct SystemParentData; - - // Presentation Flags enum class PresentationFlags { @@ -46,8 +44,6 @@ namespace o3tl } - - class VCL_DLLPUBLIC WorkWindow : public SystemWindow { private: |