diff options
Diffstat (limited to 'vcl/inc')
69 files changed, 0 insertions, 250 deletions
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index f457bcd5c7f4..5544252d70dc 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -27,7 +27,6 @@ struct FontMatchStatus; class FontSelectPattern; class PhysicalFontFamily; - struct FontMatchStatus { public: @@ -81,7 +80,5 @@ friend class PhysicalFontFamily; PhysicalFontFace* mpNext; }; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/android/svsys.h b/vcl/inc/android/svsys.h index 25fac687d6ac..6939e5066f93 100644 --- a/vcl/inc/android/svsys.h +++ b/vcl/inc/android/svsys.h @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_INC_ANDROID_SVSYS_H #define INCLUDED_VCL_INC_ANDROID_SVSYS_H - // ? #endif // INCLUDED_VCL_INC_ANDROID_SVSYS_H diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index 716265059f99..20720911d038 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -22,12 +22,9 @@ #include <vcl/controllayout.hxx> - namespace vcl { - - //= ImplControlData struct ImplControlData @@ -47,10 +44,8 @@ namespace vcl } }; - } // namespace vcl - #endif // INCLUDED_VCL_INC_CONTROLDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index b325ba57906c..a62abbd90360 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -90,7 +90,6 @@ public: virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /* * XEventListener */ @@ -98,10 +97,6 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index f385682d069c..c365c3c511d7 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -87,7 +87,6 @@ public: virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /* * XDropTargetDropContext */ @@ -108,11 +107,6 @@ public: virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index ab2ceab50fc2..acac65cf524d 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -487,7 +487,6 @@ public: std::vector< sal_Int32 >& rWidths, std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ); - // font administration functions /* system dependendent font matching diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx index 2c5b5ec11a0d..4f341da9f5f3 100644 --- a/vcl/inc/generic/gendisp.hxx +++ b/vcl/inc/generic/gendisp.hxx @@ -74,7 +74,6 @@ public: { return m_pCapture; } }; - #endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 076952e2340a..9cc47663949a 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H #define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H - #include <vcl/vclenum.hxx> #include "fontmanager.hxx" diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 98d6bc371013..7cd7bbae788e 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -63,8 +63,6 @@ namespace vcl struct FontCapabilities; } - - class VCL_DLLPUBLIC GlyphCache { public: @@ -112,8 +110,6 @@ private: class FreetypeManager* mpFtManager; }; - - class GlyphMetric { public: @@ -138,8 +134,6 @@ private: Size maSize; }; - - // the glyph specific data needed by a GlyphCachePeer is usually trivial, // not attaching it to the corresponding GlyphData would be overkill; // this is currently only used by the headless (aka svp) plugin, where meInfo is @@ -152,8 +146,6 @@ struct ExtGlyphData ExtGlyphData() : meInfo(0), mpData(NULL) {} }; - - class GlyphData { public: @@ -181,8 +173,6 @@ private: mutable long mnLruValue; }; - - class FtFontInfo; class VCL_DLLPUBLIC ServerFont @@ -285,8 +275,6 @@ private: ServerFontLayoutEngine* mpLayoutEngine; }; - - // a class for cache entries for physical font instances that are based on serverfonts class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry { @@ -302,8 +290,6 @@ public: void HandleFontOptions(); }; - - class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout { private: @@ -325,8 +311,6 @@ public: ServerFont& GetServerFont() const { return mrServerFont; } }; - - class ServerFontLayoutEngine { public: @@ -334,8 +318,6 @@ public: virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) = 0; }; - - class GlyphCachePeer { protected: @@ -351,8 +333,6 @@ protected: sal_Int32 mnBytesUsed; }; - - class VCL_DLLPUBLIC RawBitmap { public: diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index dee151c6541d..1fb877740bd6 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -272,7 +272,6 @@ public: void PSGSave (); void PSGRestore (); - /* PS helpers */ enum pspath_t { moveto = 0, lineto = 1 }; void PSBinLineTo (const Point& rCurrent, Point& rOld, @@ -412,7 +411,6 @@ public: } /* namespace psp */ - #endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index c9ea6b7b5d92..3466025318b1 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -31,7 +31,6 @@ namespace psp { // forward declarations class PrinterGfx; - class PrinterJob { private: // private data diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 8f075891fe4c..839568b13091 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -75,7 +75,6 @@ public: int nDefButton ) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index e8c1431e2542..49fa496fa0eb 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -23,10 +23,8 @@ #include <vcl/floatwin.hxx> #include <vcl/timer.hxx> - // - HelpTextWindow - - class HelpTextWindow : public FloatingWindow { private: diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 6163da02b023..9f928c9b7937 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -153,7 +153,6 @@ public: void SetSelectionAnchor( sal_Int32 nPos ) { mnSelectionAnchor = nPos; } sal_Int32 GetSelectionAnchor() const { return mnSelectionAnchor; } - void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; } @@ -260,7 +259,6 @@ protected: void ImplShowFocusRect(); void ImplHideFocusRect(); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -467,7 +465,6 @@ public: void SetReadOnly( bool b ) { maLBWindow.SetReadOnly( b ); } bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } - Size CalcSize( sal_Int32 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); } long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); } @@ -626,7 +623,6 @@ public: const Link& GetMBDownHdl() const { return maMBDownHdl; } }; - void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); diff --git a/vcl/inc/image.h b/vcl/inc/image.h index d8b1ab639cbe..d9de98caa13f 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -24,10 +24,8 @@ #include <boost/unordered_map.hpp> - // - ImplImageBmp - - class ImplImageBmp { public: @@ -56,16 +54,12 @@ private: // prevent assignment and copy construction void operator=( const ImplImageBmp& ); }; - // - ImageTypes - - enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE }; - // - ImplImageList - - struct ImageAryData { OUString maName; @@ -84,8 +78,6 @@ struct ImageAryData ImageAryData& operator=( const ImageAryData& rData ); }; - - struct ImplImageList { typedef std::vector<ImageAryData *> ImageAryDataVec; @@ -107,10 +99,8 @@ struct ImplImageList void RemoveImage( sal_uInt16 nPos ); }; - // - ImplImageRefData - - struct ImplImageRefData { ImplImageList* mpImplData; @@ -122,10 +112,8 @@ struct ImplImageRefData bool IsEqual( const ImplImageRefData& rData ); }; - // - ImpImageData - - struct ImplImageData { ImplImageBmp* mpImageBitmap; @@ -137,10 +125,8 @@ struct ImplImageData bool IsEqual( const ImplImageData& rData ); }; - // - ImplImage - - struct ImplImage { sal_uIntPtr mnRefCount; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 6f272941d81f..df6ea1b0c03d 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -29,10 +29,8 @@ #include <vcl/fntstyle.hxx> #include <outfont.hxx> - // - Impl_Font - - typedef sal_uInt32 FontRefCount; class Impl_Font @@ -86,10 +84,8 @@ private: friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& ); }; - // - ImplFontMetric - - class ImplFontMetric { friend class OutputDevice; @@ -127,10 +123,8 @@ public: bool operator==( const ImplFontMetric& ) const; }; - // - ImplFontOptions - - class ImplFontOptions { public: @@ -163,10 +157,8 @@ public: { return NULL; } }; - // - ImplFontCharMap - - class CmapResult; class VCL_PLUGIN_PUBLIC ImplFontCharMap diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index e6cee9307343..20e305dc5690 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -27,20 +27,16 @@ #include <vcl/graph.h> #include <vcl/svgdata.hxx> - // - ImpSwapInfo - - struct ImpSwapInfo { MapMode maPrefMapMode; Size maPrefSize; }; - // - ImpGraphic - - class OutputDevice; class GfxLink; struct ImpSwapFile; @@ -102,7 +98,6 @@ private: Animation ImplGetAnimation() const; const GDIMetaFile& ImplGetGDIMetaFile() const; - Size ImplGetPrefSize() const; void ImplSetPrefSize( const Size& rPrefSize ); diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx index 93f2df99c3ce..4183fc7fb5bc 100644 --- a/vcl/inc/impoct.hxx +++ b/vcl/inc/impoct.hxx @@ -22,10 +22,8 @@ #include "octree.hxx" - // - ImpErrorQuad - - class ImpErrorQuad { long nRed; @@ -59,8 +57,6 @@ public: inline BitmapColor ImplGetColor(); }; - - inline void ImpErrorQuad::operator=( const BitmapColor& rColor ) { nRed = (long) rColor.GetRed() << 5L; @@ -68,8 +64,6 @@ inline void ImpErrorQuad::operator=( const BitmapColor& rColor ) nBlue = (long) rColor.GetBlue() << 5L; } - - inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor ) { nRed -= ( (long) rColor.GetRed() << 5L ); @@ -79,8 +73,6 @@ inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor ) return *this; } - - inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed >> 4L ); @@ -88,8 +80,6 @@ inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 3L >> 4L ); @@ -97,8 +87,6 @@ inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue * 3L >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 5L >> 4L ); @@ -106,8 +94,6 @@ inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue * 5L >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 7L >> 4L ); @@ -115,8 +101,6 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue *7L >> 4L ); } - - inline BitmapColor ImpErrorQuad::ImplGetColor() { return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), @@ -124,10 +108,8 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); } - // - NodeCache - - class ImpNodeCache { OctreeNode* pActNode; @@ -141,8 +123,6 @@ public: inline void ImplReleaseNode( OctreeNode* pNode ); }; - - inline OctreeNode* ImpNodeCache::ImplGetFreeNode() { OctreeNode* pNode; @@ -160,8 +140,6 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode() return pNode; } - - inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode ) { pNode->pNextInCache = pActNode; diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h index b476b74259b8..dcd14e79f2b3 100644 --- a/vcl/inc/ios/svsys.h +++ b/vcl/inc/ios/svsys.h @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_INC_IOS_SVSYS_H #define INCLUDED_VCL_INC_IOS_SVSYS_H - // ? #endif // INCLUDED_VCL_INC_IOS_SVSYS_H diff --git a/vcl/inc/list.h b/vcl/inc/list.h index b19591022700..93a47109b60f 100644 --- a/vcl/inc/list.h +++ b/vcl/inc/list.h @@ -84,7 +84,6 @@ extern "C" } #endif - #endif // INCLUDED_VCL_INC_LIST_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index 186e4406fac1..ad2968121e49 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -104,7 +104,6 @@ private: sal_uInt8* pMap; const sal_uLong nBits; - SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax ); public: diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index 2b5e96f8fa2d..d4b4886f9ccc 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -34,10 +34,8 @@ 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 503e986038d2..1861299f2b0f 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -28,10 +28,8 @@ #include <set> #include <com/sun/star/awt/Rectangle.hpp> - // - AquaA11yEventListener - - class AquaA11yEventListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > { diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index bf9e4b4b35ba..d31ac3123003 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -24,10 +24,8 @@ #include <rtl/ref.hxx> - // - KeyboardFocusListener - - class KeyboardFocusListener : public rtl::IReference { public: diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 7feac6e404e6..24fb17f2a3db 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -45,10 +45,8 @@ class AquaBlinker; typedef struct SalFrame::SalPointerState SalPointerState; - // - AquaSalFrame - - class AquaSalFrame : public SalFrame { public: diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 26eac4db7b81..8e18a7d6f9f7 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -26,11 +26,8 @@ class AquaSalFrame; class AquaSalObject; - - // - SalObjectData - - struct SalObjectData { }; @@ -53,10 +50,8 @@ public: long mnWidth; long mnHeight; - void setClippedPosSize(); - AquaSalObject( AquaSalFrame* pFrame ); virtual ~AquaSalObject(); diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 3aa17becf245..7d35a99ac659 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -26,11 +26,8 @@ #include <boost/shared_array.hpp> - - // - AquaSalInfoPrinter - - class AquaSalGraphics; class AquaSalInfoPrinter : public SalInfoPrinter @@ -116,10 +113,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&); }; - // - AquaSalPrinter - - class AquaSalPrinter : public SalPrinter { AquaSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter @@ -158,8 +153,6 @@ inline int PtTo10Mu( double nPoints ) { return (int)(((nPoints)*fPtTo100thMM)+0. inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+0.5); } - - #endif // INCLUDED_VCL_INC_OSX_SALPRN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h index 637362426ef8..91f7d45ba255 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -24,10 +24,8 @@ #include <list> - // - SalSystemData - - class VCL_DLLPUBLIC AquaSalSystem : public SalSystem { public: @@ -45,7 +43,6 @@ public: int nDefaultButton, bool bUseResources) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_OSX_SALSYS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h index 4e5a91a3b711..b751a81c7778 100644 --- a/vcl/inc/osx/saltimer.h +++ b/vcl/inc/osx/saltimer.h @@ -38,7 +38,6 @@ class AquaSalTimer : public SalTimer static void handleStartTimerEvent( NSEvent* pEvent ); - static NSTimer* pRunningTimer; static bool bDispatchTimer; }; diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index a8f4037a0dd5..dcde57c09ee9 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -173,7 +173,6 @@ struct ImplOutDevData void ImplFontSubstitute( OUString& rFontName ); - #endif // INCLUDED_VCL_INC_OUTDEV_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 798f2611dcdc..2fa0862f2034 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -46,7 +46,6 @@ class Size; namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}} - // - ImplFontAttributes - // device independent font properties @@ -87,7 +86,6 @@ private: bool mbSymbolFlag; }; - // - ImplDevFontAttributes - // device dependent font properties @@ -160,10 +158,8 @@ public: // TODO: change to private void copyAttributes(const FontSelectPatternAttributes &rAttributes); }; - // - ImplFontMetricData - - class ImplFontMetricData : public ImplFontAttributes { public: @@ -218,7 +214,6 @@ public: // TODO: hide members behind accessor methods long mnDStrikeoutOffset2; // Offset of double strike-out to baseline }; - // - ImplFontEntry - // TODO: rename ImplFontEntry to LogicalFontInstance @@ -255,7 +250,6 @@ private: UnicodeFallbackList* mpUnicodeFallbackList; }; - class ImplTextLineInfo { private: diff --git a/vcl/inc/print.h b/vcl/inc/print.h index 219f0afb127e..2aa3c6b4a370 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -56,7 +56,6 @@ public: void ImplDeletePrnQueueList(); void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ); - #endif // INCLUDED_VCL_INC_PRINT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index a026b1d8a71f..f0883d03e6dd 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -292,7 +292,6 @@ namespace vcl }; } - #endif // INCLUDED_VCL_INC_PRINTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index c96257d5d43b..cd944319f818 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -36,10 +36,8 @@ #include "salvd.hxx" #include "salbmp.hxx" - // - SalBitmap - - struct BitmapBuffer; class BitmapPalette; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 28999b470c72..7451321ed29d 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -122,7 +122,6 @@ private: CFMutableDictionaryRef GetStyleDict( void ) const { return mpStyleDict; } }; - // - SystemFontList - // TODO: move into cross-platform headers @@ -148,7 +147,6 @@ private: #ifdef MACOSX - // - AquaSalGraphics - class AquaSalGraphics : public SalGraphics diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index 0ef560e92e89..af63756cb4ae 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -111,7 +111,6 @@ public: bool IsInside( long nX ); - bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } bool operator==( const ImplRegionBand& rRegionBand ) const; diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index 199e17486e60..5676329cf9f6 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -27,8 +27,6 @@ const char* ImplDbgTestRegionBand(const void*); #endif - - class RegionBand { private: diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 8da2d40f3d2a..8ef263845caa 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -31,7 +31,6 @@ #include <map> - class PhysicalFontCollection; class SalBitmap; class FontSelectPattern; @@ -53,10 +52,8 @@ namespace basegfx { class B2DPolyPolygon; } - // - SalGraphics-Codes - - #define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004) #define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000) diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index d3b70fcadf82..2dfca1f97eaa 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -77,7 +77,6 @@ public: bool PosIsInAnyRun( int nCharPos ) const; }; - class ImplLayoutArgs { public: @@ -310,7 +309,6 @@ public: maGlyphId(aGlyphId), maLinearPos(rLinearPos) {} - enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 }; bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0); } diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index f0cafe3ea4de..5711534cfd99 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -40,7 +40,6 @@ struct SalItemParams Image aImage; // Image }; - struct SalMenuButtonItem { sal_uInt16 mnId; @@ -91,7 +90,6 @@ public: virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ); }; - #endif // INCLUDED_VCL_INC_SALMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 065eb0de7ffc..afe10e647b77 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -27,10 +27,8 @@ struct SystemEnvData; - // - SalObject-Types - - #define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001) #define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002) #define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004) diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx index 589adfe3e97d..cbd04b028806 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -22,10 +22,8 @@ #include <tools/solar.h> - // - SalJobSetupFlags - - #define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001) #define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002) #define SAL_JOBSET_PAPERSIZE ((sal_uLong)0x00000004) @@ -35,17 +33,13 @@ SAL_JOBSET_PAPERSIZE |\ SAL_JOBSET_DUPLEXMODE) - // - SalPrinterError - - #define SAL_PRINTER_ERROR_GENERALERROR 1 #define SAL_PRINTER_ERROR_ABORT 2 - // - SalPrinterProcs - - class SalPrinter; typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter ); diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index b1044429ecb2..36eab51da2fd 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -31,10 +31,8 @@ class Window; class FontSelectPattern; - // - SalEvent - - #define SALEVENT_MOUSEMOVE ((sal_uInt16)1) #define SALEVENT_MOUSELEAVE ((sal_uInt16)2) #define SALEVENT_MOUSEBUTTONDOWN ((sal_uInt16)3) @@ -234,33 +232,25 @@ struct SalQueryCharPositionEvent long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height }; - // - SalFrame-Types - - typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); - // - SalObject-Events - - #define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1) #define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2) #define SALOBJ_EVENT_TOTOP ((sal_uInt16)3) #define SALOBJ_EVENT_COUNT ((sal_uInt16)4) - // - SalObject-Types - - typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, sal_uInt16 nEvent, const void* pEvent ); - // - SalFrameState - - struct SalFrameState { sal_uLong mnMask; @@ -275,10 +265,8 @@ struct SalFrameState sal_uLong mnState; }; - // - SalInputContext - - // Have to match DEFINEs in inputctx.hxx, as these are not converted #define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) #define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 5c0120afee1e..6dae9de87400 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -48,7 +48,6 @@ * */ - #ifndef INCLUDED_VCL_INC_SFT_HXX #define INCLUDED_VCL_INC_SFT_HXX @@ -159,17 +158,12 @@ namespace vcl }; #endif - - - /** Structure used by GetTTSimpleGlyphMetrics() and GetTTSimpleCharMetrics() functions */ typedef struct { sal_uInt16 adv; /**< advance width or height */ sal_Int16 sb; /**< left or top sidebearing */ } TTSimpleGlyphMetrics; - - /** Structure used by the TrueType Creator and GetRawGlyphData() */ typedef struct { @@ -195,8 +189,6 @@ namespace vcl sal_uInt8 *sptr; /**< Pointer to string data (not zero-terminated!) */ } NameRecord; - - /** Return value of GetTTGlobalFontInfo() */ typedef struct { @@ -245,7 +237,6 @@ namespace vcl int y; /**< positive: up, negative: down */ } KernData; - /** ControlPoint structure used by GetTTGlyphPoints() */ typedef struct { sal_uInt32 flags; /**< 00000000 00000000 e0000000 bbbbbbbb */ @@ -262,7 +253,6 @@ namespace vcl * @defgroup sft Sun Font Tools Exported Functions */ - /** * Get the number of fonts contained in a TrueType collection * @param fname - file name @@ -271,7 +261,6 @@ namespace vcl */ int CountTTCFonts(const char* fname); - /** * TrueTypeFont constructor. * The font file has to be provided as a memory buffer and length @@ -375,7 +364,6 @@ namespace vcl */ void DisposeNameRecords(NameRecord* nr, int n); - #ifndef NO_TYPE3 /** * Generates a new PostScript Type 3 font and dumps it to <b>outf</b> file. @@ -457,7 +445,6 @@ namespace vcl int nGlyphs); #endif - /** * Queries glyph metrics. Allocates an array of TTSimpleGlyphMetrics structs and returns it. * diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 2fbaa840e192..7f64bd51757b 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -154,7 +154,6 @@ struct ImplSVAppData DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* ); }; - struct ImplSVGDIData { OutputDevice* mpFirstWinGraphics; // First OutputDevice with a Frame Graphics @@ -180,7 +179,6 @@ struct ImplSVGDIData bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; - struct ImplSVWinData { Window* mpFirstFrame; // First FrameWindow @@ -204,7 +202,6 @@ struct ImplSVWinData bool mbNoSaveBackground; // true: save background is unnecessary or even less performant }; - typedef std::vector< std::pair< OUString, FieldUnit > > FieldUnitStringList; struct ImplSVCtrlData @@ -232,7 +229,6 @@ struct ImplSVCtrlData FieldUnitStringList* mpCleanUnitStrings; // same list but with some "fluff" like spaces removed }; - struct ImplSVHelpData { bool mbContextHelp : 1; // is ContextHelp enabled diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index cf89d02d9759..43c0c914e3b8 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -117,10 +117,8 @@ struct ToolBoxLayoutData : public ControlLayoutData std::vector< sal_uInt16 > m_aLineItemPositions; }; - } /* namespace vcl */ - struct ImplToolBoxPrivateData { vcl::ToolBoxLayoutData* m_pLayoutData; @@ -169,7 +167,6 @@ struct ImplToolBoxPrivateData mbDropDownByKeyboard:1; // tells whether a dropdown was started by key input }; - #endif // INCLUDED_VCL_INC_TOOLBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 4466ca6dc155..becc2b3031aa 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -139,7 +139,6 @@ class GtkSalFrame : public SalFrame } }; - GtkSalFrame* m_pFrame; std::list< PreviousKeyPress > m_aPrevKeyPresses; int m_nPrevKeyPresses; // avoid using size() @@ -267,7 +266,6 @@ class GtkSalFrame : public SalFrame bool bSendRelease ); - GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow ); static int m_nFloats; @@ -418,7 +416,6 @@ public: // returns system data (most prominent: window handle) virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; - // get current modifier and button mask virtual SalPointerState GetPointerState() SAL_OVERRIDE; diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 006e29874d28..f6cec547fa7d 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -128,7 +128,6 @@ public: inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); } void SetWindow( GtkWidget* window ) { m_pWindow = window; } - // will be set when UI theme was changed static bool bThemeChanged; static bool bNeedPixmapPaint; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 259611112651..ceda30361361 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -49,8 +49,6 @@ public: void ThreadsLeave(); }; - - class GtkSalTimer; #if GTK_CHECK_VERSION(3,0,0) class GtkInstance : public SvpSalInstance diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 56dfe8bfb1cb..1e9cddc7cd9a 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX #define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX @@ -17,7 +16,6 @@ struct GtkSalPrinter_Impl; - class VCL_DLLPUBLIC GtkSalPrinter : public PspSalPrinter { public: @@ -40,14 +38,12 @@ private: boost::scoped_ptr<GtkSalPrinter_Impl> m_pImpl; }; - class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter { public: sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 9e7182d9cdd4..1cf47fae20f6 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -86,5 +86,4 @@ private: #endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index 9f418848d7bc..d1741eedebb8 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -51,5 +51,4 @@ public: #endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx index 86138672e5cc..ae9c4ae30a2e 100644 --- a/vcl/inc/unx/i18n_keysym.hxx +++ b/vcl/inc/unx/i18n_keysym.hxx @@ -60,5 +60,4 @@ sal_Unicode KeysymToUnicode (KeySym nKeySym); #endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index f472d51e834f..f6cadaab8145 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -34,10 +34,8 @@ class SalGraphics; class ImplSalDDB; class ImplSalBitmapCache; - // - SalBitmap - - class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap { private: @@ -149,10 +147,8 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; }; - // - ImplSalDDB - - class ImplSalDDB { private: @@ -219,10 +215,8 @@ public: ) const; }; - // - ImplSalBitmapCache - - struct ImplBmpObj; class ImplSalBitmapCache diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 564f78f7286f..9207bee0c5ab 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -62,7 +62,6 @@ namespace vcl_sal { class WMAdaptor; } #define PROPERTY_DEFAULT 0x00000FCB - // server vendor typedef enum { @@ -405,7 +404,6 @@ public: void SetupInput( SalI18N_InputMethod *pInputMethod ); }; - // get foreign key names namespace vcl_sal { OUString getKeysymReplacementName( @@ -413,7 +411,6 @@ namespace vcl_sal { KeySym nSymbol ); } - #endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 8b0d0fa67028..b4f57e9c0146 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -99,7 +99,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame int m_nWorkArea; bool m_bSetFocusOnMap; - int nScreenSaversTimeout_; Rectangle maPaintRegion; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 527aa87406b0..7c799f41020a 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -354,7 +354,6 @@ public: static void releaseGlyphPeer(); }; - inline const SalDisplay *X11SalGraphics::GetDisplay() const { return GetColormap().GetDisplay(); } @@ -367,7 +366,6 @@ inline Display *X11SalGraphics::GetXDisplay() const inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const { return GetColormap().GetPixel( nSalColor ); } - #ifdef DBG_UTIL #define stderr0( s ) fprintf( stderr, s ) #else diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 01fbc998cda5..7cc73958f9eb 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -54,7 +54,6 @@ private: sal_uInt16 nClipRegionType; }; - class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject { public: diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index 1ec20174160d..dd84c3542fa3 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -34,7 +34,6 @@ class X11SalVirtualDevice : public SalVirtualDevice SalDisplay *pDisplay_; X11SalGraphics *pGraphics_; - Pixmap hDrawable_; SalX11Screen m_nXScreen; @@ -84,7 +83,6 @@ public: virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_UNX_SALVD_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index 14c5e1fa753b..724a65166286 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -48,7 +48,6 @@ public: void ImplReleaseCachedBitmap(); }; - #endif // INCLUDED_VCL_INC_WALL2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index c045e90a56f0..0962facb7e0c 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -25,10 +25,8 @@ #include <salbmp.hxx> #include <boost/shared_ptr.hpp> - // - SalBitmap - - struct BitmapBuffer; class BitmapColor; class BitmapPalette; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 8d297cd1b98a..6ab16db296c2 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -285,7 +285,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); // POSTFOCUS-Message; wParam == bFocus; lParam == 0 #define SALOBJ_MSG_POSTFOCUS (WM_USER+161) - // A/W-Wrapper BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 526b87ab0b57..e2305b70fe8f 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -25,10 +25,8 @@ class WinSalGraphics; - // - WinSalFrame - - class WinSalFrame : public SalFrame { public: diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index 119bf1dbfc60..bd82312f06ee 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -54,7 +54,6 @@ public: WinSalMenuItem(); virtual ~WinSalMenuItem(); - MENUITEMINFOW mInfo; void* mpMenu; // pointer to corresponding VCL menu OUString mText; // the item text diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index bbb59ff35868..71f6c6e776d7 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -22,10 +22,8 @@ #include <salobj.hxx> - // - SalObjectData - - class WinSalObject : public SalObject { public: @@ -39,7 +37,6 @@ public: bool mbFirstClipRect; // Flag for first cliprect to insert WinSalObject* mpNextObject; // pointer to next object - WinSalObject(); virtual ~WinSalObject(); diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 7c15d019de38..1dcbb1342cef 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -22,10 +22,8 @@ #include <salprn.hxx> - // - SalDriverData - - // WNT3 #define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433) @@ -40,10 +38,8 @@ struct SalDriverData #pragma pack() - // - WinSalInfoPrinter - - class WinSalGraphics; class WinSalInfoPrinter : public SalInfoPrinter @@ -75,10 +71,8 @@ public: virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; - // - WinSalPrinter - - class WinSalPrinter : public SalPrinter { public: diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h index 3c7d3e998e52..546a1f0dda53 100644 --- a/vcl/inc/win/salvd.h +++ b/vcl/inc/win/salvd.h @@ -24,10 +24,8 @@ class WinSalGraphics; - // - SalVirDevData - - class WinSalVirtualDevice : public SalVirtualDevice { private: diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 07e01fad3eef..e92095c95bae 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -22,10 +22,8 @@ #include <string.h> - // - Strict - - // Anpassungen fuer TypeChecking inline HPEN SelectPen( HDC hDC, HPEN hPen ) @@ -173,10 +171,8 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE ); } - // - ZMouse Erweiterungen - - #define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG" #define MOUSEZ_CLASSNAME "MouseZ" // wheel window class @@ -203,20 +199,15 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #define WHEEL_PAGESCROLL (UINT_MAX) #endif - - // - SystemAgent Erweiterungen - - #define ENABLE_AGENT 1 #define DISABLE_AGENT 2 #define GET_AGENT_STATUS 3 typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); - // - 5.0-Erweiterungen - - #ifndef COLOR_GRADIENTACTIVECAPTION #define COLOR_GRADIENTACTIVECAPTION 27 #endif @@ -238,11 +229,9 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); #define CS_DROPSHADOW 0x00020000 #endif - // MT 12/03: From winuser.h, only needed in salframe.cxx // Better change salframe.cxx to include winuser.h - #define WS_EX_LAYERED 0x00080000 #ifndef WM_UNICHAR diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 3bd78ae822f6..089583692f87 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -47,7 +47,6 @@ class VCLXWindow; class SalFrame; class SalObject; - namespace com { namespace sun { namespace star { |