Skip to content

C
core
Kaydet (Commit) 0cd6947e authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Improve indentation consistency 

Change-Id: I27a692be8d1c3aa10bdf46883fd502491aff4674
üst 40f92a3c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 71 deletions
vcl/inc/salbmp.hxx
Dosyayı görüntüle @ 0cd6947e
...@@ -51,12 +51,11 @@ public: ...@@ -51,12 +51,11 @@ public:
virtual void SetHasAlpha( bool ) { } virtual void SetHasAlpha( bool ) { }
virtual void Destroy() = 0; virtual void Destroy() = 0;
virtual Size GetSize() const = 0; virtual Size GetSize() const = 0;
virtual sal_uInt16 GetBitCount() const = 0; virtual sal_uInt16 GetBitCount() const = 0;
virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) = 0; virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) = 0;
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0; virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0;
virtual bool GetSystemData( BitmapSystemData& rData ) = 0; virtual bool GetSystemData( BitmapSystemData& rData ) = 0;
}; };
#endif #endif
......
vcl/inc/salframe.hxx
Dosyayı görüntüle @ 0cd6947e
This diff is collapsed.
vcl/inc/salgdi.hxx
Dosyayı görüntüle @ 0cd6947e
This diff is collapsed.
vcl/inc/salinst.hxx
Dosyayı görüntüle @ 0cd6947e
...@@ -73,20 +73,21 @@ public: ...@@ -73,20 +73,21 @@ public:
// DisplayName for Unix ??? // DisplayName for Unix ???
virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0; virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0;
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) = 0; virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) = 0;
virtual void DestroyFrame( SalFrame* pFrame ) = 0; virtual void DestroyFrame( SalFrame* pFrame ) = 0;
// Object (System Child Window) // Object (System Child Window)
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ) = 0; virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ) = 0;
virtual void DestroyObject( SalObject* pObject ) = 0; virtual void DestroyObject( SalObject* pObject ) = 0;
// VirtualDevice // VirtualDevice
// nDX and nDY in Pixel // nDX and nDY in pixels
// nBitCount: 0 == Default(=as window) / 1 == Mono // nBitCount: 0 == default(=as window) / 1 == mono
// pData allows for using a system dependent graphics or device context // pData allows for using a system dependent graphics or device context
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice*
long nDX, long nDY, CreateVirtualDevice( SalGraphics* pGraphics,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0; long nDX, long nDY,
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0; sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0;
// Printer // Printer
// pSetupData->mpDriverData can be 0 // pSetupData->mpDriverData can be 0
...@@ -94,38 +95,40 @@ public: ...@@ -94,38 +95,40 @@ public:
// JobSetup // JobSetup
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ) = 0; ImplJobSetup* pSetupData ) = 0;
virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0; virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0;
virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0; virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0;
virtual void DestroyPrinter( SalPrinter* pPrinter ) = 0; virtual void DestroyPrinter( SalPrinter* pPrinter ) = 0;
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0; virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0; virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0; virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
virtual OUString GetDefaultPrinter() = 0; virtual OUString GetDefaultPrinter() = 0;
// SalTimer // SalTimer
virtual SalTimer* CreateSalTimer() = 0; virtual SalTimer* CreateSalTimer() = 0;
// SalI18NImeStatus // SalI18NImeStatus
virtual SalI18NImeStatus* CreateI18NImeStatus() = 0; virtual SalI18NImeStatus*
CreateI18NImeStatus() = 0;
// SalSystem // SalSystem
virtual SalSystem* CreateSalSystem() = 0; virtual SalSystem* CreateSalSystem() = 0;
// SalBitmap // SalBitmap
virtual SalBitmap* CreateSalBitmap() = 0; virtual SalBitmap* CreateSalBitmap() = 0;
// YieldMutex // YieldMutex
virtual osl::SolarMutex* GetYieldMutex() = 0; virtual osl::SolarMutex*
virtual sal_uLong ReleaseYieldMutex() = 0; GetYieldMutex() = 0;
virtual void AcquireYieldMutex( sal_uLong nCount ) = 0; virtual sal_uLong ReleaseYieldMutex() = 0;
virtual void AcquireYieldMutex( sal_uLong nCount ) = 0;
// return true, if yield mutex is owned by this thread, else false // return true, if yield mutex is owned by this thread, else false
virtual bool CheckYieldMutex() = 0; virtual bool CheckYieldMutex() = 0;
// wait next event and dispatch // wait next event and dispatch
// must returned by UserEvent (SalFrame::PostEvent) // must returned by UserEvent (SalFrame::PostEvent)
// and timer // and timer
virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0; virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;
virtual bool AnyInput( sal_uInt16 nType ) = 0; virtual bool AnyInput( sal_uInt16 nType ) = 0;
// Menues // menus
virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pMenu ); virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pMenu );
virtual void DestroyMenu( SalMenu* pMenu); virtual void DestroyMenu( SalMenu* pMenu);
virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData );
...@@ -136,43 +139,47 @@ public: ...@@ -136,43 +139,47 @@ public:
// methods for XDisplayConnection // methods for XDisplayConnection
void SetEventCallback( rtl::Reference< vcl::DisplayConnectionDispatch > const & pInstance ) void SetEventCallback( rtl::Reference< vcl::DisplayConnectionDispatch > const & pInstance )
{ m_pEventInst = pInstance; } { m_pEventInst = pInstance; }
bool CallEventCallback( void* pEvent, int nBytes )
{ return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); } bool CallEventCallback( void* pEvent, int nBytes )
bool CallErrorCallback( void* pEvent, int nBytes ) { return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); }
{ return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); }
bool CallErrorCallback( void* pEvent, int nBytes )
{ return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); }
enum ConnectionIdentifierType { AsciiCString, Blob }; enum ConnectionIdentifierType { AsciiCString, Blob };
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0; virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
// this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_* // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_*
// this is only necessary because PrintFontManager is an exported vcl API and therefore // this is only necessary because PrintFontManager is an exported vcl API and therefore
// needs to be in libvcl while libvclplug_* do not contain exported C++ API // needs to be in libvcl while libvclplug_* do not contain exported C++ API
virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
// dtrans implementation // dtrans implementation
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ); CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource(); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget(); CreateDragSource();
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) = 0; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
CreateDropTarget();
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) = 0;
virtual bool hasNativeFileSelection() const { return false; } virtual bool hasNativeFileSelection() const { return false; }
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
createFilePicker( const com::sun::star::uno::Reference< createFilePicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& ) com::sun::star::uno::XComponentContext >& )
{ return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >(); } { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >(); }
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 > virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
createFolderPicker( const com::sun::star::uno::Reference< createFolderPicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& )
com::sun::star::uno::XComponentContext >& ) { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >(); }
{ return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >(); }
// callbacks for printer updates // callbacks for printer updates
virtual void updatePrinterUpdate() {} virtual void updatePrinterUpdate() {}
virtual void jobStartedPrinterUpdate() {} virtual void jobStartedPrinterUpdate() {}
virtual void jobEndedPrinterUpdate() {} virtual void jobEndedPrinterUpdate() {}
}; };
// called from SVMain // called from SVMain
......
vcl/inc/sallayout.hxx
Dosyayı görüntüle @ 0cd6947e
...@@ -39,10 +39,7 @@ class PhysicalFontFace; ...@@ -39,10 +39,7 @@ class PhysicalFontFace;
#define MAX_FALLBACK 16 #define MAX_FALLBACK 16
// ---------------- // Layout options
// - LayoutOption -
// ----------------
#define SAL_LAYOUT_BIDI_RTL 0x0001 #define SAL_LAYOUT_BIDI_RTL 0x0001
#define SAL_LAYOUT_BIDI_STRONG 0x0002 #define SAL_LAYOUT_BIDI_STRONG 0x0002
#define SAL_LAYOUT_RIGHT_ALIGN 0x0004 #define SAL_LAYOUT_RIGHT_ALIGN 0x0004
...@@ -238,14 +235,14 @@ public: ...@@ -238,14 +235,14 @@ public:
virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual long FillDXArray( sal_Int32* pDXArray ) const;
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos,
int&, sal_Int32* pGlyphAdvAry, int* pCharPosAry ) const; int&, sal_Int32* pGlyphAdvAry, int* pCharPosAry ) const;
virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const; virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const;
// used only by OutputDevice::ImplLayout, TODO: make friend // used only by OutputDevice::ImplLayout, TODO: make friend
explicit MultiSalLayout( SalLayout& rBaseLayout, explicit MultiSalLayout( SalLayout& rBaseLayout,
const PhysicalFontFace* pBaseFont = NULL ); const PhysicalFontFace* pBaseFont = NULL );
virtual bool AddFallback( SalLayout& rFallbackLayout, virtual bool AddFallback( SalLayout& rFallbackLayout,
ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
virtual bool LayoutText( ImplLayoutArgs& ); virtual bool LayoutText( ImplLayoutArgs& );
virtual void AdjustLayout( ImplLayoutArgs& ); virtual void AdjustLayout( ImplLayoutArgs& );
virtual void InitFont() const; virtual void InitFont() const;
......
vcl/inc/salsys.hxx
Dosyayı görüntüle @ 0cd6947e
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
/* Button combinations for ShowNativeMessageBox // Button combinations for ShowNativeMessageBox
*/
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK = 0; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK = 0;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL = 1; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL = 1;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE = 2; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE = 2;
...@@ -33,8 +32,7 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL = 3; ...@@ -33,8 +32,7 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL = 3;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO = 4; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO = 4;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL = 5; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL = 5;
/* Button identifier for ShowNativeMessageBox // Button identifier for ShowNativeMessageBox
*/
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK = 1; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK = 1;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL = 2; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL = 2;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT = 3; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT = 3;
...@@ -43,7 +41,6 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE = 5; ...@@ -43,7 +41,6 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE = 5;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES = 6; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES = 6;
const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO = 7; const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO = 7;
class VCL_PLUGIN_PUBLIC SalSystem class VCL_PLUGIN_PUBLIC SalSystem
{ {
public: public:
......
vcl/inc/salvd.hxx
Dosyayı görüntüle @ 0cd6947e
...@@ -34,21 +34,21 @@ public: // public for Sal Implementation ...@@ -34,21 +34,21 @@ public: // public for Sal Implementation
// SalGraphics or NULL, but two Graphics for all SalVirtualDevices // SalGraphics or NULL, but two Graphics for all SalVirtualDevices
// must be returned // must be returned
virtual SalGraphics* GetGraphics() = 0; virtual SalGraphics* GetGraphics() = 0;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0;
// Set new size, without saving the old contents // Set new size, without saving the old contents
virtual sal_Bool SetSize( long nNewDX, long nNewDY ) = 0; virtual sal_Bool SetSize( long nNewDX, long nNewDY ) = 0;
// Set new size using a buffer at the given address // Set new size using a buffer at the given address
virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ ) virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ )
{ {
// Only the headless virtual device has an implementation that uses pBuffer. // Only the headless virtual device has an implementation that uses pBuffer.
return SetSize( nNewDX, nNewDY ); return SetSize( nNewDX, nNewDY );
} }
/// Get actual VDev size in pixel /// Get actual VDev size in pixel
virtual void GetSize( long& rWidth, long& rHeight ) = 0; virtual void GetSize( long& rWidth, long& rHeight ) = 0;
}; };
#endif // _SV_SALVD_HXX #endif // _SV_SALVD_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment