diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
commit | b817eb954419c818e04432e87af692bc0f53ce18 (patch) | |
tree | 1f51e4435aa74ba91c752831f08caee599ff0d43 /svtools/source/inc | |
parent | 8ade1b264b756914ca121db4379cbbe709b7eb89 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit f4e5c3d6e530c85d1d9be70f2f3b4f5b35d6db80 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:07 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit a7febbdcdc9fd4a80e8357f3812456fc3fa0f39f
Author: Radek Doulik <rodo@novell.com>
Date: Thu Mar 10 15:47:35 2011 +0100
fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long
- before it became big positive long in the called Point::Move
function, moving the drawer under the visible area. so it was
basically signed/unsigned problem in the layouter
svtools/source/toolpanel/drawerlayouter.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-gui_libreoffice-3.3.3.1
Diffstat (limited to 'svtools/source/inc')
-rw-r--r-- | svtools/source/inc/accessibletableimp.hxx | 4 | ||||
-rw-r--r-- | svtools/source/inc/configitems/accessibilityoptions_const.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/filectrl.hrc | 4 | ||||
-rw-r--r-- | svtools/source/inc/gifread.hxx | 110 | ||||
-rw-r--r-- | svtools/source/inc/gradwrap.hxx | 36 | ||||
-rw-r--r-- | svtools/source/inc/iodlg.hrc | 78 | ||||
-rw-r--r-- | svtools/source/inc/jpeg.hxx | 58 | ||||
-rw-r--r-- | svtools/source/inc/msgrd.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/msgwr.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/property.hxx | 472 | ||||
-rw-r--r-- | svtools/source/inc/provider.hxx | 20 | ||||
-rw-r--r-- | svtools/source/inc/renderer.hxx | 24 | ||||
-rw-r--r-- | svtools/source/inc/sgfbram.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/sgffilt.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/sgvmain.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/sgvspln.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/svimpbox.hxx | 438 | ||||
-rw-r--r-- | svtools/source/inc/svimpicn.hxx | 362 | ||||
-rw-r--r-- | svtools/source/inc/svtaccessiblefactory.hxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/unoiface.hxx | 188 | ||||
-rw-r--r-- | svtools/source/inc/xbmread.hxx | 36 | ||||
-rw-r--r-- | svtools/source/inc/xpmread.hxx | 106 |
22 files changed, 976 insertions, 976 deletions
diff --git a/svtools/source/inc/accessibletableimp.hxx b/svtools/source/inc/accessibletableimp.hxx index ffeba9b1deef..45e3ac6faa37 100644 --- a/svtools/source/inc/accessibletableimp.hxx +++ b/svtools/source/inc/accessibletableimp.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace svt { namespace table AccessibleTableControl_Impl() : m_pAccessible(NULL) { } - + /// @see AccessibleTableControl::getTableRowHeader ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svtools/source/inc/configitems/accessibilityoptions_const.hxx b/svtools/source/inc/configitems/accessibilityoptions_const.hxx index 184e5a9850f0..b52ee6e9106a 100644 --- a/svtools/source/inc/configitems/accessibilityoptions_const.hxx +++ b/svtools/source/inc/configitems/accessibilityoptions_const.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc index 1707e306e1b0..acaf450a2126 100644 --- a/svtools/source/inc/filectrl.hrc +++ b/svtools/source/inc/filectrl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #ifndef _SV_FILECTRL_HRC #define _SV_FILECTRL_HRC -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! +#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! #endif diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx index ee42c86b23de..64231b56211c 100644 --- a/svtools/source/inc/gifread.hxx +++ b/svtools/source/inc/gifread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,65 +69,65 @@ class SvStream; class GIFReader : public GraphicReader { - Graphic aImGraphic; - Animation aAnimation; - Bitmap aBmp8; - Bitmap aBmp1; - BitmapPalette aGPalette; - BitmapPalette aLPalette; - SvStream& rIStm; - void* pCallerData; - HPBYTE pSrcBuf; - GIFLZWDecompressor* pDecomp; - BitmapWriteAccess* pAcc8; - BitmapWriteAccess* pAcc1; - long nYAcc; - long nLastPos; - sal_uInt32 nLogWidth100; - sal_uInt32 nLogHeight100; - USHORT nTimer; - USHORT nGlobalWidth; // maximale Bildbreite aus Header - USHORT nGlobalHeight; // maximale Bildhoehe aus Header - USHORT nImageWidth; // maximale Bildbreite aus Header - USHORT nImageHeight; // maximale Bildhoehe aus Header - USHORT nImagePosX; - USHORT nImagePosY; - USHORT nImageX; // maximale Bildbreite aus Header - USHORT nImageY; // maximale Bildhoehe aus Header - USHORT nLastImageY; - USHORT nLastInterCount; - USHORT nLoops; - GIFAction eActAction; - BOOL bStatus; - BOOL bGCTransparent; // Ob das Bild Transparent ist, wenn ja: - BOOL bInterlaced; - BOOL bOverreadBlock; - BOOL bImGraphicReady; - BOOL bGlobalPalette; - BYTE nBackgroundColor; // Hintergrundfarbe - BYTE nGCTransparentIndex; // Pixel von diesem Index sind durchsichtig - BYTE nGCDisposalMethod; // 'Disposal Method' (siehe GIF-Doku) - BYTE cTransIndex1; - BYTE cNonTransIndex1; - - void ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ); - void ClearImageExtensions(); - BOOL CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor ); - BOOL ReadGlobalHeader(); - BOOL ReadExtension(); - BOOL ReadLocalHeader(); - ULONG ReadNextBlock(); - void FillImages( HPBYTE pBytes, ULONG nCount ); - void CreateNewBitmaps(); - BOOL ProcessGIF(); + Graphic aImGraphic; + Animation aAnimation; + Bitmap aBmp8; + Bitmap aBmp1; + BitmapPalette aGPalette; + BitmapPalette aLPalette; + SvStream& rIStm; + void* pCallerData; + HPBYTE pSrcBuf; + GIFLZWDecompressor* pDecomp; + BitmapWriteAccess* pAcc8; + BitmapWriteAccess* pAcc1; + long nYAcc; + long nLastPos; + sal_uInt32 nLogWidth100; + sal_uInt32 nLogHeight100; + USHORT nTimer; + USHORT nGlobalWidth; // maximale Bildbreite aus Header + USHORT nGlobalHeight; // maximale Bildhoehe aus Header + USHORT nImageWidth; // maximale Bildbreite aus Header + USHORT nImageHeight; // maximale Bildhoehe aus Header + USHORT nImagePosX; + USHORT nImagePosY; + USHORT nImageX; // maximale Bildbreite aus Header + USHORT nImageY; // maximale Bildhoehe aus Header + USHORT nLastImageY; + USHORT nLastInterCount; + USHORT nLoops; + GIFAction eActAction; + BOOL bStatus; + BOOL bGCTransparent; // Ob das Bild Transparent ist, wenn ja: + BOOL bInterlaced; + BOOL bOverreadBlock; + BOOL bImGraphicReady; + BOOL bGlobalPalette; + BYTE nBackgroundColor; // Hintergrundfarbe + BYTE nGCTransparentIndex; // Pixel von diesem Index sind durchsichtig + BYTE nGCDisposalMethod; // 'Disposal Method' (siehe GIF-Doku) + BYTE cTransIndex1; + BYTE cNonTransIndex1; + + void ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ); + void ClearImageExtensions(); + BOOL CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor ); + BOOL ReadGlobalHeader(); + BOOL ReadExtension(); + BOOL ReadLocalHeader(); + ULONG ReadNextBlock(); + void FillImages( HPBYTE pBytes, ULONG nCount ); + void CreateNewBitmaps(); + BOOL ProcessGIF(); public: - ReadState ReadGIF( Graphic& rGraphic ); - const Graphic& GetIntermediateGraphic(); + ReadState ReadGIF( Graphic& rGraphic ); + const Graphic& GetIntermediateGraphic(); GIFReader( SvStream& rStm ); - virtual ~GIFReader(); + virtual ~GIFReader(); }; #endif // _GIFPRIVATE diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx index 35b04e833475..b21b9b8c78e8 100644 --- a/svtools/source/inc/gradwrap.hxx +++ b/svtools/source/inc/gradwrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,30 +32,30 @@ /****************************************************************************** |* -|* class GradientWrapper +|* class GradientWrapper |* -|* Ersterstellung: KA 24.11.95 -|* letzte Aenderung: KA 24.11.95 +|* Ersterstellung: KA 24.11.95 +|* letzte Aenderung: KA 24.11.95 |* -|* Zeck: dient beim MetaFile-Export dazu, die eigentliche Berechungs- -|* funktionalitaet zu kapseln. Das Schreiben der Records fuer -|* die unterschiedlichen File-Formate geschieht ueber LinkHandler. +|* Zeck: dient beim MetaFile-Export dazu, die eigentliche Berechungs- +|* funktionalitaet zu kapseln. Das Schreiben der Records fuer +|* die unterschiedlichen File-Formate geschieht ueber LinkHandler. |* -|* Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler -|* zur Verfuegung stellen, die im Ctor uebergeben werden: +|* Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler +|* zur Verfuegung stellen, die im Ctor uebergeben werden: |* -|* 1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe -|* 2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe -|* 3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush +|* 1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe +|* 2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe +|* 3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush |* \******************************************************************************/ class GradientWrapper { - Link aDrawPolyRecordHdl; - Link aDrawPolyPolyRecordHdl; - Link aSetFillInBrushRecordHdl; + Link aDrawPolyRecordHdl; + Link aDrawPolyPolyRecordHdl; + Link aSetFillInBrushRecordHdl; GradientWrapper() {}; @@ -67,11 +67,11 @@ public: ~GradientWrapper(); - void WriteLinearGradient(const Rectangle& rRect, + void WriteLinearGradient(const Rectangle& rRect, const Gradient& rGradient); - void WriteRadialGradient(const Rectangle& rRect, + void WriteRadialGradient(const Rectangle& rRect, const Gradient& rGradient); - void WriteRectGradient(const Rectangle& rRect, + void WriteRectGradient(const Rectangle& rRect, const Gradient& rGradient); }; diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc index e78e3fb687fe..2627a9ae1e26 100644 --- a/svtools/source/inc/iodlg.hrc +++ b/svtools/source/inc/iodlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,43 +34,43 @@ // ModalDialog DLG_SVT_EXPLORERFILE -#define FT_EXPLORERFILE_CURRENTPATH 10 -#define BTN_EXPLORERFILE_NEWFOLDER 11 -#define BTN_EXPLORERFILE_LISTVIEW 12 -#define BTN_EXPLORERFILE_DETAILSVIEW 13 -#define BTN_EXPLORERFILE_UP 14 -#define BTN_EXPLORERFILE_STANDARD 15 -#define BTN_EXPLORERFILE_OPEN 16 -#define BTN_EXPLORERFILE_CANCEL 17 -#define BTN_EXPLORERFILE_HELP 18 - -#define IMG_FILEDLG_BTN_UP 10 -#define IMG_FILEDLG_BTN_STD 11 +#define FT_EXPLORERFILE_CURRENTPATH 10 +#define BTN_EXPLORERFILE_NEWFOLDER 11 +#define BTN_EXPLORERFILE_LISTVIEW 12 +#define BTN_EXPLORERFILE_DETAILSVIEW 13 +#define BTN_EXPLORERFILE_UP 14 +#define BTN_EXPLORERFILE_STANDARD 15 +#define BTN_EXPLORERFILE_OPEN 16 +#define BTN_EXPLORERFILE_CANCEL 17 +#define BTN_EXPLORERFILE_HELP 18 + +#define IMG_FILEDLG_BTN_UP 10 +#define IMG_FILEDLG_BTN_STD 11 #define IMG_FILEDLG_CREATEFOLDER 15 -#define CTL_EXPLORERFILE_FILELIST 20 +#define CTL_EXPLORERFILE_FILELIST 20 -#define FT_EXPLORERFILE_FILENAME 30 -#define ED_EXPLORERFILE_FILENAME 31 -#define FT_EXPLORERFILE_SHARED_LISTBOX 32 -#define LB_EXPLORERFILE_SHARED_LISTBOX 33 -#define FT_EXPLORERFILE_FILETYPE 34 -#define LB_EXPLORERFILE_FILETYPE 35 +#define FT_EXPLORERFILE_FILENAME 30 +#define ED_EXPLORERFILE_FILENAME 31 +#define FT_EXPLORERFILE_SHARED_LISTBOX 32 +#define LB_EXPLORERFILE_SHARED_LISTBOX 33 +#define FT_EXPLORERFILE_FILETYPE 34 +#define LB_EXPLORERFILE_FILETYPE 35 -#define CB_EXPLORERFILE_READONLY 40 -#define CB_EXPLORERFILE_PASSWORD 41 -#define CB_AUTO_EXTENSION 42 -#define CB_OPTIONS 43 +#define CB_EXPLORERFILE_READONLY 40 +#define CB_EXPLORERFILE_PASSWORD 41 +#define CB_AUTO_EXTENSION 42 +#define CB_OPTIONS 43 // ----------------------------------------------- #define STR_EXPLORERFILE_OPEN 1 #define STR_EXPLORERFILE_SAVE 2 -#define STR_EXPLORERFILE_BUTTONSAVE 3 -#define STR_PATHNAME 4 -#define STR_PATHSELECT 5 -#define STR_BUTTONSELECT 6 -#define STR_ACTUALVERSION 7 +#define STR_EXPLORERFILE_BUTTONSAVE 3 +#define STR_PATHNAME 4 +#define STR_PATHSELECT 5 +#define STR_BUTTONSELECT 6 +#define STR_ACTUALVERSION 7 // DLG_SVT_QUERYFOLDERNAME ----------------------- @@ -92,16 +92,16 @@ #define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) #define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) +#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) +#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) +#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) +#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) +#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) +#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) +#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) +#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) +#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) +#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) #endif diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx index 4163354d1416..7560cecaaa95 100644 --- a/svtools/source/inc/jpeg.hxx +++ b/svtools/source/inc/jpeg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,68 +49,68 @@ enum ReadState }; // -------------- -// - JPEGReader - +// - JPEGReader - // -------------- class JPEGReader : public GraphicReader { - SvStream& rIStm; - Bitmap aBmp; - Bitmap aBmp1; - BitmapWriteAccess* pAcc; - BitmapWriteAccess* pAcc1; - void* pBuffer; - long nLastPos; - long nFormerPos; - long nLastLines; + SvStream& rIStm; + Bitmap aBmp; + Bitmap aBmp1; + BitmapWriteAccess* pAcc; + BitmapWriteAccess* pAcc1; + void* pBuffer; + long nLastPos; + long nFormerPos; + long nLastLines; sal_Bool bSetLogSize; - Graphic CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ); - void FillBitmap(); + Graphic CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ); + void FillBitmap(); public: - void* CreateBitmap( void* JPEGCreateBitmapParam ); + void* CreateBitmap( void* JPEGCreateBitmapParam ); public: JPEGReader( SvStream& rStm, void* pCallData, sal_Bool bSetLogSize ); - virtual ~JPEGReader(); + virtual ~JPEGReader(); - ReadState Read( Graphic& rGraphic ); + ReadState Read( Graphic& rGraphic ); }; // -------------- -// - JPEGWriter - +// - JPEGWriter - // -------------- class JPEGWriter { - SvStream& rOStm; - Bitmap aBmp; - BitmapReadAccess* pAcc; - BYTE* pBuffer; - BOOL bNative; - - sal_Bool bGreys; - sal_Int32 nQuality; - + SvStream& rOStm; + Bitmap aBmp; + BitmapReadAccess* pAcc; + BYTE* pBuffer; + BOOL bNative; + + sal_Bool bGreys; + sal_Int32 nQuality; + bool* pExpWasGrey; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; public: - void* GetScanline( long nY ); + void* GetScanline( long nY ); - JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = NULL ); ~JPEGWriter() {}; - BOOL Write( const Graphic& rGraphic ); + BOOL Write( const Graphic& rGraphic ); }; #endif // _JPEGPRIVATE diff --git a/svtools/source/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx index 6b1bc8cb5775..38cff1743dec 100644 --- a/svtools/source/inc/msgrd.hxx +++ b/svtools/source/inc/msgrd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx index 77eeda2b26b9..81536f359d77 100644 --- a/svtools/source/inc/msgwr.hxx +++ b/svtools/source/inc/msgwr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx index e77cbb4ed5e6..7fd8ab4f9adc 100644 --- a/svtools/source/inc/property.hxx +++ b/svtools/source/inc/property.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include <vcl/scrbar.hxx> #include <svl/svarray.hxx> -#ifndef _SVSTDARR_STRINGS +#ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> #endif @@ -67,34 +67,34 @@ public: SvXPropertyControl( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyControl( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0; + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0; - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener()=0; - virtual void SetProperty(const String &rString)=0; - virtual String GetProperty()const=0; - virtual BOOL HasList()=0; - virtual void ClearList()=0; - virtual void InsertEntry( const String& rString, + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener()=0; + virtual void SetProperty(const String &rString)=0; + virtual String GetProperty()const=0; + virtual BOOL HasList()=0; + virtual void ClearList()=0; + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND )=0; - virtual void SetCtrSize(const Size& rSize)=0; - virtual void SetLocked(BOOL bLocked=TRUE)=0; + virtual void SetCtrSize(const Size& rSize)=0; + virtual void SetLocked(BOOL bLocked=TRUE)=0; - virtual void SetMyName(const String &rString)=0; - virtual String GetMyName()const=0; + virtual void SetMyName(const String &rString)=0; + virtual String GetMyName()const=0; - virtual void SetMyData(void*)=0; - virtual void* GetMyData()=0; + virtual void SetMyData(void*)=0; + virtual void* GetMyData()=0; }; class SvXPropertyCtrListener { public: - virtual void Modified (SvXPropertyControl *pSvXPCtr)=0; - virtual void GetFocus (SvXPropertyControl *pSvXPCtr)=0; - virtual void LoseFocus(SvXPropertyControl *pSvXPCtr)=0; - virtual void KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0; + virtual void Modified (SvXPropertyControl *pSvXPCtr)=0; + virtual void GetFocus (SvXPropertyControl *pSvXPCtr)=0; + virtual void LoseFocus(SvXPropertyControl *pSvXPCtr)=0; + virtual void KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0; }; @@ -102,10 +102,10 @@ class SvXPropertyEdit : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - Edit aEdit; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + Edit aEdit; + void* pData; DECL_LINK(ModifiedHdl,Edit*); DECL_LINK(GetFocusHdl,Edit*); @@ -115,26 +115,26 @@ public: SvXPropertyEdit( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyEdit( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; @@ -142,10 +142,10 @@ class SvXPropertyListBox : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - ListBox aListBox; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + ListBox aListBox; + void* pData; DECL_LINK(ModifiedHdl,ListBox*); DECL_LINK(GetFocusHdl,ListBox*); @@ -156,38 +156,38 @@ public: SvXPropertyListBox( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyListBox( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - ListBox* GetListBox(); + ListBox* GetListBox(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; class SvXPropertyComboBox : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - ComboBox aComboBox; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + ComboBox aComboBox; + void* pData; DECL_LINK(ModifiedHdl,ComboBox*); DECL_LINK(GetFocusHdl,ComboBox*); @@ -198,28 +198,28 @@ public: SvXPropertyComboBox( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyComboBox( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - ComboBox* GetComboBox(); + ComboBox* GetComboBox(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; @@ -227,19 +227,19 @@ public: class SvPropertyLine : public Control { private: - FixedText aName; - USHORT nNameWidth; - BOOL bNeedsRepaint; - SvXPropertyControl* pSvXPropertyControl; + FixedText aName; + USHORT nNameWidth; + BOOL bNeedsRepaint; + SvXPropertyControl* pSvXPropertyControl; - PushButton aXButton; - BOOL bIsLocked; - BOOL bHasXButton; - BOOL bIsHyperlink; - eKindOfControl eKindOfCtr; + PushButton aXButton; + BOOL bIsLocked; + BOOL bHasXButton; + BOOL bIsHyperlink; + eKindOfControl eKindOfCtr; protected: - virtual void Resize(); + virtual void Resize(); public: SvPropertyLine( Window* pParent, @@ -247,28 +247,28 @@ public: SvPropertyLine( Window* pParent, const ResId& rResId ); - BOOL NeedsRepaint(); - void SetNeedsRepaint(BOOL bFlag); - void SetSvXPropertyControl(SvXPropertyControl*); - SvXPropertyControl* GetSvXPropertyControl(); + BOOL NeedsRepaint(); + void SetNeedsRepaint(BOOL bFlag); + void SetSvXPropertyControl(SvXPropertyControl*); + SvXPropertyControl* GetSvXPropertyControl(); - void SetKindOfControl(eKindOfControl); - eKindOfControl GetKindOfControl(); + void SetKindOfControl(eKindOfControl); + eKindOfControl GetKindOfControl(); - void SetName(const String& rString ); - String GetName() const; - void SetNameWidth(USHORT); + void SetName(const String& rString ); + String GetName() const; + void SetNameWidth(USHORT); - void ShowXButton(); - void HideXButton(); - BOOL IsVisibleXButton(); - void ShowAsHyperLink(BOOL nFlag=TRUE); - BOOL IsShownAsHyperlink(); + void ShowXButton(); + void HideXButton(); + BOOL IsVisibleXButton(); + void ShowAsHyperLink(BOOL nFlag=TRUE); + BOOL IsShownAsHyperlink(); - void Locked(BOOL nFlag=TRUE); - BOOL IsLineLocked(); + void Locked(BOOL nFlag=TRUE); + BOOL IsLineLocked(); - void SetClickHdl(const Link&); + void SetClickHdl(const Link&); }; @@ -276,16 +276,16 @@ public: class SvPropertyData { public: - eKindOfControl eKind; - String aName; - String aValue; - SvStrings theValues; // ??? - - BOOL bHasVisibleXButton; - BOOL bIsHyperLink; - BOOL bIsLocked; - void* pDataPtr; - SvXPropertyControl* pControl; + eKindOfControl eKind; + String aName; + String aValue; + SvStrings theValues; // ??? + + BOOL bHasVisibleXButton; + BOOL bIsHyperLink; + BOOL bIsLocked; + void* pDataPtr; + SvXPropertyControl* pControl; }; class SvPropertyDataObjectControl @@ -295,59 +295,59 @@ class SvPropertyDataObjectControl class SvPropertyDataControl { public: - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, void* pData)=0; - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, void* pData)=0; - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, void* pData)=0; - virtual void Select( const String& aName, + virtual void Select( const String& aName, void* pData)=0; - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData)=0; }; class SvXPropEvListener: public SvXPropertyCtrListener { - Link aModifyLink; - Link aGetFocusLink; - Link aLoseFocusLink; - Link aKeyInputLink; - String aModifiedResult; + Link aModifyLink; + Link aGetFocusLink; + Link aLoseFocusLink; + Link aKeyInputLink; + String aModifiedResult; - SvXPropertyControl * pTheActiveControl; - KeyCode aKeyCode; + SvXPropertyControl * pTheActiveControl; + KeyCode aKeyCode; public: SvXPropEvListener(); virtual ~SvXPropEvListener(); + + virtual void Modified (SvXPropertyControl *pSvXPCtr); + virtual void GetFocus (SvXPropertyControl *pSvXPCtr); + virtual void LoseFocus(SvXPropertyControl *pSvXPCtr); + virtual void KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&); - virtual void Modified (SvXPropertyControl *pSvXPCtr); - virtual void GetFocus (SvXPropertyControl *pSvXPCtr); - virtual void LoseFocus(SvXPropertyControl *pSvXPCtr); - virtual void KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&); - - SvXPropertyControl * GetPropertyControl(); - KeyCode GetKeyCode() const; + SvXPropertyControl * GetPropertyControl(); + KeyCode GetKeyCode() const; - void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } - const Link& GetModifyHdl() const { return aModifyLink; } + void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } + const Link& GetModifyHdl() const { return aModifyLink; } - void SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; } - const Link& GetGetFocusHdl() const { return aGetFocusLink; } + void SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; } + const Link& GetGetFocusHdl() const { return aGetFocusLink; } - void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; } - const Link& GetLoseFocusHdl() const { return aLoseFocusLink; } + void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; } + const Link& GetLoseFocusHdl() const { return aLoseFocusLink; } - void SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; } - const Link& GetKeyInputHdl() const { return aKeyInputLink; } + void SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; } + const Link& GetKeyInputHdl() const { return aKeyInputLink; } }; @@ -360,18 +360,18 @@ class SvListBoxForProperties: public Control { private: - SvXPropEvListener aListener; - Window aPlayGround; - ScrollBar aVScroll; - SvPropLineArray PLineArray; - SvPropertyDataControl* pPropDataControl; - USHORT nRowHeight; - BOOL bUpdate; - USHORT nTheNameSize; - long nYOffset; + SvXPropEvListener aListener; + Window aPlayGround; + ScrollBar aVScroll; + SvPropLineArray PLineArray; + SvPropertyDataControl* pPropDataControl; + USHORT nRowHeight; + BOOL bUpdate; + USHORT nTheNameSize; + long nYOffset; DECL_LINK( ScrollHdl,ScrollBar*); - DECL_LINK( ClickHdl ,PushButton*); + DECL_LINK( ClickHdl ,PushButton*); DECL_LINK( ModifyHdl,SvXPropEvListener*); DECL_LINK( GetFocusHdl,SvXPropEvListener*); @@ -379,12 +379,12 @@ private: DECL_LINK( KeyInputHdl,SvXPropEvListener*); protected: - void UpdateAll(); - void UpdatePosNSize(); - void UpdatePlayGround(); - void UpdateVScroll(); + void UpdateAll(); + void UpdatePosNSize(); + void UpdatePlayGround(); + void UpdateVScroll(); - void Resize(); + void Resize(); public: SvListBoxForProperties( Window* pParent, WinBits nWinStyle = 0 ); @@ -392,27 +392,27 @@ public: ~SvListBoxForProperties(); - virtual USHORT CalcVisibleLines(); - virtual void EnableUpdate(); - virtual void DisableUpdate(); + virtual USHORT CalcVisibleLines(); + virtual void EnableUpdate(); + virtual void DisableUpdate(); - virtual void SetController(SvPropertyDataControl *); + virtual void SetController(SvPropertyDataControl *); - virtual void Clear(); + virtual void Clear(); - virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); - virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); + virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); - virtual USHORT AppendEntry( const SvPropertyData&); + virtual USHORT AppendEntry( const SvPropertyData&); - virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); + virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); - virtual void SetFirstVisibleEntry(USHORT nPos); - virtual USHORT GetFirstVisibleEntry(); + virtual void SetFirstVisibleEntry(USHORT nPos); + virtual USHORT GetFirstVisibleEntry(); - virtual void SetSelectedEntry(USHORT nPos); - virtual USHORT GetSelectedEntry(); + virtual void SetSelectedEntry(USHORT nPos); + virtual USHORT GetSelectedEntry(); }; class SvTabPageForProperties: public TabPage @@ -420,11 +420,11 @@ class SvTabPageForProperties: public TabPage private: - SvListBoxForProperties aLbProp; + SvListBoxForProperties aLbProp; protected: - virtual void Resize(); + virtual void Resize(); public: SvTabPageForProperties(Window* pParent,WinBits nWinStyle = 0 ); @@ -437,58 +437,58 @@ class SvBasicPropertyDataControl: public SvPropertyDataControl { private: - BOOL bCorrectness; - String aEntryName; - String aEntryProperty; - String aCorrectProperty; - void* pTheData; - Link aModifyLink; - Link aClickedLink; - Link aCommitLink; - Link aSelectLink; + BOOL bCorrectness; + String aEntryName; + String aEntryProperty; + String aCorrectProperty; + void* pTheData; + Link aModifyLink; + Link aClickedLink; + Link aCommitLink; + Link aSelectLink; public: virtual ~SvBasicPropertyDataControl(); - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, - void* pData); //User has modified Property + void* pData); //User has modified Property - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, - void* pData); //Xtension-Button pressed + void* pData); //Xtension-Button pressed - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, - void* pData); //User accept changes + void* pData); //User accept changes - virtual void Select( const String& aName, - void* pData); //User select new Row + virtual void Select( const String& aName, + void* pData); //User select new Row - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData); - virtual void SetIsCorrect(BOOL nFlag); + virtual void SetIsCorrect(BOOL nFlag); - //virtual String GetTheCorrectProperty()const; - virtual void SetTheCorrectProperty(const String& aName); + //virtual String GetTheCorrectProperty()const; + virtual void SetTheCorrectProperty(const String& aName); - String GetName() const; //Tell's the name of the Property - String GetProperty() const; //Tell's the content of the Property - void* GetData(); //Tell's the storage + String GetName() const; //Tell's the name of the Property + String GetProperty() const; //Tell's the content of the Property + void* GetData(); //Tell's the storage - void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } - const Link& GetModifyHdl() const { return aModifyLink; } + void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } + const Link& GetModifyHdl() const { return aModifyLink; } - void SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; } - const Link& GetClickedHdl() const { return aClickedLink; } + void SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; } + const Link& GetClickedHdl() const { return aClickedLink; } - void SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; } - const Link& GetCommitHdl() const { return aCommitLink; } + void SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; } + const Link& GetCommitHdl() const { return aCommitLink; } - void SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; } - const Link& GetSelectHdl() const { return aSelectLink; } + void SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; } + const Link& GetSelectHdl() const { return aSelectLink; } }; @@ -496,42 +496,42 @@ public: class SvPropertyBox: public Control { private: - SvPropertyDataControl* pThePropDataCtr; - TabControl aTabControl; + SvPropertyDataControl* pThePropDataCtr; + TabControl aTabControl; protected: - virtual void Resize(); + virtual void Resize(); public: - SvPropertyBox ( Window* pParent, WinBits nWinStyle = 0 ); - SvPropertyBox ( Window* pParent, const ResId& rResId ); + SvPropertyBox ( Window* pParent, WinBits nWinStyle = 0 ); + SvPropertyBox ( Window* pParent, const ResId& rResId ); ~SvPropertyBox(); - virtual USHORT CalcVisibleLines(); - virtual void EnableUpdate(); // auch IDL? - virtual void DisableUpdate(); // auch IDL? + virtual USHORT CalcVisibleLines(); + virtual void EnableUpdate(); // auch IDL? + virtual void DisableUpdate(); // auch IDL? // AB: Hier beginnt das 'offizielle' Interface, das in IDL uebernommen werden soll - virtual void SetController(SvPropertyDataControl *); + virtual void SetController(SvPropertyDataControl *); - virtual USHORT AppendPage( const String & r ); - virtual void SetPage( USHORT ); - virtual USHORT GetCurPage(); - virtual void ClearAll(); - virtual void ClearTable(); + virtual USHORT AppendPage( const String & r ); + virtual void SetPage( USHORT ); + virtual USHORT GetCurPage(); + virtual void ClearAll(); + virtual void ClearTable(); - virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); + virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); - virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); - virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); - virtual USHORT AppendEntry( const SvPropertyData&); + virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); + virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); + virtual USHORT AppendEntry( const SvPropertyData&); - virtual void SetFirstVisibleEntry(USHORT nPos); - virtual USHORT GetFirstVisibleEntry(); + virtual void SetFirstVisibleEntry(USHORT nPos); + virtual USHORT GetFirstVisibleEntry(); - virtual void SetSelectedEntry(USHORT nPos); - virtual USHORT GetSelectedEntry(); + virtual void SetSelectedEntry(USHORT nPos); + virtual USHORT GetSelectedEntry(); }; @@ -540,30 +540,30 @@ public: class ScPropertyDlg : public ModalDialog { private: - SvBasicPropertyDataControl aBaProDatCtr; - OKButton anOk; - CancelButton aCancel; - USHORT nCount; - USHORT nClickCount; + SvBasicPropertyDataControl aBaProDatCtr; + OKButton anOk; + CancelButton aCancel; + USHORT nCount; + USHORT nClickCount; - SvPropertyData aProperty; - SvPropertyBox aPropListBox; + SvPropertyData aProperty; + SvPropertyBox aPropListBox; - ListBox aKindOfListBox; - FixedText aModAnswer; - FixedText aClickAnswer; - FixedText aCommitAnswer; - FixedText aSelectAnswer; + ListBox aKindOfListBox; + FixedText aModAnswer; + FixedText aClickAnswer; + FixedText aCommitAnswer; + FixedText aSelectAnswer; DECL_LINK( ModifiedHdl, ListBox*); DECL_LINK( RowModifiedHdl, SvBasicPropertyDataControl*); - DECL_LINK( ClickHdl , SvBasicPropertyDataControl*); - DECL_LINK( SelectHdl , SvBasicPropertyDataControl*); - DECL_LINK( CommitHdl , SvBasicPropertyDataControl*); + DECL_LINK( ClickHdl , SvBasicPropertyDataControl*); + DECL_LINK( SelectHdl , SvBasicPropertyDataControl*); + DECL_LINK( CommitHdl , SvBasicPropertyDataControl*); public: - ScPropertyDlg( Window* pParent); + ScPropertyDlg( Window* pParent); ~ScPropertyDlg(); }; */ diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index 0674d8d8ea6c..9dcd6da31690 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,10 +26,10 @@ * ************************************************************************/ -#ifndef _GOODIES_PROVIDER_HXX -#define _GOODIES_PROVIDER_HXX +#ifndef _GOODIES_PROVIDER_HXX +#define _GOODIES_PROVIDER_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/awt/XBitmap.hpp> @@ -45,13 +45,13 @@ namespace unographic { class GraphicProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::graphic::XGraphicProvider > { public: - + GraphicProvider(); ~GraphicProvider(); - + static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: // XServiceInfo @@ -62,12 +62,12 @@ protected: // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - + // XGraphicProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL queryGraphic( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const ::rtl::OUString& rResourceURL ) const; @@ -80,6 +80,6 @@ private: } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index 741d052bf9de..ced679e5a5d3 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _GOODIES_RENDERER_HXX -#define _GOODIES_RENDERER_HXX +#ifndef _GOODIES_RENDERER_HXX +#define _GOODIES_RENDERER_HXX #include <tools/gen.hxx> #include <comphelper/propertysethelper.hxx> @@ -54,13 +54,13 @@ class GraphicRendererVCL : public ::cppu::OWeakAggObject, public ::com::sun::star::graphic::XGraphicRenderer { public: - + GraphicRendererVCL(); ~GraphicRendererVCL() throw(); static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: static ::comphelper::PropertySetInfo* createPropertySetInfo(); @@ -70,7 +70,7 @@ protected: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - + // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -83,21 +83,21 @@ protected: // PropertySetHelper virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); - + // XGraphicRenderer virtual void SAL_CALL render( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic ) throw (::com::sun::star::uno::RuntimeException); private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxDevice; - - OutputDevice* mpOutDev; - Rectangle maDestRect; - ::com::sun::star::uno::Any maRenderData; + + OutputDevice* mpOutDev; + Rectangle maDestRect; + ::com::sun::star::uno::Any maRenderData; }; } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx index d3003e5ba565..d58facdf8565 100644 --- a/svtools/source/inc/sgfbram.hxx +++ b/svtools/source/inc/sgfbram.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx index e21810c6109e..835cddb90c7d 100644 --- a/svtools/source/inc/sgffilt.hxx +++ b/svtools/source/inc/sgffilt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx index 25a4785c9b15..a5175b3fe586 100644 --- a/svtools/source/inc/sgvmain.hxx +++ b/svtools/source/inc/sgvmain.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx index eda6ac628a0d..3e5737c9f0ae 100644 --- a/svtools/source/inc/sgvspln.hxx +++ b/svtools/source/inc/sgvspln.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 7361893532d6..160f84698f48 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,40 +50,40 @@ class TabBar; class ImpLBSelEng : public FunctionSet { - SvImpLBox* pImp; - SelectionEngine* pSelEng; - SvTreeListBox* pView; + SvImpLBox* pImp; + SelectionEngine* pSelEng; + SvTreeListBox* pView; public: ImpLBSelEng( SvImpLBox* pImp, SelectionEngine* pSelEng, SvTreeListBox* pView ); virtual ~ImpLBSelEng(); - void BeginDrag(); - void CreateAnchor(); - void DestroyAnchor(); - BOOL SetCursorAtPoint( const Point& rPoint, + void BeginDrag(); + void CreateAnchor(); + void DestroyAnchor(); + BOOL SetCursorAtPoint( const Point& rPoint, BOOL bDontSelectAtCursor=FALSE ); - BOOL IsSelectionAtPoint( const Point& rPoint ); - void DeselectAtPoint( const Point& rPoint ); - void DeselectAll(); + BOOL IsSelectionAtPoint( const Point& rPoint ); + void DeselectAtPoint( const Point& rPoint ); + void DeselectAll(); }; // Flags fuer nFlag -#define F_VER_SBARSIZE_WITH_HBAR 0x0001 -#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 -#define F_IGNORE_NEXT_MOUSEMOVE 0x0004 // OS/2 only -#define F_IN_SCROLLING 0x0008 -#define F_DESEL_ALL 0x0010 -#define F_START_EDITTIMER 0x0020 // MAC only -#define F_IGNORE_SELECT 0x0040 -#define F_IN_RESIZE 0x0080 -#define F_REMOVED_ENTRY_INVISIBLE 0x0100 -#define F_REMOVED_RECALC_MOST_RIGHT 0x0200 -#define F_IGNORE_CHANGED_TABS 0x0400 -#define F_PAINTED 0x0800 -#define F_IN_PAINT 0x1000 -#define F_ENDSCROLL_SET_VIS_SIZE 0x2000 -#define F_FILLING 0x4000 +#define F_VER_SBARSIZE_WITH_HBAR 0x0001 +#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 +#define F_IGNORE_NEXT_MOUSEMOVE 0x0004 // OS/2 only +#define F_IN_SCROLLING 0x0008 +#define F_DESEL_ALL 0x0010 +#define F_START_EDITTIMER 0x0020 // MAC only +#define F_IGNORE_SELECT 0x0040 +#define F_IN_RESIZE 0x0080 +#define F_REMOVED_ENTRY_INVISIBLE 0x0100 +#define F_REMOVED_RECALC_MOST_RIGHT 0x0200 +#define F_IGNORE_CHANGED_TABS 0x0400 +#define F_PAINTED 0x0800 +#define F_IN_PAINT 0x1000 +#define F_ENDSCROLL_SET_VIS_SIZE 0x2000 +#define F_FILLING 0x4000 class SvImpLBox @@ -91,83 +91,83 @@ class SvImpLBox friend class ImpLBSelEng; friend class SvTreeListBox; private: - SvTreeListBox* pView; - SvLBoxTreeList* pTree; - SvLBoxEntry* pCursor; - SvLBoxEntry* pStartEntry; - SvLBoxEntry* pAnchor; - SvLBoxEntry* pMostRightEntry; - SvLBoxButton* pActiveButton; - SvLBoxEntry* pActiveEntry; - SvLBoxTab* pActiveTab; - TabBar* pTabBar; - - ScrollBar aVerSBar; - ScrollBar aHorSBar; - ScrollBarBox aScrBarBox; + SvTreeListBox* pView; + SvLBoxTreeList* pTree; + SvLBoxEntry* pCursor; + SvLBoxEntry* pStartEntry; + SvLBoxEntry* pAnchor; + SvLBoxEntry* pMostRightEntry; + SvLBoxButton* pActiveButton; + SvLBoxEntry* pActiveEntry; + SvLBoxTab* pActiveTab; + TabBar* pTabBar; + + ScrollBar aVerSBar; + ScrollBar aHorSBar; + ScrollBarBox aScrBarBox; ::svt::AccessibleFactoryAccess m_aFactoryAccess; - static Image* s_pDefCollapsed; - static Image* s_pDefExpanded; - static Image* s_pDefCollapsedHC; - static Image* s_pDefExpandedHC; - static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed + static Image* s_pDefCollapsed; + static Image* s_pDefExpanded; + static Image* s_pDefCollapsedHC; + static Image* s_pDefExpandedHC; + static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed // Node Bitmaps enum ImageType { - itNodeExpanded = 0, // node is expanded ( usually a bitmap showing a minus ) - itNodeCollapsed, // node is collapsed ( usually a bitmap showing a plus ) - itNodeDontKnow, // don't know the node state - itEntryDefExpanded, // default for expanded entries - itEntryDefCollapsed, // default for collapsed entries + itNodeExpanded = 0, // node is expanded ( usually a bitmap showing a minus ) + itNodeCollapsed, // node is collapsed ( usually a bitmap showing a plus ) + itNodeDontKnow, // don't know the node state + itEntryDefExpanded, // default for expanded entries + itEntryDefCollapsed, // default for collapsed entries IT_IMAGE_COUNT }; // all our images - Image m_aNodeAndEntryImages[ IT_IMAGE_COUNT ]; + Image m_aNodeAndEntryImages[ IT_IMAGE_COUNT ]; // plus the high contrast versions - Image m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ]; + Image m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ]; // wg. kompat. hier - Size aOutputSize; - SelectionEngine aSelEng; - ImpLBSelEng aFctSet; - Timer aAsyncBeginDragTimer; - Point aAsyncBeginDragPos; - - long nYoffsNodeBmp; - long nNodeBmpTabDistance; // typisch kleiner 0 - long nNodeBmpWidth; - long nNextVerVisSize; - long nMostRight; - ULONG nVisibleCount; // Anzahl Zeilen im Control - ULONG nCurUserEvent; //-1 == kein Userevent amn Laufen - short nHorSBarHeight, nVerSBarWidth; - USHORT nFlags; - USHORT nCurTabPos; - - WinBits nWinBits; + Size aOutputSize; + SelectionEngine aSelEng; + ImpLBSelEng aFctSet; + Timer aAsyncBeginDragTimer; + Point aAsyncBeginDragPos; + + long nYoffsNodeBmp; + long nNodeBmpTabDistance; // typisch kleiner 0 + long nNodeBmpWidth; + long nNextVerVisSize; + long nMostRight; + ULONG nVisibleCount; // Anzahl Zeilen im Control + ULONG nCurUserEvent; //-1 == kein Userevent amn Laufen + short nHorSBarHeight, nVerSBarWidth; + USHORT nFlags; + USHORT nCurTabPos; + + WinBits nWinBits; ExtendedWinBits nExtendedWinBits; - BOOL bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION - BOOL bUpdateMode : 1; - BOOL bInVScrollHdl : 1; - BOOL bAsyncBeginDrag : 1; - BOOL bSubLstOpRet : 1; // open/close sublist with return/enter, defaulted with FALSE - BOOL bSubLstOpLR : 1; // open/close sublist with cursor left/right, defaulted with FALSE - BOOL bContextMenuHandling : 1; - BOOL bIsCellFocusEnabled : 1; + BOOL bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION + BOOL bUpdateMode : 1; + BOOL bInVScrollHdl : 1; + BOOL bAsyncBeginDrag : 1; + BOOL bSubLstOpRet : 1; // open/close sublist with return/enter, defaulted with FALSE + BOOL bSubLstOpLR : 1; // open/close sublist with cursor left/right, defaulted with FALSE + BOOL bContextMenuHandling : 1; + BOOL bIsCellFocusEnabled : 1; sal_Bool bAreChildrenTransient; - Point aEditClickPos; - Timer aEditTimer; + Point aEditClickPos; + Timer aEditTimer; // #102891# ------------------- - IntlWrapper * pIntlWrapper; + IntlWrapper * pIntlWrapper; // #97680# -------------------- std::vector< short > aContextBmpWidthVector; @@ -176,82 +176,82 @@ private: DECL_LINK( BeginDragHdl, void* ); DECL_LINK( MyUserEvent,void*); - void StopUserEvent(); + void StopUserEvent(); - void InvalidateEntriesFrom( long nY ) const; - void InvalidateEntry( long nY ) const; - void ShowVerSBar(); + void InvalidateEntriesFrom( long nY ) const; + void InvalidateEntry( long nY ) const; + void ShowVerSBar(); // setzt Thumb auf FirstEntryToDraw - void SyncVerThumb(); - BOOL IsLineVisible( long nY ) const; - long GetEntryLine( SvLBoxEntry* pEntry ) const; - void FillView(); - void CursorDown(); - void CursorUp(); - void KeyLeftRight( long nDiff ); - void PageDown( USHORT nDelta ); - void PageUp( USHORT nDelta ); + void SyncVerThumb(); + BOOL IsLineVisible( long nY ) const; + long GetEntryLine( SvLBoxEntry* pEntry ) const; + void FillView(); + void CursorDown(); + void CursorUp(); + void KeyLeftRight( long nDiff ); + void PageDown( USHORT nDelta ); + void PageUp( USHORT nDelta ); - void SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE ); + void SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE ); - void DrawNet(); + void DrawNet(); // ScrollBar-Handler DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); DECL_LINK( EndScrollHdl, ScrollBar * ); - void SetNodeBmpYOffset( const Image& ); - void SetNodeBmpTabDistance(); + void SetNodeBmpYOffset( const Image& ); + void SetNodeBmpTabDistance(); // Selection-Engine - SvLBoxEntry* MakePointVisible( const Point& rPoint, + SvLBoxEntry* MakePointVisible( const Point& rPoint, BOOL bNotifyScroll=TRUE ); - void SetAnchorSelection( SvLBoxEntry* pOld, + void SetAnchorSelection( SvLBoxEntry* pOld, SvLBoxEntry* pNewCursor ); - void BeginDrag(); - BOOL ButtonDownCheckCtrl( const MouseEvent& rMEvt, - SvLBoxEntry* pEntry, long nY ); - BOOL MouseMoveCheckCtrl( const MouseEvent& rMEvt, + void BeginDrag(); + BOOL ButtonDownCheckCtrl( const MouseEvent& rMEvt, + SvLBoxEntry* pEntry, long nY ); + BOOL MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvLBoxEntry* pEntry ); - BOOL ButtonUpCheckCtrl( const MouseEvent& rMEvt ); - BOOL ButtonDownCheckExpand( const MouseEvent&, + BOOL ButtonUpCheckCtrl( const MouseEvent& rMEvt ); + BOOL ButtonDownCheckExpand( const MouseEvent&, SvLBoxEntry*,long nY ); - void PositionScrollBars( Size& rOSize, USHORT nMask ); - USHORT AdjustScrollBars( Size& rSize ); + void PositionScrollBars( Size& rOSize, USHORT nMask ); + USHORT AdjustScrollBars( Size& rSize ); - void BeginScroll(); - void EndScroll(); - BOOL InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;} - Rectangle GetVisibleArea() const; - BOOL EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine); - void InitScrollBarBox(); - SvLBoxTab* NextTab( SvLBoxTab* ); + void BeginScroll(); + void EndScroll(); + BOOL InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;} + Rectangle GetVisibleArea() const; + BOOL EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine); + void InitScrollBarBox(); + SvLBoxTab* NextTab( SvLBoxTab* ); - BOOL SetMostRight( SvLBoxEntry* pEntry ); - void FindMostRight( SvLBoxEntry* EntryToIgnore ); - void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore ); - void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore ); - void NotifyTabsChanged(); + BOOL SetMostRight( SvLBoxEntry* pEntry ); + void FindMostRight( SvLBoxEntry* EntryToIgnore ); + void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore ); + void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore ); + void NotifyTabsChanged(); - inline BOOL IsExpandable() const // if element at cursor can be expanded in general + inline BOOL IsExpandable() const // if element at cursor can be expanded in general { return pCursor->HasChilds() || pCursor->HasChildsOnDemand(); } - inline BOOL IsNowExpandable() const // if element at cursor can be expanded at this moment + inline BOOL IsNowExpandable() const // if element at cursor can be expanded at this moment { return IsExpandable() && !pView->IsExpanded( pCursor ); } - static void implInitDefaultNodeImages(); + static void implInitDefaultNodeImages(); // #102891# ------------------- - void UpdateIntlWrapper(); + void UpdateIntlWrapper(); // #97680# -------------------- - short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ); - void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ); - void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ); + short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ); + void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ); + void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ); - void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ); + void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ); inline sal_Bool AreChildrenTransient() const { return bAreChildrenTransient; } inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; } @@ -260,115 +260,115 @@ public: SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle ); ~SvImpLBox(); - void Clear(); - void SetWindowBits( WinBits nWinStyle ); - void SetExtendedWindowBits( ExtendedWinBits _nBits ); + void Clear(); + void SetWindowBits( WinBits nWinStyle ); + void SetExtendedWindowBits( ExtendedWinBits _nBits ); ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; } - void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} - - void EntryInserted( SvLBoxEntry*); - void RemovingEntry( SvLBoxEntry* pEntry ); - void EntryRemoved(); - void MovingEntry( SvLBoxEntry* pEntry ); - void EntryMoved( SvLBoxEntry* pEntry ); - void TreeInserted( SvLBoxEntry* pEntry ); - - void IndentChanged( short nIndentPixel ); - void EntryExpanded( SvLBoxEntry* pEntry ); - void EntryCollapsed( SvLBoxEntry* pEntry ); - void CollapsingEntry( SvLBoxEntry* pEntry ); - void EntrySelected( SvLBoxEntry*, BOOL bSelect ); - - void Paint( const Rectangle& rRect ); - void RepaintSelectionItems(); - void MouseButtonDown( const MouseEvent& ); - void MouseButtonUp( const MouseEvent& ); - void MouseMove( const MouseEvent&); - BOOL KeyInput( const KeyEvent& ); - void Resize(); - void GetFocus(); - void LoseFocus(); - void UpdateAll( + void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} + + void EntryInserted( SvLBoxEntry*); + void RemovingEntry( SvLBoxEntry* pEntry ); + void EntryRemoved(); + void MovingEntry( SvLBoxEntry* pEntry ); + void EntryMoved( SvLBoxEntry* pEntry ); + void TreeInserted( SvLBoxEntry* pEntry ); + + void IndentChanged( short nIndentPixel ); + void EntryExpanded( SvLBoxEntry* pEntry ); + void EntryCollapsed( SvLBoxEntry* pEntry ); + void CollapsingEntry( SvLBoxEntry* pEntry ); + void EntrySelected( SvLBoxEntry*, BOOL bSelect ); + + void Paint( const Rectangle& rRect ); + void RepaintSelectionItems(); + void MouseButtonDown( const MouseEvent& ); + void MouseButtonUp( const MouseEvent& ); + void MouseMove( const MouseEvent&); + BOOL KeyInput( const KeyEvent& ); + void Resize(); + void GetFocus(); + void LoseFocus(); + void UpdateAll( BOOL bInvalidateCompleteView= TRUE, BOOL bUpdateVerSBar = TRUE ); - void SetEntryHeight( short nHeight ); - void PaintEntry( SvLBoxEntry* pEntry ); - void InvalidateEntry( SvLBoxEntry* ); - void RecalcFocusRect(); - - inline void SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect ); - void SetDragDropMode( DragDropMode eDDMode ); - void SetSelectionMode( SelectionMode eSelMode ); - void SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); } - BOOL IsAddMode() const { return aSelEng.IsAlwaysAdding(); } - - SvLBoxEntry* GetCurrentEntry() const { return pCursor; } - BOOL IsEntryInView( SvLBoxEntry* ) const; - SvLBoxEntry* GetEntry( const Point& rPos ) const; + void SetEntryHeight( short nHeight ); + void PaintEntry( SvLBoxEntry* pEntry ); + void InvalidateEntry( SvLBoxEntry* ); + void RecalcFocusRect(); + + inline void SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect ); + void SetDragDropMode( DragDropMode eDDMode ); + void SetSelectionMode( SelectionMode eSelMode ); + void SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); } + BOOL IsAddMode() const { return aSelEng.IsAlwaysAdding(); } + + SvLBoxEntry* GetCurrentEntry() const { return pCursor; } + BOOL IsEntryInView( SvLBoxEntry* ) const; + SvLBoxEntry* GetEntry( const Point& rPos ) const; // gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag - SvLBoxEntry* GetClickedEntry( const Point& ) const; - SvLBoxEntry* GetCurEntry() const { return pCursor; } - void SetCurEntry( SvLBoxEntry* ); - Point GetEntryPosition( SvLBoxEntry* ) const; - void MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE ); + SvLBoxEntry* GetClickedEntry( const Point& ) const; + SvLBoxEntry* GetCurEntry() const { return pCursor; } + void SetCurEntry( SvLBoxEntry* ); + Point GetEntryPosition( SvLBoxEntry* ) const; + void MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE ); - void PaintDDCursor( SvLBoxEntry* ); + void PaintDDCursor( SvLBoxEntry* ); // Images - inline Image& implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ); - inline Image& implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const; + inline Image& implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ); + inline Image& implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const; - inline void SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); inline const Image& GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; inline const Image& GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; - inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; - inline void SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - const Size& GetOutputSize() const { return aOutputSize;} - void KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE ); - void KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE ); + const Size& GetOutputSize() const { return aOutputSize;} + void KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE ); + void KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE ); bool Command( const CommandEvent& rCEvt ); - void Invalidate(); - void DestroyAnchor() { pAnchor=0; aSelEng.Reset(); } - void SelAllDestrAnch( BOOL bSelect, + void Invalidate(); + void DestroyAnchor() { pAnchor=0; aSelEng.Reset(); } + void SelAllDestrAnch( BOOL bSelect, BOOL bDestroyAnchor = TRUE, BOOL bSingleSelToo = FALSE ); - void ShowCursor( BOOL bShow ); - - BOOL RequestHelp( const HelpEvent& rHEvt ); - void EndSelection(); - BOOL IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const; - void RepaintScrollBars(); - void EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; } - void SetUpdateMode( BOOL ); - void SetUpdateModeFast( BOOL ); - BOOL GetUpdateMode() const { return bUpdateMode; } - Rectangle GetClipRegionRect() const; - BOOL HasHorScrollBar() const { return aHorSBar.IsVisible(); } - void ShowFocusRect( const SvLBoxEntry* pEntry ); - void SetTabBar( TabBar* pTabBar ); - void CancelPendingEdit(); - - void CallEventListeners( ULONG nEvent, void* pData = NULL ); + void ShowCursor( BOOL bShow ); + + BOOL RequestHelp( const HelpEvent& rHEvt ); + void EndSelection(); + BOOL IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const; + void RepaintScrollBars(); + void EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; } + void SetUpdateMode( BOOL ); + void SetUpdateModeFast( BOOL ); + BOOL GetUpdateMode() const { return bUpdateMode; } + Rectangle GetClipRegionRect() const; + BOOL HasHorScrollBar() const { return aHorSBar.IsVisible(); } + void ShowFocusRect( const SvLBoxEntry* pEntry ); + void SetTabBar( TabBar* pTabBar ); + void CancelPendingEdit(); + + void CallEventListeners( ULONG nEvent, void* pData = NULL ); /** Enables, that one cell of a tablistbox entry can be focused */ - inline BOOL IsCellFocusEnabled() const { return bIsCellFocusEnabled; } - inline void EnableCellFocus() { bIsCellFocusEnabled = TRUE; } - bool SetCurrentTabPos( USHORT _nNewPos ); - inline USHORT GetCurrentTabPos() const { return nCurTabPos; } + inline BOOL IsCellFocusEnabled() const { return bIsCellFocusEnabled; } + inline void EnableCellFocus() { bIsCellFocusEnabled = TRUE; } + bool SetCurrentTabPos( USHORT _nNewPos ); + inline USHORT GetCurrentTabPos() const { return nCurTabPos; } - bool IsSelectable( const SvLBoxEntry* pEntry ); + bool IsSelectable( const SvLBoxEntry* pEntry ); }; inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ) @@ -408,7 +408,7 @@ inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg, BmpColorMode _eMo SetNodeBmpYOffset( rImg ); } -inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const +inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const { return implGetImageLocationWithFallback( itNodeDontKnow, _eMode ); } @@ -433,12 +433,12 @@ inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _ implGetImageLocation( itEntryDefCollapsed, _eMode ) = _rImg; } -inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode ) +inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode ) { return implGetImageLocationWithFallback( itEntryDefExpanded, _eMode ); } -inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode ) +inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode ) { return implGetImageLocationWithFallback( itEntryDefCollapsed, _eMode ); } diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx index 8d297e3476db..09427410d5c7 100644 --- a/svtools/source/inc/svimpicn.hxx +++ b/svtools/source/inc/svimpicn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,272 +39,272 @@ class SvImpIconView; class ImpIcnCursor; class SvPtrarr; -#define PAINTFLAG_HOR_CENTERED 0x0001 -#define PAINTFLAG_VER_CENTERED 0x0002 +#define PAINTFLAG_HOR_CENTERED 0x0001 +#define PAINTFLAG_VER_CENTERED 0x0002 -#define SELRECT_BORDER_OFFS -7 +#define SELRECT_BORDER_OFFS -7 // Flags -#define F_VER_SBARSIZE_WITH_HBAR 0x00000001 -#define F_HOR_SBARSIZE_WITH_VBAR 0x00000002 -#define F_IGNORE_NEXT_MOUSEMOVE 0x00000004 // OS/2 only -#define F_ENTRY_REMOVED 0x00000008 +#define F_VER_SBARSIZE_WITH_HBAR 0x00000001 +#define F_HOR_SBARSIZE_WITH_VBAR 0x00000002 +#define F_IGNORE_NEXT_MOUSEMOVE 0x00000004 // OS/2 only +#define F_ENTRY_REMOVED 0x00000008 // ist gesetzt, wenn nach Clear oder Ctor mind. einmal gepaintet wurde -#define F_PAINTED 0x00000010 -#define F_ADD_MODE 0x00000020 -#define F_MOVING_SIBLING 0x00000040 -#define F_SELRECT_VISIBLE 0x00000080 -#define F_CMD_ARRIVED 0x00000100 -#define F_DRAG_SOURCE 0x00000200 -#define F_GRIDMODE 0x00000400 +#define F_PAINTED 0x00000010 +#define F_ADD_MODE 0x00000020 +#define F_MOVING_SIBLING 0x00000040 +#define F_SELRECT_VISIBLE 0x00000080 +#define F_CMD_ARRIVED 0x00000100 +#define F_DRAG_SOURCE 0x00000200 +#define F_GRIDMODE 0x00000400 // beim Einfuegen eines Eintrags ergibt sich dessen Position // durch simples Addieren auf die Position des zuletzt eingefuegten Eintrags -#define F_GRID_INSERT 0x00000800 -#define F_DOWN_CTRL 0x00001000 -#define F_DOWN_DESELECT 0x00002000 +#define F_GRID_INSERT 0x00000800 +#define F_DOWN_CTRL 0x00001000 +#define F_DOWN_DESELECT 0x00002000 // Hack fuer D&D: Hintergrund des Entries nicht painten -#define F_NO_EMPHASIS 0x00004000 +#define F_NO_EMPHASIS 0x00004000 // Selektion per Gummiband -#define F_RUBBERING 0x00008000 -#define F_START_EDITTIMER_IN_MOUSEUP 0x00010000 +#define F_RUBBERING 0x00008000 +#define F_START_EDITTIMER_IN_MOUSEUP 0x00010000 class SvImpIconView { friend class ImpIcnCursor; - ScrollBar aVerSBar; - ScrollBar aHorSBar; - Rectangle aCurSelectionRect; - SvPtrarr aSelectedRectList; - MouseEvent aMouseMoveEvent; - Timer aEditTimer; // fuer Inplace-Editieren - Timer aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion + ScrollBar aVerSBar; + ScrollBar aHorSBar; + Rectangle aCurSelectionRect; + SvPtrarr aSelectedRectList; + MouseEvent aMouseMoveEvent; + Timer aEditTimer; // fuer Inplace-Editieren + Timer aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion // Boundrect des zuletzt eingefuegten Entries - Rectangle aPrevBoundRect; - Size aOutputSize; // Pixel - Size aVirtOutputSize; // expandiert automatisch - Point aDDLastEntryPos; - Point aDDLastRectPos; + Rectangle aPrevBoundRect; + Size aOutputSize; // Pixel + Size aVirtOutputSize; // expandiert automatisch + Point aDDLastEntryPos; + Point aDDLastRectPos; SvLBoxTreeList* pModel; - SvIconView* pView; - ImpIcnCursor* pImpCursor; - long nMaxVirtWidth; // max.breite aVirtOutputSize - SvPtrarr* pZOrderList; - long nGridDX, + SvIconView* pView; + ImpIcnCursor* pImpCursor; + long nMaxVirtWidth; // max.breite aVirtOutputSize + SvPtrarr* pZOrderList; + long nGridDX, nGridDY; - long nHorSBarHeight, + long nHorSBarHeight, nVerSBarWidth; - WinBits nWinBits; - int nViewMode; - long nHorDist; - long nVerDist; - long nMaxBmpWidth; - long nMaxBmpHeight; - long nMaxTextWidth; - long nMaxBoundHeight; // Hoehe des hoechsten BoundRects - ULONG nFlags; - ULONG nCurUserEvent; - SvLBoxEntry* pCurParent; - SvLBoxEntry* pCursor; - SvLBoxEntry* pNextCursor; // wird in MovingEntry gesetzt und ist + WinBits nWinBits; + int nViewMode; + long nHorDist; + long nVerDist; + long nMaxBmpWidth; + long nMaxBmpHeight; + long nMaxTextWidth; + long nMaxBoundHeight; // Hoehe des hoechsten BoundRects + ULONG nFlags; + ULONG nCurUserEvent; + SvLBoxEntry* pCurParent; + SvLBoxEntry* pCursor; + SvLBoxEntry* pNextCursor; // wird in MovingEntry gesetzt und ist // nur in EntryMoved gueltig! - SvLBoxEntry* pDDRefEntry; - VirtualDevice* pDDDev; - VirtualDevice* pDDBufDev; + SvLBoxEntry* pDDRefEntry; + VirtualDevice* pDDDev; + VirtualDevice* pDDBufDev; VirtualDevice* pDDTempDev; SvIconViewTextMode eTextMode; - BOOL bMustRecalcBoundingRects; + BOOL bMustRecalcBoundingRects; - void CheckAllSizes(); - void CheckSizes( SvLBoxEntry* pEntry, + void CheckAllSizes(); + void CheckSizes( SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData = 0 ); - void ShowCursor( BOOL bShow ); + void ShowCursor( BOOL bShow ); - void SetNextEntryPos(const Point& rPos); - Point FindNextEntryPos( const Size& rBoundSize ); - void ImpArrange(); - void AdjustVirtSize( const Rectangle& ); - void ResetVirtSize(); - void CheckScrollBars(); + void SetNextEntryPos(const Point& rPos); + Point FindNextEntryPos( const Size& rBoundSize ); + void ImpArrange(); + void AdjustVirtSize( const Rectangle& ); + void ResetVirtSize(); + void CheckScrollBars(); DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); DECL_LINK( MouseMoveTimeoutHdl, Timer* ); DECL_LINK( EditTimeoutHdl, Timer* ); DECL_LINK( UserEventHdl, void* ); - void AdjustScrollBars(); - void PositionScrollBars( long nRealWidth, long nRealHeight ); - void CalcDocPos( Point& aMousePos ); - BOOL GetResizeRect( Rectangle& ); - void PaintResizeRect( const Rectangle& ); - SvLBoxEntry* GetNewCursor(); - void ToggleSelection( SvLBoxEntry* ); - void DeselectAllBut( SvLBoxEntry* ); - void Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const; - void StopEditTimer() { aEditTimer.Stop(); } - void StartEditTimer() { aEditTimer.Start(); } - void ImpHideDDIcon(); - void ImpDrawXORRect( const Rectangle& rRect ); - void AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS ); - void ClearSelectedRectList(); - Rectangle CalcMaxTextRect( const SvLBoxEntry* pEntry, + void AdjustScrollBars(); + void PositionScrollBars( long nRealWidth, long nRealHeight ); + void CalcDocPos( Point& aMousePos ); + BOOL GetResizeRect( Rectangle& ); + void PaintResizeRect( const Rectangle& ); + SvLBoxEntry* GetNewCursor(); + void ToggleSelection( SvLBoxEntry* ); + void DeselectAllBut( SvLBoxEntry* ); + void Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const; + void StopEditTimer() { aEditTimer.Stop(); } + void StartEditTimer() { aEditTimer.Start(); } + void ImpHideDDIcon(); + void ImpDrawXORRect( const Rectangle& rRect ); + void AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS ); + void ClearSelectedRectList(); + Rectangle CalcMaxTextRect( const SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const; - void ClipAtVirtOutRect( Rectangle& rRect ) const; - void AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 ); - Point AdjustAtGrid( + void ClipAtVirtOutRect( Rectangle& rRect ) const; + void AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 ); + Point AdjustAtGrid( const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect) const Rectangle& rBoundRect ) const; SvIconViewTextMode GetEntryTextModeSmart( const SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const; - BOOL CheckVerScrollBar(); - BOOL CheckHorScrollBar(); - void CancelUserEvent(); + BOOL CheckVerScrollBar(); + BOOL CheckHorScrollBar(); + void CancelUserEvent(); public: SvImpIconView( SvIconView* pView, SvLBoxTreeList*, WinBits nWinStyle ); ~SvImpIconView(); - void Clear( BOOL bInCtor = FALSE ); - void SetWindowBits( WinBits nWinStyle ); - void SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent ) + void Clear( BOOL bInCtor = FALSE ); + void SetWindowBits( WinBits nWinStyle ); + void SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent ) { pModel = pTree; SetCurParent(pParent); } - void EntryInserted( SvLBoxEntry*); - void RemovingEntry( SvLBoxEntry* pEntry ); - void EntryRemoved(); - void MovingEntry( SvLBoxEntry* pEntry ); - void EntryMoved( SvLBoxEntry* pEntry ); - void TreeInserted( SvLBoxEntry* pEntry ); - void ChangedFont(); - void ModelHasEntryInvalidated( SvListEntry* ); - void EntryExpanded( SvLBoxEntry* pEntry ); - void EntryCollapsed( SvLBoxEntry* pEntry ); - void CollapsingEntry( SvLBoxEntry* pEntry ); - void EntrySelected( SvLBoxEntry*, BOOL bSelect ); - - void Paint( const Rectangle& rRect ); - void RepaintSelectionItems(); - void MouseButtonDown( const MouseEvent& ); - void MouseButtonUp( const MouseEvent& ); - void MouseMove( const MouseEvent&); - BOOL KeyInput( const KeyEvent& ); - void Resize(); - void GetFocus(); - void LoseFocus(); - void UpdateAll(); - void PaintEntry( SvLBoxEntry* pEntry, + void EntryInserted( SvLBoxEntry*); + void RemovingEntry( SvLBoxEntry* pEntry ); + void EntryRemoved(); + void MovingEntry( SvLBoxEntry* pEntry ); + void EntryMoved( SvLBoxEntry* pEntry ); + void TreeInserted( SvLBoxEntry* pEntry ); + void ChangedFont(); + void ModelHasEntryInvalidated( SvListEntry* ); + void EntryExpanded( SvLBoxEntry* pEntry ); + void EntryCollapsed( SvLBoxEntry* pEntry ); + void CollapsingEntry( SvLBoxEntry* pEntry ); + void EntrySelected( SvLBoxEntry*, BOOL bSelect ); + + void Paint( const Rectangle& rRect ); + void RepaintSelectionItems(); + void MouseButtonDown( const MouseEvent& ); + void MouseButtonUp( const MouseEvent& ); + void MouseMove( const MouseEvent&); + BOOL KeyInput( const KeyEvent& ); + void Resize(); + void GetFocus(); + void LoseFocus(); + void UpdateAll(); + void PaintEntry( SvLBoxEntry* pEntry, SvIcnVwDataEntry* pViewData = 0 ); - void PaintEntry( SvLBoxEntry*, const Point&, + void PaintEntry( SvLBoxEntry*, const Point&, SvIcnVwDataEntry* pViewData = 0, OutputDevice* pOut = 0); - void SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos, + void SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos, BOOL bAdjustRow = FALSE, BOOL bCheckScrollBars = FALSE ); - void InvalidateEntry( SvLBoxEntry* ); - void ViewDataInitialized( SvLBoxEntry* pEntry ); - SvLBoxItem* GetItem( SvLBoxEntry*, const Point& rAbsPos ); + void InvalidateEntry( SvLBoxEntry* ); + void ViewDataInitialized( SvLBoxEntry* pEntry ); + SvLBoxItem* GetItem( SvLBoxEntry*, const Point& rAbsPos ); - void SetNoSelection(); - void SetDragDropMode( DragDropMode eDDMode ); - void SetSelectionMode( SelectionMode eSelMode ); + void SetNoSelection(); + void SetDragDropMode( DragDropMode eDDMode ); + void SetSelectionMode( SelectionMode eSelMode ); - void SttDrag( const Point& rPos ); - void EndDrag(); + void SttDrag( const Point& rPos ); + void EndDrag(); - SvLBoxEntry* GetCurEntry() const { return pCursor; } - void SetCursor( SvLBoxEntry* ); + SvLBoxEntry* GetCurEntry() const { return pCursor; } + void SetCursor( SvLBoxEntry* ); - BOOL IsEntryInView( SvLBoxEntry* ); - SvLBoxEntry* GetEntry( const Point& rDocPos ); - SvLBoxEntry* GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); - SvLBoxEntry* GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); + BOOL IsEntryInView( SvLBoxEntry* ); + SvLBoxEntry* GetEntry( const Point& rDocPos ); + SvLBoxEntry* GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); + SvLBoxEntry* GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); - Point GetEntryPosition( SvLBoxEntry* ); - void MakeVisible( SvLBoxEntry* pEntry ); + Point GetEntryPosition( SvLBoxEntry* ); + void MakeVisible( SvLBoxEntry* pEntry ); - void Arrange(); + void Arrange(); - void SetSpaceBetweenEntries( long nHor, long Ver ); - long GetHorSpaceBetweenEntries() const { return nHorDist; } - long GetVerSpaceBetweenEntries() const { return nVerDist; } + void SetSpaceBetweenEntries( long nHor, long Ver ); + long GetHorSpaceBetweenEntries() const { return nHorDist; } + long GetVerSpaceBetweenEntries() const { return nVerDist; } - Rectangle CalcFocusRect( SvLBoxEntry* ); + Rectangle CalcFocusRect( SvLBoxEntry* ); - Rectangle CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0, + Rectangle CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0, SvIcnVwDataEntry* pViewData=0 ); - Rectangle CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0, + Rectangle CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0, const Point* pPos = 0, BOOL bForInplaceEdit = FALSE, SvIcnVwDataEntry* pViewData = 0 ); - long CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const; - long CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const; - Size CalcBoundingSize( SvLBoxEntry*, + long CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const; + long CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const; + Size CalcBoundingSize( SvLBoxEntry*, SvIcnVwDataEntry* pViewData = 0 ) const; - void FindBoundingRect( SvLBoxEntry* pEntry, + void FindBoundingRect( SvLBoxEntry* pEntry, SvIcnVwDataEntry* pViewData = 0 ); // berechnet alle BoundRects neu - void RecalcAllBoundingRects(); + void RecalcAllBoundingRects(); // berechnet alle ungueltigen BoundRects neu - void RecalcAllBoundingRectsSmart(); + void RecalcAllBoundingRectsSmart(); const Rectangle& GetBoundingRect( SvLBoxEntry*, SvIcnVwDataEntry* pViewData=0); - void InvalidateBoundingRect( SvLBoxEntry* ); - void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; } - BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } + void InvalidateBoundingRect( SvLBoxEntry* ); + void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; } + BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } - void PaintEmphasis( const Rectangle&, BOOL bSelected, + void PaintEmphasis( const Rectangle&, BOOL bSelected, BOOL bCursored, OutputDevice* pOut = 0 ); - void PaintItem( const Rectangle& rRect, SvLBoxItem* pItem, + void PaintItem( const Rectangle& rRect, SvLBoxItem* pItem, SvLBoxEntry* pEntry, USHORT nPaintFlags, OutputDevice* pOut = 0 ); // berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == TRUE - void CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); } + void CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); } // berechnet alle invalidierten BoundingRects neu - void UpdateBoundingRects(); - void ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow ); - SvLBoxEntry* GetDropTarget( const Point& rPosPixel ); - BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + void UpdateBoundingRects(); + void ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow ); + SvLBoxEntry* GetDropTarget( const Point& rPosPixel ); + BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); - void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); - void ToTop( SvLBoxEntry* ); + void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); + void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); + void ToTop( SvLBoxEntry* ); - void SetCurParent( SvLBoxEntry* pNewParent ); - SvLBoxEntry* GetCurParent() const { return pCurParent; } - USHORT GetSelectionCount() const; - void SetGrid( long nDX, long nDY ); - void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); - const Size& GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*, + void SetCurParent( SvLBoxEntry* pNewParent ); + SvLBoxEntry* GetCurParent() const { return pCurParent; } + USHORT GetSelectionCount() const; + void SetGrid( long nDX, long nDY ); + void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); + const Size& GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*, const SvIcnVwDataEntry* pViewData = 0 ) const; - void PrepareCommandEvent( const Point& rPt ); + void PrepareCommandEvent( const Point& rPt ); - void HideDDIcon(); - void ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); - void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); + void HideDDIcon(); + void ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); + void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); - SvLBoxEntry* mpViewData; + SvLBoxEntry* mpViewData; - BOOL IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const; - void SelectRect( const Rectangle&, BOOL bAdd = TRUE, + BOOL IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const; + void SelectRect( const Rectangle&, BOOL bAdd = TRUE, SvPtrarr* pOtherRects = 0, short nOffs = SELRECT_BORDER_OFFS ); - void DrawSelectionRect( const Rectangle& ); - void HideSelectionRect(); - void CalcScrollOffsets( const Point& rRefPosPixel, + void DrawSelectionRect( const Rectangle& ); + void HideSelectionRect(); + void CalcScrollOffsets( const Point& rRefPosPixel, long& rX, long& rY, BOOL bDragDrop = FALSE, USHORT nBorderWidth = 10 ); - void EndTracking(); - BOOL IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos ); - void MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE); - void AdjustAtGrid( SvLBoxEntry* pStart = 0 ); - void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 ); + void EndTracking(); + BOOL IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos ); + void MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE); + void AdjustAtGrid( SvLBoxEntry* pStart = 0 ); + void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 ); SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0, const SvIcnVwDataEntry* pViewData = 0 ) const; - void ShowFocusRect( const SvLBoxEntry* pEntry ); + void ShowFocusRect( const SvLBoxEntry* pEntry ); }; inline void SvImpIconView::MakeVisible( SvLBoxEntry* pEntry ) diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx index 909f113cbf60..380a06834589 100644 --- a/svtools/source/inc/svtaccessiblefactory.hxx +++ b/svtools/source/inc/svtaccessiblefactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 5b5667aad85e..ab9ba5c6559b 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ namespace com { namespace sun { namespace star { namespace util { class SvNumberFormatsSupplierObj; -// ---------------------------------------------------- -// class VCLXMultiLineEdit -// ---------------------------------------------------- -class VCLXMultiLineEdit : public ::com::sun::star::awt::XTextComponent, - public ::com::sun::star::awt::XTextArea, - public ::com::sun::star::awt::XTextLayoutConstrains, +// ---------------------------------------------------- +// class VCLXMultiLineEdit +// ---------------------------------------------------- +class VCLXMultiLineEdit : public ::com::sun::star::awt::XTextComponent, + public ::com::sun::star::awt::XTextArea, + public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow { private: @@ -74,13 +74,13 @@ public: ~VCLXMultiLineEdit(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -120,29 +120,29 @@ public: }; -// ---------------------------------------------------- -// class VCLXFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFileControl +// ---------------------------------------------------- class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow { protected: - DECL_LINK( ModifyHdl, Edit* ); - TextListenerMultiplexer maTextListeners; + DECL_LINK( ModifyHdl, Edit* ); + TextListenerMultiplexer maTextListeners; public: VCLXFileControl(); ~VCLXFileControl(); - void SetWindow( Window* pWindow ); + void SetWindow( Window* pWindow ); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -173,19 +173,19 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class SVTXFormattedField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXFormattedField +// ---------------------------------------------------- class SVTXFormattedField : public VCLXSpinField { protected: - SvNumberFormatsSupplierObj* m_pCurrentSupplier; - sal_Bool bIsStandardSupplier; + SvNumberFormatsSupplierObj* m_pCurrentSupplier; + sal_Bool bIsStandardSupplier; - sal_Int32 nKeyToSetDelayed; - - FormattedField* GetFormattedField() const { return (FormattedField*)GetWindow(); } + sal_Int32 nKeyToSetDelayed; + + FormattedField* GetFormattedField() const { return (FormattedField*)GetWindow(); } public: SVTXFormattedField(); @@ -197,29 +197,29 @@ public: protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; - void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); - sal_Int32 getFormatKey(void) const; - void setFormatKey(sal_Int32 nKey); + void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); + sal_Int32 getFormatKey(void) const; + void setFormatKey(sal_Int32 nKey); - void SetValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetValue(); + void SetValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetValue(); - void SetTreatAsNumber(sal_Bool bSet); - sal_Bool GetTreatAsNumber(); + void SetTreatAsNumber(sal_Bool bSet); + sal_Bool GetTreatAsNumber(); - void SetDefaultValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetDefaultValue(); + void SetDefaultValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetDefaultValue(); - void SetMinValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetMinValue(); + void SetMinValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetMinValue(); - void SetMaxValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetMaxValue(); + void SetMaxValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetMaxValue(); - void NotifyTextListeners(); - ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); + void NotifyTextListeners(); + ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); - virtual void SetWindow(Window* _pWindow); + virtual void SetWindow(Window* _pWindow); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -227,9 +227,9 @@ protected: -// ---------------------------------------------------- -// class SVTXRoadmap -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXRoadmap +// ---------------------------------------------------- namespace svt { @@ -249,17 +249,17 @@ typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl , ::com::sun::star::awt::XItemEventBroadcaster > SVTXRoadmap_Base; class SVTXRoadmap : public SVTXRoadmap_Base - - + + { private: - ItemListenerMultiplexer maItemListeners; - + ItemListenerMultiplexer maItemListeners; + RMItemData CurRMItemData; RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent ); -protected: - ::svt::ORoadmap* GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); } +protected: + ::svt::ORoadmap* GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); } void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); ~SVTXRoadmap(); @@ -276,8 +276,8 @@ public: // XContainerListener void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); // XItemEventBroadcaster virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); @@ -297,9 +297,9 @@ protected: -// ---------------------------------------------------- -// class SVTXNumericField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXNumericField +// ---------------------------------------------------- class SVTXNumericField : public ::com::sun::star::awt::XNumericField, public SVTXFormattedField { public: @@ -307,13 +307,13 @@ public: ~SVTXNumericField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } - void SAL_CALL release() throw() { SVTXFormattedField::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } + void SAL_CALL release() throw() { SVTXFormattedField::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XNumericField void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException); @@ -337,9 +337,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXCurrencyField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXCurrencyField +// ---------------------------------------------------- class SVTXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public SVTXFormattedField { public: @@ -347,13 +347,13 @@ public: ~SVTXCurrencyField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } - void SAL_CALL release() throw() { SVTXFormattedField::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } + void SAL_CALL release() throw() { SVTXFormattedField::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); @@ -381,40 +381,40 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXProgressBar -// ---------------------------------------------------- -class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar, +// ---------------------------------------------------- +// class VCLXProgressBar +// ---------------------------------------------------- +class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar, public VCLXWindow { private: - sal_Int32 m_nValue; - sal_Int32 m_nValueMin; - sal_Int32 m_nValueMax; + sal_Int32 m_nValue; + sal_Int32 m_nValueMin; + sal_Int32 m_nValueMax; protected: - void ImplUpdateValue(); + void ImplUpdateValue(); public: VCLXProgressBar(); ~VCLXProgressBar(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::XProgressBar + // ::com::sun::star::awt::XProgressBar void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::VclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); @@ -423,9 +423,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class SVTXDateField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXDateField +// ---------------------------------------------------- class SVTXDateField : public VCLXDateField { public: @@ -439,6 +439,6 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -#endif // _SVT_UNOIFACE_HXX +#endif // _SVT_UNOIFACE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx index 030a09a6185e..537c2e98111b 100644 --- a/svtools/source/inc/xbmread.hxx +++ b/svtools/source/inc/xbmread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,30 +57,30 @@ enum ReadState class XBMReader : public GraphicReader { - SvStream& rIStm; - Bitmap aBmp1; - BitmapWriteAccess* pAcc1; - short* pHexTable; - BitmapColor aWhite; - BitmapColor aBlack; - long nLastPos; - long nWidth; - long nHeight; - BOOL bStatus; - - void InitTable(); - ByteString FindTokenLine( SvStream* pInStm, const char* pTok1, + SvStream& rIStm; + Bitmap aBmp1; + BitmapWriteAccess* pAcc1; + short* pHexTable; + BitmapColor aWhite; + BitmapColor aBlack; + long nLastPos; + long nWidth; + long nHeight; + BOOL bStatus; + + void InitTable(); + ByteString FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2 = NULL, const char* pTok3 = NULL ); - long ParseDefine( const sal_Char* pDefine ); - BOOL ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat ); + long ParseDefine( const sal_Char* pDefine ); + BOOL ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat ); public: XBMReader( SvStream& rStm ); - virtual ~XBMReader(); + virtual ~XBMReader(); - ReadState ReadXBM( Graphic& rGraphic ); + ReadState ReadXBM( Graphic& rGraphic ); }; #endif // _XBMPRIVATE diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx index 0ef3d625525a..e81dee92b814 100644 --- a/svtools/source/inc/xpmread.hxx +++ b/svtools/source/inc/xpmread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,24 +33,24 @@ #ifdef _XPMPRIVATE -#define XPMTEMPBUFSIZE 0x00008000 -#define XPMSTRINGBUF 0x00008000 +#define XPMTEMPBUFSIZE 0x00008000 +#define XPMSTRINGBUF 0x00008000 -#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases -#define XPMDEFINITION 0x00000002 // the XPM format consists of -#define XPMVALUES 0x00000003 -#define XPMCOLORS 0x00000004 -#define XPMPIXELS 0x00000005 -#define XPMEXTENSIONS 0x00000006 -#define XPMENDEXT 0x00000007 +#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases +#define XPMDEFINITION 0x00000002 // the XPM format consists of +#define XPMVALUES 0x00000003 +#define XPMCOLORS 0x00000004 +#define XPMPIXELS 0x00000005 +#define XPMEXTENSIONS 0x00000006 +#define XPMENDEXT 0x00000007 -#define XPMREMARK 0x00000001 // defines used by mnStatus -#define XPMDOUBLE 0x00000002 -#define XPMSTRING 0x00000004 -#define XPMFINISHED 0x00000008 +#define XPMREMARK 0x00000001 // defines used by mnStatus +#define XPMDOUBLE 0x00000002 +#define XPMSTRING 0x00000004 +#define XPMFINISHED 0x00000008 -#define XPMCASESENSITIVE 0x00000001 +#define XPMCASESENSITIVE 0x00000001 #define XPMCASENONSENSITIVE 0x00000002 // --------- @@ -75,48 +75,48 @@ class XPMReader : public GraphicReader { private: - SvStream& mrIStm; - Bitmap maBmp; - BitmapWriteAccess* mpAcc; - Bitmap maMaskBmp; - BitmapWriteAccess* mpMaskAcc; - long mnLastPos; - - ULONG mnWidth; - ULONG mnHeight; - ULONG mnColors; - ULONG mnCpp; // characters per pix - BOOL mbTransparent; - BOOL mbStatus; - ULONG mnStatus; - ULONG mnIdentifier; - BYTE mcThisByte; - BYTE mcLastByte; - ULONG mnTempAvail; - BYTE* mpTempBuf; - BYTE* mpTempPtr; - BYTE* mpFastColorTable; - BYTE* mpColMap; - ULONG mnStringSize; - BYTE* mpStringBuf; - ULONG mnParaSize; - BYTE* mpPara; - - BOOL ImplGetString( void ); - BOOL ImplGetColor( ULONG ); - BOOL ImplGetScanLine( ULONG ); - BOOL ImplGetColSub( BYTE* ); - BOOL ImplGetColKey( BYTE ); - void ImplGetRGBHex( BYTE*, ULONG ); - BOOL ImplGetPara( ULONG numb ); - BOOL ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE ); - ULONG ImplGetULONG( ULONG nPara ); + SvStream& mrIStm; + Bitmap maBmp; + BitmapWriteAccess* mpAcc; + Bitmap maMaskBmp; + BitmapWriteAccess* mpMaskAcc; + long mnLastPos; + + ULONG mnWidth; + ULONG mnHeight; + ULONG mnColors; + ULONG mnCpp; // characters per pix + BOOL mbTransparent; + BOOL mbStatus; + ULONG mnStatus; + ULONG mnIdentifier; + BYTE mcThisByte; + BYTE mcLastByte; + ULONG mnTempAvail; + BYTE* mpTempBuf; + BYTE* mpTempPtr; + BYTE* mpFastColorTable; + BYTE* mpColMap; + ULONG mnStringSize; + BYTE* mpStringBuf; + ULONG mnParaSize; + BYTE* mpPara; + + BOOL ImplGetString( void ); + BOOL ImplGetColor( ULONG ); + BOOL ImplGetScanLine( ULONG ); + BOOL ImplGetColSub( BYTE* ); + BOOL ImplGetColKey( BYTE ); + void ImplGetRGBHex( BYTE*, ULONG ); + BOOL ImplGetPara( ULONG numb ); + BOOL ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE ); + ULONG ImplGetULONG( ULONG nPara ); public: XPMReader( SvStream& rStm ); - virtual ~XPMReader(); + virtual ~XPMReader(); - ReadState ReadXPM( Graphic& rGraphic ); + ReadState ReadXPM( Graphic& rGraphic ); }; #endif // _XPMPRIVATE |