diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-16 22:33:14 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-16 22:40:42 +0200 |
| commit | 2976b53ff8c815f5f6a5deba1763fba153bd528f (patch) | |
| tree | 178b9b8384f71f27c39922f3a30b432034375c49 | |
| parent | 7956ff62ee9a4b82f64d19d51cccddd73bc49d1e (diff) | |
Bin more pointless comments and ASCII graphics
Suggested Easy Hack: Replace all instances of // -------- comments
including surrounding newlines with a single newline.
Another Easy Hack, slightly harder to automate: Remove all the
pointless comments that just tell the class name right before the
declaration of that class.
Change-Id: Ia890ed613b53c5d719988697e20a983d62334123
70 files changed, 8 insertions, 3739 deletions
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx index 9db118811edc..b823f7c63b67 100644 --- a/avmedia/inc/avmedia/mediaplayer.hxx +++ b/avmedia/inc/avmedia/mediaplayer.hxx @@ -24,10 +24,6 @@ #include <sfx2/dockwin.hxx> #include <avmedia/avmediadllapi.h> -// ----------- -// - Defines - -// ----------- - #define AVMEDIA_MEDIAWINDOW() \ (static_cast< ::avmedia::MediaFloater* >( ( \ SfxViewFrame::Current() && SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())) ? \ @@ -37,10 +33,6 @@ NULL)) namespace avmedia { -// --------------- -// - MediaPlayer - -// --------------- - class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: @@ -50,10 +42,6 @@ public: SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer ); }; -// ---------------- -// - MediaFloater - -// ---------------- - class MediaWindow; class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx index 89fb9ff2ff31..bafb76561275 100644 --- a/avmedia/inc/avmedia/mediawindow.hxx +++ b/avmedia/inc/avmedia/mediawindow.hxx @@ -29,16 +29,8 @@ #include <com/sun/star/uno/XInterface.hpp> #include <avmedia/avmediadllapi.h> -// ----------- -// - Defines - -// ----------- - #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 -// ------------------------ -// - Forward Declarations - -// ------------------------ - class Window; class KeyEvent; class MouseEvent; @@ -50,8 +42,6 @@ struct ExecuteDropEvent; namespace rtl { class OUString; } -/* Declaration of MediaWindow class */ - namespace avmedia { typedef ::std::vector< ::std::pair< OUString, OUString > > FilterNameVector; @@ -60,10 +50,6 @@ namespace avmedia namespace priv { class MediaWindowImpl; } - // --------------- - // - MediaWindow - - // --------------- - class AVMEDIA_DLLPUBLIC MediaWindow { public: diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm index bdb4e08ba4ce..0950eadb9bd9 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -27,10 +27,6 @@ using namespace ::com::sun::star; namespace avmedia { namespace quicktime { -// ----------- -// - statics - -// ----------- - static ::osl::Mutex& ImplGetOwnStaticMutex() { static ::osl::Mutex* pMutex = NULL; @@ -49,12 +45,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() return *pMutex; } -// --------------- -// - Window - -// --------------- - -// ------------------------------------------------------------------------------ - Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) : mxMgr( i_rxMgr ), maListeners( maMutex ), @@ -84,8 +74,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla OSL_TRACE ("Window::Window"); } -// ------------------------------------------------------------------------------ - Window::~Window() { if( mpMovieView ) @@ -103,7 +91,6 @@ bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::un } // XPlayerWindow -// ------------------------------------------------------------------------------ void SAL_CALL Window::update( ) throw (uno::RuntimeException) @@ -111,24 +98,18 @@ void SAL_CALL Window::update( ) ; } -// ------------------------------------------------------------------------------ - sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel ) throw (uno::RuntimeException) { return false; } -// ------------------------------------------------------------------------------ - media::ZoomLevel SAL_CALL Window::getZoomLevel( ) throw (uno::RuntimeException) { return meZoomLevel; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) throw (uno::RuntimeException) { @@ -136,7 +117,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) } // XWindow -// ------------------------------------------------------------------------------ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (uno::RuntimeException) @@ -151,8 +131,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I } } -// ------------------------------------------------------------------------------ - awt::Rectangle SAL_CALL Window::getPosSize() throw (uno::RuntimeException) { @@ -166,8 +144,6 @@ awt::Rectangle SAL_CALL Window::getPosSize() return aRet; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setVisible( sal_Bool ) throw (uno::RuntimeException) { @@ -175,112 +151,84 @@ void SAL_CALL Window::setVisible( sal_Bool ) } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setEnable( sal_Bool ) throw (uno::RuntimeException) { ; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setFocus( ) throw (uno::RuntimeException) { OSL_TRACE ("Window::setFocus"); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) throw (uno::RuntimeException) { @@ -288,23 +236,18 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList } // XComponent -// ------------------------------------------------------------------------------ void SAL_CALL Window::dispose( ) throw (uno::RuntimeException) { } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { @@ -312,7 +255,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis } // XServiceInfo -// ------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL Window::getImplementationName( ) throw (uno::RuntimeException) @@ -320,16 +262,12 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ); } -// ------------------------------------------------------------------------------ - sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ); } -// ------------------------------------------------------------------------------ - uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 70757e78ffb8..0956cc1a5003 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -41,10 +41,6 @@ using namespace ::com::sun::star; namespace avmedia { namespace win { -// ----------- -// - statics - -// ----------- - static ::osl::Mutex& ImplGetOwnStaticMutex() { static ::osl::Mutex* pMutex = NULL; @@ -63,10 +59,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() return *pMutex; } -// ----------- -// - WndProc - -// ----------- - LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 ) { Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 ); @@ -165,10 +157,6 @@ LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM n return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) ); } -// --------------- -// - Window - -// --------------- - WNDCLASS* lcl_getWndClass() { static WNDCLASS* s_pWndClass = NULL; @@ -189,8 +177,6 @@ WNDCLASS* lcl_getWndClass() return s_pWndClass; } -// ------------------------------------------------------------------------------ - Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) : mxMgr( rxMgr ), mrPlayer( rPlayer ), @@ -205,16 +191,12 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Playe lcl_getWndClass(); } -// ------------------------------------------------------------------------------ - Window::~Window() { if( mnFrameWnd ) ::DestroyWindow( (HWND) mnFrameWnd ); } -// ------------------------------------------------------------------------------ - void Window::ImplLayoutVideoWindow() { if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel ) @@ -300,8 +282,6 @@ void Window::ImplLayoutVideoWindow() } } -// ------------------------------------------------------------------------------ - bool Window::create( const uno::Sequence< uno::Any >& rArguments ) { IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() ); @@ -351,15 +331,11 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments ) return( mnFrameWnd != 0 ); } -// ------------------------------------------------------------------------------ - void Window::processGraphEvent() { mrPlayer.processEvent(); } -// ------------------------------------------------------------------------------ - void Window::updatePointer() { char* pCursorName; @@ -378,16 +354,12 @@ void Window::updatePointer() ::SetCursor( ::LoadCursor( NULL, pCursorName ) ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::update( ) throw (uno::RuntimeException) { ::RedrawWindow( (HWND) mnFrameWnd, NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE ); } -// ------------------------------------------------------------------------------ - sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) throw (uno::RuntimeException) { @@ -408,24 +380,18 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) return bRet; } -// ------------------------------------------------------------------------------ - media::ZoomLevel SAL_CALL Window::getZoomLevel( ) throw (uno::RuntimeException) { return meZoomLevel; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) throw (uno::RuntimeException) { mnPointerType = nPointerType; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 ) throw (uno::RuntimeException) { @@ -436,8 +402,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal } } -// ------------------------------------------------------------------------------ - awt::Rectangle SAL_CALL Window::getPosSize() throw (uno::RuntimeException) { @@ -459,8 +423,6 @@ awt::Rectangle SAL_CALL Window::getPosSize() return aRet; } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException) { @@ -475,8 +437,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible ) } } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setEnable( sal_Bool bEnable ) throw (uno::RuntimeException) { @@ -484,8 +444,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable ) ::EnableWindow( (HWND) mnFrameWnd, bEnable ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::setFocus( ) throw (uno::RuntimeException) { @@ -493,127 +451,95 @@ void SAL_CALL Window::setFocus( ) ::SetFocus( (HWND) mnFrameWnd ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::dispose( ) throw (uno::RuntimeException) { } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { maListeners.addInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { maListeners.removeInterface( getCppuType( &xListener ), xListener ); } -// ------------------------------------------------------------------------------ - void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) ); @@ -627,8 +553,6 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv } } -// ----------------------------------------------------------------------------- - void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) ); @@ -642,8 +566,6 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE } } -// ----------------------------------------------------------------------------- - void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) ); @@ -657,8 +579,6 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt } } -// ----------------------------------------------------------------------------- - void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) ); @@ -672,24 +592,18 @@ void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ) } } -// ------------------------------------------------------------------------------ - OUString SAL_CALL Window::getImplementationName( ) throw (uno::RuntimeException) { return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME ); } -// ------------------------------------------------------------------------------ - sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ServiceName == AVMEDIA_WIN_WINDOW_SERVICENAME; } -// ------------------------------------------------------------------------------ - uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 537060b30106..3f7c9894f65e 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -42,10 +42,6 @@ #include <svtools/dialogclosedlistener.hxx> #include <vector> -// ------------ -// - Forwards - -// ------------ - class GalleryTheme; class SearchProgress; class TakeProgress; @@ -54,19 +50,11 @@ class TPGalleryThemeProperties; typedef ::std::vector< OUString > StringList; typedef ::std::vector< sal_uLong > TokenList_impl; -// --------------- -// - FilterEntry - -// --------------- - struct FilterEntry { String aFilterName; }; -// ---------------- -// - SearchThread - -// ---------------- - class SearchThread: public salhelper::Thread { private: @@ -89,10 +77,6 @@ public: const INetURLObject& rStartURL ); }; -// ------------------ -// - SearchProgress - -// ------------------ - class SearchProgress : public ModalDialog { private: @@ -121,10 +105,6 @@ public: void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } }; -// -------------- -// - TakeThread - -// -------------- - class TakeThread: public salhelper::Thread { private: @@ -145,10 +125,6 @@ public: ); }; -// ---------------- -// - TakeProgress - -// ---------------- - class TakeProgress : public ModalDialog { private: @@ -175,10 +151,6 @@ public: virtual void StartExecuteModal( const Link& rEndDialogHdl ); }; -// --------------------- -// - ActualizeProgress - -// --------------------- - class ActualizeProgress : public ModalDialog { private: @@ -201,10 +173,6 @@ public: virtual short Execute(); }; -// --------------- -// - TitleDialog - -// --------------- - class TitleDialog : public ModalDialog { private: @@ -221,10 +189,6 @@ public: String GetTitle() const { return maEdit.GetText(); } }; -// ------------------- -// - GalleryIdDialog - -// ------------------- - class GalleryIdDialog : public ModalDialog { private: @@ -246,10 +210,6 @@ public: sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); } }; -// -------------------------- -// - GalleryThemeProperties - -// -------------------------- - class GalleryThemeProperties : public SfxTabDialog { ExchangeData* pData; @@ -262,10 +222,6 @@ public: ~GalleryThemeProperties() {} }; -// ------------------------- -// - TPGalleryThemeGeneral - -// ------------------------- - class TPGalleryThemeGeneral : public SfxTabPage { private: @@ -299,9 +255,6 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); }; -// ---------------------------- -// - TPGalleryThemeProperties - -// ---------------------------- typedef ::std::vector< FilterEntry* > FilterEntryList_impl; class TPGalleryThemeProperties : public SfxTabPage diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 68cedca5de9b..2cf7664898cd 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -39,19 +39,11 @@ using namespace com::sun::star::scanner; using ::rtl::OUString; -// ----------- -// - Defines - -// ----------- - #define REF( _def_Obj ) Reference< _def_Obj > #define SEQ( _def_Obj ) Sequence< _def_Obj > #define ANY Any #define AWT com::sun::star::awt -// ------------------ -// - ScannerManager - -// ------------------ - class ScannerManager : public OWeakObject, XScannerManager2, AWT::XBitmap { protected: @@ -96,8 +88,6 @@ public: void SetData( void* pData ) { ReleaseData(); mpData = pData; } }; -// ----------------------------------------------------------------------------- - REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::star::lang::XMultiServiceFactory )& rxFactory ) throw( Exception ); #endif diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 020ad5a74a06..e52b68867ff8 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -52,10 +52,6 @@ using namespace ::com::sun::star; -// ----------- -// - Defines - -// ----------- - #define TWAIN_SELECT 0x00000001UL #define TWAIN_ACQUIRE 0x00000002UL #define TWAIN_TERMINATE 0xFFFFFFFFUL @@ -75,10 +71,6 @@ using namespace ::com::sun::star; #define TWAIN_FUNCNAME "DSM_Entry" #endif -// -------------- -// - TwainState - -// -------------- - enum TwainState { TWAIN_STATE_NONE = 0, @@ -87,10 +79,6 @@ enum TwainState TWAIN_STATE_CANCELED = 3 }; -// ------------ -// - ImpTwain - -// ------------ - class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener > { friend LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam ); @@ -142,21 +130,13 @@ public: bool InitXfer(); }; -// --------- -// - Procs - -// --------- - static ImpTwain* pImpTwainInstance = NULL; -// ------------------------------------------------------------------------- - LRESULT CALLBACK TwainWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 ) { return DefWindowProc( hWnd, nMsg, nPar1, nPar2 ); } -// ------------------------------------------------------------------------- - LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) { MSG* pMsg = (MSG*) lParam; @@ -174,8 +154,6 @@ LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) } } -// ----------------------------------------------------------------------------- - // #107835# hold reference to ScannerManager, to prevent premature death ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) : mxMgr( uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( &rMgr ), uno::UNO_QUERY) ), @@ -218,8 +196,6 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) : mxSelfRef = static_cast< ::cppu::OWeakObject* >( this ); } -// ----------------------------------------------------------------------------- - ImpTwain::~ImpTwain() { // are we responsible for application shutdown? @@ -227,16 +203,12 @@ ImpTwain::~ImpTwain() ImplSendCloseEvent(); } -// ----------------------------------------------------------------------------- - void ImpTwain::Destroy() { ImplFallback( TWAIN_EVENT_NONE ); Application::PostUserEvent( LINK( this, ImpTwain, ImplDestroyHdl ), NULL ); } -// ----------------------------------------------------------------------------- - bool ImpTwain::SelectSource() { TW_UINT16 nRet = TWRC_FAILURE; @@ -257,8 +229,6 @@ bool ImpTwain::SelectSource() return( TWRC_SUCCESS == nRet ); } -// ----------------------------------------------------------------------------- - bool ImpTwain::InitXfer() { bool bRet = false; @@ -279,8 +249,6 @@ bool ImpTwain::InitXfer() return bRet; } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) @@ -305,8 +273,6 @@ void ImpTwain::ImplOpenSourceManager() } } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplOpenSource() { if( 3 == nCurState ) @@ -326,8 +292,6 @@ void ImpTwain::ImplOpenSource() } } -// ----------------------------------------------------------------------------- - bool ImpTwain::ImplEnableSource() { bool bRet = false; @@ -358,8 +322,6 @@ bool ImpTwain::ImplEnableSource() return bRet; } -// ----------------------------------------------------------------------------- - bool ImpTwain::ImplHandleMsg( void* pMsg ) { TW_UINT16 nRet; @@ -403,8 +365,6 @@ bool ImpTwain::ImplHandleMsg( void* pMsg ) return( TWRC_DSEVENT == nRet ); } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplXfer() { if( nCurState == 6 ) @@ -460,15 +420,11 @@ void ImpTwain::ImplXfer() } } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplFallback( ULONG nEvent ) { Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent ); } -// ----------------------------------------------------------------------------- - IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) { const ULONG nEvent = (ULONG) pData; @@ -541,8 +497,6 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ ) { if( hTwainWnd ) @@ -559,8 +513,6 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ ) return 0L; } -// ----------------------------------------------------------------------------- - uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() { try @@ -583,8 +535,6 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() return uno::Reference< frame::XFrame >(); } -// ----------------------------------------------------------------------------- - uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroadcaster() { try @@ -599,8 +549,6 @@ uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroad return uno::Reference< util::XCloseBroadcaster >(); } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplRegisterCloseListener() { try @@ -626,8 +574,6 @@ void ImpTwain::ImplRegisterCloseListener() OSL_FAIL("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!"); } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplDeregisterCloseListener() { try @@ -654,8 +600,6 @@ void ImpTwain::ImplDeregisterCloseListener() OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!"); } -// ----------------------------------------------------------------------------- - void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException) { // shall we re-send the close query later on? @@ -665,23 +609,17 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B throw util::CloseVetoException(); } -// ----------------------------------------------------------------------------- - void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) { // should not happen OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!"); } -// ----------------------------------------------------------------------------- - void SAL_CALL ImpTwain::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) { // we're not holding any references to the frame, thus noop } -// ----------------------------------------------------------------------------- - void ImpTwain::ImplSendCloseEvent() { try @@ -699,10 +637,6 @@ void ImpTwain::ImplSendCloseEvent() } -// --------- -// - Twain - -// --------- - class Twain { uno::Reference< lang::XEventListener > mxListener; @@ -724,8 +658,6 @@ public: TwainState GetState() const { return meState; } }; -// ------------------------------------------------------------------------ - Twain::Twain() : mpCurMgr( NULL ), mpImpTwain( NULL ), @@ -733,16 +665,12 @@ Twain::Twain() : { } -// ------------------------------------------------------------------------ - Twain::~Twain() { if( mpImpTwain ) mpImpTwain->Destroy(); } -// ------------------------------------------------------------------------ - bool Twain::SelectSource( ScannerManager& rMgr ) { bool bRet; @@ -763,8 +691,6 @@ bool Twain::SelectSource( ScannerManager& rMgr ) return bRet; } -// ------------------------------------------------------------------------ - bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener ) { bool bRet; @@ -786,8 +712,6 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X return bRet; } -// ------------------------------------------------------------------------ - IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent ) { switch( (ULONG)(void*) nEvent ) @@ -840,16 +764,8 @@ IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent ) return 0L; } -// ----------- -// - statics - -// ----------- - static Twain aTwain; -// ------------------ -// - ScannerManager - -// ------------------ - void ScannerManager::AcquireData() { } @@ -863,8 +779,6 @@ void ScannerManager::ReleaseData() } } -// ----------------------------------------------------------------------------- - AWT::Size ScannerManager::getSize() throw() { AWT::Size aRet; @@ -890,8 +804,6 @@ AWT::Size ScannerManager::getSize() throw() return aRet; } -// ----------------------------------------------------------------------------- - SEQ( sal_Int8 ) ScannerManager::getDIB() throw() { SEQ( sal_Int8 ) aRet; @@ -952,8 +864,6 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw() return aRet; } -// ----------------------------------------------------------------------------- - SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw() { osl::MutexGuard aGuard( maProtector ); @@ -965,8 +875,6 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw() return aRet; } -// ----------------------------------------------------------------------------- - sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rContext, const uno::Reference< lang::XEventListener >& ) throw( ScannerException ) { @@ -981,8 +889,6 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont return aTwain.SelectSource( *this ); } -// ----------------------------------------------------------------------------- - void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener ) throw( ScannerException ) { @@ -996,8 +902,6 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u aTwain.PerformTransfer( *this, rxListener ); } -// ----------------------------------------------------------------------------- - ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) throw( ScannerException ) { @@ -1010,8 +914,6 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone ); } -// ----------------------------------------------------------------------------- - uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ ) throw( ScannerException ) { diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index df54c7e52250..ce315b55db59 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -95,26 +95,12 @@ using namespace ::com::sun::star::xml::sax; using namespace ::std; -// ----------- -// - Defines - -// ----------- - #define SVG_EXPORT_ALLPAGES ((sal_Int32)-1) -// ----------- -// - statics - -// ----------- - // Placeholder tag used into the ImplWriteActions method to filter text placeholder fields static const ::rtl::OUString sPlaceholderTag = ::rtl::OUString::createFromAscii( "<[:isPlaceholder:]>" ); - -// ------------- -// - SVGExport - -// ------------- - -// #110680# class SVGExport : public SvXMLExport { typedef ::std::list< ::basegfx::B2DPolyPolygon > B2DPolyPolygonList; @@ -148,10 +134,6 @@ private: SVGExport(); }; -// ------------------------ -// - ObjectRepresentation - -// ------------------------ - class ObjectRepresentation { private: @@ -175,10 +157,6 @@ public: const GDIMetaFile& GetRepresentation() const { return *mpMtf; } }; -// ------------------- -// - PagePropertySet - -// ------------------- - struct PagePropertySet { sal_Bool bIsBackgroundVisible; @@ -196,12 +174,6 @@ struct PagePropertySet ::rtl::OUString sHeaderText; }; - - -// --------------------------- -// - HashReferenceXInterface - -// --------------------------- - struct HashReferenceXInterface { size_t operator()( const Reference< XInterface >& rxIf ) const @@ -210,48 +182,27 @@ struct HashReferenceXInterface } }; -// --------------------------- -// - HashOUString - -// --------------------------- - struct HashOUString { size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } }; -// --------------------------- -// - HashUChar - -// --------------------------- - struct HashUChar { size_t operator()( const sal_Unicode uchar ) const { return static_cast< size_t >( uchar ); } }; -// --------------------------- -// - HashBitmap - -// --------------------------- - struct HashBitmap { size_t operator()( const ObjectRepresentation& rObjRep ) const; }; -// --------------------------- -// - EqualityBitmap - -// --------------------------- - struct EqualityBitmap { bool operator()( const ObjectRepresentation& rObjRep1, const ObjectRepresentation& rObjRep2 ) const; }; - -// ------------- -// - SVGFilter - -// ------------- - class SVGFontExport; class SVGActionWriter; class EditFieldInfo; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 243d511079ea..588207b0bd86 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -31,10 +31,6 @@ using ::rtl::OUString; -// ----------- -// - statics - -// ----------- - static const char aXMLElemG[] = "g"; static const char aXMLElemDefs[] = "defs"; static const char aXMLElemLine[] = "line"; @@ -50,8 +46,6 @@ static const char aXMLElemLinearGradient[] = "linearGradient"; static const char aXMLElemRadialGradient[] = "radialGradient"; static const char aXMLElemStop[] = "stop"; -// ----------------------------------------------------------------------------- - static const char aXMLAttrTransform[] = "transform"; static const char aXMLAttrStyle[] = "style"; static const char aXMLAttrId[] = "id"; @@ -98,12 +92,6 @@ static const char aOOOAttrNumberingType[] = NSPREFIX "numbering-type"; static sal_Char const XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType"; static sal_Char const XML_UNO_NAME_NRULE_BULLET_CHAR[] = "BulletChar"; -// ----------------------------------------------------------------------------- - - -// ---------------------- -// - SVGAttributeWriter - -// ---------------------- SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport ) : mrExport( rExport ), @@ -113,8 +101,6 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont { } -// ----------------------------------------------------------------------------- - SVGAttributeWriter::~SVGAttributeWriter() { if( mpElemPaint ) @@ -123,15 +109,11 @@ SVGAttributeWriter::~SVGAttributeWriter() delete mpElemFont; } -// ----------------------------------------------------------------------------- - double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs ) { return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) ); } -// ----------------------------------------------------------------------------- - void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ) { if( rColor.GetTransparency() == 255 ) @@ -143,8 +125,6 @@ void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& } } -// ----------------------------------------------------------------------------- - void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor ) @@ -162,8 +142,6 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName, mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorOpacityAttrName, aColorOpacity ); } -// ----------------------------------------------------------------------------- - void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFillColor, const Rectangle* pObjBoundRect, const Gradient* pFillGradient ) { @@ -187,8 +165,6 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor ); } -// ----------------------------------------------------------------------------- - void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, ::rtl::OUString& rGradientId ) { if( rObjRect.GetWidth() && rObjRect.GetHeight() && @@ -310,8 +286,6 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie rGradientId = ::rtl::OUString(); } -// ----------------------------------------------------------------------------- - void SVGAttributeWriter::SetFontAttr( const Font& rFont ) { if( rFont != maCurFont ) @@ -429,10 +403,6 @@ void SVGAttributeWriter::setFontFamily() } } -// ------------------- -// - SVGTextWriter - -// ------------------- - SVGTextWriter::SVGTextWriter( SVGExport& rExport ) : mrExport( rExport ), mpContext( NULL ), @@ -466,30 +436,22 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport ) { } -// ----------------------------------------------------------------------------- - SVGTextWriter::~SVGTextWriter() { endTextParagraph(); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf ) { if( rxIf.is() ) (mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf ); } -// ----------------------------------------------------------------------------- - const ::rtl::OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const { if( mpVDev && mpTargetMapMode ) @@ -498,8 +460,6 @@ void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." ); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const { if( mpVDev && mpTargetMapMode ) @@ -508,8 +468,6 @@ void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." ); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implSetCurrentFont() { if( mpVDev ) @@ -526,7 +484,6 @@ void SVGTextWriter::implSetCurrentFont() OSL_FAIL( "SVGTextWriter::implSetCorrectFontHeight: invalid virtual device." ); } } -// ----------------------------------------------------------------------------- template< typename SubType > sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty ) @@ -542,8 +499,6 @@ sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& r return sal_False; } -// ----------------------------------------------------------------------------- - template<> sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty ) { @@ -558,8 +513,6 @@ sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaActio return sal_False; } -// ----------------------------------------------------------------------------- - template< typename SubType > sal_Bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty ) { @@ -569,8 +522,6 @@ sal_Bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction return sal_True; } -// ----------------------------------------------------------------------------- - /** setTextPosition * Set the start position of the next line of text. In case no text is found * the current action index is updated to the index value we reached while @@ -703,8 +654,6 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction ) { sal_uLong nCount = rMtf.GetActionSize(); @@ -772,8 +721,6 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) { implSetCurrentFont(); @@ -872,8 +819,6 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implSetFontFamily() { sal_Int32 nNextTokenPos( 0 ); @@ -895,8 +840,6 @@ void SVGTextWriter::implSetFontFamily() mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily ); } -// ----------------------------------------------------------------------------- - sal_Bool SVGTextWriter::createParagraphEnumeration() { if( mrTextShape.is() ) @@ -923,8 +866,6 @@ sal_Bool SVGTextWriter::createParagraphEnumeration() return sal_False; } -// ----------------------------------------------------------------------------- - sal_Bool SVGTextWriter::nextParagraph() { mrTextPortionEnumeration.clear(); @@ -1188,8 +1129,6 @@ sal_Bool SVGTextWriter::nextParagraph() return sal_False; } -// ----------------------------------------------------------------------------- - sal_Bool SVGTextWriter::nextTextPortion() { mrCurrentTextPortion.clear(); @@ -1394,8 +1333,6 @@ sal_Bool SVGTextWriter::nextTextPortion() return sal_False; } -// ----------------------------------------------------------------------------- - void SVGTextWriter::startTextShape() { if( mpTextShapeElem ) @@ -1412,8 +1349,6 @@ void SVGTextWriter::startTextShape() } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::endTextShape() { endTextParagraph(); @@ -1436,8 +1371,6 @@ void SVGTextWriter::endTextShape() } -// ----------------------------------------------------------------------------- - void SVGTextWriter::startTextParagraph() { endTextParagraph(); @@ -1473,8 +1406,6 @@ void SVGTextWriter::startTextParagraph() } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::endTextParagraph() { mrCurrentTextPortion.clear(); @@ -1491,8 +1422,6 @@ void SVGTextWriter::endTextParagraph() } -// ----------------------------------------------------------------------------- - void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) { endTextPosition(); @@ -1521,8 +1450,6 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) mpTextPositionElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::endTextPosition() { if( mpTextPositionElem ) @@ -1532,8 +1459,6 @@ void SVGTextWriter::endTextPosition() } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implExportHyperlinkIds() { if( !msHyperlinkIdList.isEmpty() ) @@ -1545,8 +1470,6 @@ void SVGTextWriter::implExportHyperlinkIds() } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implWriteBulletChars() { if( maBulletListItemMap.empty() ) @@ -1607,8 +1530,6 @@ void SVGTextWriter::implWriteBulletChars() maBulletListItemMap.clear(); } -// ----------------------------------------------------------------------------- - template< typename MetaBitmapActionType > void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction ) { @@ -1636,8 +1557,6 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction endTextPosition(); } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implWriteEmbeddedBitmaps() { if( mpTextEmbeddedBitmapMtf && mpTextEmbeddedBitmapMtf->GetActionSize() ) @@ -1715,8 +1634,6 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() } } -// ----------------------------------------------------------------------------- - void SVGTextWriter::writeTextPortion( const Point& rPos, const String& rText, sal_Bool bApplyMapping ) @@ -1787,8 +1704,6 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, } -// ----------------------------------------------------------------------------- - void SVGTextWriter::implWriteTextPortion( const Point& rPos, const String& rText, Color aTextColor, @@ -1897,10 +1812,6 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, mnTextWidth += mpVDev->GetTextWidth( sTextContent ); } -// ------------------- -// - SVGActionWriter - -// ------------------- - SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport ) : mnCurGradientId( 1 ), mnCurMaskId( 1 ), @@ -1918,16 +1829,12 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport maTextWriter.setVirtualDevice( mpVDev, maTargetMapMode ); } -// ----------------------------------------------------------------------------- - SVGActionWriter::~SVGActionWriter() { DBG_ASSERT( !mpContext, "Not all contexts are closed" ); delete mpVDev; } -// ----------------------------------------------------------------------------- - long SVGActionWriter::ImplMap( sal_Int32 nVal ) const { Size aSz( nVal, nVal ); @@ -1935,22 +1842,16 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const return( ImplMap( aSz, aSz ).Width() ); } -// ----------------------------------------------------------------------------- - Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const { return( rDstPt = mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) ); } -// ----------------------------------------------------------------------------- - Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const { return( rDstSz = mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) ); } -// ----------------------------------------------------------------------------- - Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const { Point aTL( rRect.TopLeft() ); @@ -1959,9 +1860,6 @@ Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect return( rDstRect = Rectangle( ImplMap( aTL, aTL ), ImplMap( aSz, aSz ) ) ); } - -// ----------------------------------------------------------------------------- - Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) const { rDstPoly = Polygon( rPoly.GetSize() ); @@ -1975,8 +1873,6 @@ Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) con return( rDstPoly ); } -// ----------------------------------------------------------------------------- - PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const { Polygon aPoly; @@ -1991,8 +1887,6 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon return( rDstPolyPoly ); } -// ----------------------------------------------------------------------------- - ::rtl::OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) { OUString aPathData; @@ -2058,8 +1952,6 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon return aPathData; } -// ----------------------------------------------------------------------------- - sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction ) { GDIMetaFile aMtf; @@ -2069,8 +1961,6 @@ sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction ) return aMtf.GetChecksum(); } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor, sal_Bool bApplyMapping ) { @@ -2103,8 +1993,6 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY, sal_Bool bApplyMapping ) { @@ -2131,8 +2019,6 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, sal_Bool bApplyMapping ) { @@ -2153,8 +2039,6 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly, sal_Bool bApplyMapping ) { @@ -2174,8 +2058,6 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping ) { PolyPolygon aPolyPoly; @@ -2267,8 +2149,6 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool ImplWritePolyPolygon( aPolyPoly, bLineOnly, sal_False ); } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, @@ -2326,8 +2206,6 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags, sal_Bool bApplyMapping ) { @@ -2349,8 +2227,6 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) { @@ -2501,8 +2377,6 @@ Color SVGActionWriter::ImplGetGradientColor( const Color& rStartColor, return Color( (sal_uInt8)nNewRed, (sal_uInt8)nNewGreen, (sal_uInt8)nNewBlue ); } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, @@ -2562,8 +2436,6 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, sal_Bool bApplyMapping ) @@ -2838,8 +2710,6 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, @@ -2891,8 +2761,6 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, } } -// ----------------------------------------------------------------------------- - void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, const ::rtl::OUString* pElementId, @@ -3784,7 +3652,6 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } } -// ----------------------------------------------------------------------------- Font SVGActionWriter::ImplSetCorrectFontHeight() const { Font aFont( mpVDev->GetFont() ); @@ -3797,8 +3664,6 @@ Font SVGActionWriter::ImplSetCorrectFontHeight() const return aFont; } -// ----------------------------------------------------------------------------- - void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm, const Size& rSize100thmm, const GDIMetaFile& rMtf, diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index e414453ca191..24a3d6d9bdc8 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -30,10 +30,6 @@ #include "drawdoc.hxx" #include "sdcgmfilter.hxx" -// ----------- -// - Defines - -// ----------- - #define CGM_IMPORT_CGM 0x00000001 #define CGM_IMPORT_IM 0x00000002 @@ -45,19 +41,10 @@ #define CGM_BIG_ENDIAN 0x00020000 #define CGM_LITTLE_ENDIAN 0x00040000 -// -------------- -// - Namespaces - -// -------------- - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -// ------------ -// - Typedefs - -// ------------ - - typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); @@ -67,23 +54,15 @@ extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uIn #endif -// --------------- -// - SdPPTFilter - -// --------------- - SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } -// ----------------------------------------------------------------------------- - SdCGMFilter::~SdCGMFilter() { } -// ----------------------------------------------------------------------------- - sal_Bool SdCGMFilter::Import() { #ifndef DISABLE_DYNLOADING @@ -136,8 +115,6 @@ sal_Bool SdCGMFilter::Import() return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool SdCGMFilter::Export() { #ifdef DISABLE_DYNLOADING diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 0f367f6d36a9..a46761342b21 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -66,10 +66,6 @@ #include "unomodel.hxx" #include <vcl/virdev.hxx> -// -------------- -// - Namespaces - -// -------------- - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; @@ -77,17 +73,9 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::clipboard; -// ----------- -// - Defines - -// ----------- - #define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 #define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 -// ------------------ -// - SdTransferable - -// ------------------ - SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ) : mpPageDocShell( NULL ) , mpOLEDataHelper( NULL ) @@ -120,8 +108,6 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, CreateData(); } -// ----------------------------------------------------------------------------- - SdTransferable::~SdTransferable() { if( mpSourceDoc ) @@ -160,8 +146,6 @@ SdTransferable::~SdTransferable() } -// ----------------------------------------------------------------------------- - void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) { if( pObj ) @@ -256,8 +240,6 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) } } -// ----------------------------------------------------------------------------- - void SdTransferable::CreateData() { if( mpSdDrawDocument && !mpSdViewIntern ) @@ -346,8 +328,6 @@ void SdTransferable::CreateData() } } -// ----------------------------------------------------------------------------- - static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { sal_Bool bOnlyControls = sal_False; // default if there are no objects @@ -378,8 +358,6 @@ static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) return bOnlyControls; } -// ----------------------------------------------------------------------------- - static bool lcl_HasOnlyOneTable( SdrModel* pModel ) { if ( pModel ) @@ -394,8 +372,6 @@ static bool lcl_HasOnlyOneTable( SdrModel* pModel ) return false; } -// ----------------------------------------------------------------------------- - void SdTransferable::AddSupportedFormats() { if( !mbPageTransferable || mbPageTransferablePersistent ) @@ -458,8 +434,6 @@ void SdTransferable::AddSupportedFormats() } } -// ----------------------------------------------------------------------------- - sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) { if (SD_MOD()==NULL) @@ -584,8 +558,6 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) return bOK; } -// ----------------------------------------------------------------------------- - sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& ) { sal_Bool bRet = sal_False; @@ -668,16 +640,12 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject return bRet; } -// ----------------------------------------------------------------------------- - void SdTransferable::DragFinished( sal_Int8 nDropAction ) { if( mpSdView ) ( (::sd::View*) mpSdView )->DragFinished( nDropAction ); } -// ----------------------------------------------------------------------------- - void SdTransferable::ObjectReleased() { if( this == SD_MOD()->pTransferClip ) @@ -690,8 +658,6 @@ void SdTransferable::ObjectReleased() SD_MOD()->pTransferSelection = NULL; } -// ----------------------------------------------------------------------------- - void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ) { delete mpObjDesc; @@ -699,8 +665,6 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO PrepareOLE( rObjDesc ); } -// ----------------------------------------------------------------------------- - void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBookmarks, sal_Bool bPersistent ) { if( mpSourceDoc ) @@ -743,8 +707,6 @@ void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBo } } -// ----------------------------------------------------------------------------- - sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ) { sal_Int64 nRet; @@ -786,8 +748,6 @@ sal_Int32 SdTransferable::GetUserDataCount (void) const return ::boost::shared_ptr<UserData>(); } -// ----------------------------------------------------------------------------- - namespace { class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {}; @@ -798,8 +758,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelI return theSdTransferableUnoTunnelId::get().getSeq(); } -// ----------------------------------------------------------------------------- - SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw() { try @@ -813,9 +771,6 @@ SdTransferable* SdTransferable::getImplementation( const Reference< XInterface > return NULL; } -// ----------------------------------------------------------------------------- - -// SfxListener void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint ); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 420c6a35573c..28f4c6633a0e 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -35,16 +35,8 @@ #include <vcl/msgbox.hxx> #include <vcl/metaact.hxx> -// ----------- -// - Defines - -// ----------- - #define VECTORIZE_MAX_EXTENT 512 -// ------------------ -// - SdVectorizeDlg - -// ------------------ - SdVectorizeDlg::SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) : ModalDialog ( pParent, SdResId( DLG_VECTORIZE ) ), @@ -86,14 +78,10 @@ SdVectorizeDlg::SdVectorizeDlg( InitPreviewBmp(); } -// ----------------------------------------------------------------------------- - SdVectorizeDlg::~SdVectorizeDlg() { } -// ----------------------------------------------------------------------------- - Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) const { Rectangle aRect; @@ -124,8 +112,6 @@ Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) return aRect; } -// ----------------------------------------------------------------------------- - void SdVectorizeDlg::InitPreviewBmp() { const Rectangle aRect( GetRect( aBmpWin.GetSizePixel(), aBmp.GetSizePixel() ) ); @@ -135,8 +121,6 @@ void SdVectorizeDlg::InitPreviewBmp() aBmpWin.SetGraphic( aPreviewBmp ); } -// ----------------------------------------------------------------------------- - Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) { Bitmap aNew( rBmp ); @@ -156,8 +140,6 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) return aNew; } -// ----------------------------------------------------------------------------- - void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) { mpDocSh->SetWaitCursor( sal_True ); @@ -231,8 +213,6 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) mpDocSh->SetWaitCursor( sal_False ); } -// ----------------------------------------------------------------------------- - void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { @@ -273,16 +253,12 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, rMtf.AddAction( new MetaRectAction( aRect ) ); } -// ----------------------------------------------------------------------------- - IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) { aPrgs.SetValue( (sal_uInt16)(sal_uLong) pData ); return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl) { Calculate( aBmp, aMtf ); @@ -292,8 +268,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl) return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl) { if( aBtnPreview.IsEnabled() ) @@ -305,8 +279,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl) return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb ) { if( pCb->IsChecked() ) @@ -325,16 +297,12 @@ IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb ) return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl) { aBtnPreview.Enable(); return 0L; } -// ----------------------------------------------------------------------------- - void SdVectorizeDlg::LoadSettings() { SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( @@ -366,8 +334,6 @@ void SdVectorizeDlg::LoadSettings() ToggleHdl( &aCbFillHoles ); } -// ----------------------------------------------------------------------------- - void SdVectorizeDlg::SaveSettings() const { SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index bd56aba73b20..5473ead9e8ea 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -28,9 +28,7 @@ #include <svx/dlgutil.hxx> #include "sddllapi.h" -// ----------------- -// - Option ranges - -// ----------------- +// Option ranges #define SD_OPTIONS_NONE 0x00000000 #define SD_OPTIONS_ALL 0xffffffff @@ -43,20 +41,12 @@ #define SD_OPTIONS_GRID 0x00000020 #define SD_OPTIONS_PRINT 0x00000040 -// ------------ -// - Forwards - -// ------------ - class SdOptions; namespace sd { class FrameView; } -// ----------------- -// - SdOptionsItem - -// ----------------- - class SdOptionsGeneric; class SD_DLLPUBLIC SdOptionsItem : public ::utl::ConfigItem @@ -82,10 +72,6 @@ public: void SetModified(); }; -// -------------------- -// - SdOptionsGeneric - -// -------------------- - class SD_DLLPUBLIC SdOptionsGeneric { friend class SdOptionsItem; @@ -128,10 +114,6 @@ public: static bool isMetricSystem(); }; -// ------------------- -// - SdOptionsLayout - -// ------------------- - class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: @@ -173,8 +155,6 @@ public: void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; -// ----------------------------------------------------------------------------- - class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem { public: @@ -192,10 +172,6 @@ private: SdOptionsLayout maOptionsLayout; }; -// --------------------- -// - SdOptionsContents - -// --------------------- - class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric { private: @@ -213,8 +189,6 @@ public: sal_Bool operator==( const SdOptionsContents& rOpt ) const; }; -// ----------------------------------------------------------------------------- - class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem { public: @@ -231,10 +205,6 @@ private: SdOptionsContents maOptionsContents; }; -// ----------------- -// - SdOptionsMisc - -// ----------------- - class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric { private: @@ -364,8 +334,6 @@ public: void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } }; -// ----------------------------------------------------------------------------- - class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem { public: @@ -384,10 +352,6 @@ private: SdOptionsMisc maOptionsMisc; }; -// ----------------- -// - SdOptionsSnap - -// ----------------- - class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: @@ -439,8 +403,6 @@ public: void SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } }; -// ----------------------------------------------------------------------------- - class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem { public: @@ -458,10 +420,6 @@ private: SdOptionsSnap maOptionsSnap; }; -// ----------------- -// - SdOptionsZoom - -// ----------------- - class SdOptionsZoom : public SdOptionsGeneric { private: @@ -486,12 +444,6 @@ public: void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; -// ----------------------------------------------------------------------------- - -// ----------------- -// - SdOptionsGrid - -// ----------------- - class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: @@ -531,8 +483,6 @@ public: void SetEqualGrid( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; -// ----------------------------------------------- - class SdOptionsGridItem : public SvxGridItem { @@ -542,10 +492,6 @@ public: void SetOptions( SdOptions* pOpts ) const; }; -// ------------------ -// - SdOptionsPrint - -// ------------------ - class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: @@ -630,8 +576,6 @@ public: void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; -// ----------------------------------------------------------------------------- - class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem { public: @@ -650,10 +594,6 @@ private: SdOptionsPrint maOptionsPrint; }; -// ------------- -// - SdOptions - -// ------------- - class SdOptions : public SdOptionsLayout, public SdOptionsContents, public SdOptionsMisc, public SdOptionsSnap, public SdOptionsZoom, public SdOptionsGrid, diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 8b2e77e48378..ec354360aea8 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -19,10 +19,6 @@ #include "sfx2/sfx.hrc" #include "cfgids.hxx" -// ----------- -// - Defines - -// ----------- - #define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; } // Bitmaps for Tree-ListBox in Effects-TabDialog @@ -41,13 +37,10 @@ // Bitmaps for ValueSet in EffectWindow -// ----------------------------------------------------------------------------- - #define BMP_FOIL_NONE RID_APP_START+120 #define BMP_GROUP RID_APP_START+121 #define BMP_WAIT_ICON RID_APP_START+124 -// ----------------------------------------------------------------------------- // additional effects #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 @@ -192,8 +185,6 @@ #define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589) #define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590) -// ----------------------------------------------------------------------------- - // ResourceIDs for Popup-Menus do not need a dummy string!!! #define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43 diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index cfbd6be98a9c..e90f36200ddc 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -29,25 +29,12 @@ #include "slideshowimpl.hxx" -// ---------------- -// - SdShowWindow - -// ---------------- - - namespace sd { class SlideshowImpl; -// ----------- -// - Defines - -// ----------- - #define SLIDE_NO_TIMEOUT SAL_MAX_INT32 -// --------- -// - Enums - -// --------- - enum ShowWindowMode { SHOWWINDOWMODE_NORMAL = 0, diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index eca0aeb7949b..1ae07ad03111 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -23,10 +23,6 @@ #include <vcl/graph.hxx> #include <svtools/svtdllapi.h> -// ----------- -// - Defines - -// ----------- - #define GRFMGR_DRAW_NOTCACHED 0x00000000UL #define GRFMGR_DRAW_CACHED 0x00000001UL #define GRFMGR_DRAW_SMOOTHSCALE 0x00000002UL @@ -35,18 +31,14 @@ #define GRFMGR_DRAW_NO_SUBSTITUTE 0x00000010UL #define GRFMGR_DRAW_STANDARD (GRFMGR_DRAW_CACHED|GRFMGR_DRAW_SMOOTHSCALE) -// -------------------- -// - AutoSwap Defines - -// -------------------- +// AutoSwap defines #define GRFMGR_AUTOSWAPSTREAM_LINK ((SvStream*)0x00000000UL) #define GRFMGR_AUTOSWAPSTREAM_LOADED ((SvStream*)0xfffffffdUL) #define GRFMGR_AUTOSWAPSTREAM_TEMP ((SvStream*)0xfffffffeUL) #define GRFMGR_AUTOSWAPSTREAM_NONE ((SvStream*)0xffffffffUL) -// ---------------------- -// - Adjustment Defines - -// ---------------------- +// Adjustment defines #define ADJUSTMENT_NONE 0x00000000UL #define ADJUSTMENT_DRAWMODE 0x00000001UL @@ -56,10 +48,6 @@ #define ADJUSTMENT_TRANSPARENCY 0x00000010UL #define ADJUSTMENT_ALL 0xFFFFFFFFUL -// --------- -// - Enums - -// --------- - enum GraphicDrawMode { GRAPHICDRAWMODE_STANDARD = 0, @@ -68,10 +56,6 @@ enum GraphicDrawMode GRAPHICDRAWMODE_WATERMARK = 3 }; -// ------------ -// - Forwards - -// ------------ - class GraphicManager; class SvStream; class BitmapWriteAccess; @@ -80,10 +64,6 @@ class VirtualDevice; struct GrfSimpleCacheObj; struct ImplTileInfo; -// --------------- -// - GraphicAttr - -// --------------- - class SVT_DLLPUBLIC GraphicAttr { private: @@ -174,10 +154,6 @@ public: friend SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ); }; -// ----------------- -// - GraphicObject - -// ----------------- - class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream { friend class GraphicManager; @@ -519,10 +495,6 @@ public: static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< rtl::OUString >& rvEmbedImgUrls ); }; -// ------------------ -// - GraphicManager - -// ------------------ - typedef ::std::vector< GraphicObject* > GraphicObjectList_impl; class SVT_DLLPUBLIC GraphicManager diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index d7f2a350cbee..342b29c51b0f 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -40,10 +40,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/XInputStream.hpp> -// ------------------------ -// - Forward declarations - -// ------------------------ - class Bitmap; class GDIMetaFile; class Graphic; @@ -55,9 +51,7 @@ class FileList; class Window; class Link; -// --------------------- -// - Drag&Drop defines - -// --------------------- +// Drag&Drop defines #define DND_ACTION_NONE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE #define DND_ACTION_COPY ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY @@ -68,10 +62,6 @@ class Link; #define DND_POINTER_NONE 0 #define DND_IMAGE_NONE 0 -// -------------------------------- -// - TransferableObjectDescriptor - -// -------------------------------- - struct TransferableObjectDescriptor { SvGlobalName maClassName; @@ -93,10 +83,6 @@ struct TransferableObjectDescriptor SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ); }; -// ------------------- -// - AcceptDragEvent - -// ------------------- - struct AcceptDropEvent { sal_Int8 mnAction; @@ -121,10 +107,6 @@ struct AcceptDropEvent mbDefault( sal_False ) {} }; -// -------------------- -// - ExecuteDropEvent - -// -------------------- - struct ExecuteDropEvent { sal_Int8 mnAction; @@ -145,10 +127,6 @@ struct ExecuteDropEvent mbDefault( sal_False ) {} }; -// ---------------------- -// - TransferableHelper - -// ---------------------- - class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner, ::com::sun::star::datatransfer::dnd::XDragSourceListener, @@ -285,10 +263,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); }; -// -------------------------- -// - TransferableDataHelper - -// -------------------------- - struct TransferableDataHelper_Impl; class SVT_DLLPUBLIC TransferableDataHelper @@ -391,10 +365,6 @@ public: sal_Bool bCompareParameters = sal_False ); }; -// -------------------- -// - DragSourceHelper - -// -------------------- - class SVT_DLLPUBLIC DragSourceHelper { private: @@ -441,10 +411,6 @@ public: virtual ~DragSourceHelper(); }; -// -------------------- -// - DropTargetHelper - -// -------------------- - class SVT_DLLPUBLIC DropTargetHelper { private: @@ -513,11 +479,6 @@ public: }; - -//------------------------ -// TransferDataContainer -//------------------------ - struct TransferDataContainer_Impl; class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index e67ddfd529d6..87e8e353b312 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -36,18 +36,11 @@ #include <itemholder2.hxx> #include <sal/macros.h> -// ----------- -// - statics - -// ----------- static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; #define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray)) -// ----------- -// - Defines - -// ----------- - #define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option")) #define ROOTNODE_PRINTOPTION OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")) @@ -63,19 +56,11 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; #define PROPERTYNAME_CONVERTTOGREYSCALES OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales")) #define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT OUString(RTL_CONSTASCII_USTRINGPARAM("PDFAsStandardPrintJobFormat")) -// -------------- -// - Namespaces - -// -------------- - using namespace ::utl; using namespace ::rtl; using namespace ::osl; using namespace ::com::sun::star::uno; -// ----------- -// - statics - -// ----------- - static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = NULL; static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = NULL; @@ -85,25 +70,12 @@ sal_Int32 SvtPrinterOptions::m_nRefCount = 0; SvtPrintOptions_Impl* SvtPrintFileOptions::m_pStaticDataContainer = NULL; sal_Int32 SvtPrintFileOptions::m_nRefCount = 0; -// ------------------------ -// - SvtPrintOptions_Impl - -// ------------------------ - class SvtPrintOptions_Impl { public: - -//--------------------------------------------------------------------------------------------------------- -// constructor / destructor -//--------------------------------------------------------------------------------------------------------- - SvtPrintOptions_Impl( const OUString& rConfigRoot ); ~SvtPrintOptions_Impl(); -//--------------------------------------------------------------------------------------------------------- -// public interface -//--------------------------------------------------------------------------------------------------------- - sal_Bool IsReduceTransparency() const ; sal_Int16 GetReducedTransparencyMode() const ; sal_Bool IsReduceGradients() const ; @@ -531,25 +503,14 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, } } -// ----------------------------------------------------------------------------- - - -// ----------------------- -// - SvtBasePrintOptions - -// ----------------------- - SvtBasePrintOptions::SvtBasePrintOptions() { } -// ----------------------------------------------------------------------------- - SvtBasePrintOptions::~SvtBasePrintOptions() { } -// ----------------------------------------------------------------------------- - Mutex& SvtBasePrintOptions::GetOwnStaticMutex() { // Initialize static mutex only for one time! @@ -572,184 +533,138 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex() return *pMutex; } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsReduceTransparency() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsReduceTransparency(); } -// ----------------------------------------------------------------------------- - sal_Int16 SvtBasePrintOptions::GetReducedTransparencyMode() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetReducedTransparencyMode(); } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsReduceGradients() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsReduceGradients(); } -// ----------------------------------------------------------------------------- - sal_Int16 SvtBasePrintOptions::GetReducedGradientMode() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetReducedGradientMode(); } -// ----------------------------------------------------------------------------- - sal_Int16 SvtBasePrintOptions::GetReducedGradientStepCount() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetReducedGradientStepCount(); } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsReduceBitmaps() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsReduceBitmaps(); } -// ----------------------------------------------------------------------------- - sal_Int16 SvtBasePrintOptions::GetReducedBitmapMode() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetReducedBitmapMode(); } -// ----------------------------------------------------------------------------- - sal_Int16 SvtBasePrintOptions::GetReducedBitmapResolution() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetReducedBitmapResolution(); } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsReducedBitmapIncludesTransparency(); } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsConvertToGreyscales() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsConvertToGreyscales(); } -// ----------------------------------------------------------------------------- - sal_Bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsPDFAsStandardPrintJobFormat(); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReduceTransparency( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReduceTransparency( bState ) ; } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedTransparencyMode( sal_Int16 nMode ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedTransparencyMode( nMode ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReduceGradients( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReduceGradients( bState ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedGradientMode( sal_Int16 nMode ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedGradientMode( nMode ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedGradientStepCount( sal_Int16 nStepCount ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedGradientStepCount( nStepCount ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReduceBitmaps( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReduceBitmaps( bState ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedBitmapMode( sal_Int16 nMode ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedBitmapMode( nMode ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedBitmapResolution( sal_Int16 nResolution ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedBitmapResolution( nResolution ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetReducedBitmapIncludesTransparency( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetReducedBitmapIncludesTransparency( bState ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetConvertToGreyscales( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetConvertToGreyscales( bState ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetPDFAsStandardPrintJobFormat( sal_Bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetPDFAsStandardPrintJobFormat( bState ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::GetPrinterOptions( PrinterOptions& rOptions ) const { rOptions.SetReduceTransparency( IsReduceTransparency() ); @@ -765,8 +680,6 @@ void SvtBasePrintOptions::GetPrinterOptions( PrinterOptions& rOptions ) const rOptions.SetPDFAsStandardPrintJobFormat( IsPDFAsStandardPrintJobFormat() ); } -// ----------------------------------------------------------------------------- - void SvtBasePrintOptions::SetPrinterOptions( const PrinterOptions& rOptions ) { SetReduceTransparency( rOptions.IsReduceTransparency() ); @@ -801,10 +714,6 @@ void SvtBasePrintOptions::SetPrinterOptions( const PrinterOptions& rOptions ) } } -// --------------------- -// - SvtPrinterOptions - -// --------------------- - SvtPrinterOptions::SvtPrinterOptions() { // Global access, must be guarded (multithreading!). @@ -823,8 +732,6 @@ SvtPrinterOptions::SvtPrinterOptions() SetDataContainer( m_pStaticDataContainer ); } -// ----------------------------------------------------------------------------- - SvtPrinterOptions::~SvtPrinterOptions() { // Global access, must be guarded (multithreading!) @@ -841,10 +748,6 @@ SvtPrinterOptions::~SvtPrinterOptions() } } -// --------------------- -// - SvtPrintFileOptions - -// --------------------- - SvtPrintFileOptions::SvtPrintFileOptions() { // Global access, must be guarded (multithreading!). @@ -864,8 +767,6 @@ SvtPrintFileOptions::SvtPrintFileOptions() SetDataContainer( m_pStaticDataContainer ); } -// ----------------------------------------------------------------------------- - SvtPrintFileOptions::~SvtPrintFileOptions() { // Global access, must be guarded (multithreading!) diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 350c175b1f89..47bfacfc0b34 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -34,16 +34,8 @@ #include <vector> -// ----------- -// - Defines - -// ----------- - #define VALUESET_ITEM_NONEITEM 0xFFFE -// -------------------- -// - ValueSetItemType - -// -------------------- - enum ValueSetItemType { VALUESETITEM_NONE, @@ -52,10 +44,6 @@ enum ValueSetItemType VALUESETITEM_USERDRAW }; -// ---------------- -// - ValueSetItem - -// ---------------- - class ValueSet; struct ValueSetItem @@ -77,10 +65,6 @@ struct ValueSetItem GetAccessible( bool bIsTransientChildrenDisabled ); }; -// --------------- -// - ValueSetAcc - -// --------------- - typedef ::cppu::PartialWeakComponentImplHelper6< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -214,10 +198,6 @@ private: bool HasNoneField (void) const; }; -// ---------------- -// - ValueItemAcc - -// ---------------- - class ValueItemAcc : public ::cppu::WeakImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 03ccbc92cb6c..0e5a763e9a32 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -28,23 +28,11 @@ #include <rtl/crc.h> #include <memory> -// ----------- -// - Defines - -// ----------- - #define RELEASE_TIMEOUT 10000 #define MAX_BMP_EXTENT 4096 -// ----------- -// - statics - -// ----------- - static const char aHexData[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; -// ------------- -// - GraphicID - -// ------------- - class GraphicID { private: @@ -72,8 +60,6 @@ public: sal_Bool IsEmpty() const { return( 0 == mnID4 ); } }; -// ----------------------------------------------------------------------------- - GraphicID::GraphicID( const GraphicObject& rObj ) { const Graphic& rGraphic = rObj.GetGraphic(); @@ -132,8 +118,6 @@ GraphicID::GraphicID( const GraphicObject& rObj ) } } -// ----------------------------------------------------------------------------- - rtl::OString GraphicID::GetIDString() const { rtl::OStringBuffer aHexStr; @@ -155,10 +139,6 @@ rtl::OString GraphicID::GetIDString() const return aHexStr.makeStringAndClear(); } -// --------------------- -// - GraphicCacheEntry - -// --------------------- - class GraphicCacheEntry { private: @@ -197,8 +177,6 @@ public: void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); }; -// ----------------------------------------------------------------------------- - GraphicCacheEntry::GraphicCacheEntry( const GraphicObject& rObj ) : maID ( rObj ), mpBmpEx ( NULL ), @@ -210,8 +188,6 @@ GraphicCacheEntry::GraphicCacheEntry( const GraphicObject& rObj ) : maGraphicObjectList.push_back( (GraphicObject*)&rObj ); } -// ----------------------------------------------------------------------------- - GraphicCacheEntry::~GraphicCacheEntry() { DBG_ASSERT( @@ -224,8 +200,6 @@ GraphicCacheEntry::~GraphicCacheEntry() delete mpAnimation; } -// ----------------------------------------------------------------------------- - bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj ) { bool bRet = false; @@ -284,8 +258,6 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj ) return bRet; } -// ----------------------------------------------------------------------------- - void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) { // create substitute for graphic; @@ -340,8 +312,6 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) } } -// ----------------------------------------------------------------------------- - void GraphicCacheEntry::AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute ) { if( mbSwappedAll ) @@ -351,8 +321,6 @@ void GraphicCacheEntry::AddGraphicObjectReference( const GraphicObject& rObj, Gr maGraphicObjectList.push_back( (GraphicObject*) &rObj ); } -// ----------------------------------------------------------------------------- - bool GraphicCacheEntry::ReleaseGraphicObjectReference( const GraphicObject& rObj ) { for( @@ -370,8 +338,6 @@ bool GraphicCacheEntry::ReleaseGraphicObjectReference( const GraphicObject& rObj return false; } -// ----------------------------------------------------------------------------- - bool GraphicCacheEntry::HasGraphicObjectReference( const GraphicObject& rObj ) { bool bRet = false; @@ -383,16 +349,12 @@ bool GraphicCacheEntry::HasGraphicObjectReference( const GraphicObject& rObj ) return bRet; } -// ----------------------------------------------------------------------------- - void GraphicCacheEntry::TryToSwapIn() { if( mbSwappedAll && !maGraphicObjectList.empty() ) maGraphicObjectList.front()->FireSwapInRequest(); } -// ----------------------------------------------------------------------------- - void GraphicCacheEntry::GraphicObjectWasSwappedOut( const GraphicObject& /*rObj*/ ) { mbSwappedAll = true; @@ -412,8 +374,6 @@ void GraphicCacheEntry::GraphicObjectWasSwappedOut( const GraphicObject& /*rObj* } } -// ----------------------------------------------------------------------------- - bool GraphicCacheEntry::FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ) { bool bRet = false; @@ -427,18 +387,12 @@ bool GraphicCacheEntry::FillSwappedGraphicObject( const GraphicObject& rObj, Gra return bRet; } -// ----------------------------------------------------------------------------- - void GraphicCacheEntry::GraphicObjectWasSwappedIn( const GraphicObject& rObj ) { if( mbSwappedAll ) mbSwappedAll = !ImplInit( rObj ); } -// ---------------------------- -// - GraphicDisplayCacheEntry - -// ---------------------------- - class GraphicDisplayCacheEntry { private: @@ -520,8 +474,6 @@ public: void Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const; }; -// ----------------------------------------------------------------------------- - // This whole function is based on checkMetadataBitmap() from grfmgr2.cxx, see that one for details. // If you do changes here, change the original function too. static void checkMetadataBitmap( const BitmapEx& rBmpEx, @@ -845,8 +797,6 @@ sal_uLong GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Poi return rGraphic.GetSizeBytes(); } -// ----------------------------------------------------------------------------- - GraphicDisplayCacheEntry::~GraphicDisplayCacheEntry() { if( mpMtf ) @@ -856,8 +806,6 @@ GraphicDisplayCacheEntry::~GraphicDisplayCacheEntry() delete mpBmpEx; } -// ----------------------------------------------------------------------------- - void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const { if( mpMtf ) @@ -877,10 +825,6 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const } } -// ----------------------- -// - GraphicCache - -// ----------------------- - GraphicCache::GraphicCache( sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDisplayCacheSize ) : mnReleaseTimeoutSeconds ( 0UL ), mnMaxDisplaySize ( nDisplayCacheSize ), @@ -892,16 +836,12 @@ GraphicCache::GraphicCache( sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDispla maReleaseTimer.Start(); } -// ----------------------------------------------------------------------------- - GraphicCache::~GraphicCache() { DBG_ASSERT( !maGraphicCache.size(), "GraphicCache::~GraphicCache(): there are some GraphicObjects in cache" ); DBG_ASSERT( maDisplayCache.empty(), "GraphicCache::~GraphicCache(): there are some GraphicObjects in display cache" ); } -// ----------------------------------------------------------------------------- - void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, @@ -1006,8 +946,6 @@ void GraphicCache::AddGraphicObject( maGraphicCache.push_back( new GraphicCacheEntry( rObj ) ); } -// ----------------------------------------------------------------------------- - void GraphicCache::ReleaseGraphicObject( const GraphicObject& rObj ) { // Release cached object @@ -1049,8 +987,6 @@ void GraphicCache::ReleaseGraphicObject( const GraphicObject& rObj ) DBG_ASSERT( bRemoved, "GraphicCache::ReleaseGraphicObject(...): GraphicObject not found in cache" ); } -// ----------------------------------------------------------------------------- - void GraphicCache::GraphicObjectWasSwappedOut( const GraphicObject& rObj ) { // notify cache that rObj is swapped out (and can thus be pruned @@ -1061,8 +997,6 @@ void GraphicCache::GraphicObjectWasSwappedOut( const GraphicObject& rObj ) pEntry->GraphicObjectWasSwappedOut( rObj ); } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ) { GraphicCacheEntry* pEntry = ImplGetCacheEntry( rObj ); @@ -1073,8 +1007,6 @@ sal_Bool GraphicCache::FillSwappedGraphicObject( const GraphicObject& rObj, Grap return pEntry->FillSwappedGraphicObject( rObj, rSubstitute ); } -// ----------------------------------------------------------------------------- - void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj ) { GraphicCacheEntry* pEntry = ImplGetCacheEntry( rObj ); @@ -1091,8 +1023,6 @@ void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj ) } } -// ----------------------------------------------------------------------------- - void GraphicCache::SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ) { mnMaxDisplaySize = nNewCacheSize; @@ -1101,8 +1031,6 @@ void GraphicCache::SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ) ImplFreeDisplayCacheSpace( GetUsedDisplayCacheSize() - GetMaxDisplayCacheSize() ); } -// ----------------------------------------------------------------------------- - void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) { const sal_Bool bDestroy = ( bDestroyGreaterCached && ( nNewMaxObjSize < mnMaxObjDisplaySize ) ); @@ -1127,8 +1055,6 @@ void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize, sal_Bool } } -// ----------------------------------------------------------------------------- - void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { if( mnReleaseTimeoutSeconds != nTimeoutSeconds ) @@ -1149,8 +1075,6 @@ void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds ) } } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const { @@ -1158,8 +1082,6 @@ sal_Bool GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, GetMaxObjDisplayCacheSize() ); } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const { @@ -1181,8 +1103,6 @@ sal_Bool GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, c return bFound; } -// ----------------------------------------------------------------------------- - rtl::OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const { rtl::OString aRet; @@ -1201,8 +1121,6 @@ rtl::OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const return aRet; } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr, const BitmapEx& rBmpEx ) @@ -1235,8 +1153,6 @@ sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& r return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr, const GDIMetaFile& rMtf ) @@ -1269,8 +1185,6 @@ sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& r return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) { @@ -1311,8 +1225,6 @@ sal_Bool GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ) { sal_uLong nFreedSize = 0UL; @@ -1341,8 +1253,6 @@ sal_Bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ) return( nFreedSize >= nSizeToFree ); } -// ----------------------------------------------------------------------------- - GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) { GraphicCacheEntry* pRet = NULL; @@ -1360,8 +1270,6 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) return pRet; } -// ----------------------------------------------------------------------------- - IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer ) { pTimer->Stop(); diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index a7fea64688ec..2396db0dceae 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -23,10 +23,6 @@ #include <svx/dialogs.hrc> #include "galtheme.hrc" -// ----------- -// - Defines - -// ----------- - // Dialoge #define RID_SVXDLG_GALLERYBROWSER (RID_SVX_GALLERY_START + 5) diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 6031d86cbfd7..fed858cba3e6 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -24,13 +24,8 @@ #include <vcl/graph.hxx> #include "svx/galmisc.hxx" -// ----------- -// - Defines - -// ----------- - #define S_THUMB 80 -// ----------------------------------------------------------------------------- #define SGA_FORMAT_NONE 0x00000000L #define SGA_FORMAT_STRING 0x00000001L @@ -40,10 +35,6 @@ #define SGA_FORMAT_SVDRAW 0x00010000L #define SGA_FORMAT_ALL 0xFFFFFFFFL -// ---------------- -// - GalSoundType - -// ---------------- - enum GalSoundType { SOUND_STANDARD = 0, @@ -56,10 +47,6 @@ enum GalSoundType SOUND_ANIMAL = 7 }; -// ------------- -// - SgaObject - -// ------------- - class SVX_DLLPUBLIC SgaObject { friend class GalleryTheme; @@ -104,10 +91,6 @@ public: friend SvStream& operator>>( SvStream& rIn, SgaObject& rObj ); }; -// ------------------ -// - SgaObjectSound - -// ------------------ - class SgaObjectSound : public SgaObject { private: @@ -130,10 +113,6 @@ public: GalSoundType GetSoundType() const { return eSoundType; } }; -// ------------------- -// - SgaObjectSvDraw - -// ------------------- - class FmFormModel; class SgaObjectSvDraw : public SgaObject @@ -163,10 +142,6 @@ public: static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; -// ---------------- -// - SgaObjectBmp - -// ---------------- - class SgaObjectBmp: public SgaObject { private: @@ -188,10 +163,6 @@ public: virtual SgaObjKind GetObjKind() const { return SGA_OBJ_BMP; } }; -// ----------------- -// - SgaObjectAnim - -// ----------------- - class SgaObjectAnim : public SgaObjectBmp { private: @@ -208,10 +179,6 @@ public: virtual SgaObjKind GetObjKind() const { return SGA_OBJ_ANIM; } }; -// ----------------- -// - SgaObjectINet - -// ----------------- - class SgaObjectINet : public SgaObjectAnim { private: diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx index 83c5c600488a..0269643c658b 100644 --- a/svx/inc/svx/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -26,16 +26,8 @@ #include <tools/urlobj.hxx> #include "svx/svxdllapi.h" -// ----------- -// - Defines - -// ----------- - #define GALLERYBROWSER() ((GalleryBrowser*)( SfxViewFrame::Current()->GetChildWindow(GalleryChildWindow::GetChildWindowId())->GetWindow())) -// ------------------------- -// - SvxGalleryChildWindow - -// ------------------------- - class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow { public: @@ -45,16 +37,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( GalleryChildWindow ); }; -// ------------------ -// - FormModel - -// ------------------ - class FmFormModel; - -// ------------------ -// - GalleryBrowser - -// ------------------ - class GalleryBrowser1; class GalleryBrowser2; class GallerySplitter; diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 2c40880bb275..782163aa95fd 100644 --- a/svx/inc/svx/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -37,17 +37,9 @@ #include "svx/galmisc.hxx" #include "svx/svxdllapi.h" -// ------------ -// - Forwards - -// ------------ - class GalleryTheme; class GalleryBrowser2; -// ------------------ -// - GalleryPreview - -// ------------------ - class SVX_DLLPUBLIC GalleryPreview : public Window, public DropTargetHelper, public DragSourceHelper { private: @@ -87,10 +79,6 @@ public: void PreviewMedia( const INetURLObject& rURL ); }; -// ------------------- -// - GalleryIconView - -// ------------------- - class GalleryIconView : public ValueSet, public DropTargetHelper, public DragSourceHelper { using ValueSet::StartDrag; @@ -123,10 +111,6 @@ public: ~GalleryIconView(); }; -// ------------------- -// - GalleryListView - -// ------------------- - class GalleryListView : public BrowseBox { using BrowseBox::AcceptDrop; diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index c160ce82d583..1bbbd226b405 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -26,10 +26,6 @@ #include <vector> #include "svx/svxdllapi.h" -// ----------- -// - Defines - -// ----------- - #define SGA_FORMAT_NONE 0x00000000L #define SGA_FORMAT_STRING 0x00000001L #define SGA_FORMAT_GRAPHIC 0x00000010L @@ -51,10 +47,6 @@ #define GALLERY_THEME_FONTWORK 37 #define GALLERY_THEME_FONTWORK_VERTICAL 38 -// ------------------- -// - GalleryExplorer - -// ------------------- - class Gallery; class VCDrawModel; class FmFormModel; diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 3765e487c0e1..a40e59820ac4 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -32,16 +32,8 @@ #include <tools/date.hxx> #include <tools/time.hxx> -// ------------ -// - Forwards - -// ------------ - class GalleryTheme; -// ---------------- -// - ExchangeData - -// ---------------- - struct ExchangeData { GalleryTheme* pTheme; @@ -66,10 +58,6 @@ enum SgaObjKind SGA_OBJ_INET = 6 // graphics from the internet }; -// ----------- -// - Defines - -// ----------- - #define IV_IMAPINFO (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000) #define ID_IMAPINFO 2 @@ -89,10 +77,6 @@ enum SgaObjKind #define GALLERY_BG_COLOR Application::GetSettings().GetStyleSettings().GetWindowColor() #define GALLERY_DLG_COLOR Application::GetSettings().GetStyleSettings().GetDialogColor() -// ------------- -// - Functions - -// ------------- - class ResMgr; class String; class SvStream; @@ -114,11 +98,6 @@ sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject sal_Bool KillFile( const INetURLObject& rURL ); BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); - -// --------------- -// - SgaIMapInfo - -// --------------- - class SgaIMapInfo : public SdrObjUserData, public SfxListener { ImageMap aImageMap; @@ -142,10 +121,6 @@ public: const ImageMap& GetImageMap() const { return aImageMap; } }; -// ---------------------- -// - SgaUserDataFactory - -// ---------------------- - class SgaUserDataFactory { public: @@ -155,10 +130,6 @@ public: DECL_LINK( MakeUserData, SdrObjFactory* ); }; -// ------------------- -// - GalleryProgress - -// ------------------- - class GraphicFilter; class SVX_DLLPUBLIC GalleryProgress @@ -174,10 +145,6 @@ class SVX_DLLPUBLIC GalleryProgress void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ); }; -// ----------------------- -// - GalleryTransferable - -// ----------------------- - class Gallery; class GalleryTheme; class GraphicObject; @@ -217,10 +184,6 @@ protected: sal_Int32 nDragImage = DND_IMAGE_NONE ); }; -// --------------- -// - GalleryHint - -// --------------- - #define GALLERY_HINT_NONE 0x00000000 #define GALLERY_HINT_CLOSE_THEME 0x00000001 #define GALLERY_HINT_THEME_REMOVED 0x00000002 @@ -230,8 +193,6 @@ protected: #define GALLERY_HINT_CLOSE_OBJECT 0x00000020 #define GALLERY_HINT_OBJECT_REMOVED 0x00000040 -// ----------------------------------------------------------------------------- - class GalleryHint : public SfxHint { private: diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 1399ca9f629a..5d663dcc3215 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -26,9 +26,6 @@ #include <svtools/grfmgr.hxx> #include "svx/svxdllapi.h" -////////////////////////////////////////////////////////////////////////////// -// predeclarations - namespace sdr { namespace properties @@ -41,21 +38,12 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -// ----------- -// - Defines - -// ----------- - #define SDRGRAFOBJ_TRANSFORMATTR_NONE 0x00000000UL #define SDRGRAFOBJ_TRANSFORMATTR_COLOR 0x00000001UL #define SDRGRAFOBJ_TRANSFORMATTR_MIRROR 0x00000002UL #define SDRGRAFOBJ_TRANSFORMATTR_ROTATE 0x00000004UL #define SDRGRAFOBJ_TRANSFORMATTR_ALL 0xffffffffUL -// --------------------- -// - SdrGrafObjGeoData - -// --------------------- - -// #109872# class SdrGrafObjGeoData : public SdrTextObjGeoData { public: @@ -67,10 +55,6 @@ public: } }; -// -------------- -// - SdrGrafObj - -// -------------- - class GraphicObject; class SdrGraphicLink; diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index d33d7f34fba2..0c614b93c356 100644 --- a/svx/inc/svx/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx @@ -25,10 +25,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include "svx/svxdllapi.h" -// ----------- -// - Defines - -// ----------- - #define XOUTBMP_MIRROR_HORZ 0x00000001L #define XOUTBMP_MIRROR_VERT 0x00000010L @@ -42,10 +38,6 @@ #define XOUTBMP_USE_GIF_IF_SENSIBLE 0x40000000L #define XOUTBMP_USE_NATIVE_IF_POSSIBLE 0x80000000L -// -------------- -// - XOutBitmap - -// -------------- - class GraphicFilter; class VirtualDevice; class INetURLObject; @@ -74,10 +66,6 @@ public: const Rectangle* pWorkRect = NULL ); }; -// ---------------- -// - DitherBitmap - -// ---------------- - SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap ); #endif // _XOUTBMP_HXX diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 8577703e6a60..2a5a28416ea0 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -47,25 +47,13 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -// ----------- -// - Defines - -// ----------- - #undef GALLERY_USE_CLIPBOARD #define TBX_ID_ICON 1 #define TBX_ID_LIST 2 -// ----------- -// - statics - -// ----------- - GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON; -// -------------------------- -// - GalleryBackgroundPopup - -// -------------------------- - class GalleryBackgroundPopup : public PopupMenu, public SfxControllerItem { const GalleryTheme* mpTheme; @@ -80,7 +68,6 @@ public: ~GalleryBackgroundPopup(); }; -// ------------------------------------------------------------------------ DBG_NAME(GalleryBackgroundPopup) GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) : @@ -93,15 +80,11 @@ GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_ RemoveDisabledEntries(); } -// ------------------------------------------------------------------------ - GalleryBackgroundPopup::~GalleryBackgroundPopup() { DBG_DTOR(GalleryBackgroundPopup,NULL); } -// ------------------------------------------------------------------------ - void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) { if ( ( nSID == SID_GALLERY_BG_BRUSH ) && pItem && ( eState != SFX_ITEM_DISABLED ) ) @@ -128,8 +111,6 @@ void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, } } -// ------------------------------------------------------------------------ - void GalleryBackgroundPopup::Select() { Menu::Select(); @@ -144,10 +125,6 @@ void GalleryBackgroundPopup::Select() &aBrushItem, &aPosItem, &aPathItem, 0L ); } -// --------------------- -// - GalleryThemePopup - -// --------------------- - class GalleryThemePopup : public PopupMenu, public SfxControllerItem { GalleryBackgroundPopup maBackgroundPopup; @@ -163,7 +140,6 @@ public: ~GalleryThemePopup(); }; -// ------------------------------------------------------------------------ DBG_NAME(GalleryThemePopup) GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) : @@ -250,15 +226,11 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nO RemoveDisabledEntries(); } -// ------------------------------------------------------------------------ - GalleryThemePopup::~GalleryThemePopup() { DBG_DTOR(GalleryThemePopup,NULL); } -// ------------------------------------------------------------------------ - void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) { if( ( nSID == SID_GALLERY_ENABLE_ADDCOPY ) && pItem && ( eState != SFX_ITEM_DISABLED ) ) @@ -272,9 +244,6 @@ void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons } } -// ------------------ -// - GalleryToolBox - -// ------------------ DBG_NAME(GalleryToolBox) GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) : @@ -283,24 +252,17 @@ GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) : DBG_CTOR(GalleryToolBox,NULL); } -// ------------------------------------------------------------------------ - GalleryToolBox::~GalleryToolBox() { DBG_DTOR(GalleryToolBox,NULL); } -// ------------------------------------------------------------------------ - void GalleryToolBox::KeyInput( const KeyEvent& rKEvt ) { if( !static_cast< GalleryBrowser2* >( GetParent() )->KeyInput( rKEvt, this ) ) ToolBox::KeyInput( rKEvt ); } -// ------------------- -// - GalleryBrowser2 - -// ------------------- DBG_NAME(GalleryBrowser2) GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, Gallery* pGallery ) : @@ -360,8 +322,6 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, mpIconView->SetAccessibleRelationMemberOf(mpIconView); } -// ----------------------------------------------------------------------------- - GalleryBrowser2::~GalleryBrowser2() { maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) ); @@ -376,8 +336,6 @@ GalleryBrowser2::~GalleryBrowser2() DBG_DTOR(GalleryBrowser2,NULL); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::InitSettings() { Font aInfoFont( maInfoBar.GetControlFont() ); @@ -394,8 +352,6 @@ void GalleryBrowser2::InitSettings() maSeparator.SetControlForeground( GALLERY_FG_COLOR ); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) @@ -404,8 +360,6 @@ void GalleryBrowser2::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::Resize() { Control::Resize(); @@ -439,8 +393,6 @@ void GalleryBrowser2::Resize() } } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const GalleryHint& rGalleryHint = (const GalleryHint&) rHint; @@ -461,8 +413,6 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// ----------------------------------------------------------------------------- - sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -488,8 +438,6 @@ sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDro return nRet; } -// ----------------------------------------------------------------------------- - sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -509,8 +457,6 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent return nRet; } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) { if( mpCurTheme ) @@ -523,16 +469,12 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) } } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::TogglePreview( Window*, const Point* ) { SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode ); GetViewWindow()->GrabFocus(); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) { Point aSelPos; @@ -555,8 +497,6 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) } } -// ----------------------------------------------------------------------------- - sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) { Point aSelPos; @@ -637,8 +577,6 @@ sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) return bRet; } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::SelectTheme( const String& rThemeName ) { delete mpIconView, mpIconView = NULL; @@ -680,8 +618,6 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName ) mpIconView->SetAccessibleRelationMemberOf(mpIconView); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) { if( GetMode() != eMode ) @@ -762,8 +698,6 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) } } -// ----------------------------------------------------------------------------- - Window* GalleryBrowser2::GetViewWindow() const { Window* pRet; @@ -781,8 +715,6 @@ Window* GalleryBrowser2::GetViewWindow() const return pRet; } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) { if( mpCurTheme ) @@ -832,8 +764,6 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) } } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId ) { mpIconView->Hide(); @@ -867,8 +797,6 @@ void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId ) ImplUpdateInfoBar(); } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::ImplUpdateInfoBar() { String aInfoText; @@ -900,8 +828,6 @@ void GalleryBrowser2::ImplUpdateInfoBar() maInfoBar.SetText( aInfoText ); } -// ----------------------------------------------------------------------------- - sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos ) { const Size aOutputSizePixel( GetOutputSizePixel() ); @@ -954,8 +880,6 @@ sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& return nRet; } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId ) { if( nItemId ) @@ -966,8 +890,6 @@ void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId ) } } -// ----------------------------------------------------------------------------- - void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) { Point aSelPos; @@ -1095,8 +1017,6 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) } } -// ----------------------------------------------------------------------------- - String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags ) { String aRet; @@ -1141,8 +1061,6 @@ String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject return aRet; } -// ----------------------------------------------------------------------------- - INetURLObject GalleryBrowser2::GetURL() const { INetURLObject aURL; @@ -1153,8 +1071,6 @@ INetURLObject GalleryBrowser2::GetURL() const return aURL; } -// ----------------------------------------------------------------------------- - String GalleryBrowser2::GetFilterName() const { String aFilterName; @@ -1177,8 +1093,6 @@ String GalleryBrowser2::GetFilterName() const return aFilterName; } -// ----------------------------------------------------------------------------- - Graphic GalleryBrowser2::GetGraphic() const { Graphic aGraphic; @@ -1189,15 +1103,11 @@ Graphic GalleryBrowser2::GetGraphic() const return aGraphic; } -// ----------------------------------------------------------------------------- - sal_Bool GalleryBrowser2::IsLinkage() const { return mbCurActionIsLinkage; } -// ----------------------------------------------------------------------------- - IMPL_LINK( GalleryBrowser2, MenuSelectHdl, Menu*, pMenu ) { if( pMenu ) @@ -1206,16 +1116,12 @@ IMPL_LINK( GalleryBrowser2, MenuSelectHdl, Menu*, pMenu ) return 0; } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl) { ImplUpdateInfoBar(); return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) { if( pBox->GetCurItemId() == TBX_ID_ICON ) @@ -1226,8 +1132,6 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) return 0L; } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) { maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 3645384534f3..c6cc85839a0c 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -34,16 +34,9 @@ #include "gallery.hrc" #include <vcl/graphicfilter.hxx> -// ----------- -// - Defines - -// ----------- - #define GALLERY_BRWBOX_TITLE 1 #define GALLERY_BRWBOX_PATH 2 -// ------------------ -// - GalleryPreview - -// ------------------ DBG_NAME(GalleryPreview) GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : @@ -58,8 +51,6 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) InitSettings(); } -// ------------------------------------------------------------------------ - GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : Window( pParent, rResId ), DropTargetHelper( this ), @@ -72,8 +63,6 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : InitSettings(); } -// ------------------------------------------------------------------------ - GalleryPreview::~GalleryPreview() { DBG_DTOR(GalleryPreview,NULL); @@ -101,8 +90,6 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) return bRet; } -// ------------------------------------------------------------------------ - void GalleryPreview::InitSettings() { SetBackground( Wallpaper( GALLERY_BG_COLOR ) ); @@ -110,8 +97,6 @@ void GalleryPreview::InitSettings() SetControlForeground( GALLERY_FG_COLOR ); } -// ----------------------------------------------------------------------- - void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) @@ -120,8 +105,6 @@ void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -// ------------------------------------------------------------------------ - sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const { const Size aWinSize( GetOutputSizePixel() ); @@ -155,8 +138,6 @@ sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rect return bRet; } -// ------------------------------------------------------------------------ - void GalleryPreview::Paint( const Rectangle& rRect ) { Window::Paint( rRect ); @@ -173,16 +154,12 @@ void GalleryPreview::Paint( const Rectangle& rRect ) } } -// ------------------------------------------------------------------------ - void GalleryPreview::MouseButtonDown( const MouseEvent& rMEvt ) { if( mpTheme && ( rMEvt.GetClicks() == 2 ) ) ( (GalleryBrowser2*) GetParent() )->TogglePreview( this ); } -// ------------------------------------------------------------------------ - void GalleryPreview::Command(const CommandEvent& rCEvt ) { Window::Command( rCEvt ); @@ -192,8 +169,6 @@ void GalleryPreview::Command(const CommandEvent& rCEvt ) ( rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : NULL ) ); } -// ------------------------------------------------------------------------ - void GalleryPreview::KeyInput( const KeyEvent& rKEvt ) { if( mpTheme ) @@ -236,8 +211,6 @@ void GalleryPreview::KeyInput( const KeyEvent& rKEvt ) Window::KeyInput( rKEvt ); } -// ------------------------------------------------------------------------ - sal_Int8 GalleryPreview::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet; @@ -250,8 +223,6 @@ sal_Int8 GalleryPreview::AcceptDrop( const AcceptDropEvent& rEvt ) return nRet; } -// ------------------------------------------------------------------------ - sal_Int8 GalleryPreview::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet; @@ -264,16 +235,12 @@ sal_Int8 GalleryPreview::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -// ------------------------------------------------------------------------ - void GalleryPreview::StartDrag( sal_Int8, const Point& ) { if( mpTheme ) ( (GalleryBrowser2*) GetParent() )->StartDrag( this ); } -// ------------------------------------------------------------------------ - void GalleryPreview::PreviewMedia( const INetURLObject& rURL ) { if( rURL.GetProtocol() != INET_PROT_NOT_VALID ) @@ -291,11 +258,6 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL ) } } -// ------------------------------------------------------------------------ - -// ------------------- -// - GalleryIconView - -// ------------------- DBG_NAME(GalleryIconView) GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : @@ -315,15 +277,11 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme SetItemHeight( S_THUMB + 6 ); } -// ------------------------------------------------------------------------ - GalleryIconView::~GalleryIconView() { DBG_DTOR(GalleryIconView,NULL); } -// ------------------------------------------------------------------------ - void GalleryIconView::InitSettings() { SetBackground( Wallpaper( GALLERY_BG_COLOR ) ); @@ -332,8 +290,6 @@ void GalleryIconView::InitSettings() SetColor( GALLERY_BG_COLOR ); } -// ----------------------------------------------------------------------- - void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) @@ -342,8 +298,6 @@ void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt ) ValueSet::DataChanged( rDCEvt ); } -// ------------------------------------------------------------------------ - void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) { const sal_uInt16 nId = rUDEvt.GetItemId(); @@ -407,8 +361,6 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) } } -// ------------------------------------------------------------------------ - void GalleryIconView::MouseButtonDown( const MouseEvent& rMEvt ) { ValueSet::MouseButtonDown( rMEvt ); @@ -417,8 +369,6 @@ void GalleryIconView::MouseButtonDown( const MouseEvent& rMEvt ) ( (GalleryBrowser2*) GetParent() )->TogglePreview( this, &rMEvt.GetPosPixel() ); } -// ------------------------------------------------------------------------ - void GalleryIconView::Command( const CommandEvent& rCEvt ) { ValueSet::Command( rCEvt ); @@ -430,30 +380,22 @@ void GalleryIconView::Command( const CommandEvent& rCEvt ) } } -// ------------------------------------------------------------------------ - void GalleryIconView::KeyInput( const KeyEvent& rKEvt ) { if( !mpTheme || !static_cast< GalleryBrowser2* >( GetParent() )->KeyInput( rKEvt, this ) ) ValueSet::KeyInput( rKEvt ); } -// ------------------------------------------------------------------------ - sal_Int8 GalleryIconView::AcceptDrop( const AcceptDropEvent& rEvt ) { return( static_cast< GalleryBrowser2* >( GetParent() )->AcceptDrop( *this, rEvt ) ); } -// ------------------------------------------------------------------------ - sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt ) { return( static_cast< GalleryBrowser2* >( GetParent() )->ExecuteDrop( *this, rEvt ) ); } -// ------------------------------------------------------------------------ - void GalleryIconView::StartDrag( sal_Int8, const Point& ) { const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True ); @@ -464,9 +406,6 @@ void GalleryIconView::StartDrag( sal_Int8, const Point& ) static_cast< GalleryBrowser2* >( GetParent() )->StartDrag( this ); } -// ------------------- -// - GalleryListView - -// ------------------- DBG_NAME(GalleryListView) GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : @@ -486,15 +425,11 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme InsertDataColumn( GALLERY_BRWBOX_PATH, GAL_RESSTR(RID_SVXSTR_GALLERY_PATH), 256 ); } -// ------------------------------------------------------------------------ - GalleryListView::~GalleryListView() { DBG_DTOR(GalleryListView,NULL); } -// ------------------------------------------------------------------------ - void GalleryListView::InitSettings() { SetBackground( Wallpaper( GALLERY_BG_COLOR ) ); @@ -502,8 +437,6 @@ void GalleryListView::InitSettings() SetControlForeground( GALLERY_FG_COLOR ); } -// ----------------------------------------------------------------------- - void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) @@ -512,16 +445,12 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt ) BrowseBox::DataChanged( rDCEvt ); } -// ------------------------------------------------------------------------ - sal_Bool GalleryListView::SeekRow( long nRow ) { mnCurRow = nRow; return sal_True; } -// ----------------------------------------------------------------------------- - String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const { String sRet; @@ -541,8 +470,6 @@ String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const return sRet; } -// ----------------------------------------------------------------------------- - Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) { DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= USHRT_MAX, "GalleryListView::GetFieldCharacterBounds: _nColumnId overflow"); @@ -560,8 +487,6 @@ Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nC return aRect; } -// ----------------------------------------------------------------------------- - sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) { DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= USHRT_MAX, "GalleryListView::GetFieldIndexAtPoint: _nColumnId overflow"); @@ -575,8 +500,6 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu return nRet; } -// ------------------------------------------------------------------------ - void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const { rDev.Push( PUSH_CLIPREGION ); @@ -645,8 +568,6 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa rDev.Pop(); } -// ------------------------------------------------------------------------ - void GalleryListView::Command( const CommandEvent& rCEvt ) { BrowseBox::Command( rCEvt ); @@ -662,16 +583,12 @@ void GalleryListView::Command( const CommandEvent& rCEvt ) } } -// ------------------------------------------------------------------------ - void GalleryListView::KeyInput( const KeyEvent& rKEvt ) { if( !mpTheme || !static_cast< GalleryBrowser2* >( GetParent() )->KeyInput( rKEvt, this ) ) BrowseBox::KeyInput( rKEvt ); } -// ------------------------------------------------------------------------ - void GalleryListView::DoubleClick( const BrowserMouseEvent& rEvt ) { BrowseBox::DoubleClick( rEvt ); @@ -680,16 +597,12 @@ void GalleryListView::DoubleClick( const BrowserMouseEvent& rEvt ) ( (GalleryBrowser2*) GetParent() )->TogglePreview( this, &rEvt.GetPosPixel() ); } -// ------------------------------------------------------------------------ - void GalleryListView::Select() { if( maSelectHdl.IsSet() ) maSelectHdl.Call( this ); } -// ------------------------------------------------------------------------ - sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -700,8 +613,6 @@ sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& ) return nRet; } -// ------------------------------------------------------------------------ - sal_Int8 GalleryListView::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) { ExecuteDropEvent aEvt( rEvt ); @@ -711,8 +622,6 @@ sal_Int8 GalleryListView::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) return( ( (GalleryBrowser2*) GetParent() )->ExecuteDrop( *this, aEvt ) ); } -// ------------------------------------------------------------------------ - void GalleryListView::StartDrag( sal_Int8, const Point& rPosPixel ) { ( (GalleryBrowser2*) GetParent() )->StartDrag( this, &rPosPixel ); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index c9622d1ca5e2..a32cad756868 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -65,18 +65,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -// ----------- -// - Defines - -// ----------- - #define SWAPGRAPHIC_TIMEOUT 5000 - -// ------------------ -// - SdrGraphicLink - -// ------------------ - - const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilterName ) { Graphic aGraphic; @@ -194,8 +184,6 @@ void SAL_CALL SdrGraphicUpdater::run(void) } } -// ----------------------------------------------------------------------------- - SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) : ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ) , pGrafObj( pObj ) @@ -204,30 +192,22 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) SetSynchron( false ); } -// ----------------------------------------------------------------------------- - SdrGraphicLink::~SdrGraphicLink() { if ( pGraphicUpdater ) pGraphicUpdater->Terminate(); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) { pGrafObj->ImpSetLinkedGraphic( rGraphic ); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::RemoveGraphicUpdater() { pGraphicUpdater = NULL; } -// ----------------------------------------------------------------------------- - ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ) { @@ -253,8 +233,6 @@ void SdrGraphicLink::RemoveGraphicUpdater() return SUCCESS; } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::Closed() { // close connection; set pLink of the object to NULL, as link instance is just about getting destructed. @@ -264,8 +242,6 @@ void SdrGraphicLink::Closed() SvBaseLink::Closed(); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::UpdateAsynchron() { if( GetObj() ) @@ -283,13 +259,6 @@ void SdrGraphicLink::UpdateAsynchron() } } -// -------------- -// - SdrGrafObj - -// -------------- - -////////////////////////////////////////////////////////////////////////////// -// BaseProperties section - sdr::properties::BaseProperties* SdrGrafObj::CreateObjectSpecificProperties() { return new sdr::properties::GraphicProperties(*this); @@ -355,12 +324,8 @@ void SdrGrafObj::onGraphicChanged() } } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1(SdrGrafObj,SdrRectObj); -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj() : SdrRectObj(), pGraphicLink ( NULL ), @@ -385,8 +350,6 @@ SdrGrafObj::SdrGrafObj() mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), pGraphicLink ( NULL ), @@ -411,8 +374,6 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), pGraphicLink ( NULL ), @@ -437,8 +398,6 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::~SdrGrafObj() { delete pGraphic; @@ -446,8 +405,6 @@ SdrGrafObj::~SdrGrafObj() ImpLinkAbmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) { *pGraphic = rGrfObj; @@ -461,8 +418,6 @@ void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) onGraphicChanged(); } -// ----------------------------------------------------------------------------- - const GraphicObject& SdrGrafObj::GetGraphicObject(bool bForceSwapIn) const { if(bForceSwapIn) @@ -488,8 +443,6 @@ const GraphicObject* SdrGrafObj::GetReplacementGraphicObject() const return mpReplacementGraphic; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetGraphic( const Graphic& rGrf ) { pGraphic->SetGraphic( rGrf ); @@ -507,16 +460,12 @@ void SdrGrafObj::SetGraphic( const Graphic& rGrf ) BroadcastObjectChange(); } -// ----------------------------------------------------------------------------- - const Graphic& SdrGrafObj::GetGraphic() const { ForceSwapIn(); return pGraphic->GetGraphic(); } -// ----------------------------------------------------------------------------- - Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { // Refactored most of the code to GraphicObject, where @@ -557,8 +506,6 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const return GetGraphicObject().GetTransformedGraphic( aDestSize, aDestMap, aActAttr ); } -// ----------------------------------------------------------------------------- - GraphicType SdrGrafObj::GetGraphicType() const { return pGraphic->GetType(); @@ -589,8 +536,6 @@ const Size& SdrGrafObj::GetGrafPrefSize() const return pGraphic->GetPrefSize(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGrafStreamURL( const String& rGraphicStreamURL ) { mbIsPreview = false; @@ -608,15 +553,11 @@ void SdrGrafObj::SetGrafStreamURL( const String& rGraphicStreamURL ) } } -// ----------------------------------------------------------------------------- - String SdrGrafObj::GetGrafStreamURL() const { return pGraphic->GetUserData(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ForceSwapIn() const { if( mbIsPreview ) @@ -646,15 +587,11 @@ void SdrGrafObj::ForceSwapIn() const } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ForceSwapOut() const { pGraphic->FireSwapOutRequest(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpLinkAnmeldung() { sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; @@ -671,8 +608,6 @@ void SdrGrafObj::ImpLinkAnmeldung() } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpLinkAbmeldung() { sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; @@ -685,8 +620,6 @@ void SdrGrafObj::ImpLinkAbmeldung() } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName) { ImpLinkAbmeldung(); @@ -699,8 +632,6 @@ void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rF pGraphic->SetSwapState(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); @@ -723,8 +654,6 @@ const rtl::OUString& SdrGrafObj::GetFilterName() const return aFilterName; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bAnim = pGraphic->IsAnimated(); @@ -754,15 +683,11 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -// ----------------------------------------------------------------------------- - sal_uInt16 SdrGrafObj::GetObjIdentifier() const { return sal_uInt16( OBJ_GRAF ); } -// ----------------------------------------------------------------------------- - /* The graphic of the GraphicLink will be loaded. If it is called with bAsynchron = true then the graphic will be set later via DataChanged */ @@ -780,8 +705,6 @@ bool SdrGrafObj::ImpUpdateGraphicLink( bool bAsynchron ) const return bRet; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) { const sal_Bool bIsChanged = GetModel()->IsChanged(); @@ -791,8 +714,6 @@ void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) GetModel()->SetChanged( bIsChanged ); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { if(pGraphic) @@ -842,8 +763,6 @@ void SdrGrafObj::TakeObjNameSingul(XubString& rName) const } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const { if(pGraphic) @@ -893,8 +812,6 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const } } -// ----------------------------------------------------------------------------- - SdrObject* SdrGrafObj::getFullDragClone() const { // call parent @@ -937,9 +854,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) return *this; } -// ----------------------------------------------------------------------------- -// #i25616# - basegfx::B2DPolyPolygon SdrGrafObj::TakeXorPoly() const { if(mbInsidePaint) @@ -966,22 +880,16 @@ basegfx::B2DPolyPolygon SdrGrafObj::TakeXorPoly() const } } -// ----------------------------------------------------------------------------- - sal_uInt32 SdrGrafObj::GetHdlCount() const { return 8L; } -// ----------------------------------------------------------------------------- - SdrHdl* SdrGrafObj::GetHdl(sal_uInt32 nHdlNum) const { return SdrRectObj::GetHdl( nHdlNum + 1L ); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { SdrRectObj::NbcResize( rRef, xFact, yFact ); @@ -993,52 +901,38 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract bMirrored = !bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { SdrRectObj::NbcRotate(rRef,nWink,sn,cs); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) { SdrRectObj::NbcMirror(rRef1,rRef2); bMirrored = !bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { // #i118485# Call Shear now, old version redirected to rotate SdrRectObj::NbcShear(rRef, nWink, tn, bVShear); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) { SdrRectObj::NbcSetSnapRect(rRect); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { SdrRectObj::NbcSetLogicRect(rRect); } -// ----------------------------------------------------------------------------- - SdrObjGeoData* SdrGrafObj::NewGeoData() const { return new SdrGrafObjGeoData; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const { SdrRectObj::SaveGeoData(rGeo); @@ -1046,8 +940,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const rGGeo.bMirrored=bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { SdrRectObj::RestGeoData(rGeo); @@ -1055,8 +947,6 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) bMirrored=rGGeo.bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetPage( SdrPage* pNewPage ) { bool bRemove = pNewPage == NULL && pPage != NULL; @@ -1078,8 +968,6 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) ImpLinkAnmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetModel( SdrModel* pNewModel ) { bool bChg = pNewModel != pModel; @@ -1103,22 +991,16 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) ImpLinkAnmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/) { SetGrafAnimationAllowed(true); } -// ----------------------------------------------------------------------------- - bool SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); } -// ----------------------------------------------------------------------------- - bool SdrGrafObj::isEmbeddedSvg() const { return GRAPHIC_BITMAP == GetGraphicType() && GetGraphic().getSvgData().get(); @@ -1289,8 +1171,6 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText ) cons return pRetval; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SetXPolyDirty(); @@ -1329,8 +1209,6 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() SetRectsDirty(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) { Size aSize; @@ -1381,8 +1259,6 @@ void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) } } -// ----------------------------------------------------------------------------- - IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { SvStream* pRet = GRFMGR_AUTOSWAPSTREAM_NONE; @@ -1490,8 +1366,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) return (long)(void*) pRet; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGrafAnimationAllowed(bool bNew) { if(mbGrafAnimationAllowed != bNew) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 8e23dc80ed34..86e5c5e17942 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -52,7 +52,6 @@ #include "svx/grafctrl.hxx" #include "svx/tbxcolor.hxx" -// namespaces using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -61,45 +60,29 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; #include <svx/svxdlg.hxx> -// ----------- -// - Defines - -// ----------- #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() #define TOOLBOX_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "colorbar" ) ) -// ---------------- -// - TbxImageItem - -// ---------------- - TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); -//--------------------------------------------------------- - TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) : SfxUInt16Item( _nWhich, nImage ) { } -//--------------------------------------------------------- SfxPoolItem* TbxImageItem::Clone( SfxItemPool* ) const { return new TbxImageItem( *this ); } -//--------------------------------------------------------- - int TbxImageItem::operator==( const SfxPoolItem& rItem ) const { return( ( (TbxImageItem&) rItem ).GetValue() == GetValue() ); } -// ----------------------- -// - ImplGrafMetricField - -// ----------------------- - class ImplGrafMetricField : public MetricField { using Window::Update; @@ -124,8 +107,6 @@ public: const OUString& GetCommand() const { return maCommand; } }; -// ----------------------------------------------------------------------------- - ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), @@ -165,21 +146,15 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& maTimer.SetTimeoutHdl( LINK( this, ImplGrafMetricField, ImplModifyHdl ) ); } -// ----------------------------------------------------------------------------- - ImplGrafMetricField::~ImplGrafMetricField() { } -// ----------------------------------------------------------------------------- - void ImplGrafMetricField::Modify() { maTimer.Start(); } -// ----------------------------------------------------------------------------- - IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl) { const sal_Int64 nVal = GetValue(); @@ -212,8 +187,6 @@ IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl) return 0L; } -// ----------------------------------------------------------------------------- - void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) { if( pItem ) @@ -233,10 +206,6 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) SetText( OUString() ); } -// -------------------- -// - ImplGrafControl - -// -------------------- - struct CommandToRID { const char* pCommand; @@ -273,8 +242,6 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand ) return nRID; } -// ----------------------------------------------------------------------------- - class ImplGrafControl : public Control { using Window::Update; @@ -295,8 +262,6 @@ public: void SetText( const OUString& rStr ) { maField.SetText( rStr ); } }; -// ----------------------------------------------------------------------------- - ImplGrafControl::ImplGrafControl( Window* pParent, const rtl::OUString& rCmd, @@ -337,23 +302,15 @@ ImplGrafControl::ImplGrafControl( maField.Show(); } -// ----------------------------------------------------------------------------- - ImplGrafControl::~ImplGrafControl() { } -// ----------------------------------------------------------------------------- - void ImplGrafControl::GetFocus() { maField.GrabFocus(); } -// ----------------------- -// - ImplGrafModeControl - -// ----------------------- - class ImplGrafModeControl : public ListBox { using Window::Update; @@ -374,8 +331,6 @@ public: void Update( const SfxPoolItem* pItem ); }; -// ----------------------------------------------------------------------------- - ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ), mnCurPos( 0 ), @@ -391,14 +346,10 @@ ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFra Show(); } -// ----------------------------------------------------------------------- - ImplGrafModeControl::~ImplGrafModeControl() { } -// ----------------------------------------------------------------------- - void ImplGrafModeControl::Select() { if ( !IsTravelSelect() ) @@ -419,8 +370,6 @@ void ImplGrafModeControl::Select() } } -// ----------------------------------------------------------------------- - long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -431,8 +380,6 @@ long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) return ListBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- - long ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) { long nHandled = ListBox::Notify( rNEvt ); @@ -463,8 +410,6 @@ long ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- - void ImplGrafModeControl::ImplReleaseFocus() { if( SfxViewShell::Current() ) @@ -476,8 +421,6 @@ void ImplGrafModeControl::ImplReleaseFocus() } } -// ----------------------------------------------------------------------- - void ImplGrafModeControl::Update( const SfxPoolItem* pItem ) { if( pItem ) @@ -486,14 +429,8 @@ void ImplGrafModeControl::Update( const SfxPoolItem* pItem ) SetNoSelection(); } -// ------------------------------- -// - SvxGrafFilterToolBoxControl - -// ------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem ); -// ----------------------------------------------------------------------------- - SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { @@ -501,28 +438,20 @@ SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sa rTbx.Invalidate(); } -// ----------------------------------------------------------------------------- - SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl() { } -// ----------------------------------------------------------------------------- - void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) ); } -// ----------------------------------------------------------------------------- - SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------------- - SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow() { rtl::OUString aSubTbxResName( @@ -532,12 +461,6 @@ SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow() return NULL; } -// ------------------------- -// - SvxGrafToolBoxControl - -// ------------------------- - -// ----------------------------------------------------------------------------- - SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) : SfxToolBoxControl( nSlotId, nId, rTbx ) { @@ -545,14 +468,10 @@ SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId rTbx.Invalidate(); } -// ----------------------------------------------------------------------------- - SvxGrafToolBoxControl::~SvxGrafToolBoxControl() { } -// ----------------------------------------------------------------------------- - void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -575,125 +494,71 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const } } -// ----------------------------------------------------------------------------- - Window* SvxGrafToolBoxControl::CreateItemWindow( Window *pParent ) { return( new ImplGrafControl( pParent, m_aCommandURL, m_xFrame ) ); } -// ---------------------------- -// - SvxGrafRedToolBoxControl - -// ---------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafRedToolBoxControl, SfxInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ------------------------------ -// - SvxGrafGreenToolBoxControl - -// ------------------------------ - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGreenToolBoxControl, SfxInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ----------------------------- -// - SvxGrafBlueToolBoxControl - -// ----------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafBlueToolBoxControl, SfxInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ---------------------------------- -// - SvxGrafLuminanceToolBoxControl - -// ---------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafLuminanceToolBoxControl, SfxInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ---------------------------------- -// - SvxGrafContrastToolBoxControl - -// ---------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafContrastToolBoxControl, SfxInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ------------------------------ -// - SvxGrafGammaToolBoxControl - -// ------------------------------ - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGammaToolBoxControl, SfxUInt32Item ); -// ----------------------------------------------------------------------------- - SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ------------------------------------- -// - SvxGrafTransparenceToolBoxControl - -// ------------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafTransparenceToolBoxControl, SfxUInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } -// ----------------------------- -// - SvxGrafModeToolBoxControl - -// ----------------------------- - SFX_IMPL_TOOLBOX_CONTROL( SvxGrafModeToolBoxControl, SfxUInt16Item ); -// ----------------------------------------------------------------------------- - SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } -// ----------------------------------------------------------------------------- - SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl() { } -// ----------------------------------------------------------------------------- - void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -716,17 +581,11 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c } } -// ----------------------------------------------------------------------------- - Window* SvxGrafModeToolBoxControl::CreateItemWindow( Window *pParent ) { return( new ImplGrafModeControl( pParent, m_xFrame ) ); } -// --------------------- -// - SvxGrafAttrHelper - -// --------------------- - void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { SfxItemPool& rPool = rView.GetModel()->GetItemPool(); @@ -1005,8 +864,6 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) } } -// ----------------------------------------------------------------------------- - void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) { SfxItemPool& rPool = rView.GetModel()->GetItemPool(); diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index c144ec118c88..af61eab983fe 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -44,10 +44,6 @@ #include <map> #include "svx/xmleohlp.hxx" -// ----------- -// - Defines - -// ----------- - using namespace ::osl; using namespace ::cppu; using namespace ::utl; @@ -65,8 +61,6 @@ using namespace ::com::sun::star::lang; // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- - class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream> { ::osl::Mutex maMutex; @@ -130,8 +124,6 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() bStreamClosed = sal_True; } -// ----------------------------------------------------------------------------- - struct OUStringLess { bool operator() ( const ::rtl::OUString& r1, const ::rtl::OUString& r2 ) const @@ -140,11 +132,6 @@ struct OUStringLess } }; -// ----------------------------------------------------------------------------- - -// ----------------------------- -// - SvXMLEmbeddedObjectHelper - -// ----------------------------- DBG_NAME(SvXMLEmbeddedObjectHelper) SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), @@ -169,9 +156,6 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHel Init( 0, rDocPersist, eCreateMode ); } - -// ----------------------------------------------------------------------------- - SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper() { DBG_DTOR(SvXMLEmbeddedObjectHelper,NULL); @@ -191,8 +175,6 @@ SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper() } } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLEmbeddedObjectHelper::disposing() { Flush(); @@ -240,8 +222,6 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar, } } -// ----------------------------------------------------------------------------- - sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( const ::rtl::OUString& rURLStr, ::rtl::OUString& rContainerStorageName, @@ -354,9 +334,6 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( return sal_True; } - -// ----------------------------------------------------------------------------- - uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( const ::rtl::OUString& rStorageName ) { @@ -393,8 +370,6 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt return mxContainerStorage; } -// ----------------------------------------------------------------------------- - sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( const ::rtl::OUString& rContainerStorageName, ::rtl::OUString& rObjName, @@ -478,8 +453,6 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( return sal_True; } -// ----------------------------------------------------------------------------- - ::rtl::OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( const ::rtl::OUString& rURLStr ) { @@ -536,8 +509,6 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( return sRetURL; } -// ----------------------------------------------------------------------------- - uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacementImage( const uno::Reference< embed::XEmbeddedObject >& xObj ) { @@ -582,8 +553,6 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement return xStream; } -// ----------------------------------------------------------------------------- - void SvXMLEmbeddedObjectHelper::Init( const uno::Reference < embed::XStorage >& rRootStorage, ::comphelper::IEmbeddedHelper& rPersist, @@ -594,8 +563,6 @@ void SvXMLEmbeddedObjectHelper::Init( meCreateMode = eCreateMode; } -// ----------------------------------------------------------------------------- - SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create( const uno::Reference < embed::XStorage >& rRootStorage, ::comphelper::IEmbeddedHelper& rDocPersist, @@ -624,8 +591,6 @@ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create( return pThis; } -// ----------------------------------------------------------------------------- - void SvXMLEmbeddedObjectHelper::Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper ) { @@ -636,8 +601,6 @@ void SvXMLEmbeddedObjectHelper::Destroy( } } -// ----------------------------------------------------------------------------- - void SvXMLEmbeddedObjectHelper::Flush() { if( mxTempStorage.is() ) diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 4fb5058a0b23..3b7ced224a39 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -44,10 +44,6 @@ #include <algorithm> -// ----------- -// - Defines - -// ----------- - using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::io; @@ -57,10 +53,6 @@ using ::com::sun::star::lang::XMultiServiceFactory; #define XML_GRAPHICSTORAGE_NAME "Pictures" #define XML_GRAPHICOBJECT_URL_BASE "vnd.sun.star.GraphicObject:" -// --------------------------- -// - SvXMLGraphicInputStream - -// --------------------------- - const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) { const MetaCommentAction* pComment = NULL; @@ -102,8 +94,6 @@ public: sal_Bool Exists() const { return mxStmWrapper.is(); } }; -// ----------------------------------------------------------------------------- - SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphicId ) { GraphicObject aGrfObject( rtl::OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); @@ -159,14 +149,10 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi } } -// ----------------------------------------------------------------------------- - SvXMLGraphicInputStream::~SvXMLGraphicInputStream() { } -// ----------------------------------------------------------------------------- - sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, RuntimeException ) { @@ -176,8 +162,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rDa return mxStmWrapper->readBytes( rData, nBytesToRead ); } -// ----------------------------------------------------------------------------- - sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, RuntimeException ) { @@ -187,8 +171,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& return mxStmWrapper->readSomeBytes( rData, nMaxBytesToRead ); } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException, BufferSizeExceededException, RuntimeException ) { @@ -198,8 +180,6 @@ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) mxStmWrapper->skipBytes( nBytesToSkip ); } -// ----------------------------------------------------------------------------- - sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException ) { if( !mxStmWrapper.is() ) @@ -208,8 +188,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedExcep return mxStmWrapper->available(); } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException ) { if( !mxStmWrapper.is() ) @@ -218,10 +196,6 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException mxStmWrapper->closeInput(); } -// ---------------------------- -// - SvXMLGraphicOutputStream - -// ---------------------------- - class SvXMLGraphicOutputStream : public::cppu::WeakImplHelper1< XOutputStream > { private: @@ -252,8 +226,6 @@ public: const GraphicObject& GetGraphicObject(); }; -// ----------------------------------------------------------------------------- - SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() : mpTmp( new ::utl::TempFile ), mbClosed( sal_False ) @@ -266,16 +238,12 @@ SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() : mxStmWrapper = new ::utl::OOutputStreamWrapper( *mpOStm ); } -// ----------------------------------------------------------------------------- - SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream() { delete mpTmp; delete mpOStm; } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) { @@ -285,8 +253,6 @@ void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& mxStmWrapper->writeBytes( rData ); } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) { @@ -296,8 +262,6 @@ void SAL_CALL SvXMLGraphicOutputStream::flush() mxStmWrapper->flush(); } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) { @@ -310,8 +274,6 @@ void SAL_CALL SvXMLGraphicOutputStream::closeOutput() mbClosed = sal_True; } -// ------------------------------------------------------------------------------ - const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() { if( mbClosed && ( maGrfObj.GetType() == GRAPHIC_NONE ) && mpOStm ) @@ -383,10 +345,6 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() return maGrfObj; } -// ---------------------- -// - SvXMLGraphicHelper - -// ---------------------- - SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, ::com::sun::star::document::XBinaryStreamResolver >( maMutex ) @@ -400,20 +358,14 @@ SvXMLGraphicHelper::SvXMLGraphicHelper() : { } -// ----------------------------------------------------------------------------- - SvXMLGraphicHelper::~SvXMLGraphicHelper() { } -// ----------------------------------------------------------------------------- - void SAL_CALL SvXMLGraphicHelper::disposing() { } -// ----------------------------------------------------------------------------- - sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, ::rtl::OUString& rPictureStorageName, ::rtl::OUString& rPictureStreamName ) @@ -442,8 +394,6 @@ sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, return bRet; } -// ----------------------------------------------------------------------------- - uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( const ::rtl::OUString& rStorageName ) { uno::Reference < embed::XStorage > xRetStorage; @@ -476,8 +426,6 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co return xRetStorage; } -// ----------------------------------------------------------------------------- - SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, sal_Bool bTruncate ) @@ -507,8 +455,6 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rt return aRet; } -// ----------------------------------------------------------------------------- - String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) const { struct XMLGraphicMimeTypeMapper @@ -541,8 +487,6 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con return aMimeType; } -// ----------------------------------------------------------------------------- - Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName ) { @@ -558,8 +502,6 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor return aGraphic; } -// ----------------------------------------------------------------------------- - sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, const ::rtl::OUString& rGraphicId, @@ -646,8 +588,6 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt return bRet; } -// ----------------------------------------------------------------------------- - void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName ) { rtl::OUString aURLString( rURLStr ); @@ -795,8 +735,6 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s } } -// ----------------------------------------------------------------------------- - void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, sal_Bool bDirect ) @@ -806,8 +744,6 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto mbDirect = ( ( GRAPHICHELPER_MODE_READ == meCreateMode ) ? bDirect : sal_True ); } -// ----------------------------------------------------------------------------- - SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, sal_Bool bDirect ) @@ -820,8 +756,6 @@ SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XS return pThis; } -// ----------------------------------------------------------------------------- - SvXMLGraphicHelper* SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode eCreateMode ) { SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper; @@ -832,8 +766,6 @@ SvXMLGraphicHelper* SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode eCreateMo return pThis; } -// ----------------------------------------------------------------------------- - void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) { if( pSvXMLGraphicHelper ) @@ -843,8 +775,6 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) } } -// ----------------------------------------------------------------------------- - // XGraphicObjectResolver ::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const ::rtl::OUString& rURL ) throw(uno::RuntimeException) @@ -889,8 +819,6 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) return maGrfURLs[ nIndex ].second; } -// ----------------------------------------------------------------------------- - // XBinaryStreamResolver Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const ::rtl::OUString& rURL ) throw( RuntimeException ) @@ -913,8 +841,6 @@ Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const ::r return xRet; } -// ----------------------------------------------------------------------------- - Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() throw( RuntimeException ) { @@ -933,8 +859,6 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() return xRet; } -// ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) throw( RuntimeException ) { @@ -964,9 +888,6 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() return aRet; } - -// -------------------------------------------------------------------------------- - // for instantiation via service manager namespace svx { diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 2018dbea42ad..bd2b56f2a9c0 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -30,23 +30,13 @@ #include <vcl/FilterConfigItem.hxx> #include <vcl/graphicfilter.hxx> -// ----------- -// - Defines - -// ----------- - #define FORMAT_BMP String(RTL_CONSTASCII_USTRINGPARAM("bmp")) #define FORMAT_GIF String(RTL_CONSTASCII_USTRINGPARAM("gif")) #define FORMAT_JPG String(RTL_CONSTASCII_USTRINGPARAM("jpg")) #define FORMAT_PNG String(RTL_CONSTASCII_USTRINGPARAM("png")) -// -------------- -// - XOutBitmap - -// -------------- - GraphicFilter* XOutBitmap::pGrfFilter = NULL; -// ------------------------------------------------------------------------ - Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ) { Animation aNewAnim( rAnimation ); @@ -86,8 +76,6 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHM return aNewAnim; } -// ------------------------------------------------------------------------ - Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ) { Graphic aRetGraphic; @@ -124,8 +112,6 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nM return aRetGraphic; } -// ------------------------------------------------------------------------ - sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, const String& rFilterName, const sal_uIntPtr nFlags, const Size* pMtfSize_100TH_MM ) @@ -297,8 +283,6 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, } } -// ------------------------------------------------------------------------ - sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) @@ -325,8 +309,6 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje return nRet; } -// ------------------------------------------------------------------------ - Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) { const Size aSize( rBmp.GetSizePixel() ); @@ -412,8 +394,6 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) return aRetBmp; }; -// ------------------------------------------------------------------------ - Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags, const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel ) { @@ -553,10 +533,6 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags, return aRetPoly; }; -// ---------------- -// - DitherBitmap - -// ---------------- - sal_Bool DitherBitmap( Bitmap& rBitmap ) { sal_Bool bRet = sal_False; diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 2a0b139df92e..7753083ace72 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -27,15 +27,10 @@ #include <vcl/region.hxx> #include <vcl/scopedbitmapaccess.hxx> -// ----------- -// - Defines - -// ----------- - #define BMP_MIRROR_NONE 0x00000000UL #define BMP_MIRROR_HORZ 0x00000001UL #define BMP_MIRROR_VERT 0x00000002UL -// ----------------------------------------------------------------------------- #define BMP_SCALE_NONE 0x00000000UL #define BMP_SCALE_FAST 0x00000001UL @@ -50,29 +45,19 @@ #define BMP_SCALE_BEST BMP_SCALE_LANCZOS #define BMP_SCALE_DEFAULT BMP_SCALE_BOX -// ----------------------------------------------------------------------------- - #define BMP_DITHER_NONE 0x00000000UL #define BMP_DITHER_MATRIX 0x00000001UL #define BMP_DITHER_FLOYD 0x00000002UL #define BMP_DITHER_FLOYD_16 0x00000004UL -// ----------------------------------------------------------------------------- - #define BMP_VECTORIZE_NONE BMP_VECTORIZE_OUTER #define BMP_VECTORIZE_INNER 0x00000001UL #define BMP_VECTORIZE_OUTER 0x00000002UL #define BMP_VECTORIZE_BOUND_ONLY 0x00000004UL #define BMP_VECTORIZE_REDUCE_EDGES 0x00000008UL -// ----------------------------------------------------------------------------- - #define BMP_COL_TRANS Color( 252, 3, 251 ) -// --------- -// - Enums - -// --------- - enum BmpConversion { BMP_CONVERSION_NONE = 0, @@ -88,8 +73,6 @@ enum BmpConversion BMP_CONVERSION_GHOSTED = 10 }; -// ------------------------------------------------------------------------ - enum BmpCombine { BMP_COMBINE_COPY = 0, @@ -102,8 +85,6 @@ enum BmpCombine BMP_COMBINE_NXOR = 7 }; -// ------------------------------------------------------------------------ - enum BmpReduce { BMP_REDUCE_SIMPLE = 0, @@ -111,8 +92,6 @@ enum BmpReduce BMP_REDUCE_MEDIAN = 2 }; -// ------------------------------------------------------------------------ - enum BmpEmboss { BMP_EMBOSS_TOPLEFT = 0, @@ -126,8 +105,6 @@ enum BmpEmboss BMP_EMBOSS_BOTTOMRIGHT = 8 }; -// ------------------------------------------------------------------------ - enum BmpFilter { BMP_FILTER_SMOOTH = 0, @@ -143,12 +120,6 @@ enum BmpFilter BMP_FILTER_UNKNOWN = 65535 }; -// ------------------------------------------------------------------------ - -// -------------------- -// - FilterParameters - -// -------------------- - class VCL_DLLPUBLIC BmpFilterParam { friend class Bitmap; @@ -217,7 +188,7 @@ public: }; // -------------------- -// Resample Kernels +// Resample kernels // -------------------- class Kernel @@ -299,10 +270,6 @@ class BoxKernel : public Kernel { } }; -// ---------- -// - Bitmap - -// ---------- - class BitmapReadAccess; class BitmapWriteAccess; class BitmapPalette; @@ -868,80 +835,56 @@ public: friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ); }; -// ----------- -// - Inlines - -// ----------- - inline sal_Bool Bitmap::operator!() const { return( mpImpBmp == NULL ); } -// ------------------------------------------------------------------ - inline sal_Bool Bitmap::operator==( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } -// ------------------------------------------------------------------ - inline sal_Bool Bitmap::operator!=( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp != mpImpBmp ); } -// ------------------------------------------------------------------ - inline sal_Bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } -// ------------------------------------------------------------------ - inline sal_Bool Bitmap::IsEmpty() const { return( mpImpBmp == NULL ); } -// ------------------------------------------------------------------ - inline const MapMode& Bitmap::GetPrefMapMode() const { return maPrefMapMode; } -// ------------------------------------------------------------------ - inline void Bitmap::SetPrefMapMode( const MapMode& rMapMode ) { maPrefMapMode = rMapMode; } -// ------------------------------------------------------------------ - inline const Size& Bitmap::GetPrefSize() const { return maPrefSize; } -// ------------------------------------------------------------------ - inline void Bitmap::SetPrefSize( const Size& rSize ) { maPrefSize = rSize; } -// ------------------------------------------------------------------ - inline sal_uLong Bitmap::GetColorCount() const { return( 1UL << (sal_uLong) GetBitCount() ); } -// ------------------------------------------------------------------ - inline sal_uLong Bitmap::GetSizeBytes() const { const Size aSizePix( GetSizePixel() ); diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx index 5ca9dbd1c5eb..2dc9435cdfa9 100644 --- a/vcl/inc/vcl/cvtsvm.hxx +++ b/vcl/inc/vcl/cvtsvm.hxx @@ -25,10 +25,6 @@ #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -// ----------- -// - Defines - -// ----------- - #define CONVERT_TO_SVM1 0x00000001UL #define CONVERT_FROM_SVM1 0x00000002UL @@ -81,10 +77,6 @@ #define GDI_LINECAP_ACTION 1036 -// ---------------- -// - SVMConverter - -// ---------------- - class VCL_PLUGIN_PUBLIC SVMConverter { private: diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 4e7f38e1f952..51cff9fc4cb9 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -51,18 +51,10 @@ class Gradient; #define METAFILE_LABEL_NOTFOUND GDI_METAFILE_LABEL_NOTFOUND #endif -// ----------- -// - Defines - -// ----------- - #define MTF_MIRROR_NONE 0x00000000UL #define MTF_MIRROR_HORZ 0x00000001UL #define MTF_MIRROR_VERT 0x00000002UL -// --------- -// - Enums - -// --------- - enum MtfConversion { MTF_CONVERSION_NONE = 0, @@ -77,11 +69,6 @@ enum MtfConversion typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); - -// --------------- -// - GDIMetaFile - -// --------------- - class VCL_DLLPUBLIC GDIMetaFile { private: diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index 78445bfd8a67..6c7ba0a70347 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -33,17 +33,9 @@ struct ImplImage; struct ImplImageList; namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } } -// ----------- -// - Defines - -// ----------- - #define IMAGE_STDBTN_COLOR Color( 0xC0, 0xC0, 0xC0 ) #define IMAGELIST_IMAGE_NOTFOUND ((sal_uInt16)0xFFFF) -// ----------------------- -// - ImageColorTransform - -// ----------------------- - enum ImageColorTransform { IMAGECOLORTRANSFORM_NONE = 0, @@ -52,10 +44,6 @@ enum ImageColorTransform IMAGECOLORTRANSFORM_MONOCHROME_WHITE = 3 }; -// --------- -// - Image - -// --------- - class VCL_DLLPUBLIC Image { friend class ImageList; @@ -91,10 +79,6 @@ private: SAL_DLLPRIVATE void ImplInit( const BitmapEx& rBmpEx ); }; -// ------------- -// - ImageList - -// ------------- - class VCL_DLLPUBLIC ImageList { public: diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index e52d18457036..4cad0a3fb8bf 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -37,10 +37,6 @@ class SvStream; -// ----------- -// - Defines - -// ----------- - #define META_NULL_ACTION (0) #define META_PIXEL_ACTION (100) #define META_POINT_ACTION (101) @@ -97,8 +93,6 @@ class SvStream; #define META_COMMENT_ACTION (512) -// ------------------------------------------------------------------------ - struct ImplMetaReadData { rtl_TextEncoding meActualCharSet; @@ -109,8 +103,6 @@ struct ImplMetaReadData } }; -// ------------------------------------------------------------------------ - struct ImplMetaWriteData { rtl_TextEncoding meActualCharSet; @@ -121,8 +113,6 @@ struct ImplMetaWriteData } }; -// ------------------------------------------------------------------------ - #define DECL_META_ACTION( Name, nType ) \ Meta##Name##Action(); \ protected: \ @@ -138,10 +128,6 @@ Meta##Name##Action::Meta##Name##Action() : \ MetaAction( nType ) {} \ Meta##Name##Action::~Meta##Name##Action() {} -// -------------- -// - MetaAction - -// -------------- - class VCL_DLLPUBLIC MetaAction { private: @@ -177,10 +163,6 @@ public: static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); }; -// ------------------- -// - MetaPixelAction - -// ------------------- - class VCL_DLLPUBLIC MetaPixelAction : public MetaAction { private: @@ -201,10 +183,6 @@ public: const Color& GetColor() const { return maColor; } }; -// ------------------- -// - MetaPointAction - -// ------------------- - class VCL_DLLPUBLIC MetaPointAction : public MetaAction { private: @@ -223,10 +201,6 @@ public: const Point& GetPoint() const { return maPt; } }; -// ------------------ -// - MetaLineAction - -// ------------------ - class VCL_DLLPUBLIC MetaLineAction : public MetaAction { private: @@ -252,10 +226,6 @@ public: const LineInfo& GetLineInfo() const { return maLineInfo; } }; -// ------------------ -// - MetaRectAction - -// ------------------ - class VCL_DLLPUBLIC MetaRectAction : public MetaAction { private: @@ -274,10 +244,6 @@ public: const Rectangle& GetRect() const { return maRect; } }; -// ----------------------- -// - MetaRoundRectAction - -// ----------------------- - class VCL_DLLPUBLIC MetaRoundRectAction : public MetaAction { private: @@ -302,10 +268,6 @@ public: sal_uInt32 GetVertRound() const { return mnVertRound; } }; -// --------------------- -// - MetaEllipseAction - -// --------------------- - class VCL_DLLPUBLIC MetaEllipseAction : public MetaAction { private: @@ -325,10 +287,6 @@ public: const Rectangle& GetRect() const { return maRect; } }; -// ----------------- -// - MetaArcAction - -// ----------------- - class VCL_DLLPUBLIC MetaArcAction : public MetaAction { private: @@ -353,10 +311,6 @@ public: const Point& GetEndPoint() const { return maEndPt; } }; -// ----------------- -// - MetaPieAction - -// ----------------- - class VCL_DLLPUBLIC MetaPieAction : public MetaAction { private: @@ -381,10 +335,6 @@ public: const Point& GetEndPoint() const { return maEndPt; } }; -// ------------------- -// - MetaChordAction - -// ------------------- - class VCL_DLLPUBLIC MetaChordAction : public MetaAction { private: @@ -409,10 +359,6 @@ public: const Point& GetEndPoint() const { return maEndPt; } }; -// ---------------------- -// - MetaPolyLineAction - -// ---------------------- - class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction { private: @@ -435,10 +381,6 @@ public: const LineInfo& GetLineInfo() const { return maLineInfo; } }; -// --------------------- -// - MetaPolygonAction - -// --------------------- - class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction { private: @@ -458,10 +400,6 @@ public: const Polygon& GetPolygon() const { return maPoly; } }; -// ------------------------- -// - MetaPolyPolygonAction - -// ------------------------- - class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction { private: @@ -481,10 +419,6 @@ public: const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; -// ------------------ -// - MetaTextAction - -// ------------------ - class VCL_DLLPUBLIC MetaTextAction : public MetaAction { private: @@ -511,10 +445,6 @@ public: sal_uInt16 GetLen() const { return mnLen; } }; -// ----------------------- -// - MetaTextArrayAction - -// ----------------------- - class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction { private: @@ -554,10 +484,6 @@ public: sal_Int32* GetDXArray() const { return mpDXAry; } }; -// ------------------------- -// - MetaStretchTextAction - -// ------------------------- - class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction { private: @@ -587,10 +513,6 @@ public: sal_uInt16 GetLen() const { return mnLen; } }; -// ---------------------- -// - MetaTextRectAction - -// ---------------------- - class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction { private: @@ -615,10 +537,6 @@ public: sal_uInt16 GetStyle() const { return mnStyle; } }; -// ---------------------- -// - MetaTextLineAction - -// ---------------------- - class VCL_DLLPUBLIC MetaTextLineAction : public MetaAction { private: @@ -648,10 +566,6 @@ public: FontUnderline GetOverline() const { return meOverline; } }; -// ----------------- -// - MetaBmpAction - -// ----------------- - class VCL_DLLPUBLIC MetaBmpAction : public MetaAction { private: @@ -673,10 +587,6 @@ public: const Point& GetPoint() const { return maPt; } }; -// ---------------------- -// - MetaBmpScaleAction - -// ---------------------- - class VCL_DLLPUBLIC MetaBmpScaleAction : public MetaAction { private: @@ -701,10 +611,6 @@ public: const Size& GetSize() const { return maSz; } }; -// -------------------------- -// - MetaBmpScalePartAction - -// -------------------------- - class VCL_DLLPUBLIC MetaBmpScalePartAction : public MetaAction { private: @@ -734,10 +640,6 @@ public: const Size& GetSrcSize() const { return maSrcSz; } }; -// ----------------- -// - MetaBmpExAction - -// ----------------- - class VCL_DLLPUBLIC MetaBmpExAction : public MetaAction { private: @@ -759,10 +661,6 @@ public: const Point& GetPoint() const { return maPt; } }; -// ---------------------- -// - MetaBmpExScaleAction - -// ---------------------- - class VCL_DLLPUBLIC MetaBmpExScaleAction : public MetaAction { private: @@ -787,10 +685,6 @@ public: const Size& GetSize() const { return maSz; } }; -// ---------------------------- -// - MetaBmpExScalePartAction - -// ---------------------------- - class VCL_DLLPUBLIC MetaBmpExScalePartAction : public MetaAction { private: @@ -820,10 +714,6 @@ public: const Size& GetSrcSize() const { return maSrcSz; } }; -// ------------------ -// - MetaMaskAction - -// ------------------ - class VCL_DLLPUBLIC MetaMaskAction : public MetaAction { private: @@ -849,10 +739,6 @@ public: const Point& GetPoint() const { return maPt; } }; -// ----------------------- -// - MetaMaskScaleAction - -// ----------------------- - class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction { private: @@ -880,10 +766,6 @@ public: const Size& GetSize() const { return maSz; } }; -// --------------------------- -// - MetaMaskScalePartAction - -// --------------------------- - class VCL_DLLPUBLIC MetaMaskScalePartAction : public MetaAction { private: @@ -916,10 +798,6 @@ public: const Size& GetSrcSize() const { return maSrcSz; } }; -// ---------------------- -// - MetaGradientAction - -// ---------------------- - class VCL_DLLPUBLIC MetaGradientAction : public MetaAction { private: @@ -941,10 +819,6 @@ public: const Gradient& GetGradient() const { return maGradient; } }; -// ------------------------ -// - MetaGradientExAction - -// ------------------------ - class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction { private: @@ -966,10 +840,6 @@ public: const Gradient& GetGradient() const { return maGradient; } }; -// ------------------- -// - MetaHatchAction - -// ------------------- - class VCL_DLLPUBLIC MetaHatchAction : public MetaAction { private: @@ -991,10 +861,6 @@ public: const Hatch& GetHatch() const { return maHatch; } }; -// ----------------------- -// - MetaWallpaperAction - -// ----------------------- - class VCL_DLLPUBLIC MetaWallpaperAction : public MetaAction { private: @@ -1017,10 +883,6 @@ public: const Wallpaper& GetWallpaper() const { return maWallpaper; } }; -// ------------------------ -// - MetaClipRegionAction - -// ------------------------ - class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction { private: @@ -1042,10 +904,6 @@ public: sal_Bool IsClipping() const { return mbClip; } }; -// --------------------------------- -// - MetaISectRectClipRegionAction - -// --------------------------------- - class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction { private: @@ -1065,10 +923,6 @@ public: const Rectangle& GetRect() const { return maRect; } }; -// ----------------------------------- -// - MetaISectRegionClipRegionAction - -// ----------------------------------- - class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction { private: @@ -1088,10 +942,6 @@ public: const Region& GetRegion() const { return maRegion; } }; -// ---------------------------- -// - MetaMoveClipRegionAction - -// ---------------------------- - class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction { private: @@ -1112,10 +962,6 @@ public: long GetVertMove() const { return mnVertMove; } }; -// ----------------------- -// - MetaLineColorAction - -// ----------------------- - class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction { private: @@ -1134,10 +980,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// ----------------------- -// - MetaFillColorAction - -// ----------------------- - class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction { private: @@ -1156,10 +998,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// ----------------------- -// - MetaTextColorAction - -// ----------------------- - class VCL_DLLPUBLIC MetaTextColorAction : public MetaAction { private: @@ -1176,10 +1014,6 @@ public: const Color& GetColor() const { return maColor; } }; -// --------------------------- -// - MetaTextFillColorAction - -// --------------------------- - class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction { private: @@ -1198,10 +1032,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// --------------------------- -// - MetaTextLineColorAction - -// --------------------------- - class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction { private: @@ -1220,10 +1050,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// --------------------------- -// - MetaOverlineColorAction - -// --------------------------- - class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction { private: @@ -1242,10 +1068,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// ----------------------- -// - MetaTextAlignAction - -// ----------------------- - class VCL_DLLPUBLIC MetaTextAlignAction : public MetaAction { private: @@ -1262,10 +1084,6 @@ public: TextAlign GetTextAlign() const { return maAlign; } }; -// --------------------- -// - MetaMapModeAction - -// --------------------- - class VCL_DLLPUBLIC MetaMapModeAction : public MetaAction { private: @@ -1284,10 +1102,6 @@ public: const MapMode& GetMapMode() const { return maMapMode; } }; -// --------------------- -// - MetaFontAction - -// --------------------- - class VCL_DLLPUBLIC MetaFontAction : public MetaAction { private: @@ -1306,10 +1120,6 @@ public: const Font& GetFont() const { return maFont; } }; -// ------------------ -// - MetaPushAction - -// ------------------ - class VCL_DLLPUBLIC MetaPushAction : public MetaAction { private: @@ -1326,10 +1136,6 @@ public: sal_uInt16 GetFlags() const { return mnFlags; } }; -// ----------------- -// - MetaPopAction - -// ----------------- - class VCL_DLLPUBLIC MetaPopAction : public MetaAction { public: @@ -1337,10 +1143,6 @@ public: DECL_META_ACTION( Pop, META_POP_ACTION ) }; -// ---------------------- -// - MetaRasterOpAction - -// ---------------------- - class VCL_DLLPUBLIC MetaRasterOpAction : public MetaAction { private: @@ -1357,10 +1159,6 @@ public: RasterOp GetRasterOp() const { return meRasterOp; } }; -// ------------------------- -// - MetaTransparentAction - -// ------------------------- - class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction { private: @@ -1382,10 +1180,6 @@ public: sal_uInt16 GetTransparence() const { return mnTransPercent; } }; -// ------------------------------ -// - MetaFloatTransparentAction - -// ------------------------------ - class VCL_DLLPUBLIC MetaFloatTransparentAction : public MetaAction { private: @@ -1412,10 +1206,6 @@ public: const Gradient& GetGradient() const { return maGradient; } }; -// --------------------- -// - MetaDrawEPSAction - -// --------------------- - class VCL_DLLPUBLIC MetaEPSAction : public MetaAction { private: @@ -1442,10 +1232,6 @@ public: const Size& GetSize() const { return maSize; } }; -// ---------------------- -// - MetaRefPointAction - -// ---------------------- - class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction { private: @@ -1464,10 +1250,6 @@ public: sal_Bool IsSetting() const { return mbSet; } }; -// --------------------- -// - MetaCommentAction - -// --------------------- - class VCL_DLLPUBLIC MetaCommentAction : public MetaAction { private: @@ -1502,10 +1284,6 @@ public: const sal_uInt8* GetData() const { return mpData; } }; -// ------------------------ -// - MetaLayoutModeAction - -// ------------------------ - class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction { private: @@ -1521,10 +1299,6 @@ public: sal_uInt32 GetLayoutMode() const { return mnLayoutMode; } }; -// ------------------------ -// - MetaTextLanguageAction - -// ------------------------ - class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction { private: diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 86b191757744..7d1054db8156 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -23,17 +23,9 @@ #include <vcl/salbtype.hxx> #include <vcl/dllapi.h> -// ----------- -// - Defines - -// ----------- - #define OCTREE_BITS 5 #define OCTREE_BITS_1 10 -// -------------- -// - OctreeNode - -// -------------- - typedef struct OctreeNode { sal_uLong nCount; @@ -50,10 +42,6 @@ typedef struct OctreeNode typedef NODE* PNODE; typedef PNODE* PPNODE; -// ---------- -// - Octree - -// ---------- - class ImpNodeCache; class BitmapReadAccess; @@ -91,8 +79,6 @@ public: inline sal_uInt16 GetBestPaletteIndex( const BitmapColor& rColor ); }; -// ------------------------------------------------------------------------ - inline const BitmapPalette& Octree::GetPalette() { aPal.SetEntryCount( (sal_uInt16) nLeafCount ); @@ -101,8 +87,6 @@ inline const BitmapPalette& Octree::GetPalette() return aPal; } -// ------------------------------------------------------------------------ - inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor ) { pColor = &(BitmapColor&) rColor; @@ -112,10 +96,6 @@ inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor ) return nPalIndex; } -// ------------------- -// - InverseColorMap - -// ------------------- - class VCL_PLUGIN_PUBLIC InverseColorMap { private: @@ -135,8 +115,6 @@ public: inline sal_uInt16 GetBestPaletteIndex( const BitmapColor& rColor ); }; -// ------------------------------------------------------------------------ - inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor ) { return pMap[ ( ( (sal_uLong) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx index 0c7db7b0d4ab..4fbb65d2a49a 100644 --- a/vcl/inc/vcl/salctype.hxx +++ b/vcl/inc/vcl/salctype.hxx @@ -25,10 +25,6 @@ #include <vcl/graph.hxx> -// ----------- -// - Defines - -// ----------- - #define CVT_UNKNOWN (0x00000000UL) #define CVT_BMP (0x00000001UL) #define CVT_GIF (0x00000002UL) @@ -42,10 +38,6 @@ #define CVT_EMF (0x0000000aUL) #define CVT_SVG (0x0000000bUL) -// --------------- -// - ConvertData - -// --------------- - class SvStream; struct ConvertData @@ -65,18 +57,10 @@ public: ~ConvertData() {} }; -// ------------ -// - Callback - -// ------------ - typedef sal_uLong (*SALGRFCVTPROC)( void* pInst, sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, sal_uLong nOutFormat, void** ppOutBuffer ); -// ------------------- -// - BitmapConverter - -// ------------------- - namespace vcl { com::sun::star::uno::Reference< com::sun::star::script::XInvocation > createBmpConverter(); diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index b6839f5309ef..a60b6f6d9c92 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -38,10 +38,6 @@ class FontSelectPattern; class ImplWinFontEntry; class ImplFontAttrCache; -// ----------- -// - Defines - -// ----------- - #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) @@ -142,10 +138,6 @@ public: bool IsGSUBstituted( sal_UCS4 ) const; }; -// ------------------ -// - WinSalGraphics - -// ------------------ - class WinSalGraphics : public SalGraphics { public: @@ -383,16 +375,8 @@ int ImplIsSysColorEntry( SalColor nSalColor ); void ImplGetLogFontFromFontSelect( HDC, const FontSelectPattern*, LOGFONTW&, bool bTestVerticalAvail ); -// ----------- -// - Defines - -// ----------- - #define MAX_64KSALPOINTS ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS)) -// ----------- -// - Inlines - -// ----------- - // #102411# Win's GCP mishandles kerning => we need to do it ourselves // SalGraphicsData::mpFontKernPairs is sorted by inline bool ImplCmpKernData( const KERNINGPAIR& a, const KERNINGPAIR& b ) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index d1835d0602d5..dddc3a5d1f82 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -67,10 +67,6 @@ #define IMPORT_FUNCTION_NAME "GraphicImport" #define EXPORT_FUNCTION_NAME "GraphicExport" -// ----------- -// - statics - -// ----------- - using namespace ::rtl; using namespace ::com::sun::star; @@ -86,10 +82,6 @@ static ::osl::Mutex& getListMutex() return s_aListProtection; } -// ------------------------- -// - ImpFilterOutputStream - -// ------------------------- - class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > { protected: @@ -135,8 +127,6 @@ static sal_Bool DirEntryExists( const INetURLObject& rObj ) return bExists; } -// ----------------------------------------------------------------------------- - static void KillDirEntry( const String& rMainUrl ) { try @@ -160,11 +150,7 @@ static void KillDirEntry( const String& rMainUrl ) #endif // !DISABLE_EXPORT -// -------------------- -// - Helper functions - -// -------------------- - -//-------------------------------------------------------------------------- +// Helper functions sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize ) { @@ -949,11 +935,6 @@ static String ImpCreateFullFilterPath( const String& rPath, const String& rFilte return String( aSystemPath ); } - -// -------------------------- -// - ImpFilterLibCacheEntry - -// -------------------------- - class ImpFilterLibCache; struct ImpFilterLibCacheEntry @@ -972,8 +953,6 @@ struct ImpFilterLibCacheEntry PFilterCall GetImportFunction(); }; -// ------------------------------------------------------------------------ - ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ) : mpNext ( NULL ), #ifndef DISABLE_DYNLOADING @@ -988,8 +967,6 @@ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const S #endif } -// ------------------------------------------------------------------------ - #ifdef DISABLE_DYNLOADING extern "C" sal_Bool icdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); @@ -1041,12 +1018,6 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() return mpfnImport; } -// ------------------------------------------------------------------------ - -// --------------------- -// - ImpFilterLibCache - -// --------------------- - class ImpFilterLibCache { ImpFilterLibCacheEntry* mpFirst; @@ -1059,16 +1030,12 @@ public: ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername ); }; -// ------------------------------------------------------------------------ - ImpFilterLibCache::ImpFilterLibCache() : mpFirst ( NULL ), mpLast ( NULL ) { } -// ------------------------------------------------------------------------ - ImpFilterLibCache::~ImpFilterLibCache() { ImpFilterLibCacheEntry* pEntry = mpFirst; @@ -1080,8 +1047,6 @@ ImpFilterLibCache::~ImpFilterLibCache() } } -// ------------------------------------------------------------------------ - ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, const String& rFilterName ) { ImpFilterLibCacheEntry* pEntry = mpFirst; @@ -1117,14 +1082,8 @@ ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, return pEntry; }; -// ------------------------------------------------------------------------ - namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; } -// ----------------- -// - GraphicFilter - -// ----------------- - GraphicFilter::GraphicFilter( sal_Bool bConfig ) : bUseConfig ( bConfig ), nExpGraphHint ( 0 ) @@ -1132,8 +1091,6 @@ GraphicFilter::GraphicFilter( sal_Bool bConfig ) : ImplInit(); } -// ------------------------------------------------------------------------ - GraphicFilter::~GraphicFilter() { { @@ -1159,8 +1116,6 @@ GraphicFilter::~GraphicFilter() delete pErrorEx; } -// ------------------------------------------------------------------------ - void GraphicFilter::ImplInit() { { @@ -1188,193 +1143,140 @@ void GraphicFilter::ImplInit() bAbort = sal_False; } -// ------------------------------------------------------------------------ - sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm ) { pErrorEx->nFilterError = nError; pErrorEx->nStreamError = pStm ? pStm->GetError() : ERRCODE_NONE; return nError; } -// ------------------------------------------------------------------------ sal_uInt16 GraphicFilter::GetImportFormatCount() { return pConfig->GetImportFormatCount(); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetImportFormatNumber( const String& rFormatName ) { return pConfig->GetImportFormatNumber( rFormatName ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetImportFormatNumberForMediaType( const String& rMediaType ) { return pConfig->GetImportFormatNumberForMediaType( rMediaType ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetImportFormatNumberForShortName( const String& rShortName ) { return pConfig->GetImportFormatNumberForShortName( rShortName ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetImportFormatNumberForTypeName( const String& rType ) { return pConfig->GetImportFormatNumberForTypeName( rType ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportFormatName( sal_uInt16 nFormat ) { return pConfig->GetImportFormatName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportFormatTypeName( sal_uInt16 nFormat ) { return pConfig->GetImportFilterTypeName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportFormatMediaType( sal_uInt16 nFormat ) { return pConfig->GetImportFormatMediaType( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportFormatShortName( sal_uInt16 nFormat ) { return pConfig->GetImportFormatShortName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportOSFileType( sal_uInt16 ) { String aOSFileType; return aOSFileType; } -// ------------------------------------------------------------------------ - String GraphicFilter::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ) { return pConfig->GetImportWildcard( nFormat, nEntry ); } -// ------------------------------------------------------------------------ - sal_Bool GraphicFilter::IsImportPixelFormat( sal_uInt16 nFormat ) { return pConfig->IsImportPixelFormat( nFormat ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetExportFormatCount() { return pConfig->GetExportFormatCount(); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetExportFormatNumber( const String& rFormatName ) { return pConfig->GetExportFormatNumber( rFormatName ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetExportFormatNumberForMediaType( const String& rMediaType ) { return pConfig->GetExportFormatNumberForMediaType( rMediaType ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetExportFormatNumberForShortName( const String& rShortName ) { return pConfig->GetExportFormatNumberForShortName( rShortName ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportInternalFilterName( sal_uInt16 nFormat ) { return pConfig->GetExportInternalFilterName( nFormat ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::GetExportFormatNumberForTypeName( const String& rType ) { return pConfig->GetExportFormatNumberForTypeName( rType ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportFormatName( sal_uInt16 nFormat ) { return pConfig->GetExportFormatName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportFormatTypeName( sal_uInt16 nFormat ) { return pConfig->GetExportFilterTypeName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportFormatMediaType( sal_uInt16 nFormat ) { return pConfig->GetExportFormatMediaType( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportFormatShortName( sal_uInt16 nFormat ) { return pConfig->GetExportFormatShortName( nFormat ); } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportOSFileType( sal_uInt16 ) { String aOSFileType; return aOSFileType; } -// ------------------------------------------------------------------------ - String GraphicFilter::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ) { return pConfig->GetExportWildcard( nFormat, nEntry ); } -// ------------------------------------------------------------------------ - sal_Bool GraphicFilter::IsExportPixelFormat( sal_uInt16 nFormat ) { return pConfig->IsExportPixelFormat( nFormat ); } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat ) { @@ -1391,8 +1293,6 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath, return nRetValue; } -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::CanImportGraphic( const String& rMainUrl, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat ) { @@ -1407,7 +1307,6 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const String& rMainUrl, SvStream& rI return (sal_uInt16) ImplSetError( nRes, &rIStream ); } -// ------------------------------------------------------------------------ //SJ: TODO, we need to create a GraphicImporter component sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags ) @@ -1833,9 +1732,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, return nStatus; } - -// ------------------------------------------------------------------------ - sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData ) { @@ -1866,8 +1762,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO #endif } -// ------------------------------------------------------------------------ - #ifdef DISABLE_DYNLOADING #ifndef DISABLE_EXPORT @@ -2259,30 +2153,22 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& #endif } -// ------------------------------------------------------------------------ - const FilterErrorEx& GraphicFilter::GetLastError() const { return *pErrorEx; } -// ------------------------------------------------------------------------ - void GraphicFilter::ResetLastError() { pErrorEx->nFilterError = pErrorEx->nStreamError = 0UL; } -// ------------------------------------------------------------------------ - const Link GraphicFilter::GetFilterCallback() const { const Link aLink( LINK( this, GraphicFilter, FilterCallback ) ); return aLink; } -// ------------------------------------------------------------------------ - IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) { long nRet = 0L; diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 011be8c4a81e..fd231ff88fbb 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -23,16 +23,8 @@ #include "decode.hxx" #include "gifread.hxx" -// ----------- -// - Defines - -// ----------- - #define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING ) -// ------------- -// - GIFReader - -// ------------- - GIFReader::GIFReader( SvStream& rStm ) : aGPalette ( 256 ), aLPalette ( 256 ), @@ -58,7 +50,6 @@ GIFReader::GIFReader( SvStream& rStm ) : ClearImageExtensions(); } -// ------------------------------------------------------------------------ GIFReader::~GIFReader() { @@ -73,8 +64,6 @@ GIFReader::~GIFReader() delete[] pSrcBuf; } -// ------------------------------------------------------------------------ - void GIFReader::ClearImageExtensions() { nGCDisposalMethod = 0; @@ -82,8 +71,6 @@ void GIFReader::ClearImageExtensions() nTimer = 0; } -// ------------------------------------------------------------------------ - sal_Bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, sal_Bool bWatchForBackgroundColor ) { @@ -139,8 +126,6 @@ sal_Bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPa return bStatus; } -// ------------------------------------------------------------------------ - sal_Bool GIFReader::ReadGlobalHeader() { char pBuf[ 7 ]; @@ -184,8 +169,6 @@ sal_Bool GIFReader::ReadGlobalHeader() return bRet; } -// ------------------------------------------------------------------------ - void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) { const sal_uLong nLen = 3UL * nCount; @@ -218,8 +201,6 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) delete[] pBuf; } -// ------------------------------------------------------------------------ - sal_Bool GIFReader::ReadExtension() { sal_uInt8 cFunction; @@ -355,8 +336,6 @@ sal_Bool GIFReader::ReadExtension() return bRet; } -// ------------------------------------------------------------------------ - sal_Bool GIFReader::ReadLocalHeader() { sal_uInt8 pBuf[ 9 ]; @@ -404,8 +383,6 @@ sal_Bool GIFReader::ReadLocalHeader() return bRet; } -// ------------------------------------------------------------------------ - sal_uLong GIFReader::ReadNextBlock() { sal_uLong nRet = 0UL; @@ -447,8 +424,6 @@ sal_uLong GIFReader::ReadNextBlock() return nRet; } -// ------------------------------------------------------------------------ - void GIFReader::FillImages( HPBYTE pBytes, sal_uLong nCount ) { for( sal_uLong i = 0UL; i < nCount; i++ ) @@ -552,8 +527,6 @@ void GIFReader::FillImages( HPBYTE pBytes, sal_uLong nCount ) } } -// ------------------------------------------------------------------------ - void GIFReader::CreateNewBitmaps() { AnimationBitmap aAnimBmp; @@ -591,8 +564,6 @@ void GIFReader::CreateNewBitmaps() } } -// ------------------------------------------------------------------------ - const Graphic& GIFReader::GetIntermediateGraphic() { // Intermediate-Graphic nur erzeugen, wenn schon @@ -622,8 +593,6 @@ const Graphic& GIFReader::GetIntermediateGraphic() return aImGraphic; } -// ------------------------------------------------------------------------ - sal_Bool GIFReader::ProcessGIF() { sal_Bool bRead = sal_False; @@ -788,8 +757,6 @@ sal_Bool GIFReader::ProcessGIF() return bRead; } -// ------------------------------------------------------------------------ - ReadState GIFReader::ReadGIF( Graphic& rGraphic ) { ReadState eReadState; @@ -826,11 +793,6 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic ) return eReadState; } - -// ------------- -// - ImportGIF - -// ------------- - sal_Bool ImportGIF( SvStream & rStm, Graphic& rGraphic ) { GIFReader* pGIFReader = (GIFReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx index 35d9b3aa250d..e80e62187978 100644 --- a/vcl/source/filter/igif/gifread.hxx +++ b/vcl/source/filter/igif/gifread.hxx @@ -25,10 +25,6 @@ #ifdef _GIFPRIVATE -// --------- -// - Enums - -// --------- - enum GIFAction { GLOBAL_HEADER_READING, @@ -41,8 +37,6 @@ enum GIFAction END_READING }; -// ------------------------------------------------------------------------ - enum ReadState { GIFREAD_OK, @@ -50,10 +44,6 @@ enum ReadState GIFREAD_NEED_MORE }; -// ------------- -// - GIFReader - -// ------------- - class GIFLZWDecompressor; class SvStream; @@ -122,11 +112,7 @@ public: #endif // _GIFPRIVATE -// ------------- -// - ImportGIF - -// ------------- - - sal_Bool ImportGIF( SvStream& rStream, Graphic& rGraphic ); +sal_Bool ImportGIF( SvStream& rStream, Graphic& rGraphic ); #endif // _GIFREAD_HXX diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index 1b66f0956a76..387430887660 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -25,10 +25,6 @@ #ifdef _XBMPRIVATE -// --------- -// - Enums - -// --------- - enum XBMFormat { XBM10, @@ -42,10 +38,6 @@ enum ReadState XBMREAD_NEED_MORE }; -// ------------- -// - XBMReader - -// ------------- - class XBMReader : public GraphicReader { SvStream& rIStm; @@ -76,10 +68,6 @@ public: #endif // _XBMPRIVATE -// ------------- -// - ImportXBM - -// ------------- - sal_Bool ImportXBM( SvStream& rStream, Graphic& rGraphic ); #endif // _XBMREAD_HXX diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx index 79abfe88e74c..cf16eec9acb3 100644 --- a/vcl/source/filter/ixpm/xpmread.hxx +++ b/vcl/source/filter/ixpm/xpmread.hxx @@ -44,10 +44,6 @@ #define XPMCASESENSITIVE 0x00000001 #define XPMCASENONSENSITIVE 0x00000002 -// --------- -// - Enums - -// --------- - enum ReadState { XPMREAD_OK, @@ -55,10 +51,6 @@ enum ReadState XPMREAD_NEED_MORE }; -// ------------- -// - XPMReader - -// ------------- - class BitmapWriteAccess; class Graphic; @@ -112,10 +104,6 @@ public: #endif // _XPMPRIVATE -// ------------- -// - ImportXPM - -// ------------- - sal_Bool ImportXPM( SvStream& rStream, Graphic& rGraphic ); #endif // _XPMREAD_HXX diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index ad0513ab6ee0..e32fe7488e48 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -34,34 +34,20 @@ extern "C" #include <vcl/FilterConfigItem.hxx> #include <vcl/graphicfilter.hxx> -// ----------- -// - Defines - -// ----------- - using namespace ::com::sun::star; #define JPEGMINREAD 512 -// ------------- -// - (C-Calls) - -// ------------- - -// ------------------------------------------------------------------------ - extern "C" void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ) { return ( (JPEGReader*) pJPEGReader )->CreateBitmap( pJPEGCreateBitmapParam ); } -// ------------------------------------------------------------------------ - extern "C" void* GetScanline( void* pJPEGWriter, long nY ) { return ( (JPEGWriter*) pJPEGWriter )->GetScanline( nY ); } -// ------------------------------------------------------------------------ - struct JPEGCallbackStruct { uno::Reference< task::XStatusIndicator > xStatusIndicator; @@ -286,10 +272,6 @@ extern "C" void jpeg_svstream_src (j_decompress_ptr cinfo, void * in) src->pub.next_input_byte = NULL; /* until buffer loaded */ } -// -------------- -// - JPEGReader - -// -------------- - JPEGReader::JPEGReader( SvStream& rStm, void* /*pCallData*/, sal_Bool bSetLS ) : rIStm ( rStm ), pAcc ( NULL ), @@ -303,8 +285,6 @@ JPEGReader::JPEGReader( SvStream& rStm, void* /*pCallData*/, sal_Bool bSetLS ) : nFormerPos = nLastPos; } -// ------------------------------------------------------------------------ - JPEGReader::~JPEGReader() { if( pBuffer ) @@ -317,8 +297,6 @@ JPEGReader::~JPEGReader() aBmp1.ReleaseAccess( pAcc1 ); } -// ------------------------------------------------------------------------ - void* JPEGReader::CreateBitmap( void* _pParam ) { JPEGCreateBitmapParam *pParam = (JPEGCreateBitmapParam *) _pParam; @@ -405,8 +383,6 @@ void* JPEGReader::CreateBitmap( void* _pParam ) return pBmpBuf; } -// ------------------------------------------------------------------------ - void JPEGReader::FillBitmap() { if( pBuffer && pAcc ) @@ -459,8 +435,6 @@ void JPEGReader::FillBitmap() } } -// ------------------------------------------------------------------------ - Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ) { Graphic aGraphic; @@ -504,8 +478,6 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine return aGraphic; } -// ------------------------------------------------------------------------ - ReadState JPEGReader::Read( Graphic& rGraphic ) { long nEndPos; @@ -581,11 +553,6 @@ ReadState JPEGReader::Read( Graphic& rGraphic ) return eReadState; } - -// -------------- -// - JPEGWriter - -// -------------- - JPEGWriter::JPEGWriter( SvStream& rStm, const uno::Sequence< beans::PropertyValue >* pFilterData, bool* pExportWasGrey ) : rOStm ( rStm ), pAcc ( NULL ), @@ -611,8 +578,6 @@ JPEGWriter::JPEGWriter( SvStream& rStm, const uno::Sequence< beans::PropertyValu } } -// ------------------------------------------------------------------------ - void* JPEGWriter::GetScanline( long nY ) { void* pScanline = NULL; @@ -659,8 +624,6 @@ void* JPEGWriter::GetScanline( long nY ) return pScanline; } -// ------------------------------------------------------------------------ - sal_Bool JPEGWriter::Write( const Graphic& rGraphic ) { sal_Bool bRet = sal_False; @@ -727,10 +690,6 @@ sal_Bool JPEGWriter::Write( const Graphic& rGraphic ) return bRet; } -// -------------- -// - ImportJPEG - -// -------------- - sal_Bool ImportJPEG( SvStream& rStm, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags ) { JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index a3329c44f4ce..bd1adae90957 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -28,10 +28,6 @@ #ifdef _JPEGPRIVATE -// -------- -// - Enum - -// -------- - enum ReadState { JPEGREAD_OK, @@ -39,10 +35,6 @@ enum ReadState JPEGREAD_NEED_MORE }; -// -------------- -// - JPEGReader - -// -------------- - class JPEGReader : public GraphicReader { SvStream& rIStm; @@ -74,10 +66,6 @@ public: ReadState Read( Graphic& rGraphic ); }; -// -------------- -// - JPEGWriter - -// -------------- - class JPEGWriter { SvStream& rOStm; @@ -106,10 +94,6 @@ public: #endif // _JPEGPRIVATE -// --------------------- -// - Import/ExportJPEG - -// --------------------- - sal_Bool ImportJPEG( SvStream& rStream, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags ); sal_Bool ExportJPEG( SvStream& rStream, diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 603ca06c0b2f..ae495945fac8 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -24,10 +24,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vcl/lineinfo.hxx> -// ----------- -// - Defines - -// ----------- - #define WIN_EMR_HEADER 1 #define WIN_EMR_POLYBEZIER 2 #define WIN_EMR_POLYGON 3 @@ -219,11 +215,6 @@ typedef enum EmfPlusSetTSClip = 0x403A } EmfPlusRecordType; - -// ------------- -// - EMFWriter - -// ------------- - void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType ) { ImplBeginRecord( WIN_EMR_GDICOMMENT ); @@ -257,8 +248,6 @@ void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplEndPlusRecord() { DBG_ASSERT( mbRecordPlusOpen, "EMF+ Record was not opened!" ); @@ -446,8 +435,6 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter return( m_rStm.GetError() == ERRCODE_NONE ); } -// ----------------------------------------------------------------------------- - sal_uLong EMFWriter::ImplAcquireHandle() { sal_uLong nHandle = HANDLE_INVALID; @@ -467,16 +454,12 @@ sal_uLong EMFWriter::ImplAcquireHandle() return( nHandle != HANDLE_INVALID ? nHandle + 1 : HANDLE_INVALID ); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplReleaseHandle( sal_uLong nHandle ) { DBG_ASSERT( nHandle && ( nHandle < MAXHANDLES ), "Handle out of range" ); mpHandlesUsed[ nHandle - 1 ] = sal_False; } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplBeginRecord( sal_uInt32 nType ) { DBG_ASSERT( !mbRecordOpen, "Another record is already opened!" ); @@ -491,8 +474,6 @@ void EMFWriter::ImplBeginRecord( sal_uInt32 nType ) } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplEndRecord() { DBG_ASSERT( mbRecordOpen, "Record was not opened!" ); @@ -514,8 +495,6 @@ void EMFWriter::ImplEndRecord() } } -// ----------------------------------------------------------------------------- - sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ) { if( rHandle != HANDLE_INVALID ) @@ -548,8 +527,6 @@ sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSel return( HANDLE_INVALID != rHandle ); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplCheckLineAttr() { if( mbLineChanged && ImplPrepareHandleSelect( mnLineHandle, LINE_SELECT ) ) @@ -568,8 +545,6 @@ void EMFWriter::ImplCheckLineAttr() } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplCheckFillAttr() { if( mbFillChanged && ImplPrepareHandleSelect( mnFillHandle, FILL_SELECT ) ) @@ -589,8 +564,6 @@ void EMFWriter::ImplCheckFillAttr() } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplCheckTextAttr() { if( mbTextChanged && ImplPrepareHandleSelect( mnTextHandle, TEXT_SELECT ) ) @@ -702,8 +675,6 @@ void EMFWriter::ImplCheckTextAttr() } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteColor( const Color& rColor ) { sal_uInt32 nCol = rColor.GetRed(); @@ -714,8 +685,6 @@ void EMFWriter::ImplWriteColor( const Color& rColor ) m_rStm << nCol; } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) { sal_uInt32 nROP2; @@ -732,32 +701,24 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) ImplEndRecord(); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteExtent( long nExtent ) { nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width(); m_rStm << (sal_Int32) nExtent; } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWritePoint( const Point& rPoint ) { const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode )); m_rStm << (sal_Int32) aPoint.X() << (sal_Int32) aPoint.Y(); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteSize( const Size& rSize) { const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode )); m_rStm << (sal_Int32) aSize.Width() << (sal_Int32) aSize.Height(); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); @@ -768,8 +729,6 @@ void EMFWriter::ImplWriteRect( const Rectangle& rRect ) << static_cast<sal_Int32>(aRect.Bottom()); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ) { if( rPoly.GetSize() ) @@ -795,8 +754,6 @@ void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ) } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) { sal_uInt16 n, i, nPolyCount = rPolyPoly.Count(); @@ -846,8 +803,6 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) { if ( bClosed ) @@ -933,8 +888,6 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) ImplEndRecord(); } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, sal_uInt32 nROP ) { @@ -983,8 +936,6 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth ) { xub_StrLen nLen = rText.Len(), i; @@ -1057,8 +1008,6 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons } } -// ----------------------------------------------------------------------------- - void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon) { if(rLinePolygon.count()) @@ -1097,8 +1046,6 @@ void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const bas } } -// ----------------------------------------------------------------------------- - void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) { for( size_t j = 0, nActionCount = rMtf.GetActionSize(); j < nActionCount; j++ ) diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index fe7de29f3bd4..9665f832040e 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -27,23 +27,11 @@ #include <impanmvw.hxx> DBG_NAME( Animation ) -// ----------- -// - Defines - -// ----------- - #define MIN_TIMEOUT 2L #define INC_TIMEOUT 0L -// ----------- -// - statics - -// ----------- - sal_uLong Animation::mnAnimCount = 0UL; -// ------------------- -// - AnimationBitmap - -// ------------------- - sal_uLong AnimationBitmap::GetChecksum() const { sal_uInt32 nCrc = aBmpEx.GetChecksum(); @@ -73,10 +61,6 @@ sal_uLong AnimationBitmap::GetChecksum() const return nCrc; } -// ------------- -// - Animation - -// ------------- - Animation::Animation() : mnLoopCount ( 0 ), mnLoops ( 0 ), @@ -90,8 +74,6 @@ Animation::Animation() : maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) ); } -// ----------------------------------------------------------------------- - Animation::Animation( const Animation& rAnimation ) : maBitmapEx ( rAnimation.maBitmapEx ), maGlobalSize ( rAnimation.maGlobalSize ), @@ -111,8 +93,6 @@ Animation::Animation( const Animation& rAnimation ) : mnLoops = mbLoopTerminated ? 0 : mnLoopCount; } -// ----------------------------------------------------------------------- - Animation::~Animation() { DBG_DTOR( Animation, NULL ); @@ -127,8 +107,6 @@ Animation::~Animation() delete maViewList[ i ]; } -// ----------------------------------------------------------------------- - Animation& Animation::operator=( const Animation& rAnimation ) { Clear(); @@ -148,8 +126,6 @@ Animation& Animation::operator=( const Animation& rAnimation ) return *this; } -// ----------------------------------------------------------------------- - sal_Bool Animation::operator==( const Animation& rAnimation ) const { const size_t nCount = maList.size(); @@ -192,8 +168,6 @@ void Animation::Clear() maViewList.clear(); } -// ----------------------------------------------------------------------- - sal_Bool Animation::IsTransparent() const { Point aPoint; @@ -223,8 +197,6 @@ sal_Bool Animation::IsTransparent() const return bRet; } -// ----------------------------------------------------------------------- - sal_uLong Animation::GetSizeBytes() const { sal_uLong nSizeBytes = GetBitmapEx().GetSizeBytes(); @@ -238,8 +210,6 @@ sal_uLong Animation::GetSizeBytes() const return nSizeBytes; } -// ----------------------------------------------------------------------- - sal_uLong Animation::GetChecksum() const { SVBT32 aBT32; @@ -266,8 +236,6 @@ sal_uLong Animation::GetChecksum() const return nCrc; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz, long nExtraData, OutputDevice* pFirstFrameOutDev ) { @@ -330,8 +298,6 @@ sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& return bRet; } -// ----------------------------------------------------------------------- - void Animation::Stop( OutputDevice* pOut, long nExtraData ) { for( size_t i = 0; i < maViewList.size(); ) @@ -355,15 +321,11 @@ void Animation::Stop( OutputDevice* pOut, long nExtraData ) } } -// ----------------------------------------------------------------------- - void Animation::Draw( OutputDevice* pOut, const Point& rDestPt ) const { Draw( pOut, rDestPt, pOut->PixelToLogic( maGlobalSize ) ); } -// ----------------------------------------------------------------------- - void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz ) const { const size_t nCount = maList.size(); @@ -388,15 +350,12 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDes } } -// ----------------------------------------------------------------------- - void Animation::ImplRestartTimer( sal_uLong nTimeout ) { maTimer.SetTimeout( Max( nTimeout, (sal_uLong)(MIN_TIMEOUT + ( mnAnimCount - 1 ) * INC_TIMEOUT) ) * 10L ); maTimer.Start(); } -// ----------------------------------------------------------------------- typedef ::std::vector< AInfo* > AInfoList_impl; IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) @@ -523,8 +482,6 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) return 0L; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Insert( const AnimationBitmap& rStepBmp ) { sal_Bool bRet = sal_False; @@ -547,16 +504,12 @@ sal_Bool Animation::Insert( const AnimationBitmap& rStepBmp ) return bRet; } -// ----------------------------------------------------------------------- - const AnimationBitmap& Animation::Get( sal_uInt16 nAnimation ) const { DBG_ASSERT( ( nAnimation < maList.size() ), "No object at this position" ); return *maList[ nAnimation ]; } -// ----------------------------------------------------------------------- - void Animation::Replace( const AnimationBitmap& rNewAnimationBitmap, sal_uInt16 nAnimation ) { DBG_ASSERT( ( nAnimation < maList.size() ), "No object at this position" ); @@ -583,24 +536,18 @@ void Animation::Replace( const AnimationBitmap& rNewAnimationBitmap, sal_uInt16 } } -// ----------------------------------------------------------------------- - void Animation::SetLoopCount( const sal_uLong nLoopCount ) { mnLoopCount = nLoopCount; ResetLoopCount(); } -// ----------------------------------------------------------------------- - void Animation::ResetLoopCount() { mnLoops = mnLoopCount; mbLoopTerminated = sal_False; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Convert( BmpConversion eConversion ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -622,8 +569,6 @@ sal_Bool Animation::Convert( BmpConversion eConversion ) return bRet; } -// ----------------------------------------------------------------------- - sal_Bool Animation::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -645,8 +590,6 @@ sal_Bool Animation::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) return bRet; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Invert() { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -668,8 +611,6 @@ sal_Bool Animation::Invert() return bRet; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Mirror( sal_uLong nMirrorFlags ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -704,8 +645,6 @@ sal_Bool Animation::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, double fGamma, sal_Bool bInvert ) @@ -739,8 +678,6 @@ sal_Bool Animation::Adjust( short nLuminancePercent, short nContrastPercent, return bRet; } -// ----------------------------------------------------------------------- - sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); @@ -762,8 +699,6 @@ sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterPara return bRet; } -// ----------------------------------------------------------------------- - SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) { const sal_uInt16 nCount = rAnimation.Count(); @@ -807,8 +742,6 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) return rOStm; } -// ----------------------------------------------------------------------- - SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) { Bitmap aBmp; diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 98de0a4e2f84..64d8f4e64bec 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -33,17 +33,11 @@ #include <impbmp.hxx> #include <salbmp.hxx> -// ---------- -// - Bitmap - -// ---------- - Bitmap::Bitmap() : mpImpBmp( NULL ) { } -// ------------------------------------------------------------------ - Bitmap::Bitmap( const ResId& rResId ) : mpImpBmp( NULL ) { @@ -53,8 +47,6 @@ Bitmap::Bitmap( const ResId& rResId ) : *this = aBmpEx.GetBitmap(); } -// ------------------------------------------------------------------ - Bitmap::Bitmap( const Bitmap& rBitmap ) : maPrefMapMode ( rBitmap.maPrefMapMode ), maPrefSize ( rBitmap.maPrefSize ) @@ -65,8 +57,6 @@ Bitmap::Bitmap( const Bitmap& rBitmap ) : mpImpBmp->ImplIncRefCount(); } -// ------------------------------------------------------------------ - Bitmap::Bitmap( SalBitmap* pSalBitmap ) { mpImpBmp = new ImpBitmap(); @@ -75,8 +65,6 @@ Bitmap::Bitmap( SalBitmap* pSalBitmap ) maPrefSize = mpImpBmp->ImplGetSize(); } -// ------------------------------------------------------------------ - Bitmap::Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal ) { if( rSizePixel.Width() && rSizePixel.Height() ) @@ -140,15 +128,11 @@ Bitmap::Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalett mpImpBmp = NULL; } -// ------------------------------------------------------------------ - Bitmap::~Bitmap() { ImplReleaseRef(); } -// ------------------------------------------------------------------ - const BitmapPalette& Bitmap::GetGreyPalette( int nEntries ) { static BitmapPalette aGreyPalette2; @@ -217,8 +201,6 @@ const BitmapPalette& Bitmap::GetGreyPalette( int nEntries ) } } -// ------------------------------------------------------------------ - bool BitmapPalette::IsGreyPalette() const { const int nEntryCount = GetEntryCount(); @@ -244,8 +226,6 @@ bool BitmapPalette::IsGreyPalette() const return bRet; } -// ------------------------------------------------------------------ - Bitmap& Bitmap::operator=( const Bitmap& rBitmap ) { maPrefSize = rBitmap.maPrefSize; @@ -260,8 +240,6 @@ Bitmap& Bitmap::operator=( const Bitmap& rBitmap ) return *this; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::IsEqual( const Bitmap& rBmp ) const { return( IsSameInstance( rBmp ) || @@ -270,8 +248,6 @@ sal_Bool Bitmap::IsEqual( const Bitmap& rBmp ) const rBmp.GetChecksum() == GetChecksum() ) ); } -// ------------------------------------------------------------------ - void Bitmap::SetEmpty() { maPrefMapMode = MapMode(); @@ -281,13 +257,10 @@ void Bitmap::SetEmpty() mpImpBmp = NULL; } -// ------------------------------------------------------------------ - Size Bitmap::GetSizePixel() const { return( mpImpBmp ? mpImpBmp->ImplGetSize() : Size() ); } -// ------------------------------------------------------------------ void Bitmap::SetSourceSizePixel( const Size& rSize) { @@ -295,15 +268,11 @@ void Bitmap::SetSourceSizePixel( const Size& rSize) mpImpBmp->ImplSetSourceSize( rSize); } -// ------------------------------------------------------------------ - sal_uInt16 Bitmap::GetBitCount() const { return( mpImpBmp ? mpImpBmp->ImplGetBitCount() : 0 ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::HasGreyPalette() const { const sal_uInt16 nBitCount = GetBitCount(); @@ -320,8 +289,6 @@ sal_Bool Bitmap::HasGreyPalette() const return bRet; } -// ------------------------------------------------------------------ - sal_uLong Bitmap::GetChecksum() const { sal_uLong nRet = 0UL; @@ -377,8 +344,6 @@ sal_uLong Bitmap::GetChecksum() const return nRet; } -// ------------------------------------------------------------------ - void Bitmap::ImplReleaseRef() { if( mpImpBmp ) @@ -393,8 +358,6 @@ void Bitmap::ImplReleaseRef() } } -// ------------------------------------------------------------------ - void Bitmap::ImplMakeUnique() { if( mpImpBmp && mpImpBmp->ImplGetRefCount() > 1UL ) @@ -408,8 +371,6 @@ void Bitmap::ImplMakeUnique() } } -// ------------------------------------------------------------------ - void Bitmap::ImplAssignWithSize( const Bitmap& rBitmap ) { const Size aOldSizePix( GetSizePixel() ); @@ -431,15 +392,11 @@ void Bitmap::ImplAssignWithSize( const Bitmap& rBitmap ) maPrefMapMode = aOldMapMode; } -// ------------------------------------------------------------------ - ImpBitmap* Bitmap::ImplGetImpBitmap() const { return mpImpBmp; } -// ------------------------------------------------------------------ - void Bitmap::ImplSetImpBitmap( ImpBitmap* pImpBmp ) { if( pImpBmp != mpImpBmp ) @@ -449,8 +406,6 @@ void Bitmap::ImplSetImpBitmap( ImpBitmap* pImpBmp ) } } -// ------------------------------------------------------------------ - BitmapReadAccess* Bitmap::AcquireReadAccess() { BitmapReadAccess* pReadAccess = new BitmapReadAccess( *this ); @@ -464,8 +419,6 @@ BitmapReadAccess* Bitmap::AcquireReadAccess() return pReadAccess; } -// ------------------------------------------------------------------ - BitmapWriteAccess* Bitmap::AcquireWriteAccess() { BitmapWriteAccess* pWriteAccess = new BitmapWriteAccess( *this ); @@ -479,15 +432,11 @@ BitmapWriteAccess* Bitmap::AcquireWriteAccess() return pWriteAccess; } -// ------------------------------------------------------------------ - void Bitmap::ReleaseAccess( BitmapReadAccess* pBitmapAccess ) { delete pBitmapAccess; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Erase( const Color& rFillColor ) { if( !(*this) ) @@ -568,8 +517,6 @@ sal_Bool Bitmap::Erase( const Color& rFillColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Invert() { BitmapWriteAccess* pAcc = AcquireWriteAccess(); @@ -604,8 +551,6 @@ sal_Bool Bitmap::Invert() return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) { sal_Bool bHorz = ( ( nMirrorFlags & BMP_MIRROR_HORZ ) == BMP_MIRROR_HORZ ); @@ -705,8 +650,6 @@ sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) { sal_Bool bRet = sal_False; @@ -848,8 +791,6 @@ sal_Bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) return bRet; }; -// ------------------------------------------------------------------ - sal_Bool Bitmap::Crop( const Rectangle& rRectPixel ) { const Size aSizePix( GetSizePixel() ); @@ -894,8 +835,6 @@ sal_Bool Bitmap::Crop( const Rectangle& rRectPixel ) return bRet; }; -// ------------------------------------------------------------------ - sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const Bitmap* pBmpSrc ) { @@ -1083,8 +1022,6 @@ sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) { sal_Bool bRet = sal_False; @@ -1144,8 +1081,6 @@ sal_Bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) return bRet; } -// ------------------------------------------------------------------ - Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const { Bitmap aNewBmp( GetSizePixel(), 1 ); @@ -1336,8 +1271,6 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const return aNewBmp; } -// ------------------------------------------------------------------ - Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const { Region aRegion; @@ -1389,8 +1322,6 @@ Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const return aRegion; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); @@ -1467,8 +1398,6 @@ sal_Bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) { Bitmap aNewBmp( GetSizePixel(), 24 ); @@ -1513,8 +1442,6 @@ sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { // Bitmaps with 1 bit color depth can cause problems @@ -1576,8 +1503,6 @@ sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, sal_uLong* _pTols ) { @@ -1685,8 +1610,6 @@ sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColor return bRet; } -// ------------------------------------------------------------------ - Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay ) { Bitmap aDispBmp( *this ); @@ -1704,8 +1627,6 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay ) return aDispBmp; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); @@ -1843,8 +1764,6 @@ sal_Bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) { // TODO: Have a look at OutputDevice::ImplDrawAlpha() for some @@ -1879,15 +1798,11 @@ sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::MakeMono( sal_uInt8 cThreshold ) { return ImplMakeMono( cThreshold ); } -// ------------------------------------------------------------------ - bool Bitmap::GetSystemData( BitmapSystemData& rData ) const { bool bRet = false; diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index 43a0d405669b..ab259bfb37c6 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -31,19 +31,11 @@ #include <valgrind/memcheck.h> #endif - -// ----------- -// - Defines - -// ----------- - #define DIBCOREHEADERSIZE ( 12UL ) #define DIBINFOHEADERSIZE ( sizeof( DIBInfoHeader ) ) #define BITMAPINFOHEADER 0x28 -// ---------------------- -// - Compression defines -// ---------------------- - +// Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) #define COMPRESS_NONE ( 0UL ) #define RLE_8 ( 1UL ) @@ -51,10 +43,6 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ -// ----------------- -// - DIBInfoHeader - -// ----------------- - struct DIBInfoHeader { sal_uInt32 nSize; @@ -101,26 +89,18 @@ namespace } } -// ---------- -// - Bitmap - -// ---------- - SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap ) { rBitmap.Read( rIStm, sal_True ); return rIStm; } -// ------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ) { rBitmap.Write( rOStm, sal_False, sal_True ); return rOStm; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader, sal_Bool bIsMSOFormat ) { const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); @@ -151,8 +131,6 @@ sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader, sal_Bool bIsMSOFor return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, sal_Bool bIsMSOFormat ) { DIBInfoHeader aHeader; @@ -255,8 +233,6 @@ sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) { sal_uInt32 nTmp32; @@ -290,8 +266,6 @@ sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bIsMSOFormat ) { // BITMAPINFOHEADER or BITMAPCOREHEADER @@ -407,8 +381,6 @@ sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, return( ( rHeader.nPlanes == 1 ) && ( rIStm.GetError() == 0UL ) ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); @@ -436,8 +408,6 @@ sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, s return( rIStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ) { const sal_uLong nAlignedWidth = AlignedWidth4Bytes( rHeader.nWidth * rHeader.nBitCount ); @@ -659,8 +629,6 @@ sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, Bitma return( rIStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Write( SvStream& rOStm, sal_Bool bCompressed, sal_Bool bFileHeader ) const { DBG_ASSERT( mpImpBmp, "Empty Bitmaps can't be saved" ); @@ -701,8 +669,6 @@ sal_Bool Bitmap::Write( SvStream& rOStm, sal_Bool bCompressed, sal_Bool bFileHea return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const { const MapMode aMapPixel( MAP_PIXEL ); @@ -851,8 +817,6 @@ sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc ) { sal_uInt32 nPalCount = ( rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : @@ -868,8 +832,6 @@ sal_Bool Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); @@ -894,8 +856,6 @@ sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - #if defined HAVE_VALGRIND_HEADERS namespace { @@ -1086,8 +1046,6 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bRLE4 ) { @@ -1191,8 +1149,6 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, while ( !bEndDecoding && ( nY >= 0L ) ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ) { const sal_uLong nWidth = rAcc.Width(); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 10b1160f471d..2855ca6b7ad6 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -29,10 +29,6 @@ #include <impvect.hxx> #include <math.h> -// ----------- -// - Defines - -// ----------- - #define RGB15( _def_cR, _def_cG, _def_cB ) (((sal_uLong)(_def_cR)<<10UL)|((sal_uLong)(_def_cG)<<5UL)|(sal_uLong)(_def_cB)) #define GAMMA( _def_cVal, _def_InvGamma ) ((sal_uInt8)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L)) @@ -65,10 +61,6 @@ p1T[nX] += FloydError7[nRErr]; \ p2T[nX] += FloydError1[nRErr]; -// ----------- -// - Statics - -// ----------- - const extern sal_uLong nVCLRLut[ 6 ] = { 16, 17, 18, 19, 20, 21 }; const extern sal_uLong nVCLGLut[ 6 ] = { 0, 6, 12, 18, 24, 30 }; const extern sal_uLong nVCLBLut[ 6 ] = { 0, 36, 72, 108, 144, 180 }; @@ -215,10 +207,6 @@ const long FloydIndexMap[6] = -30, 21, 72, 123, 174, 225 }; -// -------------------------- -// - ImplCreateDitherMatrix - -// -------------------------- - void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] ) { double fVal = 3.125; @@ -245,10 +233,6 @@ void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] ) (*pDitherMatrix)[i][j] = (sal_uInt8) ( fVal * pMtx[i][j] ); } -// ---------- -// - Bitmap - -// ---------- - sal_Bool Bitmap::Convert( BmpConversion eConversion ) { const sal_uInt16 nBitCount = GetBitCount(); diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 882ae050669f..45c99c822149 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -22,10 +22,6 @@ #include <vcl/bmpacc.hxx> #include <vcl/bitmap.hxx> -// ----------- -// - Defines - -// ----------- - #define S2(a,b) { register long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } } #define MN3(a,b,c) S2(a,b); S2(a,c); #define MX3(a,b,c) S2(b,c); S2(a,c); @@ -34,10 +30,6 @@ #define MNMX5(a,b,c,d,e) S2(a,b); S2(c,d); MN3(a,c,e); MX3(b,d,e); #define MNMX6(a,b,c,d,e,f) S2(a,d); S2(b,e); S2(c,f); MN3(a,b,c); MX3(d,e,f); -// ---------- -// - Bitmap - -// ---------- - sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { sal_Bool bRet = sal_False; @@ -106,8 +98,6 @@ sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { @@ -254,8 +244,6 @@ sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); @@ -385,8 +373,6 @@ sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { sal_Bool bRet = ImplMakeGreyscales( 256 ); @@ -513,8 +499,6 @@ sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Li return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { sal_Bool bRet = ImplMakeGreyscales( 256 ); @@ -627,8 +611,6 @@ sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { sal_Bool bRet = sal_False; @@ -677,8 +659,6 @@ sal_Bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* / return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); @@ -764,8 +744,6 @@ sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pP return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? @@ -923,16 +901,12 @@ sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*p return bRet; } -// ----------------------------------------------------------------------------- - struct PopArtEntry { sal_uInt32 mnIndex; sal_uInt32 mnCount; }; -// ------------------------------------------------------------------------ - extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) { int nRet; @@ -947,8 +921,6 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) return nRet; } -// ------------------------------------------------------------------------ - sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { sal_Bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True; diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index e2d4c1d7c1f6..798d4d830a5b 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -49,16 +49,8 @@ using namespace com::sun::star; -// ----------- -// - Defines - -// ----------- - #define GAMMA( _def_cVal, _def_InvGamma ) ((sal_uInt8)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0L,255L)) -// -------------------------- -// - Color exchange structs - -// -------------------------- - struct ImplColAdjustParam { sal_uInt8* pMapR; @@ -77,8 +69,6 @@ struct ImplBmpAdjustParam sal_Bool bInvert; }; -// ----------------------------------------------------------------------------- - struct ImplColConvertParam { MtfConversion eConversion; @@ -89,8 +79,6 @@ struct ImplBmpConvertParam BmpConversion eConversion; }; -// ----------------------------------------------------------------------------- - struct ImplColMonoParam { Color aColor; @@ -101,8 +89,6 @@ struct ImplBmpMonoParam Color aColor; }; -// ----------------------------------------------------------------------------- - struct ImplColReplaceParam { sal_uLong* pMinR; @@ -123,10 +109,6 @@ struct ImplBmpReplaceParam const sal_uLong* pTols; }; -// --------------- -// - GDIMetaFile - -// --------------- - GDIMetaFile::GDIMetaFile() : nCurrentActionElement( 0 ), aPrefSize ( 1, 1 ), @@ -139,8 +121,6 @@ GDIMetaFile::GDIMetaFile() : { } -// ------------------------------------------------------------------------ - GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : aPrefMapMode ( rMtf.aPrefMapMode ), aPrefSize ( rMtf.aPrefSize ), @@ -168,44 +148,32 @@ GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : } } -// ------------------------------------------------------------------------ - GDIMetaFile::~GDIMetaFile() { Clear(); } -// ------------------------------------------------------------------------ - size_t GDIMetaFile::GetActionSize() const { return aList.size(); } -// ------------------------------------------------------------------------ - MetaAction* GDIMetaFile::GetAction( size_t nAction ) const { return (nAction < aList.size()) ? aList[ nAction ] : NULL; } -// ------------------------------------------------------------------------ - MetaAction* GDIMetaFile::FirstAction() { nCurrentActionElement = 0; return aList.empty() ? NULL : aList[ 0 ]; } -// ------------------------------------------------------------------------ - MetaAction* GDIMetaFile::NextAction() { return ( nCurrentActionElement + 1 < aList.size() ) ? aList[ ++nCurrentActionElement ] : NULL; } -// ------------------------------------------------------------------------ - MetaAction* GDIMetaFile::ReplaceAction( MetaAction* pAction, size_t nAction ) { if ( nAction >= aList.size() ) @@ -221,8 +189,6 @@ MetaAction* GDIMetaFile::ReplaceAction( MetaAction* pAction, size_t nAction ) return pAction; } -// ------------------------------------------------------------------------ - GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) { if( this != &rMtf ) @@ -258,8 +224,6 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) return *this; } -// ------------------------------------------------------------------------ - sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const { const size_t nObjCount = aList.size(); @@ -286,8 +250,6 @@ sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const return bRet; } -// ------------------------------------------------------------------------ - void GDIMetaFile::Clear() { if( bRecord ) @@ -298,8 +260,6 @@ void GDIMetaFile::Clear() aList.clear(); } -// ------------------------------------------------------------------------ - void GDIMetaFile::Linker( OutputDevice* pOut, sal_Bool bLink ) { if( bLink ) @@ -333,15 +293,11 @@ void GDIMetaFile::Linker( OutputDevice* pOut, sal_Bool bLink ) } } -// ------------------------------------------------------------------------ - long GDIMetaFile::Hook() { return aHookHdlLink.Call( this ); } -// ------------------------------------------------------------------------ - void GDIMetaFile::Record( OutputDevice* pOut ) { if( bRecord ) @@ -353,8 +309,6 @@ void GDIMetaFile::Record( OutputDevice* pOut ) Linker( pOut, sal_True ); } -// ------------------------------------------------------------------------ - void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos ) { if ( !bRecord && !rMtf.bRecord ) @@ -380,8 +334,6 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) { if( !bRecord ) @@ -432,8 +384,6 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) } } -// ------------------------------------------------------------------------ - bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rDestSize ) { if (!bUseCanvas) @@ -524,8 +474,6 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S return false; } -// ------------------------------------------------------------------------ - void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut ) { OSL_ASSERT( pAct->GetComment() == "DELEGATE_PLUGGABLE_RENDERER" ); @@ -597,8 +545,6 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, const Size& rSize, size_t nPos ) { @@ -663,8 +609,6 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Pause( sal_Bool _bPause ) { if( bRecord ) @@ -684,8 +628,6 @@ void GDIMetaFile::Pause( sal_Bool _bPause ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Stop() { if( bRecord ) @@ -699,16 +641,12 @@ void GDIMetaFile::Stop() } } -// ------------------------------------------------------------------------ - void GDIMetaFile::WindStart() { if( !bRecord ) nCurrentActionElement = 0; } -// ------------------------------------------------------------------------ - void GDIMetaFile::WindPrev() { if( !bRecord ) @@ -716,8 +654,6 @@ void GDIMetaFile::WindPrev() --nCurrentActionElement; } -// ------------------------------------------------------------------------ - void GDIMetaFile::AddAction( MetaAction* pAction ) { aList.push_back( pAction ); @@ -729,8 +665,6 @@ void GDIMetaFile::AddAction( MetaAction* pAction ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::AddAction( MetaAction* pAction, size_t nPos ) { if ( nPos < aList.size() ) @@ -751,15 +685,11 @@ void GDIMetaFile::AddAction( MetaAction* pAction, size_t nPos ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::push_back( MetaAction* pAction ) { aList.push_back( pAction ); } -// ------------------------------------------------------------------------ - // @since #110496# void GDIMetaFile::RemoveAction( size_t nPos ) { @@ -776,8 +706,6 @@ void GDIMetaFile::RemoveAction( size_t nPos ) pPrev->RemoveAction( nPos ); } -// ------------------------------------------------------------------------ - sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) { const Size aOldPrefSize( GetPrefSize() ); @@ -808,8 +736,6 @@ sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ------------------------------------------------------------------------ - void GDIMetaFile::Move( long nX, long nY ) { const Size aBaseOffset( nX, nY ); @@ -887,8 +813,6 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Scale( double fScaleX, double fScaleY ) { for( MetaAction* pAct = FirstAction(); pAct; pAct = NextAction() ) @@ -910,15 +834,11 @@ void GDIMetaFile::Scale( double fScaleX, double fScaleY ) aPrefSize.Height() = FRound( aPrefSize.Height() * fScaleY ); } -// ------------------------------------------------------------------------ - void GDIMetaFile::Scale( const Fraction& rScaleX, const Fraction& rScaleY ) { Scale( (double) rScaleX, (double) rScaleY ); } -// ------------------------------------------------------------------------ - void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) { Rectangle aCurRect( i_rClipRect ); @@ -951,8 +871,6 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) } } -// ------------------------------------------------------------------------ - Point GDIMetaFile::ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ) { @@ -963,8 +881,6 @@ Point GDIMetaFile::ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt -FRound( fSin * nX - fCos * nY ) + rRotatePt.Y() + rOffset.Height() ); } -// ------------------------------------------------------------------------ - Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ) { @@ -976,8 +892,6 @@ Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& r return aRet; } -// ------------------------------------------------------------------------ - PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ) { @@ -989,8 +903,6 @@ PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly return aRet; } -// ------------------------------------------------------------------------ - void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, const PolyPolygon& rPolyPoly, @@ -1015,8 +927,6 @@ void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf, } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Rotate( long nAngle10 ) { nAngle10 %= 3600L; @@ -1480,8 +1390,6 @@ void GDIMetaFile::Rotate( long nAngle10 ) } } -// ------------------------------------------------------------------------ - static void ImplActionBounds( Rectangle& o_rOutBounds, const Rectangle& i_rInBounds, const std::vector<Rectangle>& i_rClipStack, @@ -1929,8 +1837,6 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai return aBound; } -// ------------------------------------------------------------------------ - Color GDIMetaFile::ImplColAdjustFnc( const Color& rColor, const void* pColParam ) { return Color( rColor.GetTransparency(), @@ -1940,8 +1846,6 @@ Color GDIMetaFile::ImplColAdjustFnc( const Color& rColor, const void* pColParam } -// ------------------------------------------------------------------------ - BitmapEx GDIMetaFile::ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmpParam ) { const ImplBmpAdjustParam* p = (const ImplBmpAdjustParam*) pBmpParam; @@ -1954,8 +1858,6 @@ BitmapEx GDIMetaFile::ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmp return aRet; } -// ------------------------------------------------------------------------ - Color GDIMetaFile::ImplColConvertFnc( const Color& rColor, const void* pColParam ) { sal_uInt8 cLum = rColor.GetLuminance(); @@ -1966,8 +1868,6 @@ Color GDIMetaFile::ImplColConvertFnc( const Color& rColor, const void* pColParam return Color( rColor.GetTransparency(), cLum, cLum, cLum ); } -// ------------------------------------------------------------------------ - BitmapEx GDIMetaFile::ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBmpParam ) { BitmapEx aRet( rBmpEx ); @@ -1977,15 +1877,11 @@ BitmapEx GDIMetaFile::ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBm return aRet; } -// ------------------------------------------------------------------------ - Color GDIMetaFile::ImplColMonoFnc( const Color&, const void* pColParam ) { return( ( (const ImplColMonoParam*) pColParam )->aColor ); } -// ------------------------------------------------------------------------ - BitmapEx GDIMetaFile::ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpParam ) { BitmapPalette aPal( 3 ); @@ -2005,8 +1901,6 @@ BitmapEx GDIMetaFile::ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpPa return aBmp; } -// ------------------------------------------------------------------------ - Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam ) { const sal_uLong nR = rColor.GetRed(), nG = rColor.GetGreen(), nB = rColor.GetBlue(); @@ -2027,8 +1921,6 @@ Color GDIMetaFile::ImplColReplaceFnc( const Color& rColor, const void* pColParam return rColor; } -// ------------------------------------------------------------------------ - BitmapEx GDIMetaFile::ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBmpParam ) { const ImplBmpReplaceParam* p = (const ImplBmpReplaceParam*) pBmpParam; @@ -2039,8 +1931,6 @@ BitmapEx GDIMetaFile::ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBm return aRet; } -// ------------------------------------------------------------------------ - void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, BmpExchangeFnc pFncBmp, const void* pBmpParam ) { @@ -2305,8 +2195,6 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol *this = aMtf; } -// ------------------------------------------------------------------------ - void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, double fGamma, sal_Bool bInvert ) @@ -2381,8 +2269,6 @@ void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent, } } -// ------------------------------------------------------------------------ - void GDIMetaFile::Convert( MtfConversion eConversion ) { // nothing to do? => return quickly @@ -2398,8 +2284,6 @@ void GDIMetaFile::Convert( MtfConversion eConversion ) } } -// ------------------------------------------------------------------------ - void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, sal_uLong* pTols ) { ImplColReplaceParam aColParam; @@ -2448,8 +2332,6 @@ void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pRepla delete[] aColParam.pMaxB; }; -// ------------------------------------------------------------------------ - GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const { GDIMetaFile aRet( *this ); @@ -2465,8 +2347,6 @@ GDIMetaFile GDIMetaFile::GetMonochromeMtf( const Color& rColor ) const return aRet; } -// ------------------------------------------------------------------------ - sal_uLong GDIMetaFile::GetChecksum() const { GDIMetaFile aMtf; @@ -2813,8 +2693,6 @@ sal_uLong GDIMetaFile::GetChecksum() const return nCrc; } -// ------------------------------------------------------------------------ - sal_uLong GDIMetaFile::GetSizeBytes() const { sal_uLong nSizeBytes = 0; @@ -2871,8 +2749,6 @@ sal_uLong GDIMetaFile::GetSizeBytes() const return( nSizeBytes ); } -// ------------------------------------------------------------------------ - SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { if( !rIStm.GetError() ) @@ -2935,8 +2811,6 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) return rIStm; } -// ------------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ) { if( !rOStm.GetError() ) @@ -2967,8 +2841,6 @@ Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" return rOStm; } -// ------------------------------------------------------------------------ - SvStream& GDIMetaFile::Read( SvStream& rIStm ) { Clear(); @@ -2977,8 +2849,6 @@ SvStream& GDIMetaFile::Read( SvStream& rIStm ) return rIStm; } -// ------------------------------------------------------------------------ - SvStream& GDIMetaFile::Write( SvStream& rOStm ) { VersionCompat* pCompat; @@ -3013,8 +2883,6 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm ) return rOStm; } -// ------------------------------------------------------------------------ - sal_Bool GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay, @@ -3136,8 +3004,6 @@ void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -// ------------------------------------------------------------------------ - MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, const rtl::OUString& rGraphicServiceName, const void* _pData, diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index fc161a2cfed6..2e90cf7d29a2 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -37,10 +37,6 @@ #include <impgraph.hxx> #include <com/sun/star/ucb/CommandAbortedException.hpp> -// ----------- -// - Defines - -// ----------- - #define GRAPHIC_MAXPARTLEN 256000L #define GRAPHIC_MTFTOBMP_MAXEXT 2048 #define GRAPHIC_STREAMBUFSIZE 8192UL @@ -53,20 +49,12 @@ #define GRAPHIC_FORMAT_50 static_cast<sal_uInt32>(COMPAT_FORMAT( 'G', 'R', 'F', '5' )) #define NATIVE_FORMAT_50 static_cast<sal_uInt32>(COMPAT_FORMAT( 'N', 'A', 'T', '5' )) -// --------------- -// - ImpSwapFile - -// --------------- - struct ImpSwapFile { INetURLObject aSwapURL; sal_uLong nRefCount; }; -// ----------------- -// - Graphicreader - -// ----------------- - class ReaderData { public: @@ -78,16 +66,12 @@ GraphicReader::~GraphicReader() delete mpReaderData; } -// ------------------------------------------------------------------------ - void GraphicReader::DisablePreviewMode() { if( mpReaderData ) mpReaderData->maPreviewSize = Size( 0, 0 ); } -// ------------------------------------------------------------------------ - void GraphicReader::SetPreviewSize( const Size& rSize ) { if( !mpReaderData ) @@ -95,8 +79,6 @@ void GraphicReader::SetPreviewSize( const Size& rSize ) mpReaderData->maPreviewSize = rSize; } -// ------------------------------------------------------------------------ - Size GraphicReader::GetPreviewSize() const { Size aSize( 0, 0 ); @@ -105,10 +87,6 @@ Size GraphicReader::GetPreviewSize() const return aSize; } -// -------------- -// - ImpGraphic - -// -------------- - ImpGraphic::ImpGraphic() : mpAnimation ( NULL ), mpContext ( NULL ), @@ -123,8 +101,6 @@ ImpGraphic::ImpGraphic() : { } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic( const ImpGraphic& rImpGraphic ) : maMetaFile ( rImpGraphic.maMetaFile ), maEx ( rImpGraphic.maEx ), @@ -157,8 +133,6 @@ ImpGraphic::ImpGraphic( const ImpGraphic& rImpGraphic ) : maSvgData = rImpGraphic.maSvgData; } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : maEx ( rBitmap ), mpAnimation ( NULL ), @@ -174,8 +148,6 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : { } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : maEx ( rBitmapEx ), mpAnimation ( NULL ), @@ -191,8 +163,6 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : { } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic(const SvgDataPtr& rSvgDataPtr) : mpAnimation( NULL ), mpContext( NULL ), @@ -208,8 +178,6 @@ ImpGraphic::ImpGraphic(const SvgDataPtr& rSvgDataPtr) { } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic( const Animation& rAnimation ) : maEx ( rAnimation.GetBitmapEx() ), mpAnimation ( new Animation( rAnimation ) ), @@ -225,8 +193,6 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : { } -// ------------------------------------------------------------------------ - ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) : maMetaFile ( rMtf ), mpAnimation ( NULL ), @@ -242,8 +208,6 @@ ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) : { } -// ------------------------------------------------------------------------ - ImpGraphic::~ImpGraphic() { ImplClear(); @@ -252,8 +216,6 @@ ImpGraphic::~ImpGraphic() delete mpContext; } -// ------------------------------------------------------------------------ - ImpGraphic& ImpGraphic::operator=( const ImpGraphic& rImpGraphic ) { if( &rImpGraphic != this ) @@ -302,8 +264,6 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic& rImpGraphic ) return *this; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const { sal_Bool bRet = sal_False; @@ -367,8 +327,6 @@ sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const return bRet; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplClearGraphics( sal_Bool bCreateSwapInfo ) { if( bCreateSwapInfo && !ImplIsSwapOut() ) @@ -396,8 +354,6 @@ void ImpGraphic::ImplClearGraphics( sal_Bool bCreateSwapInfo ) maSvgData.reset(); } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplClear() { if( mpSwapFile ) @@ -444,30 +400,22 @@ void ImpGraphic::ImplClear() mnSizeBytes = 0; } -// ------------------------------------------------------------------------ - GraphicType ImpGraphic::ImplGetType() const { return meType; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetDefaultType() { ImplClear(); meType = GRAPHIC_DEFAULT; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsSupportedGraphic() const { return( meType != GRAPHIC_NONE ); } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsTransparent() const { sal_Bool bRet(sal_True); @@ -480,8 +428,6 @@ sal_Bool ImpGraphic::ImplIsTransparent() const return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsAlpha() const { sal_Bool bRet(sal_False); @@ -498,15 +444,11 @@ sal_Bool ImpGraphic::ImplIsAlpha() const return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsAnimated() const { return( mpAnimation != NULL ); } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsEPS() const { return( ( meType == GRAPHIC_GDIMETAFILE ) && @@ -514,9 +456,6 @@ sal_Bool ImpGraphic::ImplIsEPS() const ( maMetaFile.GetAction( 0 )->GetType() == META_EPS_ACTION ) ); } - -// ------------------------------------------------------------------------ - Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) const { Bitmap aRetBmp; @@ -618,8 +557,6 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) return aRetBmp; } -// ------------------------------------------------------------------------ - BitmapEx ImpGraphic::ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const { BitmapEx aRetBmpEx; @@ -646,8 +583,6 @@ BitmapEx ImpGraphic::ImplGetBitmapEx(const GraphicConversionParameters& rParamet return aRetBmpEx; } -// ------------------------------------------------------------------------ - Animation ImpGraphic::ImplGetAnimation() const { Animation aAnimation; @@ -658,15 +593,11 @@ Animation ImpGraphic::ImplGetAnimation() const return aAnimation; } -// ------------------------------------------------------------------------ - const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const { return maMetaFile; } -// ------------------------------------------------------------------------ - Size ImpGraphic::ImplGetPrefSize() const { Size aSize; @@ -714,8 +645,6 @@ Size ImpGraphic::ImplGetPrefSize() const return aSize; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetPrefSize( const Size& rPrefSize ) { switch( meType ) @@ -754,8 +683,6 @@ void ImpGraphic::ImplSetPrefSize( const Size& rPrefSize ) } } -// ------------------------------------------------------------------------ - MapMode ImpGraphic::ImplGetPrefMapMode() const { MapMode aMapMode; @@ -799,8 +726,6 @@ MapMode ImpGraphic::ImplGetPrefMapMode() const return aMapMode; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetPrefMapMode( const MapMode& rPrefMapMode ) { switch( meType ) @@ -839,8 +764,6 @@ void ImpGraphic::ImplSetPrefMapMode( const MapMode& rPrefMapMode ) } } -// ------------------------------------------------------------------------ - sal_uLong ImpGraphic::ImplGetSizeBytes() const { if( 0 == mnSizeBytes ) @@ -865,8 +788,6 @@ sal_uLong ImpGraphic::ImplGetSizeBytes() const return( mnSizeBytes ); } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const { if( ImplIsSupportedGraphic() && !ImplIsSwapOut() ) @@ -902,8 +823,6 @@ void ImpGraphic::ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const } } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplDraw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const { @@ -944,8 +863,6 @@ void ImpGraphic::ImplDraw( OutputDevice* pOutDev, } } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize, long nExtraData, OutputDevice* pFirstFrameOutDev ) @@ -954,24 +871,18 @@ void ImpGraphic::ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt mpAnimation->Start( pOutDev, rDestPt, rDestSize, nExtraData, pFirstFrameOutDev ); } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplStopAnimation( OutputDevice* pOutDev, long nExtraData ) { if( ImplIsSupportedGraphic() && !ImplIsSwapOut() && mpAnimation ) mpAnimation->Stop( pOutDev, nExtraData ); } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetAnimationNotifyHdl( const Link& rLink ) { if( mpAnimation ) mpAnimation->SetNotifyHdl( rLink ); } -// ------------------------------------------------------------------------ - Link ImpGraphic::ImplGetAnimationNotifyHdl() const { Link aLink; @@ -982,29 +893,21 @@ Link ImpGraphic::ImplGetAnimationNotifyHdl() const return aLink; } -// ------------------------------------------------------------------------ - sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const { return( mpAnimation ? mpAnimation->GetLoopCount() : 0UL ); } -// ------------------------------------------------------------------------ - GraphicReader* ImpGraphic::ImplGetContext() { return mpContext; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetContext( GraphicReader* pReader ) { mpContext = pReader; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetDocFileName( const String& rName, sal_uLong nFilePos ) { const INetURLObject aURL( rName ); @@ -1015,22 +918,16 @@ void ImpGraphic::ImplSetDocFileName( const String& rName, sal_uLong nFilePos ) mnDocFilePos = nFilePos; } -// ------------------------------------------------------------------------ - const String& ImpGraphic::ImplGetDocFileName() const { return maDocFileURLStr; } -// ------------------------------------------------------------------------ - sal_uLong ImpGraphic::ImplGetDocFilePos() const { return mnDocFilePos; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) { MapMode aMapMode; @@ -1268,8 +1165,6 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) { sal_Bool bRet = sal_False; @@ -1349,8 +1244,6 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplSwapOut() { sal_Bool bRet = sal_False; @@ -1424,8 +1317,6 @@ sal_Bool ImpGraphic::ImplSwapOut() return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplSwapOut( SvStream* pOStm ) { sal_Bool bRet = sal_False; @@ -1454,8 +1345,6 @@ sal_Bool ImpGraphic::ImplSwapOut( SvStream* pOStm ) return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplSwapIn() { sal_Bool bRet = sal_False; @@ -1531,8 +1420,6 @@ sal_Bool ImpGraphic::ImplSwapIn() return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) { sal_Bool bRet = sal_False; @@ -1557,15 +1444,11 @@ sal_Bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) return bRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsSwapOut() const { return mbSwapOut; } -// ------------------------------------------------------------------------ - void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink ) { delete mpGfxLink; @@ -1575,22 +1458,16 @@ void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink ) mpGfxLink->SwapOut(); } -// ------------------------------------------------------------------------ - GfxLink ImpGraphic::ImplGetLink() { return( mpGfxLink ? *mpGfxLink : GfxLink() ); } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplIsLink() const { return ( mpGfxLink != NULL ) ? sal_True : sal_False; } -// ------------------------------------------------------------------------ - sal_uLong ImpGraphic::ImplGetChecksum() const { sal_uLong nRet = 0; @@ -1630,8 +1507,6 @@ sal_uLong ImpGraphic::ImplGetChecksum() const return nRet; } -// ------------------------------------------------------------------------ - sal_Bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const { sal_Bool bResult = sal_False; @@ -1655,15 +1530,11 @@ sal_Bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const return bResult; } -// ------------------------------------------------------------------------ - const SvgDataPtr& ImpGraphic::getSvgData() const { return maSvgData; } -// ------------------------------------------------------------------------ - SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) { if( !rIStm.GetError() ) @@ -1814,8 +1685,6 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) return rIStm; } -// ------------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic ) { if( !rOStm.GetError() ) diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 50e32b6e5638..7bb76da3f510 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -28,15 +28,9 @@ #include <image.h> -// ----------- -// - Defines - -// ----------- - #define IMPSYSIMAGEITEM_MASK ( 0x01 ) #define IMPSYSIMAGEITEM_ALPHA ( 0x02 ) -// ----------------------------------------------------------------------- - ImageAryData::ImageAryData( const ImageAryData& rData ) : maName( rData.maName ), mnId( rData.mnId ), @@ -50,14 +44,10 @@ ImageAryData::ImageAryData( const rtl::OUString &aName, { } -// ----------------------------------------------------------------------- - ImageAryData::~ImageAryData() { } -// ----------------------------------------------------------------------- - ImageAryData& ImageAryData::operator=( const ImageAryData& rData ) { maName = rData.maName; @@ -67,10 +57,6 @@ ImageAryData& ImageAryData::operator=( const ImageAryData& rData ) return *this; } -// ----------------- -// - ImplImageList - -// ----------------- - ImplImageList::ImplImageList() { } @@ -113,42 +99,26 @@ void ImplImageList::RemoveImage( sal_uInt16 nPos ) maImages.erase( maImages.begin() + nPos ); } -// ----------------- -// - ImplImageData - -// ----------------- - ImplImageData::ImplImageData( const BitmapEx& rBmpEx ) : mpImageBitmap( NULL ), maBmpEx( rBmpEx ) { } -// ----------------------------------------------------------------------- - ImplImageData::~ImplImageData() { delete mpImageBitmap; } -// ----------------- -// - ImplImageData - -// ----------------- - sal_Bool ImplImageData::IsEqual( const ImplImageData& rData ) { return( maBmpEx == rData.maBmpEx ); } -// ------------- -// - ImplImage - -// ------------- - ImplImage::ImplImage() { } -// ------------------------------------------------------------------------------ - ImplImage::~ImplImage() { switch( meType ) @@ -163,10 +133,6 @@ ImplImage::~ImplImage() } } -// ---------------- -// - ImplImageBmp - -// ---------------- - ImplImageBmp::ImplImageBmp() : mpDisplayBmp( NULL ), mpInfoAry( NULL ), @@ -174,18 +140,12 @@ ImplImageBmp::ImplImageBmp() : { } -// ------------- -// - ImplImage - -// ------------- - ImplImageBmp::~ImplImageBmp() { delete[] mpInfoAry; delete mpDisplayBmp; } -// ----------------------------------------------------------------------- - void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight, sal_uInt16 nInitSize ) { maBmpEx = rBmpEx; @@ -204,8 +164,6 @@ void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHe mnSize ); } -// ----------------------------------------------------------------------- - void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, const Point& rPos, sal_uInt16 nStyle, const Size* pSize ) @@ -362,8 +320,6 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, } } -// ----------------------------------------------------------------------- - void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice* #if defined WNT pOutDev @@ -390,8 +346,6 @@ pOutDev } } -// ----------------------------------------------------------------------- - void ImplImageBmp::ImplUpdateDisabledBmpEx( int nPos ) { const Size aTotalSize( maBmpEx.GetSizePixel() ); diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 26c12f8f4be1..093d94fdbcf7 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -28,35 +28,21 @@ #include <vcl/virdev.hxx> #include <impvect.hxx> -// ----------- -// - Defines - -// ----------- - #define VECT_POLY_MAX 8192 -// ----------------------------------------------------------------------------- - #define VECT_FREE_INDEX 0 #define VECT_CONT_INDEX 1 #define VECT_DONE_INDEX 2 -// ----------------------------------------------------------------------------- - #define VECT_POLY_INLINE_INNER 1UL #define VECT_POLY_INLINE_OUTER 2UL #define VECT_POLY_OUTLINE_INNER 4UL #define VECT_POLY_OUTLINE_OUTER 8UL -// ----------------------------------------------------------------------------- - #define VECT_MAP( _def_pIn, _def_pOut, _def_nVal ) _def_pOut[_def_nVal]=(_def_pIn[_def_nVal]=((_def_nVal)*4L)+1L)+5L; #define BACK_MAP( _def_nVal ) ((((_def_nVal)+2)>>2)-1) #define VECT_PROGRESS( _def_pProgress, _def_nVal ) if(_def_pProgress&&_def_pProgress->IsSet())(_def_pProgress->Call((void*)_def_nVal)); -// ----------- -// - statics - -// ----------- - struct ChainMove { long nDX; long nDY; }; static ChainMove aImplMove[ 8 ] = { @@ -92,10 +78,6 @@ static ChainMove aImplMoveOuter[ 8 ] = { { 0L, -1L } }; -// ---------------- -// - ImplColorSet - -// ---------------- - struct ImplColorSet { BitmapColor maColor; @@ -106,22 +88,16 @@ struct ImplColorSet sal_Bool operator>( const ImplColorSet& rSet ) const; }; -// ---------------------------------------------------------------------------- - inline sal_Bool ImplColorSet::operator<( const ImplColorSet& rSet ) const { return( mbSet && ( !rSet.mbSet || ( maColor.GetLuminance() > rSet.maColor.GetLuminance() ) ) ); } -// ---------------------------------------------------------------------------- - inline sal_Bool ImplColorSet::operator>( const ImplColorSet& rSet ) const { return( !mbSet || ( rSet.mbSet && maColor.GetLuminance() < rSet.maColor.GetLuminance() ) ); } -// ---------------------------------------------------------------------------- - extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 ) { ImplColorSet* pSet1 = (ImplColorSet*) p1; @@ -144,10 +120,6 @@ extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 ) return nRet; } -// ------------------ -// - ImplPointArray - -// ------------------ - class ImplPointArray { Point* mpArray; @@ -170,8 +142,6 @@ public: void ImplCreatePoly( Polygon& rPoly ) const; }; -// ----------------------------------------------------------------------------- - ImplPointArray::ImplPointArray() : mpArray ( NULL ), mnSize ( 0UL ), @@ -180,16 +150,12 @@ ImplPointArray::ImplPointArray() : { } -// ----------------------------------------------------------------------------- - ImplPointArray::~ImplPointArray() { if( mpArray ) rtl_freeMemory( mpArray ); } -// ----------------------------------------------------------------------------- - void ImplPointArray::ImplSetSize( sal_uLong nSize ) { const sal_uLong nTotal = nSize * sizeof( Point ); @@ -204,33 +170,23 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize ) memset( (HPBYTE) mpArray, 0, nTotal ); } -// ----------------------------------------------------------------------------- - inline Point& ImplPointArray::operator[]( sal_uLong nPos ) { DBG_ASSERT( nPos < mnSize, "ImplPointArray::operator[]: nPos out of range!" ); return mpArray[ nPos ]; } -// ----------------------------------------------------------------------------- - inline const Point& ImplPointArray::operator[]( sal_uLong nPos ) const { DBG_ASSERT( nPos < mnSize, "ImplPointArray::operator[]: nPos out of range!" ); return mpArray[ nPos ]; } -// ----------------------------------------------------------------------------- - void ImplPointArray::ImplCreatePoly( Polygon& rPoly ) const { rPoly = Polygon( sal::static_int_cast<sal_uInt16>(mnRealSize), mpArray ); } -// --------------- -// - ImplVectMap - -// --------------- - class ImplVectMap { private: @@ -259,8 +215,6 @@ public: }; -// ----------------------------------------------------------------------------- - ImplVectMap::ImplVectMap( long nWidth, long nHeight ) : mnWidth ( nWidth ), mnHeight( nHeight ) @@ -276,55 +230,38 @@ ImplVectMap::ImplVectMap( long nWidth, long nHeight ) : mpScan[ nY++ ] = pTmp; } -// ----------------------------------------------------------------------------- - - ImplVectMap::~ImplVectMap() { rtl_freeMemory( mpBuf ); rtl_freeMemory( mpScan ); } -// ----------------------------------------------------------------------------- - inline void ImplVectMap::Set( long nY, long nX, sal_uInt8 cVal ) { const sal_uInt8 cShift = sal::static_int_cast<sal_uInt8>(6 - ( ( nX & 3 ) << 1 )); ( ( mpScan[ nY ][ nX >> 2 ] ) &= ~( 3 << cShift ) ) |= ( cVal << cShift ); } -// ----------------------------------------------------------------------------- - inline sal_uInt8 ImplVectMap::Get( long nY, long nX ) const { return sal::static_int_cast<sal_uInt8>( ( ( mpScan[ nY ][ nX >> 2 ] ) >> ( 6 - ( ( nX & 3 ) << 1 ) ) ) & 3 ); } -// ----------------------------------------------------------------------------- - inline sal_Bool ImplVectMap::IsFree( long nY, long nX ) const { return( VECT_FREE_INDEX == Get( nY, nX ) ); } -// ----------------------------------------------------------------------------- - inline sal_Bool ImplVectMap::IsCont( long nY, long nX ) const { return( VECT_CONT_INDEX == Get( nY, nX ) ); } -// ----------------------------------------------------------------------------- - inline sal_Bool ImplVectMap::IsDone( long nY, long nX ) const { return( VECT_DONE_INDEX == Get( nY, nX ) ); } -// ------------- -// - ImplChain - -// ------------- - class ImplChain { private: @@ -355,8 +292,6 @@ public: const Polygon& ImplGetPoly() const { return maPoly; } }; -// ----------------------------------------------------------------------------- - ImplChain::ImplChain( sal_uLong nInitCount, long nResize ) : mnArraySize ( nInitCount ), mnCount ( 0UL ), @@ -366,15 +301,11 @@ ImplChain::ImplChain( sal_uLong nInitCount, long nResize ) : mpCodes = new sal_uInt8[ mnArraySize ]; } -// ----------------------------------------------------------------------------- - ImplChain::~ImplChain() { delete[] mpCodes; } -// ----------------------------------------------------------------------------- - void ImplChain::ImplGetSpace() { const sal_uLong nOldArraySize = mnArraySize; @@ -387,8 +318,6 @@ void ImplChain::ImplGetSpace() mpCodes = pNewCodes; } -// ----------------------------------------------------------------------------- - void ImplChain::ImplBeginAdd( const Point& rStartPt ) { maPoly = Polygon(); @@ -396,8 +325,6 @@ void ImplChain::ImplBeginAdd( const Point& rStartPt ) mnCount = 0UL; } -// ----------------------------------------------------------------------------- - inline void ImplChain::ImplAdd( sal_uInt8 nCode ) { if( mnCount == mnArraySize ) @@ -406,8 +333,6 @@ inline void ImplChain::ImplAdd( sal_uInt8 nCode ) mpCodes[ mnCount++ ] = nCode; } -// ----------------------------------------------------------------------------- - void ImplChain::ImplEndAdd( sal_uLong nFlag ) { if( mnCount ) @@ -650,8 +575,6 @@ void ImplChain::ImplEndAdd( sal_uLong nFlag ) maPoly.SetSize( 0 ); } -// ----------------------------------------------------------------------------- - void ImplChain::ImplPostProcess( const ImplPointArray& rArr ) { ImplPointArray aNewArr1; @@ -711,22 +634,14 @@ void ImplChain::ImplPostProcess( const ImplPointArray& rArr ) aNewArr2.ImplCreatePoly( maPoly ); } -// ------------------ -// - ImplVectorizer - -// ------------------ - ImplVectorizer::ImplVectorizer() { } -// ----------------------------------------------------------------------------- - ImplVectorizer::~ImplVectorizer() { } -// ----------------------------------------------------------------------------- - sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) { @@ -830,8 +745,6 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rM return bRet; } -// ----------------------------------------------------------------------------- - sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) @@ -927,8 +840,6 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, return bRet; } -// ----------------------------------------------------------------------------- - void ImplVectorizer::ImplLimitPolyPoly( PolyPolygon& rPolyPoly ) { if( rPolyPoly.Count() > VECT_POLY_MAX ) @@ -961,8 +872,6 @@ void ImplVectorizer::ImplLimitPolyPoly( PolyPolygon& rPolyPoly ) } } -// ----------------------------------------------------------------------------- - ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ) { ImplVectMap* pMap = NULL; @@ -1054,8 +963,6 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r return pMap; } -// ----------------------------------------------------------------------------- - void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) { const long nWidth = pMap->Width(), nHeight= pMap->Height(); @@ -1123,8 +1030,6 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, s } } -// ----------------------------------------------------------------------------- - sal_Bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ) { long nActX = rStartPt.X(); @@ -1177,8 +1082,6 @@ sal_Bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt return sal_True; } -// ----------------------------------------------------------------------------- - sal_Bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const { if( pMap->IsDone( nY - 1L, nX ) ) diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index cb014ec4bfa8..2872262ddb10 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -30,7 +30,6 @@ #include <vcl/print.hxx> #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> -// declare system types in sysdata.hxx #include <svsys.h> #include <vcl/sysdata.hxx> @@ -78,8 +77,6 @@ DBG_NAME( PolyPolygon ) #endif DBG_NAMEEX( Region ) -// ----------------------------------------------------------------------- - #ifdef DBG_UTIL const char* ImplDbgCheckOutputDevice( const void* pObj ) { @@ -123,8 +120,6 @@ struct ImplObjStack sal_uInt16 mnFlags; }; -// ----------------------------------------------------------------------- - static void ImplDeleteObjStack( ImplObjStack* pObjStack ) { if ( pObjStack->mnFlags & PUSH_LINECOLOR ) @@ -175,8 +170,6 @@ static void ImplDeleteObjStack( ImplObjStack* pObjStack ) delete pObjStack; } -// ----------------------------------------------------------------------- - bool OutputDevice::ImplIsAntiparallel() const { bool bRet = false; @@ -191,9 +184,6 @@ bool OutputDevice::ImplIsAntiparallel() const return bRet; } -// ----------------------------------------------------------------------- - - bool OutputDevice::ImplSelectClipRegion( const Region& rRegion, SalGraphics* pGraphics ) { DBG_TESTSOLARMUTEX(); @@ -414,8 +404,6 @@ OutputDevice::OutputDevice() : maThresRes.mnThresPixToLogY = 0; } -// ----------------------------------------------------------------------- - OutputDevice::~OutputDevice() { DBG_DTOR( OutputDevice, ImplDbgCheckOutputDevice ); @@ -487,8 +475,6 @@ bool OutputDevice::supportsOperation( OutDevSupportType eType ) const return bHasSupport; } -// ----------------------------------------------------------------------- - void OutputDevice::EnableRTL( sal_Bool bEnable ) { mbEnableRTL = (bEnable != 0); @@ -561,9 +547,6 @@ void OutputDevice::ImplReMirror( Region &rRegion ) const rRegion = aMirroredRegion; } - -// ----------------------------------------------------------------------- - SalGraphics* OutputDevice::ImplGetGraphics() const { DBG_TESTSOLARMUTEX(); @@ -714,8 +697,6 @@ SalGraphics* OutputDevice::ImplGetGraphics() const return mpGraphics; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplReleaseGraphics( sal_Bool bRelease ) { DBG_TESTSOLARMUTEX(); @@ -833,8 +814,6 @@ void OutputDevice::ImplReleaseGraphics( sal_Bool bRelease ) mpNextGraphics = NULL; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitOutDevData() { if ( !mpOutDevData ) @@ -849,8 +828,6 @@ void OutputDevice::ImplInitOutDevData() } } -// ----------------------------------------------------------------------- - // #i75163# void OutputDevice::ImplInvalidateViewTransform() { @@ -870,15 +847,11 @@ void OutputDevice::ImplInvalidateViewTransform() } } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::ImplIsRecordLayout() const { return mpOutDevData && mpOutDevData->mpRecordLayout; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDeInitOutDevData() { if ( mpOutDevData ) @@ -893,8 +866,6 @@ void OutputDevice::ImplDeInitOutDevData() } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitLineColor() { DBG_TESTSOLARMUTEX(); @@ -916,8 +887,6 @@ void OutputDevice::ImplInitLineColor() mbInitLineColor = sal_False; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitFillColor() { DBG_TESTSOLARMUTEX(); @@ -939,8 +908,6 @@ void OutputDevice::ImplInitFillColor() mbInitFillColor = sal_False; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitClipRegion() { DBG_TESTSOLARMUTEX(); @@ -1027,8 +994,6 @@ void OutputDevice::ImplInitClipRegion() mbInitClipRegion = sal_False; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplSetClipRegion( const Region* pRegion ) { DBG_TESTSOLARMUTEX(); @@ -1050,8 +1015,6 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion ) } } -// ----------------------------------------------------------------------- - void OutputDevice::SetClipRegion() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1065,8 +1028,6 @@ void OutputDevice::SetClipRegion() mpAlphaVDev->SetClipRegion(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetClipRegion( const Region& rRegion ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1087,8 +1048,6 @@ void OutputDevice::SetClipRegion( const Region& rRegion ) mpAlphaVDev->SetClipRegion( rRegion ); } -// ----------------------------------------------------------------------- - Region OutputDevice::GetClipRegion() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1096,8 +1055,6 @@ Region OutputDevice::GetClipRegion() const return PixelToLogic( maRegion ); } -// ----------------------------------------------------------------------- - Region OutputDevice::GetActiveClipRegion() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1119,8 +1076,6 @@ Region OutputDevice::GetActiveClipRegion() const return GetClipRegion(); } -// ----------------------------------------------------------------------- - void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1139,8 +1094,6 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove ) mpAlphaVDev->MoveClipRegion( nHorzMove, nVertMove ); } -// ----------------------------------------------------------------------- - void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1157,8 +1110,6 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) mpAlphaVDev->IntersectClipRegion( rRect ); } -// ----------------------------------------------------------------------- - void OutputDevice::IntersectClipRegion( const Region& rRegion ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1181,8 +1132,6 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion ) mpAlphaVDev->IntersectClipRegion( rRegion ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1193,8 +1142,6 @@ void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) mpAlphaVDev->SetDrawMode( nDrawMode ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetRasterOp( RasterOp eRasterOp ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1215,8 +1162,6 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp ) mpAlphaVDev->SetRasterOp( eRasterOp ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetLineColor() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1235,8 +1180,6 @@ void OutputDevice::SetLineColor() mpAlphaVDev->SetLineColor(); } -// ----------------------------------------------------------------------- - Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const { Color aColor( rColor ); @@ -1310,8 +1253,6 @@ void OutputDevice::SetLineColor( const Color& rColor ) mpAlphaVDev->SetLineColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetFillColor() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1330,8 +1271,6 @@ void OutputDevice::SetFillColor() mpAlphaVDev->SetFillColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetFillColor( const Color& rColor ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1401,8 +1340,6 @@ void OutputDevice::SetFillColor( const Color& rColor ) mpAlphaVDev->SetFillColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetBackground() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1414,8 +1351,6 @@ void OutputDevice::SetBackground() mpAlphaVDev->SetBackground(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetBackground( const Wallpaper& rBackground ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1431,8 +1366,6 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground ) mpAlphaVDev->SetBackground( rBackground ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetRefPoint() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1447,8 +1380,6 @@ void OutputDevice::SetRefPoint() mpAlphaVDev->SetRefPoint(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetRefPoint( const Point& rRefPoint ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1463,8 +1394,6 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint ) mpAlphaVDev->SetRefPoint( rRefPoint ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1525,8 +1454,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) mpAlphaVDev->DrawLine( rStartPt, rEndPt ); } -// ----------------------------------------------------------------------- - void OutputDevice::impPaintLineGeometryWithEvtlExpand( const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon) @@ -1663,8 +1590,6 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand( mpMetaFile = pOldMetaFile; } -// ----------------------------------------------------------------------- - void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, const LineInfo& rLineInfo ) { @@ -1717,8 +1642,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, mpAlphaVDev->DrawLine( rStartPt, rEndPt, rLineInfo ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawRect( const Rectangle& rRect ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1757,8 +1680,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect ) mpAlphaVDev->DrawRect( rRect ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawPolyLine( const Polygon& rPoly ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1834,8 +1755,6 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly ) mpAlphaVDev->DrawPolyLine( rPoly ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1925,8 +1844,6 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI mpAlphaVDev->DrawPolyLine( rPoly, rLineInfo ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawPolygon( const Polygon& rPoly ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2020,8 +1937,6 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly ) mpAlphaVDev->DrawPolygon( rPoly ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2121,8 +2036,6 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) mpAlphaVDev->DrawPolyPolygon( rPolyPoly ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawPolygon( const ::basegfx::B2DPolygon& rB2DPolygon) { // AW: Do NOT paint empty polygons @@ -2221,8 +2134,6 @@ void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPo ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon ); } -// ----------------------------------------------------------------------- - bool OutputDevice::ImpTryDrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth, @@ -2366,8 +2277,6 @@ void OutputDevice::DrawPolyLine( } } -// ----------------------------------------------------------------------- - sal_uInt32 OutputDevice::GetGCStackDepth() const { const ImplObjStack* pData = mpObjStack; @@ -2380,8 +2289,6 @@ sal_uInt32 OutputDevice::GetGCStackDepth() const return nDepth; } -// ----------------------------------------------------------------------- - void OutputDevice::Push( sal_uInt16 nFlags ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2468,8 +2375,6 @@ void OutputDevice::Push( sal_uInt16 nFlags ) mpAlphaVDev->Push(); } -// ----------------------------------------------------------------------- - void OutputDevice::Pop() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2561,15 +2466,11 @@ void OutputDevice::Pop() mpMetaFile = pOldMetaFile; } -// ----------------------------------------------------------------------- - void OutputDevice::SetConnectMetaFile( GDIMetaFile* pMtf ) { mpMetaFile = pMtf; } -// ----------------------------------------------------------------------- - void OutputDevice::EnableOutput( sal_Bool bEnable ) { mbOutput = (bEnable != 0); @@ -2578,8 +2479,6 @@ void OutputDevice::EnableOutput( sal_Bool bEnable ) mpAlphaVDev->EnableOutput( bEnable ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetSettings( const AllSettings& rSettings ) { maSettings = rSettings; @@ -2588,8 +2487,6 @@ void OutputDevice::SetSettings( const AllSettings& rSettings ) mpAlphaVDev->SetSettings( rSettings ); } -// ----------------------------------------------------------------------- - sal_uInt16 OutputDevice::GetBitCount() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2607,8 +2504,6 @@ sal_uInt16 OutputDevice::GetBitCount() const return (sal_uInt16)mpGraphics->GetBitCount(); } -// ----------------------------------------------------------------------- - sal_uInt16 OutputDevice::GetAlphaBitCount() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2622,8 +2517,6 @@ sal_uInt16 OutputDevice::GetAlphaBitCount() const return 0; } -// ----------------------------------------------------------------------- - sal_uLong OutputDevice::GetColorCount() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -2632,23 +2525,17 @@ sal_uLong OutputDevice::GetColorCount() const return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uLong) 1 ) << nBitCount) ); } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::HasAlpha() { return mpAlphaVDev != NULL; } -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > OutputDevice::CreateUnoGraphics() { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); return pWrapper ? pWrapper->CreateGraphics( this ) : ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >(); } -// ----------------------------------------------------------------------- - SystemGraphicsData OutputDevice::GetSystemGfxData() const { if ( !mpGraphics ) @@ -2660,8 +2547,6 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const return mpGraphics->GetGraphicsData(); } -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Any OutputDevice::GetSystemGfxDataAny() const { ::com::sun::star::uno::Any aRet; @@ -2672,8 +2557,6 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const return uno::makeAny(aSeq); } -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > OutputDevice::GetCanvas() const { uno::Sequence< uno::Any > aArg(6); @@ -2703,6 +2586,4 @@ SystemGraphicsData OutputDevice::GetSystemGfxData() const return xCanvas; } -// ----------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 888e25f5048e..11bdd1188a31 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -42,12 +42,6 @@ DBG_NAMEEX( OutputDevice ) -// ======================================================================= - -// ----------- -// - Defines - -// ----------- - #define OUTDEV_INIT() \ { \ if ( !IsDeviceOutputNecessary() ) \ @@ -64,18 +58,12 @@ DBG_NAMEEX( OutputDevice ) return; \ } -// ------------- -// - externals - -// ------------- - extern const sal_uLong nVCLRLut[ 6 ]; extern const sal_uLong nVCLGLut[ 6 ]; extern const sal_uLong nVCLBLut[ 6 ]; extern const sal_uLong nVCLDitherLut[ 256 ]; extern const sal_uLong nVCLLut[ 256 ]; -// ======================================================================= - sal_uLong ImplAdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ) { sal_uLong nMirrFlags = 0; @@ -133,8 +121,6 @@ sal_uLong ImplAdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ) return nMirrFlags; } -// ======================================================================= - void ImplAdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect ) { if( ( rTwoRect.mnSrcX < rValidSrcRect.Left() ) || ( rTwoRect.mnSrcX >= rValidSrcRect.Right() ) || @@ -172,8 +158,6 @@ void ImplAdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect ) } } -// ======================================================================= - void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pVoidPosAry ) { SalTwoRect* pPosAry = (SalTwoRect*)pVoidPosAry; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index aeb20c4e6a0c..9f022ed94215 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -91,30 +91,20 @@ #include <algorithm> -// ======================================================================= - DBG_NAMEEX( OutputDevice ) DBG_NAMEEX( Font ) -// ======================================================================= - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; using namespace ::vcl; using namespace ::utl; -// ======================================================================= - #define TEXT_DRAW_ELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS | TEXT_DRAW_NEWSELLIPSIS) -// ======================================================================= - #define UNDERLINE_LAST UNDERLINE_BOLDWAVE #define STRIKEOUT_LAST STRIKEOUT_X -// ======================================================================= - static void ImplRotatePos( long nOriginX, long nOriginY, long& rX, long& rY, int nOrientation ) { @@ -166,8 +156,6 @@ static void ImplRotatePos( long nOriginX, long nOriginY, long& rX, long& rY, } } -// ======================================================================= - void OutputDevice::ImplUpdateFontData( bool bNewFontLists ) { // the currently selected logical font is no longer needed @@ -245,8 +233,6 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists ) } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists ) { ImplSVData* pSVData = ImplGetSVData(); @@ -302,25 +288,16 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists ) } } -// ======================================================================= - - -// ======================================================================= - // TODO: remove this method when the CWS-gfbfcfg dust has settled void ImplFreeOutDevFontData() {} -// ======================================================================= - void OutputDevice::BeginFontSubstitution() { ImplSVData* pSVData = ImplGetSVData(); pSVData->maGDIData.mbFontSubChanged = sal_False; } -// ----------------------------------------------------------------------- - void OutputDevice::EndFontSubstitution() { ImplSVData* pSVData = ImplGetSVData(); @@ -336,8 +313,6 @@ void OutputDevice::EndFontSubstitution() } } -// ----------------------------------------------------------------------- - void OutputDevice::AddFontSubstitute( const XubString& rFontName, const XubString& rReplaceFontName, sal_uInt16 nFlags ) @@ -349,16 +324,12 @@ void OutputDevice::AddFontSubstitute( const XubString& rFontName, ImplGetSVData()->maGDIData.mbFontSubChanged = sal_True; } -// ----------------------------------------------------------------------- - void ImplDirectFontSubstitution::AddFontSubstitute( const String& rFontName, const String& rSubstFontName, sal_uInt16 nFlags ) { maFontSubstList.push_back( ImplFontSubstEntry( rFontName, rSubstFontName, nFlags ) ); } -// ----------------------------------------------------------------------- - ImplFontSubstEntry::ImplFontSubstEntry( const OUString& rFontName, const OUString& rSubstFontName, sal_uInt16 nSubstFlags ) : maName( rFontName ) @@ -371,8 +342,6 @@ ImplFontSubstEntry::ImplFontSubstEntry( const OUString& rFontName, GetEnglishSearchFontName( maSearchReplaceName ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplAddDevFontSubstitute( const XubString& rFontName, const XubString& rReplaceFontName, sal_uInt16 nFlags ) @@ -381,8 +350,6 @@ void OutputDevice::ImplAddDevFontSubstitute( const XubString& rFontName, mpOutDevData->maDevFontSubst.AddFontSubstitute( rFontName, rReplaceFontName, nFlags ); } -// ----------------------------------------------------------------------- - void OutputDevice::RemoveFontSubstitute( sal_uInt16 n ) { ImplDirectFontSubstitution* pSubst = ImplGetSVData()->maGDIData.mpDirectFontSubst; @@ -390,8 +357,6 @@ void OutputDevice::RemoveFontSubstitute( sal_uInt16 n ) pSubst->RemoveFontSubstitute( n ); } -// ----------------------------------------------------------------------- - void ImplDirectFontSubstitution::RemoveFontSubstitute( int nIndex ) { FontSubstList::iterator it = maFontSubstList.begin(); @@ -400,8 +365,6 @@ void ImplDirectFontSubstitution::RemoveFontSubstitute( int nIndex ) maFontSubstList.erase( it ); } -// ----------------------------------------------------------------------- - sal_uInt16 OutputDevice::GetFontSubstituteCount() { const ImplDirectFontSubstitution* pSubst = ImplGetSVData()->maGDIData.mpDirectFontSubst; @@ -411,8 +374,6 @@ sal_uInt16 OutputDevice::GetFontSubstituteCount() return (sal_uInt16)nCount; } -// ----------------------------------------------------------------------- - bool ImplDirectFontSubstitution::FindFontSubstitute( String& rSubstName, const String& rSearchName, sal_uInt16 nFlags ) const { @@ -432,8 +393,6 @@ bool ImplDirectFontSubstitution::FindFontSubstitute( String& rSubstName, return false; } -// ----------------------------------------------------------------------- - static void ImplFontSubstitute( OUString& rFontName, sal_uInt16 nFlags, ImplDirectFontSubstitution* pDevSpecific ) { @@ -464,8 +423,6 @@ static void ImplFontSubstitute( OUString& rFontName, } } -// ----------------------------------------------------------------------- - Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, sal_uLong nFlags, const OutputDevice* pOutDev ) { @@ -666,8 +623,6 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, return aFont; } -// ======================================================================= - static unsigned ImplIsCJKFont( const String& rFontName ) { // Test, if Fontname includes CJK characters --> In this case we @@ -701,8 +656,6 @@ static unsigned ImplIsCJKFont( const String& rFontName ) return 0; } -// ----------------------------------------------------------------------- - static void ImplCalcType( sal_uLong& rType, FontWeight& rWeight, FontWidth& rWidth, FontFamily eFamily, const FontNameAttr* pFontAttr ) { @@ -733,8 +686,6 @@ static void ImplCalcType( sal_uLong& rType, FontWeight& rWeight, FontWidth& rWid } } -// ======================================================================= - PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagic ) : ImplDevFontAttributes( rDFA ), mnWidth(0), @@ -749,8 +700,6 @@ PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagi SetSymbolFlag( true ); } -// ----------------------------------------------------------------------- - sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) const { // compare their width, weight, italic and style name @@ -773,8 +722,6 @@ sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) return eCompare; } -// ----------------------------------------------------------------------- - sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace& rOther ) const { sal_Int32 eCompare = CompareIgnoreSize( rOther ); @@ -794,8 +741,6 @@ sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace& rOther ) co return COMPARE_EQUAL; } -// ----------------------------------------------------------------------- - struct FontMatchStatus { public: @@ -947,8 +892,6 @@ bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD, FontMatchSt return true; } -// ======================================================================= - ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) : maFontSelData( rFontSelData ), maMetric( rFontSelData ), @@ -963,15 +906,11 @@ ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) maFontSelData.mpFontEntry = this; } -// ----------------------------------------------------------------------- - ImplFontEntry::~ImplFontEntry() { delete mpUnicodeFallbackList; } -// ----------------------------------------------------------------------- - size_t ImplFontEntry::GFBCacheKey_Hash::operator()( const GFBCacheKey& rData ) const { boost::hash<sal_UCS4> a; @@ -986,8 +925,6 @@ inline void ImplFontEntry::AddFallbackForUnicode( sal_UCS4 cChar, FontWeight eWe (*mpUnicodeFallbackList)[ GFBCacheKey(cChar,eWeight) ] = rFontName; } -// ----------------------------------------------------------------------- - inline bool ImplFontEntry::GetFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, OUString* pFontName ) const { if( !mpUnicodeFallbackList ) @@ -1001,8 +938,6 @@ inline bool ImplFontEntry::GetFallbackForUnicode( sal_UCS4 cChar, FontWeight eWe return true; } -// ----------------------------------------------------------------------- - inline void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, const String& rFontName ) { // DBG_ASSERT( mpUnicodeFallbackList, "ImplFontEntry::IgnoreFallbackForUnicode no list" ); @@ -1014,8 +949,6 @@ inline void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight mpUnicodeFallbackList->erase( it ); } -// ======================================================================= - ImplDevFontListData::ImplDevFontListData( const String& rSearchName ) : mpFirst( NULL ), maSearchName( rSearchName ), @@ -1028,8 +961,6 @@ ImplDevFontListData::ImplDevFontListData( const String& rSearchName ) mnMinQuality( -1 ) {} -// ----------------------------------------------------------------------- - ImplDevFontListData::~ImplDevFontListData() { // release all physical font faces @@ -1041,8 +972,6 @@ ImplDevFontListData::~ImplDevFontListData() } } -// ----------------------------------------------------------------------- - bool ImplDevFontListData::AddFontFace( PhysicalFontFace* pNewData ) { pNewData->mpNext = NULL; @@ -1141,8 +1070,6 @@ bool ImplDevFontListData::AddFontFace( PhysicalFontFace* pNewData ) return true; } -// ----------------------------------------------------------------------- - // get font attributes using the normalized font family name void ImplDevFontListData::InitMatchData( const utl::FontSubstConfiguration& rFontSubst, const String& rSearchName ) @@ -1160,8 +1087,6 @@ void ImplDevFontListData::InitMatchData( const utl::FontSubstConfiguration& rFon mnMatchType |= ImplIsCJKFont( maName ); } -// ----------------------------------------------------------------------- - PhysicalFontFace* ImplDevFontListData::FindBestFontFace( const FontSelectPattern& rFSD ) const { if( !mpFirst ) @@ -1187,8 +1112,6 @@ PhysicalFontFace* ImplDevFontListData::FindBestFontFace( const FontSelectPattern return pBestFontFace; } -// ----------------------------------------------------------------------- - // update device font list with unique font faces, with uniqueness // meaning different font attributes, but not different fonts sizes void ImplDevFontListData::UpdateDevFontList( ImplGetDevFontList& rDevFontList ) const @@ -1202,8 +1125,6 @@ void ImplDevFontListData::UpdateDevFontList( ImplGetDevFontList& rDevFontList ) } } -// ----------------------------------------------------------------------- - void ImplDevFontListData::GetFontHeights( std::set<int>& rHeights ) const { // add all available font heights @@ -1211,8 +1132,6 @@ void ImplDevFontListData::GetFontHeights( std::set<int>& rHeights ) const rHeights.insert( pFace->GetHeight() ); } -// ----------------------------------------------------------------------- - void ImplDevFontListData::UpdateCloneFontList( ImplDevFontList& rDevFontList, bool bScalable, bool bEmbeddable ) const { @@ -1228,8 +1147,6 @@ void ImplDevFontListData::UpdateCloneFontList( ImplDevFontList& rDevFontList, } } -// ======================================================================= - ImplDevFontList::ImplDevFontList() : mbMatchData( false ) , mbMapNames( false ) @@ -1239,29 +1156,21 @@ ImplDevFontList::ImplDevFontList() , mnFallbackCount( -1 ) {} -// ----------------------------------------------------------------------- - ImplDevFontList::~ImplDevFontList() { Clear(); } -// ----------------------------------------------------------------------- - void ImplDevFontList::SetPreMatchHook( ImplPreMatchFontSubstitution* pHook ) { mpPreMatchHook = pHook; } -// ----------------------------------------------------------------------- - void ImplDevFontList::SetFallbackHook( ImplGlyphFallbackFontSubstitution* pHook ) { mpFallbackHook = pHook; } -// ----------------------------------------------------------------------- - void ImplDevFontList::Clear() { // remove fallback lists @@ -1283,9 +1192,6 @@ void ImplDevFontList::Clear() mbMatchData = false; } - -// ----------------------------------------------------------------------- - void ImplDevFontList::InitGenericGlyphFallback( void ) const { // normalized family names of fonts suited for glyph fallback @@ -1376,8 +1282,6 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const mpFallbackList = pFallbackList; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData, rtl::OUString& rMissingCodes, int nFallbackLevel ) const { @@ -1474,8 +1378,6 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r return pFallbackData; } -// ----------------------------------------------------------------------- - void ImplDevFontList::Add( PhysicalFontFace* pNewData ) { OUString aSearchName = pNewData->GetFamilyName(); @@ -1498,8 +1400,6 @@ void ImplDevFontList::Add( PhysicalFontFace* pNewData ) delete pNewData; } -// ----------------------------------------------------------------------- - // find the font from the normalized font family name ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSearchName ) const { @@ -1517,8 +1417,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSea return pFoundData; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName, const rtl::OUString& rShortName) const { @@ -1555,8 +1453,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& r return NULL; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName ) const { // normalize the font fomily name and @@ -1566,8 +1462,6 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName ) return pFound; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const { ImplDevFontListData* pFoundData = NULL; @@ -1587,8 +1481,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& return pFoundData; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const utl::FontNameAttr& rFontAttr ) const { ImplDevFontListData* pFoundData = NULL; @@ -1622,8 +1514,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const utl::FontNa return NULL; } -// ----------------------------------------------------------------------- - void ImplDevFontList::InitMatchData() const { // short circuit if already done @@ -1644,8 +1534,6 @@ void ImplDevFontList::InitMatchData() const } } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType, FontWeight eSearchWeight, FontWidth eSearchWidth, FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const @@ -2003,8 +1891,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchTyp return pFoundData; } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::FindDefaultFont() const { // try to find one of the default fonts of the @@ -2056,8 +1942,6 @@ ImplDevFontListData* ImplDevFontList::FindDefaultFont() const return pFoundData; } -// ----------------------------------------------------------------------- - ImplDevFontList* ImplDevFontList::Clone( bool bScalable, bool bEmbeddable ) const { ImplDevFontList* pClonedList = new ImplDevFontList; @@ -2079,8 +1963,6 @@ ImplDevFontList* ImplDevFontList::Clone( bool bScalable, bool bEmbeddable ) cons return pClonedList; } -// ----------------------------------------------------------------------- - ImplGetDevFontList* ImplDevFontList::GetDevFontList() const { ImplGetDevFontList* pGetDevFontList = new ImplGetDevFontList; @@ -2095,8 +1977,6 @@ ImplGetDevFontList* ImplDevFontList::GetDevFontList() const return pGetDevFontList; } -// ----------------------------------------------------------------------- - ImplGetDevSizeList* ImplDevFontList::GetDevSizeList( const String& rFontName ) const { ImplGetDevSizeList* pGetDevSizeList = new ImplGetDevSizeList( rFontName ); @@ -2187,8 +2067,6 @@ void FontSelectPattern::copyAttributes(const FontSelectPatternAttributes &rAttri static_cast<FontSelectPatternAttributes&>(*this) = rAttributes; } -// ======================================================================= - size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const { return rFSD.hashCode(); @@ -2258,8 +2136,6 @@ bool FontSelectPatternAttributes::operator==(const FontSelectPatternAttributes& return true; } -// ----------------------------------------------------------------------- - bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const FontSelectPattern& rB) const { // check normalized font family name @@ -2317,16 +2193,12 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo return true; } -// ----------------------------------------------------------------------- - ImplFontCache::ImplFontCache( bool bPrinter ) : mpFirstEntry( NULL ), mnRef0Count( 0 ), mbPrinter( bPrinter ) {} -// ----------------------------------------------------------------------- - ImplFontCache::~ImplFontCache() { FontInstanceList::iterator it = maFontInstanceList.begin(); @@ -2337,8 +2209,6 @@ ImplFontCache::~ImplFontCache() } } -// ----------------------------------------------------------------------- - ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, const Font& rFont, const Size& rSize, float fExactHeight, ImplDirectFontSubstitution* pDevSpecific ) { @@ -2349,8 +2219,6 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, return GetFontEntry( pFontList, aFontSelData, pDevSpecific ); } -// ----------------------------------------------------------------------- - ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, FontSelectPattern& aFontSelData, ImplDirectFontSubstitution* pDevSpecific ) { @@ -2484,8 +2352,6 @@ namespace } } -// ----------------------------------------------------------------------- - ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, bool bPrinter, ImplDirectFontSubstitution* pDevSpecific ) const { @@ -2805,8 +2671,6 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, return pFoundData; } -// ----------------------------------------------------------------------- - ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) { @@ -2843,8 +2707,6 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, return pFallbackFont; } -// ----------------------------------------------------------------------- - void ImplFontCache::Release( ImplFontEntry* pEntry ) { static const int FONTCACHE_MAX = 50; @@ -2877,8 +2739,6 @@ void ImplFontCache::Release( ImplFontEntry* pEntry ) DBG_ASSERT( (mnRef0Count==0), "ImplFontCache::Release() - refcount0 mismatch" ); } -// ----------------------------------------------------------------------- - void ImplFontCache::Invalidate() { // delete unreferenced entries @@ -2900,8 +2760,6 @@ void ImplFontCache::Invalidate() DBG_ASSERT( (mnRef0Count==0), "ImplFontCache::Invalidate() - mnRef0Count non-zero" ); } -// ======================================================================= - ImplMultiTextLineInfo::ImplMultiTextLineInfo() { mpLines = new PImplTextLineInfo[MULTITEXTLINEINFO_RESIZE]; @@ -2938,8 +2796,6 @@ void ImplMultiTextLineInfo::Clear() mnLines = 0; } -// ======================================================================= - FontEmphasisMark OutputDevice::ImplGetEmphasisMarkStyle( const Font& rFont ) { FontEmphasisMark nEmphasisMark = rFont.GetEmphasisMark(); @@ -2966,8 +2822,6 @@ FontEmphasisMark OutputDevice::ImplGetEmphasisMarkStyle( const Font& rFont ) return nEmphasisMark; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::ImplIsUnderlineAbove( const Font& rFont ) { if ( !rFont.IsVertical() ) @@ -2981,8 +2835,6 @@ sal_Bool OutputDevice::ImplIsUnderlineAbove( const Font& rFont ) return sal_False; } -// ======================================================================= - void OutputDevice::ImplInitFontList() const { if( ! mpFontList->Count() ) @@ -3007,8 +2859,6 @@ void OutputDevice::ImplInitFontList() const } } -// ======================================================================= - void OutputDevice::ImplInitFont() const { DBG_TESTSOLARMUTEX(); @@ -3037,8 +2887,6 @@ void OutputDevice::ImplInitFont() const } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitTextColor() { DBG_TESTSOLARMUTEX(); @@ -3050,8 +2898,6 @@ void OutputDevice::ImplInitTextColor() } } -// ----------------------------------------------------------------------- - bool OutputDevice::ImplNewFont() const { DBG_TESTSOLARMUTEX(); @@ -3221,8 +3067,6 @@ bool OutputDevice::ImplNewFont() const return true; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, long nHeight ) { @@ -3281,8 +3125,6 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY, mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout ) { const long nWidth = rSalLayout.GetTextWidth() / rSalLayout.GetUnitsPerPixel(); @@ -3303,8 +3145,6 @@ void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout ) mpFontEntry->mnLineHeight+mnEmphasisAscent+mnEmphasisDescent ); } -// ----------------------------------------------------------------------- - Rectangle OutputDevice::ImplGetTextBoundRect( const SalLayout& rSalLayout ) { Point aPoint = rSalLayout.GetDrawPosition(); @@ -3341,22 +3181,16 @@ Rectangle OutputDevice::ImplGetTextBoundRect( const SalLayout& rSalLayout ) return Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitTextLineSize() { mpFontEntry->maMetric.ImplInitTextLineSize( this ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplInitAboveTextLineSize() { mpFontEntry->maMetric.ImplInitAboveTextLineSize(); } -// ----------------------------------------------------------------------- - bool ImplFontAttributes::operator==(const ImplFontAttributes& rOther) const { if (maName != rOther.maName) @@ -3386,8 +3220,6 @@ bool ImplFontAttributes::operator==(const ImplFontAttributes& rOther) const return true; } -// ----------------------------------------------------------------------- - ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) : ImplFontAttributes( rFontSelData ) { @@ -3448,8 +3280,6 @@ ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) mnDStrikeoutOffset2 = 0; } -// ----------------------------------------------------------------------- - void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev ) { long nDescent = mnDescent; @@ -3534,8 +3364,6 @@ void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev ) mnDStrikeoutOffset2 = mnDStrikeoutOffset1 + n2LineDY + n2LineHeight; } -// ----------------------------------------------------------------------- - void ImplFontMetricData::ImplInitAboveTextLineSize() { long nIntLeading = mnIntLeading; @@ -3586,8 +3414,6 @@ void ImplFontMetricData::ImplInitAboveTextLineSize() mnAboveWUnderlineOffset = nCeiling + (nIntLeading + 1) / 2; } -// ----------------------------------------------------------------------- - static void ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, @@ -3611,8 +3437,6 @@ static void ImplDrawWavePixel( long nOriginX, long nOriginY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, long nHeight, @@ -3735,8 +3559,6 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontUnderline eTextLine, @@ -3799,8 +3621,6 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontUnderline eTextLine, @@ -4031,8 +3851,6 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontStrikeout eStrikeout, @@ -4095,8 +3913,6 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontStrikeout eStrikeout, @@ -4192,8 +4008,6 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, ImplInitTextColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawTextLine( long nX, long nY, long nDistX, long nWidth, FontStrikeout eStrikeout, @@ -4260,8 +4074,6 @@ void OutputDevice::ImplDrawTextLine( long nX, long nY, ImplDrawStrikeoutLine( nX, nY, nDistX, 0, nWidth, eStrikeout, aStrikeoutColor ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bWordLine, sal_Bool bUnderlineAbove ) { @@ -4322,8 +4134,6 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawMnemonicLine( long nX, long nY, long nWidth ) { long nBaseX = nX; @@ -4339,8 +4149,6 @@ void OutputDevice::ImplDrawMnemonicLine( long nX, long nY, long nWidth ) ImplDrawTextLine( nX, nY, 0, nWidth, STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE, sal_False ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, @@ -4494,8 +4302,6 @@ void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyL rYOff += nDotSize; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) @@ -4539,8 +4345,6 @@ void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) { Color aOldLineColor = GetLineColor(); @@ -4623,8 +4427,6 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) mpMetaFile = pOldMetaFile; } -// ----------------------------------------------------------------------- - bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) { int nX = rSalLayout.DrawBase().X(); @@ -4698,8 +4500,6 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) return true; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, sal_Bool bTextLines ) { if( mpFontEntry->mnOwnOrientation ) @@ -4747,8 +4547,6 @@ void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, sal_Bool bTextLine ImplDrawEmphasisMarks( rSalLayout ); } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) { Color aOldColor = GetTextColor(); @@ -4868,8 +4666,6 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawText( SalLayout& rSalLayout ) { if( mbInitClipRegion ) @@ -4890,8 +4686,6 @@ void OutputDevice::ImplDrawText( SalLayout& rSalLayout ) ImplDrawTextDirect( rSalLayout, mbTextLines ); } -// ----------------------------------------------------------------------- - long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const XubString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) @@ -5094,8 +4888,6 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, return nMaxLineWidth; } -// ======================================================================= - void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) { if ( mnAntialiasing != nMode ) @@ -5113,8 +4905,6 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) mpAlphaVDev->SetAntialiasing( nMode ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetFont( const Font& rNewFont ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5224,8 +5014,6 @@ void OutputDevice::SetFont( const Font& rNewFont ) } } -// ----------------------------------------------------------------------- - void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) { if( mpMetaFile ) @@ -5237,8 +5025,6 @@ void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) mpAlphaVDev->SetLayoutMode( nTextLayoutMode ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) { if( mpMetaFile ) @@ -5250,8 +5036,6 @@ void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) mpAlphaVDev->SetDigitLanguage( eTextLanguage ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetTextColor( const Color& rColor ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5295,8 +5079,6 @@ void OutputDevice::SetTextColor( const Color& rColor ) mpAlphaVDev->SetTextColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetTextFillColor() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5313,8 +5095,6 @@ void OutputDevice::SetTextFillColor() mpAlphaVDev->SetTextFillColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetTextFillColor( const Color& rColor ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5366,8 +5146,6 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) mpAlphaVDev->SetTextFillColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - Color OutputDevice::GetTextFillColor() const { if ( maFont.IsTransparent() ) @@ -5376,8 +5154,6 @@ Color OutputDevice::GetTextFillColor() const return maFont.GetFillColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetTextLineColor() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5391,8 +5167,6 @@ void OutputDevice::SetTextLineColor() mpAlphaVDev->SetTextLineColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetTextLineColor( const Color& rColor ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5433,8 +5207,6 @@ void OutputDevice::SetTextLineColor( const Color& rColor ) mpAlphaVDev->SetTextLineColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - void OutputDevice::SetOverlineColor() { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5448,8 +5220,6 @@ void OutputDevice::SetOverlineColor() mpAlphaVDev->SetOverlineColor(); } -// ----------------------------------------------------------------------- - void OutputDevice::SetOverlineColor( const Color& rColor ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5490,9 +5260,6 @@ void OutputDevice::SetOverlineColor( const Color& rColor ) mpAlphaVDev->SetOverlineColor( COL_BLACK ); } -// ----------------------------------------------------------------------- - - void OutputDevice::SetTextAlign( TextAlign eAlign ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5510,8 +5277,6 @@ void OutputDevice::SetTextAlign( TextAlign eAlign ) mpAlphaVDev->SetTextAlign( eAlign ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, @@ -5556,8 +5321,6 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth, mpAlphaVDev->DrawTextLine( rPos, nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove ); } -// ------------------------------------------------------------------------ - void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ) { @@ -5626,8 +5389,6 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos, mpAlphaVDev->DrawWaveLine( rStartPos, rEndPos, nStyle ); } -// ----------------------------------------------------------------------- - void OutputDevice::DrawText( const Point& rStartPt, const String& rStr, xub_StrLen nIndex, xub_StrLen nLen, MetricVector* pVector, OUString* pDisplayText @@ -5709,8 +5470,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const String& rStr, mpAlphaVDev->DrawText( rStartPt, rStr, nIndex, nLen, pVector, pDisplayText ); } -// ----------------------------------------------------------------------- - long OutputDevice::GetTextWidth( const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { @@ -5720,8 +5479,6 @@ long OutputDevice::GetTextWidth( const String& rStr, return nWidth; } -// ----------------------------------------------------------------------- - long OutputDevice::GetTextHeight() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -5746,8 +5503,6 @@ float OutputDevice::approximate_char_width() const return GetTextWidth(rtl::OUString("aemnnxEM")) / 8.0; } -// ----------------------------------------------------------------------- - void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr, const sal_Int32* pDXAry, xub_StrLen nIndex, xub_StrLen nLen ) @@ -5777,8 +5532,6 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr, mpAlphaVDev->DrawTextArray( rStartPt, rStr, pDXAry, nIndex, nLen ); } -// ----------------------------------------------------------------------- - long OutputDevice::GetTextArray( const String& rStr, sal_Int32* pDXAry, xub_StrLen nIndex, xub_StrLen nLen ) const { @@ -5823,8 +5576,6 @@ long OutputDevice::GetTextArray( const String& rStr, sal_Int32* pDXAry, return nWidth; } -// ----------------------------------------------------------------------- - bool OutputDevice::GetCaretPositions( const XubString& rStr, sal_Int32* pCaretXArray, xub_StrLen nIndex, xub_StrLen nLen, sal_Int32* pDXAry, long nLayoutWidth, @@ -5891,8 +5642,6 @@ bool OutputDevice::GetCaretPositions( const XubString& rStr, sal_Int32* pCaretXA return true; } -// ----------------------------------------------------------------------- - void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) @@ -5916,8 +5665,6 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, mpAlphaVDev->DrawStretchText( rStartPt, nWidth, rStr, nIndex, nLen ); } -// ----------------------------------------------------------------------- - ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( String& rStr, xub_StrLen nMinIndex, xub_StrLen nLen, long nPixelWidth, const sal_Int32* pDXArray ) const @@ -6028,8 +5775,6 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( String& rStr, return aLayoutArgs; } -// ----------------------------------------------------------------------- - SalLayout* OutputDevice::ImplLayout( const String& rOrigStr, xub_StrLen nMinIndex, xub_StrLen nLen, @@ -6238,8 +5983,6 @@ SalLayout* OutputDevice::getFallbackFontThatFits(ImplFontEntry &rFallbackFont, return pFallback; } -// ----------------------------------------------------------------------- - SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLayoutArgs& rLayoutArgs ) const { // prepare multi level glyph fallback @@ -6326,8 +6069,6 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay return pSalLayout; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetTextIsRTL( const String& rString, xub_StrLen nIndex, xub_StrLen nLen ) const @@ -6340,8 +6081,6 @@ sal_Bool OutputDevice::GetTextIsRTL( return (nCharPos != nIndex) ? sal_True : sal_False; } -// ----------------------------------------------------------------------- - xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, xub_StrLen nIndex, xub_StrLen nLen, long nCharExtra, sal_Bool /*TODO: bCellBreaking*/ ) const @@ -6374,8 +6113,6 @@ xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, return nRetVal; } -// ----------------------------------------------------------------------- - xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, sal_Unicode nHyphenatorChar, xub_StrLen& rHyphenatorPos, xub_StrLen nIndex, xub_StrLen nLen, @@ -6433,8 +6170,6 @@ xub_StrLen OutputDevice::GetTextBreak( const String& rStr, long nTextWidth, return nRetVal; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, @@ -6705,8 +6440,6 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r } } -// ----------------------------------------------------------------------- - void OutputDevice::AddTextRectActions( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, @@ -6741,8 +6474,6 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect, mpMetaFile = pMtf; } -// ----------------------------------------------------------------------- - void OutputDevice::DrawText( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout* _pTextLayout ) @@ -6788,8 +6519,6 @@ void OutputDevice::DrawText( const Rectangle& rRect, const String& rOrigStr, sal mpAlphaVDev->DrawText( rRect, rOrigStr, nStyle, pVector, pDisplayText ); } -// ----------------------------------------------------------------------- - Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, const XubString& rStr, sal_uInt16 nStyle, TextRectInfo* pInfo, @@ -6908,8 +6637,6 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, return aRect; } -// ----------------------------------------------------------------------- - static sal_Bool ImplIsCharIn( sal_Unicode c, const sal_Char* pStr ) { while ( *pStr ) @@ -6922,8 +6649,6 @@ static sal_Bool ImplIsCharIn( sal_Unicode c, const sal_Char* pStr ) return sal_False; } -// ----------------------------------------------------------------------- - OUString OutputDevice::GetEllipsisString( const String& rOrigStr, long nMaxWidth, sal_uInt16 nStyle ) const { @@ -6932,8 +6657,6 @@ OUString OutputDevice::GetEllipsisString( const String& rOrigStr, long nMaxWidth return ImplGetEllipsisString( *this, rOrigStr, nMaxWidth, nStyle, aTextLayout ); } -// ----------------------------------------------------------------------- - String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, const XubString& rOrigStr, long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ) { @@ -7062,8 +6785,6 @@ String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, c return aStr; } -// ----------------------------------------------------------------------- - void OutputDevice::DrawCtrlText( const Point& rPos, const XubString& rStr, xub_StrLen nIndex, xub_StrLen nLen, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText ) @@ -7194,8 +6915,6 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const XubString& rStr, mpAlphaVDev->DrawCtrlText( rPos, rStr, nIndex, nLen, nStyle, pVector, pDisplayText ); } -// ----------------------------------------------------------------------- - long OutputDevice::GetCtrlTextWidth( const String& rStr, xub_StrLen nIndex, xub_StrLen nLen, sal_uInt16 nStyle ) const @@ -7220,8 +6939,6 @@ long OutputDevice::GetCtrlTextWidth( const String& rStr, return GetTextWidth( rStr, nIndex, nLen ); } -// ----------------------------------------------------------------------- - String OutputDevice::GetNonMnemonicString( const String& rStr, xub_StrLen& rMnemonicPos ) { String aStr = rStr; @@ -7254,8 +6971,6 @@ String OutputDevice::GetNonMnemonicString( const String& rStr, xub_StrLen& rMnem return aStr; } -// ----------------------------------------------------------------------- - int OutputDevice::GetDevFontCount() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7265,8 +6980,6 @@ int OutputDevice::GetDevFontCount() const return mpGetDevFontList->Count(); } -// ----------------------------------------------------------------------- - FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7296,8 +7009,6 @@ FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const return aFontInfo; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::AddTempDevFont( const String& rFileURL, const String& rFontName ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7318,8 +7029,6 @@ sal_Bool OutputDevice::AddTempDevFont( const String& rFileURL, const String& rFo return sal_True; } -// ----------------------------------------------------------------------- - int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7331,8 +7040,6 @@ int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const return mpGetDevSizeList->Count(); } -// ----------------------------------------------------------------------- - Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7365,8 +7072,6 @@ Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const return aSize; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::IsFontAvailable( const String& rFontName ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7375,8 +7080,6 @@ sal_Bool OutputDevice::IsFontAvailable( const String& rFontName ) const return (pFound != NULL); } -// ----------------------------------------------------------------------- - FontMetric OutputDevice::GetFontMetric() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7431,8 +7134,6 @@ FontMetric OutputDevice::GetFontMetric() const return aMetric; } -// ----------------------------------------------------------------------- - FontMetric OutputDevice::GetFontMetric( const Font& rFont ) const { // select font, query metrics, select original font again @@ -7443,8 +7144,6 @@ FontMetric OutputDevice::GetFontMetric( const Font& rFont ) const return aMetric; } -// ----------------------------------------------------------------------- - /** OutputDevice::GetSysFontData * * @param nFallbacklevel Fallback font level (0 = best matching font) @@ -7464,9 +7163,6 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const return aSysFontData; } - -// ----------------------------------------------------------------------- - /** OutputDevice::GetSysTextLayoutData * * @param rStartPt Start point of the text @@ -7531,9 +7227,6 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c return aSysLayoutData; } -// ----------------------------------------------------------------------- - - long OutputDevice::GetMinKashida() const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -7545,7 +7238,6 @@ long OutputDevice::GetMinKashida() const return ImplDevicePixelToLogicWidth( pMetric->mnMinKashida ); } -// ----------------------------------------------------------------------- xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, xub_StrLen nIdx, xub_StrLen nLen, xub_StrLen nKashCount, @@ -7569,8 +7261,6 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, return nDropped; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { @@ -7593,8 +7283,6 @@ sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& r return (nLen == (int)rVector.size()); } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, sal_uLong nLayoutWidth, const sal_Int32* pDXAry ) const @@ -7770,8 +7458,6 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, return sal_False; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const @@ -7999,8 +7685,6 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector return bRet; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const @@ -8022,8 +7706,6 @@ sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, return sal_True; } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const String& rStr, xub_StrLen nBase, xub_StrLen nIndex, xub_StrLen nLen, sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const @@ -8061,8 +7743,6 @@ bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) co return mpGraphics->GetImplFontCapabilities(rFontCapabilities); } -// ----------------------------------------------------------------------- - sal_Bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const { rFontCharMap.Reset(); @@ -8120,8 +7800,6 @@ sal_Bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const return sal_True; } -// ----------------------------------------------------------------------- - xub_StrLen OutputDevice::HasGlyphs( const Font& rTempFont, const String& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { @@ -8153,6 +7831,4 @@ xub_StrLen OutputDevice::HasGlyphs( const Font& rTempFont, const String& rStr, return STRING_LEN; } -// ----------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index f487e808442f..fa4a667fd8c3 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -43,17 +43,9 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -// ----------- -// - Defines - -// ----------- - #define HATCH_MAXPOINTS 1024 #define GRADIENT_DEFAULT_STEPCOUNT 0 -// ---------------- -// - Cmp-Function - -// ---------------- - extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) { const long nX1 = ( (Point*) p1 )->X(); @@ -64,13 +56,9 @@ extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } -// ======================================================================= - DBG_NAMEEX( OutputDevice ) DBG_NAMEEX( Gradient ) -// ======================================================================= - void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) @@ -87,8 +75,6 @@ void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pCl } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly ) { PolyPolygon* pPolyPoly; @@ -146,8 +132,6 @@ void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const Poly delete pPolyPoly; } -// ----------------------------------------------------------------------- - inline sal_uInt8 ImplGetGradientColorValue( long nValue ) { if ( nValue < 0 ) @@ -158,8 +142,6 @@ inline sal_uInt8 ImplGetGradientColorValue( long nValue ) return (sal_uInt8)nValue; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ) @@ -400,8 +382,6 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ) @@ -614,8 +594,6 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, } } -// ----------------------------------------------------------------------- - void OutputDevice::DrawGradient( const Rectangle& rRect, const Gradient& rGradient ) { @@ -744,8 +722,6 @@ void OutputDevice::DrawGradient( const Rectangle& rRect, } } -// ----------------------------------------------------------------------- - void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) { @@ -967,8 +943,6 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, mpAlphaVDev->DrawPolyPolygon( rPolyPoly ); } -// ----------------------------------------------------------------------- - void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& rGradient, GDIMetaFile& rMtf ) { @@ -1011,8 +985,6 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r } } -// ----------------------------------------------------------------------- - void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); @@ -1088,8 +1060,6 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch mpAlphaVDev->DrawHatch( rPolyPoly, rHatch ); } -// ----------------------------------------------------------------------- - void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& rHatch, GDIMetaFile& rMtf ) { @@ -1111,8 +1081,6 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r } } -// ----------------------------------------------------------------------- - void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, sal_Bool bMtf ) { Rectangle aRect( rPolyPoly.GetBoundRect() ); @@ -1162,8 +1130,6 @@ void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHa delete[] pPtBuffer; } -// ----------------------------------------------------------------------- - void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ) { @@ -1272,8 +1238,6 @@ void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, sal_ } } -// ------------------------------------------------------------------------ - void OutputDevice::ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, sal_Bool bMtf ) { diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index bafafd56cd0b..f1ae86514a3a 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -30,10 +30,6 @@ #include <vcl/alpha.hxx> #include <osl/endian.h> -// ----------- -// - Defines - -// ----------- - #define PNGCHUNK_IHDR 0x49484452 #define PNGCHUNK_PLTE 0x504c5445 #define PNGCHUNK_IDAT 0x49444154 @@ -48,11 +44,6 @@ namespace vcl { -// ----------- -// - statics - -// ----------- - -// ------------------------------------------------------------------------------ static const sal_uInt8 mpDefaultColorTable[ 256 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -73,10 +64,6 @@ static const sal_uInt8 mpDefaultColorTable[ 256 ] = 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }; -// ------------- -// - PNGReaderImpl - -// ------------- - class PNGReaderImpl { private: @@ -167,8 +154,6 @@ public: void SetIgnoreGammaChunk( sal_Bool bIgnore ){ mbIgnoreGammaChunk = bIgnore; }; }; -// ------------------------------------------------------------------------------ - PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) : mrPNGStream( rPNGStream ), mpBmp ( NULL ), @@ -216,8 +201,6 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mnPreviewMask = (1 << mnPreviewShift) - 1; } -// ------------------------------------------------------------------------ - PNGReaderImpl::~PNGReaderImpl() { mrPNGStream.SetNumberFormatInt( mnOrigStreamMode ); @@ -237,8 +220,6 @@ PNGReaderImpl::~PNGReaderImpl() delete mpZCodec; } -// ------------------------------------------------------------------------ - bool PNGReaderImpl::ReadNextChunk() { if( maChunkIter == maChunkSeq.end() ) @@ -304,24 +285,18 @@ bool PNGReaderImpl::ReadNextChunk() return true; } -// ------------------------------------------------------------------------ - // read the remaining chunks from mrPNGStream void PNGReaderImpl::ReadRemainingChunks() { while( ReadNextChunk() ) ; } -// ------------------------------------------------------------------------ - const std::vector< vcl::PNGReader::ChunkData >& PNGReaderImpl::GetAllChunks() { ReadRemainingChunks(); return maChunkSeq; } -// ------------------------------------------------------------------------ - BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint ) { // reset to the first chunk @@ -448,8 +423,6 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint ) return aRet; } -// ------------------------------------------------------------------------ - sal_Bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) { if( mnChunkLen < 13 ) @@ -676,8 +649,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) return sal_True; } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplGetGrayPalette( sal_uInt16 nBitDepth ) { if( nBitDepth > 8 ) @@ -697,8 +668,6 @@ void PNGReaderImpl::ImplGetGrayPalette( sal_uInt16 nBitDepth ) mpColorTable[ nStart ], mpColorTable[ nStart ] ) ); } -// ------------------------------------------------------------------------ - sal_Bool PNGReaderImpl::ImplReadPalette() { sal_uInt16 nCount = static_cast<sal_uInt16>( mnChunkLen / 3 ); @@ -722,8 +691,6 @@ sal_Bool PNGReaderImpl::ImplReadPalette() return mbStatus; } -// ------------------------------------------------------------------------ - sal_Bool PNGReaderImpl::ImplReadTransparent() { bool bNeedAlpha = false; @@ -803,8 +770,6 @@ sal_Bool PNGReaderImpl::ImplReadTransparent() return sal_True; } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplGetGamma() { if( mnChunkLen < 4 ) @@ -829,8 +794,6 @@ void PNGReaderImpl::ImplGetGamma() } } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplGetBackground() { switch ( mnColorType ) @@ -877,8 +840,6 @@ void PNGReaderImpl::ImplGetBackground() } } -// ------------------------------------------------------------------------ - // for color type 0 and 4 (greyscale) the return value is always index to the color // 2 and 6 (RGB) the return value is always the 8 bit color component sal_uInt8 PNGReaderImpl::ImplScaleColor() @@ -894,7 +855,6 @@ sal_uInt8 PNGReaderImpl::ImplScaleColor() return (sal_uInt8) nCol; } -// ------------------------------------------------------------------------ // ImplReadIDAT reads as much image data as needed void PNGReaderImpl::ImplReadIDAT() @@ -951,8 +911,6 @@ void PNGReaderImpl::ImplReadIDAT() } } -// --------------------------------------------------------------------------------------------------- - bool PNGReaderImpl::ImplPreparePass() { struct InterlaceParams{ int mnXStart, mnYStart, mnXAdd, mnYAdd; }; @@ -1015,7 +973,6 @@ bool PNGReaderImpl::ImplPreparePass() return true; } -// ---------------------------------------------------------------------------- // ImplApplyFilter writes the complete Scanline (nY) // in interlace mode the parameter nXStart and nXAdd are non-zero @@ -1122,7 +1079,6 @@ void PNGReaderImpl::ImplApplyFilter() memcpy( mpScanPrior, mpInflateInBuf, mnScansize ); } -// --------------------------------------------------------------------------------------------------- // ImplDrawScanlines draws the complete Scanline (nY) into the target bitmap // In interlace mode the parameter nXStart and nXAdd append to the currently used pass @@ -1436,8 +1392,6 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd ) } } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplSetPixel( sal_uInt32 nY, sal_uInt32 nX, const BitmapColor& rBitmapColor ) { // TODO: get preview mode checks out of inner loop @@ -1448,8 +1402,6 @@ void PNGReaderImpl::ImplSetPixel( sal_uInt32 nY, sal_uInt32 nX, const BitmapColo mpAcc->SetPixel( nY, nX, rBitmapColor ); } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplSetPixel( sal_uInt32 nY, sal_uInt32 nX, sal_uInt8 nPalIndex ) { // TODO: get preview mode checks out of inner loop @@ -1460,8 +1412,6 @@ void PNGReaderImpl::ImplSetPixel( sal_uInt32 nY, sal_uInt32 nX, sal_uInt8 nPalIn mpAcc->SetPixel( nY, nX, nPalIndex ); } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplSetTranspPixel( sal_uInt32 nY, sal_uInt32 nX, const BitmapColor& rBitmapColor, sal_Bool bTrans ) { // TODO: get preview mode checks out of inner loop @@ -1477,8 +1427,6 @@ void PNGReaderImpl::ImplSetTranspPixel( sal_uInt32 nY, sal_uInt32 nX, const Bitm mpMaskAcc->SetPixel( nY, nX, mcOpaqueColor ); } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplSetAlphaPixel( sal_uInt32 nY, sal_uInt32 nX, sal_uInt8 nPalIndex, sal_uInt8 nAlpha ) { @@ -1491,8 +1439,6 @@ void PNGReaderImpl::ImplSetAlphaPixel( sal_uInt32 nY, sal_uInt32 nX, mpMaskAcc->SetPixel( nY, nX, ~nAlpha ); } -// ------------------------------------------------------------------------ - void PNGReaderImpl::ImplSetAlphaPixel( sal_uInt32 nY, sal_uInt32 nX, const BitmapColor& rBitmapColor, sal_uInt8 nAlpha ) { @@ -1505,8 +1451,6 @@ void PNGReaderImpl::ImplSetAlphaPixel( sal_uInt32 nY, sal_uInt32 nX, mpMaskAcc->SetPixel( nY, nX, ~nAlpha ); } -// ------------------------------------------------------------------------ - sal_uInt32 PNGReaderImpl::ImplReadsal_uInt32() { sal_uInt32 nRet; @@ -1520,40 +1464,26 @@ sal_uInt32 PNGReaderImpl::ImplReadsal_uInt32() return nRet; } -// ------------------------------------------------------------------------ - -// ------------- -// - PNGReader - -// ------------- - PNGReader::PNGReader( SvStream& rIStm ) : mpImpl( new ::vcl::PNGReaderImpl( rIStm ) ) { } -// ------------------------------------------------------------------------ - PNGReader::~PNGReader() { delete mpImpl; } -// ------------------------------------------------------------------------ - BitmapEx PNGReader::Read( const Size& i_rPreviewSizeHint ) { return mpImpl->GetBitmapEx( i_rPreviewSizeHint ); } -// ------------------------------------------------------------------------ - const std::vector< vcl::PNGReader::ChunkData >& PNGReader::GetChunks() const { return mpImpl->GetAllChunks(); } -// ------------------------------------------------------------------------ - void PNGReader::SetIgnoreGammaChunk( sal_Bool b ) { mpImpl->SetIgnoreGammaChunk( b ); diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 501e7d5214dc..8d204efd5445 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -31,10 +31,6 @@ #include <vcl/alpha.hxx> #include <osl/endian.h> -// ----------- -// - Defines - -// ----------- - #define PNG_DEF_COMPRESSION 6 #define PNGCHUNK_IHDR 0x49484452 @@ -48,9 +44,6 @@ namespace vcl { -// ----------------- -// - PNGWriterImplImpl - -// ----------------- class PNGWriterImpl { @@ -103,8 +96,6 @@ private: void ImplCloseChunk( void ) const; }; -// ------------------------------------------------------------------------ - PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) : mnCompLevel ( PNG_DEF_COMPRESSION ), @@ -239,15 +230,11 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, } } -// ------------------------------------------------------------------------ - PNGWriterImpl::~PNGWriterImpl() { delete mpZCodec; } -// ------------------------------------------------------------------------ - sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) { /* png signature is always an array of 8 bytes */ @@ -279,15 +266,11 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) return mbStatus; } -// ------------------------------------------------------------------------ - std::vector< vcl::PNGWriter::ChunkData >& PNGWriterImpl::GetChunks() { return maChunkSeq; } -// ------------------------------------------------------------------------ - sal_Bool PNGWriterImpl::ImplWriteHeader() { ImplOpenChunk(PNGCHUNK_IHDR); @@ -324,8 +307,6 @@ sal_Bool PNGWriterImpl::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplWritePalette() { const sal_uLong nCount = mpAccess->GetPaletteEntryCount(); @@ -346,8 +327,6 @@ void PNGWriterImpl::ImplWritePalette() delete[] pTempBuf; } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplWriteTransparent () { const sal_uLong nTransIndex = mpAccess->GetBestMatchingColor( BMP_COL_TRANS ); @@ -360,8 +339,6 @@ void PNGWriterImpl::ImplWriteTransparent () ImplCloseChunk(); } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplWritepHYs( const BitmapEx& rBmpEx ) { if ( rBmpEx.GetPrefMapMode() == MAP_100TH_MM ) @@ -381,8 +358,6 @@ void PNGWriterImpl::ImplWritepHYs( const BitmapEx& rBmpEx ) } } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplWriteIDAT () { mnDeflateInSize = mnBitsPerPixel; @@ -472,7 +447,6 @@ void PNGWriterImpl::ImplWriteIDAT () } } -// --------------------------------------------------------------------------------------------------- // ImplGetFilter writes the complete Scanline (nY) - in interlace mode the parameter nXStart and nXAdd // appends to the currently used pass // the complete size of scanline will be returned - in interlace mode zero is possible! @@ -633,24 +607,18 @@ sal_uLong PNGWriterImpl::ImplGetFilter ( sal_uLong nY, sal_uLong nXStart, sal_uL return ( mnDeflateInSize ); } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplClearFirstScanline() { if ( mnFilterType ) memset( mpPreviousScan, 0, mnDeflateInSize ); } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplOpenChunk ( sal_uLong nChunkType ) { maChunkSeq.resize( maChunkSeq.size() + 1 ); maChunkSeq.back().nType = nChunkType; } -// ------------------------------------------------------------------------ - void PNGWriterImpl::ImplWriteChunk ( sal_uInt8 nSource ) { maChunkSeq.back().aData.push_back( nSource ); @@ -676,38 +644,27 @@ void PNGWriterImpl::ImplWriteChunk ( unsigned char* pSource, sal_uInt32 nDatSize } } -// ------------------------------------------------------------------------ // nothing to do void PNGWriterImpl::ImplCloseChunk ( void ) const { } -// ------------- -// - PNGWriter - -// ------------- - PNGWriter::PNGWriter( const BitmapEx& rBmpEx, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) : mpImpl( new ::vcl::PNGWriterImpl( rBmpEx, pFilterData ) ) { } -// ------------------------------------------------------------------------ - PNGWriter::~PNGWriter() { delete mpImpl; } -// ------------------------------------------------------------------------ - sal_Bool PNGWriter::Write( SvStream& rIStm ) { return mpImpl->Write( rIStm ); } -// ------------------------------------------------------------------------ - std::vector< vcl::PNGWriter::ChunkData >& PNGWriter::GetChunks() { return mpImpl->GetChunks(); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index e1fe203b6ca8..0614a1807318 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -39,17 +39,9 @@ #include "pdfwriter_impl.hxx" -// ----------- -// - Defines - -// ----------- - #define MAX_TILE_WIDTH 1024 #define MAX_TILE_HEIGHT 1024 -// --------- -// - Types - -// --------- - typedef ::std::pair< MetaAction*, int > Component; // MetaAction plus index in metafile typedef ::std::list< Component > ComponentList; @@ -74,11 +66,6 @@ struct ConnectedComponents typedef ::std::list< ConnectedComponents > ConnectedComponentsList; - -// ----------- -// - Printer - -// ----------- - /** #i10613# Extracted from Printer::GetPreparedMetaFile. Returns true if given action requires special handling (usually because of transparency) @@ -1358,8 +1345,6 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, return bTransparent; } -// ----------------------------------------------------------------------------- - Bitmap OutputDevice::GetDownsampledBitmap( const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, long nMaxBmpDPIX, long nMaxBmpDPIY ) @@ -1427,8 +1412,6 @@ Bitmap OutputDevice::GetDownsampledBitmap( const Size& rDstSz, return aBmp; } -// ----------------------------------------------------------------------------- - void Printer::DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient ) { const PrinterOptions& rPrinterOptions = GetPrinterOptions(); diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 702470ca1329..79e554e47fab 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -21,17 +21,11 @@ #include <vcl/salbtype.hxx> #include <bmpfast.hxx> -// ----------- -// - Defines - -// ----------- - #define IMPL_CASE_GET_FORMAT( Format ) \ case( BMP_FORMAT##Format ): \ pFncGetPixel = BitmapReadAccess::GetPixelFor##Format; \ break -// ----------------------------------------------------------------------------- - #define IMPL_CASE_SET_FORMAT( Format, BitCount ) \ case( BMP_FORMAT##Format ): \ { \ @@ -40,8 +34,6 @@ case( BMP_FORMAT##Format ): \ } \ break -// ----------------------------------------------------------------------------- - #define DOUBLE_SCANLINES() \ while( ( nActY < nHeight1 ) && ( pMapY[ nActY + 1 ] == nMapY ) ) \ { \ @@ -49,10 +41,6 @@ while( ( nActY < nHeight1 ) && ( pMapY[ nActY + 1 ] == nMapY ) ) nActY++; \ } -// ----------- -// - Inlines - -// ----------- - #define TC_TO_PAL_COLORS 4096 static long ImplIndexFromColor( const BitmapColor& rCol ) @@ -72,10 +60,6 @@ static long ImplIndexFromColor( const BitmapColor& rCol ) #endif } -// ------------------------ -// - conversion functions - -// ------------------------ - static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY ) @@ -108,8 +92,6 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff } } -// ----------------------------------------------------------------------------- - static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY ) @@ -185,8 +167,6 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe } } -// ----------------------------------------------------------------------------- - static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY ) @@ -229,8 +209,6 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer } } -// ----------------------------------------------------------------------------- - static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer, FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel, Scanline* pSrcScanMap, Scanline* pDstScanMap, long* pMapX, long* pMapY ) @@ -272,12 +250,6 @@ static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe delete[] pColToPalMap; } -// ----------------------------------------------------------------------------- - -// --------------------- -// - StretchAndConvert - -// --------------------- - BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, sal_uLong nDstBitmapFormat, BitmapPalette* pDstPal, ColorMask* pDstMask ) { diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index e49fb29184dd..627f2041fbe6 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -31,20 +31,12 @@ #include <math.h> -// ----------- -// - Defines - -// ----------- - #define WHEEL_WIDTH 25 #define WHEEL_RADIUS ((WHEEL_WIDTH) >> 1 ) #define MAX_TIME 300 #define MIN_TIME 20 #define DEF_TIMEOUT 50 -// ------------------- -// - ImplWheelWindow - -// ------------------- - ImplWheelWindow::ImplWheelWindow( Window* pParent ) : FloatingWindow ( pParent, 0 ), mnRepaintTime ( 1UL ), @@ -91,16 +83,12 @@ ImplWheelWindow::ImplWheelWindow( Window* pParent ) : CaptureMouse(); } -// ------------------------------------------------------------------------ - ImplWheelWindow::~ImplWheelWindow() { ImplStop(); delete mpTimer; } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplStop() { ReleaseMouse(); @@ -108,8 +96,6 @@ void ImplWheelWindow::ImplStop() Show(sal_False); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) { Point aPos( GetPointerPosPixel() ); @@ -125,8 +111,6 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) SetWindowRegionPixel( rRegionBmp.CreateRegion( COL_BLACK, aRect ) ); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplCreateImageList() { ResMgr* pResMgr = ImplGetResMgr(); @@ -135,8 +119,6 @@ void ImplWheelWindow::ImplCreateImageList() ( ResId( SV_RESID_BITMAP_SCROLLBMP, *pResMgr ), 6, NULL ); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode ) { if( nWheelMode != mnWheelMode ) @@ -158,8 +140,6 @@ void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode ) } } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplDrawWheel() { sal_uInt16 nId; @@ -179,8 +159,6 @@ void ImplWheelWindow::ImplDrawWheel() DrawImage( Point(), maImgList.GetImage( nId ) ); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::ImplRecalcScrollValues() { if( mnActDist < WHEEL_RADIUS ) @@ -235,8 +213,6 @@ void ImplWheelWindow::ImplRecalcScrollValues() } } -// ------------------------------------------------------------------------ - PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY ) { PointerStyle eStyle; @@ -303,15 +279,11 @@ PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY ) return eStyle; } -// ------------------------------------------------------------------------ - void ImplWheelWindow::Paint( const Rectangle& ) { ImplDrawWheel(); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) { FloatingWindow::MouseMove( rMEvt ); @@ -358,8 +330,6 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_V : WHEELMODE_V ); } -// ------------------------------------------------------------------------ - void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) { if( mnActDist > WHEEL_RADIUS ) @@ -368,8 +338,6 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) FloatingWindow::MouseButtonUp( rMEvt ); } -// ------------------------------------------------------------------------ - IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) { if ( mnActDeltaX || mnActDeltaY ) diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 2b6e7c78ca08..bd6ee20204f0 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -21,10 +21,6 @@ #include <vcl/bitmap.hxx> #include <vcl/image.hxx> -// ----------- -// - Defines - -// ----------- - #define WHEELMODE_NONE 0x00000000UL #define WHEELMODE_VH 0x00000001UL #define WHEELMODE_V 0x00000002UL @@ -33,10 +29,6 @@ #define WHEELMODE_SCROLL_V 0x00000010UL #define WHEELMODE_SCROLL_H 0x00000020UL -// ------------------- -// - ImplWheelWindow - -// ------------------- - class Timer; class ImplWheelWindow : public FloatingWindow |