diff options
Diffstat (limited to 'vcl/inc')
30 files changed, 1 insertions, 220 deletions
diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx index df5b9a182b3a..8c5ee6dfeb68 100644 --- a/vcl/inc/vcl/accel.hxx +++ b/vcl/inc/vcl/accel.hxx @@ -60,7 +60,6 @@ private: BOOL mbIsCancel; BOOL* mpDel; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); SAL_DLLPRIVATE void ImplDeleteData(); @@ -68,7 +67,6 @@ private: BOOL bEnable, Accelerator* pAutoAccel ); SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const KeyCode& rKeyCode ) const; -//#endif protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx index b43834bedf85..5a9b1b6dfc4f 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -162,7 +162,6 @@ class VCL_DLLPUBLIC Animation BOOL mbLoopTerminated; BOOL mbIsWaiting; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplRestartTimer( ULONG nTimeout ); DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer* ); @@ -173,7 +172,6 @@ public: SAL_DLLPRIVATE static void ImplDecAnimCount() { mnAnimCount--; } SAL_DLLPRIVATE ULONG ImplGetCurPos() const { return mnPos; } -//#endif public: Animation(); diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 80db7c839d03..b84ed70db927 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -258,7 +258,6 @@ private: MapMode maPrefMapMode; Size maPrefSize; -//#if 0 // _SOLAR__PRIVATE public: @@ -309,8 +308,6 @@ public: SAL_DLLPRIVATE BOOL ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); SAL_DLLPRIVATE BOOL ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); -//#endif // PRIVATE - public: Bitmap(); diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index d1f5488dbd5d..15e38cf1c286 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -64,13 +64,10 @@ private: public: -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE ImpBitmap* ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); } SAL_DLLPRIVATE ImpBitmap* ImplGetMaskImpBitmap() const { return aMask.ImplGetImpBitmap(); } -//#endif // PRIVATE - public: BitmapEx(); diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index 4ed3bc4f6a2c..e3530b786e65 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -34,7 +34,6 @@ #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> -//#if 0 // _SOLAR__PRIVATE // -------------------- // - Access defines - @@ -70,7 +69,6 @@ case( BMP_FORMAT##Format ): \ } \ break; -//#endif // __PRIVATE // -------------------- // - Access functions - @@ -102,7 +100,6 @@ protected: FncSetPixel mFncSetPixel; BOOL mbModify; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplDestroy(); @@ -129,8 +126,6 @@ SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; } DECL_FORMAT( _32BIT_TC_BGRA ) DECL_FORMAT( _32BIT_TC_RGBA ) DECL_FORMAT( _32BIT_TC_MASK ) -//#endif // __PRIVATE - protected: BitmapReadAccess( Bitmap& rBitmap, BOOL bModify ); diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index d161f615b02c..3ab9f6dfa630 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -59,7 +59,6 @@ private: Link maSelectHdl; Link maDoubleClickHdl; -//#if 0 // _SOLAR__PRIVATE private: SAL_DLLPRIVATE void ImplInitComboBoxData(); SAL_DLLPRIVATE void ImplUpdateFloatSelection(); @@ -79,7 +78,6 @@ protected: SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); -//#endif protected: ComboBox( WindowType nType ); diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index dffcb3a48de7..1790096f8cdd 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -110,7 +110,6 @@ protected: void ImplInitSettings( const BOOL _bFont, const BOOL _bForeground ); -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE void ImplClearLayoutData() const; /** draws a frame around the give rectangle, onto the given device @@ -132,7 +131,6 @@ public: by the space occupied by the drawn pixels. */ SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); -//#endif public: Control( Window* pParent, WinBits nWinStyle = 0 ); diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx index 564b5e0b4bc7..f1f07957db96 100644 --- a/vcl/inc/vcl/cursor.hxx +++ b/vcl/inc/vcl/cursor.hxx @@ -65,7 +65,6 @@ private: BOOL mbVisible; // Ist Cursor sichtbar unsigned char mnDirection; // indicates direction -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE void ImplDraw(); SAL_DLLPRIVATE void ImplRestore(); @@ -73,7 +72,6 @@ public: SAL_DLLPRIVATE void ImplShow( BOOL bDrawDirect = TRUE ); SAL_DLLPRIVATE void ImplHide(); SAL_DLLPRIVATE void ImplNew(); -//#endif public: Cursor(); diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx index c4bc49a2a041..37a3c271b52c 100644 --- a/vcl/inc/vcl/cvtgrf.hxx +++ b/vcl/inc/vcl/cvtgrf.hxx @@ -47,11 +47,9 @@ private: Link maFilterHdl; ConvertData* mpConvertData; -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE ULONG ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nInBufSize, void** ppOutBuffer, ULONG nOutFormat ); -//#endif // __PRIVATE public: diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx index 5681407ef1c3..f7c45f50ed16 100644 --- a/vcl/inc/vcl/cvtsvm.hxx +++ b/vcl/inc/vcl/cvtsvm.hxx @@ -96,14 +96,12 @@ class Stack; class VCL_DLLPUBLIC SVMConverter { private: -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE ULONG ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, VirtualDevice& rSaveVDev, BOOL& rRop_0_1, Color& rLineCol, Stack& rLineColStack, rtl_TextEncoding& rActualCharSet ); -//#endif public: SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, ULONG nConvertMode ); diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index f8a49441cad8..404b18127af8 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -59,7 +59,6 @@ private: SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); -//#if 0 // _SOLAR__PRIVATE // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE Dialog (const Dialog &); SAL_DLLPRIVATE Dialog & operator= (const Dialog &); @@ -73,7 +72,6 @@ protected: public: SAL_DLLPRIVATE BOOL IsInClose() const { return mbInClose; } -//#endif protected: Dialog( WindowType nType ); @@ -130,11 +128,9 @@ public: class VCL_DLLPUBLIC ModelessDialog : public Dialog { -//#if 0 // _SOLAR__PRIVATE // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE ModelessDialog (const ModelessDialog &); SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); -//#endif public: ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS ); @@ -157,11 +153,9 @@ private: using Window::Hide; void Hide(); -//#if 0 // _SOLAR__PRIVATE // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE ModalDialog (const ModalDialog &); SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &); -//#endif }; #endif // _SV_DIALOG_HXX diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index 3998b5ba792e..4950e267a786 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -288,7 +288,6 @@ private: mbDockBtn:1, mbHideBtn:1; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplInitDockingWindowData(); // Copy assignment is forbidden and not implemented. @@ -303,7 +302,6 @@ protected: public: SAL_DLLPRIVATE BOOL ImplStartDocking( const Point& rPos ); -//#endif protected: DockingWindow( WindowType nType ); diff --git a/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx index 5f36eeaa2470..2a27bbfff033 100644 --- a/vcl/inc/vcl/evntpost.hxx +++ b/vcl/inc/vcl/evntpost.hxx @@ -46,9 +46,7 @@ namespace vcl ULONG m_nId; Link m_aLink; -//#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* ); -//#endif public: EventPoster( const Link& rLink ); diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 61921c6299d5..d14cc750d6ea 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -43,7 +43,6 @@ class UserDrawEvent; class VCL_DLLPUBLIC FixedText : public Control { -//#if 0 // _SOLAR__PRIVATE private: using Control::ImplInitSettings; using Window::ImplInit; @@ -54,7 +53,6 @@ private: const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: SAL_DLLPRIVATE static USHORT ImplGetTextStyle( WinBits nWinBits ); -//#endif protected: virtual void FillLayoutData() const; virtual const Font& diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx index 5dad714cc7cd..eb15b116938e 100644 --- a/vcl/inc/vcl/floatwin.hxx +++ b/vcl/inc/vcl/floatwin.hxx @@ -95,7 +95,6 @@ private: BOOL mbInCleanUp; Link maPopupModeEndHdl; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); @@ -124,7 +123,6 @@ public: SAL_DLLPRIVATE void ImplEndPopupMode( USHORT nFlags = 0, ULONG nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE BOOL ImplIsInPrivatePopupMode() const { return mbInPopupMode; } -//#endif public: FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 6c0cc72fd465..9e40829a26f6 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -85,12 +85,9 @@ enum MtfConversion // - Color conversion routines - // ----------------------------- -//#if 0 // _SOLAR__PRIVATE - typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); -//#endif // __PRIVATE // --------------- // - GDIMetaFile - @@ -111,7 +108,6 @@ private: BOOL bRecord; BOOL bUseCanvas; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color& rColor, const void* pColParam ); SAL_DLLPRIVATE static BitmapEx ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmpParam ); @@ -141,7 +137,6 @@ private: SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rDestSize ); SAL_DLLPRIVATE void ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut ); -//#endif // __PRIVATE protected: diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index b4221cefaf3b..78994327041e 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -87,15 +87,11 @@ private: ImpGraphic* mpImpGraphic; -//#if 0 // _SOLAR__PRIVATE - public: SAL_DLLPRIVATE void ImplTestRefCount(); SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mpImpGraphic; } -//#endif - public: TYPEINFO(); diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx deleted file mode 100644 index 36acda22fd71..000000000000 --- a/vcl/inc/vcl/impprn.hxx +++ /dev/null @@ -1,141 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#if 0 -#define _SV_IMPPRN_HXX - -#include <vcl/print.hxx> -#include <vcl/timer.hxx> -#include <vcl/impdel.hxx> - -#include <vector> - -struct QueuePage; - -// ---------------- -// - ImplQPrinter - -// ---------------- - -/* - ImplQPrinter is on most systems a simple buffer that allows a potential - lengthy print job to be printed in the background. For this it saves all - normal drawing operations for each printed page to a metafile, then spooling - the metafiles timer based to a normal printer. The application can act in the meantime - including changing the original document without influencing the print job. - - On some systems (currently Mac/Aqua Cocoa) ImplQPrinter has the additional - purpose of adapting to the print system: here theprint systems starts a - job and will not return from that function until it has ended; to do so - it queries for each consecutive page to be printed. Also the Cocoa print system - needs to know the number of pages BEFORE starting a print job. Since our Printer - does not know that, we need to do the completing spooling to ImplQPrinter before - we can actually print to the real print system. Let's call this the pull model - instead of the push model (because the systems pulls the pages). -*/ - -class ImplQPrinter : public Printer, public vcl::DeletionNotifier -{ -private: - Printer* mpParent; - std::vector< QueuePage* > maQueue; - AutoTimer maTimer; - bool mbAborted; - bool mbUserCopy; - bool mbDestroyAllowed; - bool mbDestroyed; - - GDIMetaFile maCurPageMetaFile; - long mnMaxBmpDPIX; - long mnMaxBmpDPIY; - ULONG mnRestoreDrawMode; - int mnCurCopyCount; - - DECL_LINK( ImplPrintHdl, Timer* ); - - ~ImplQPrinter(); - - void ImplPrintMtf( GDIMetaFile& rMtf, long nMaxBmpDPIX, long nMaxBmpDPIY ); - - ImplQPrinter( const ImplQPrinter& rPrinter ); - Printer& operator =( const ImplQPrinter& rPrinter ); - - void PrePrintPage( QueuePage* ); - void PostPrintPage(); - -public: - - ImplQPrinter( Printer* pParent ); - void Destroy(); - - void StartQueuePrint(); - void EndQueuePrint(); - void AbortQueuePrint(); - void AddQueuePage( GDIMetaFile* pPage, USHORT nPage, BOOL bNewJobSetup ); - - bool IsUserCopy() const { return mbUserCopy; } - void SetUserCopy( bool bSet ) { mbUserCopy = bSet; } - - /** - used by pull implementation to emit the next page - */ - void PrintPage( unsigned int nPage ); - /** - used by pull implementation to get the number of physical pages - (that is how often PrintNextPage should be called) - */ - ULONG GetPrintPageCount() const; - - /** - used by pull implementation to get ranges of physical pages that - are to be printed on the same paper. If bIncludeOrientationChanges is true - then orientation changes will not break a page run; the implementation has - to rotate the page contents accordingly in that case. - - The returned vector contains all pages indices beginning a new medium and additionally - the index that of the last page+1 (for convenience, so the length of a range - is always v[i+1] - v[i]) - - Example: 5 pages, all A4 - return: [0 5] - - Example: 6 pages, beginning A4, switching tol A5 on fourth page, back to A4 on fifth page - return [0 3 4 6] - - returns an false in push model (error condition) - */ - bool GetPaperRanges( std::vector< ULONG >& o_rRanges, bool i_bIncludeOrientationChanges ) const; - - /** - get the jobsetup for a page - */ - ImplJobSetup* GetPageSetup( unsigned int nPage ) const; -}; - -#endif // _SV_IMPPRN_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index c684f144ce93..a5a3735c3da5 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -48,12 +48,10 @@ class VCL_DLLPUBLIC JobSetup private: ImplJobSetup* mpData; -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE ImplJobSetup* ImplGetData(); SAL_DLLPRIVATE ImplJobSetup* ImplGetConstData(); SAL_DLLPRIVATE const ImplJobSetup* ImplGetConstData() const; -//#endif public: JobSetup(); diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index 953b90b9c873..fdbb36f7af6c 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -98,9 +98,7 @@ public: class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter { -//#if 0 // _SOLAR__PRIVATE friend void ImplNewLongCurrencyFieldValue( LongCurrencyField*, BigInt ); -//#endif private: BigInt mnSpinSize; diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 5359f0622961..5d74ce5c7a99 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -57,7 +57,6 @@ private: Link maDoubleClickHdl; USHORT mnLineCount; -//#if 0 // _SOLAR__PRIVATE private: SAL_DLLPRIVATE void ImplInitListBoxData(); @@ -75,7 +74,6 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); -//#endif BOOL IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; } protected: diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index ea3e8b859dbb..751f4ac16ca5 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -401,7 +401,6 @@ class VCL_DLLPUBLIC MenuBar : public Menu BOOL mbHideBtnVisible; BOOL mbDisplayable; -//#if 0 // _SOLAR__PRIVATE friend class Application; friend class Menu; friend class MenuBarWindow; @@ -411,7 +410,6 @@ class VCL_DLLPUBLIC MenuBar : public Menu SAL_DLLPRIVATE static Window* ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu ); SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, BOOL bDelete ); SAL_DLLPRIVATE BOOL ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu = TRUE ); -//#endif public: MenuBar(); diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 12b64d8224ca..085ef648f98f 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -136,12 +136,9 @@ private: BYTE* pMap; const ULONG nBits; -//#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void ImplCreateBuffers( const ULONG nMax ); -//#endif // __PRIVATE - public: InverseColorMap( const BitmapPalette& rPal ); diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index 48b41f4cb137..1721e201b1ae 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -182,13 +182,11 @@ private: BitmapColor* mpBitmapColor; USHORT mnCount; -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE inline BitmapColor* ImplGetColorBuffer() const; -//#endif // __PRIVATE public: @@ -685,13 +683,11 @@ inline BitmapColor& BitmapPalette::operator[]( USHORT nIndex ) // ------------------------------------------------------------------ -//#if 0 // _SOLAR__PRIVATE inline BitmapColor* BitmapPalette::ImplGetColorBuffer() const { DBG_ASSERT( mpBitmapColor, "No color buffer available!" ); return mpBitmapColor; } -//#endif // ------------------------------------------------------------------ inline USHORT BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx index 3b642fe06f96..b0ccdec69cbb 100644 --- a/vcl/inc/vcl/seleng.hxx +++ b/vcl/inc/vcl/seleng.hxx @@ -92,9 +92,7 @@ private: USHORT nMouseSensitivity; USHORT nLockedMods; USHORT nFlags; -//#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer * ); -//#endif inline BOOL ShouldDeselect( BOOL bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index c58934f6c2ae..7d5a9a1c9f2d 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -108,9 +108,7 @@ private: SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); SAL_DLLPRIVATE void ImplFormat(); SAL_DLLPRIVATE BOOL ImplIsItemUpdate(); -// #if 0 // _SOLAR__PRIVATE using OutputDevice::ImplDrawText; -// #endif SAL_DLLPRIVATE void ImplDrawText( BOOL bOffScreen, long nOldTextWidth ); SAL_DLLPRIVATE void ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL bDrawFrame ); SAL_DLLPRIVATE void ImplDrawProgress( BOOL bPaint, diff --git a/vcl/inc/vcl/taskpanelist.hxx b/vcl/inc/vcl/taskpanelist.hxx index 0624a4c38002..0eb4f20cd97d 100644 --- a/vcl/inc/vcl/taskpanelist.hxx +++ b/vcl/inc/vcl/taskpanelist.hxx @@ -41,10 +41,8 @@ class VCL_DLLPUBLIC TaskPaneList Window *FindNextFloat( Window *pWindow, BOOL bForward = TRUE ); Window *FindNextSplitter( Window *pWindow, BOOL bForward = TRUE ); -//#if 0 // _SOLAR__PRIVATE public: BOOL IsInList( Window *pWindow ); -//#endif public: TaskPaneList(); diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index d7a9ef82e1b9..094e831af702 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -252,9 +252,7 @@ private: using Window::ImplInit; private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); -// #if 0 // _SOLAR__PRIVATE using DockingWindow::ImplInitSettings; -// #endif SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( USHORT nId ) const; @@ -300,7 +298,6 @@ private: DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* ); DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, ToolBox* ); -//#if 0 // _SOLAR__PRIVATE // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE ToolBox (const ToolBox &); SAL_DLLPRIVATE ToolBox& operator= (const ToolBox &); @@ -342,7 +339,6 @@ public: static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, BOOL bHighlight ); static SAL_DLLPRIVATE USHORT ImplCountLineBreaks( const ToolBox *pThis ); SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } -//#endif protected: void SetCurItemId(USHORT nSet) { mnCurItemId = nSet; } diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx index 372250dea18f..0011501392be 100644 --- a/vcl/inc/vcl/wall.hxx +++ b/vcl/inc/vcl/wall.hxx @@ -93,10 +93,9 @@ private: SAL_DLLPRIVATE void ImplMakeUnique( BOOL bReleaseCache = TRUE ); SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const; -//#if 0 // _SOLAR__PRIVATE public: SAL_DLLPRIVATE ImplWallpaper* ImplGetImpWallpaper() const { return mpImplWallpaper; } -//#endif + public: Wallpaper(); diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 9542854c8366..e6bd75afdcba 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -174,9 +174,7 @@ namespace svt { class PopupWindowControllerImpl; } #define TOTOP_RESTOREWHENMIN ((USHORT)0x0001) #define TOTOP_FOREGROUNDTASK ((USHORT)0x0002) #define TOTOP_NOGRABFOCUS ((USHORT)0x0004) -//#if 0 // _SOLAR__PRIVATE // vcl internal only #define TOTOP_GRABFOCUSONLY ((USHORT)0x0008) -//#endif // Flags for Invalidate #define INVALIDATE_CHILDREN ((USHORT)0x0001) @@ -301,7 +299,6 @@ typedef USHORT StateChangedType; #define EXTTEXTINPUT_END_COMPLETE ((USHORT)0x0001) #define EXTTEXTINPUT_END_CANCEL ((USHORT)0x0002) -//#if 0 // _SOLAR__PRIVATE #define IMPL_MINSIZE_BUTTON_WIDTH 70 #define IMPL_MINSIZE_BUTTON_HEIGHT 22 #define IMPL_EXTRA_BUTTON_WIDTH 18 @@ -319,7 +316,6 @@ typedef USHORT StateChangedType; #define DLGWINDOW_PREV 0 #define DLGWINDOW_NEXT 1 #define DLGWINDOW_FIRST 2 -//#endif enum WindowSizeType { WINDOWSIZE_MINIMUM, |