vcl/inc/aqua/atsui/salgdi.h | 2 -- vcl/inc/coretext/salgdi.h | 2 -- vcl/inc/headless/svpbmp.hxx | 2 +- vcl/inc/headless/svpframe.hxx | 12 ++++++------ vcl/inc/headless/svpgdi.hxx | 37 ++++++++++++++++++------------------- vcl/inc/headless/svpinst.hxx | 40 +++++++++++++++++++++------------------- vcl/inc/salframe.hxx | 6 ------ vcl/inc/salwtype.hxx | 20 -------------------- 8 files changed, 46 insertions(+), 75 deletions(-)
New commits: commit 1c0ea49edb8b798aa6a18b14a7acf957703f504a Author: Tor Lillqvist <[email protected]> Date: Mon Mar 18 19:28:52 2013 +0200 IsPrinterGraphics() and IsVirDevGraphics() were unused. Change-Id: If5d7bb5c777d3247e3e1a4d39ae1a8f8ba6f4cd8 diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index 44d433c..ddda552 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -143,8 +143,6 @@ public: void updateResolution(); bool IsWindowGraphics() const { return mbWindow; } - bool IsPrinterGraphics() const { return mbPrinter; } - bool IsVirDevGraphics() const { return mbVirDev; } AquaSalFrame* getGraphicsFrame() const { return mpFrame; } void setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; } diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/coretext/salgdi.h index 7ef49d5..c93894a 100644 --- a/vcl/inc/coretext/salgdi.h +++ b/vcl/inc/coretext/salgdi.h @@ -123,8 +123,6 @@ public: void updateResolution(); bool IsWindowGraphics() const { return mbWindow; } - bool IsPrinterGraphics() const { return mbPrinter; } - bool IsVirDevGraphics() const { return mbVirDev; } void ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels commit ebc44be2bdb9e3c849ee6b03e191371f08d086c8 Author: Tor Lillqvist <[email protected]> Date: Mon Mar 18 19:27:01 2013 +0200 Improve indentation and alignment consistency SCNR. Change-Id: I11bcd451eae74ec5eb20e4baa96d308f9eacf01c diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 3891fee..9acc4b0 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -50,7 +50,7 @@ public: bool bMask = false ); virtual void Destroy(); virtual Size GetSize() const; - virtual sal_uInt16 GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ); virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index c48d602..4c073d5 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -77,7 +77,7 @@ public: virtual void SetTitle( const rtl::OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); - virtual void DrawMenuBar(); + virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); @@ -89,7 +89,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual sal_Bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); virtual void StartPresentation( sal_Bool bStart ); virtual void SetAlwaysOnTop( sal_Bool bOnTop ); @@ -102,11 +102,11 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); - virtual const SystemEnvData* GetSystemData() const; + virtual const SystemEnvData* GetSystemData() const; virtual SalPointerState GetPointerState(); virtual SalIndicatorState GetIndicatorState(); virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); @@ -124,7 +124,7 @@ public: /*TODO: functional implementation */ virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } virtual void SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; } - bool IsVisible() { return m_bVisible; } + bool IsVisible() { return m_bVisible; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 90bfb76..fbceb7d 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -73,7 +73,7 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual sal_uInt16 GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); @@ -90,16 +90,16 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ); virtual void SetTextColor( SalColor nSalColor ); - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -108,18 +108,18 @@ public: FontSubsetInfo& rInfo ); virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ); - virtual const void* GetEmbedFontData( const PhysicalFontFace*, - const sal_Ucs* pUnicodes, - sal_Int32* pWidths, - FontSubsetInfo& rInfo, - long* pDataLen ); + virtual const void* GetEmbedFontData( const PhysicalFontFace*, + const sal_Ucs* pUnicodes, + sal_Int32* pWidths, + FontSubsetInfo& rInfo, + long* pDataLen ); virtual void FreeEmbedFontData( const void* pData, long nDataLen ); virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, Ucs2UIntMap& rUnicodeEnc ); - virtual sal_Bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ); - virtual sal_Bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ); + virtual sal_Bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ); + virtual sal_Bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); virtual void DrawServerFontLayout( const ServerFontLayout& ); virtual bool supportsOperation( OutDevSupportType ) const; @@ -128,12 +128,11 @@ public: virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); - virtual bool drawPolyLine( - const ::basegfx::B2DPolygon&, - double fTransparency, - const ::basegfx::B2DVector& rLineWidths, - basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap); + virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, + double fTransparency, + const ::basegfx::B2DVector& rLineWidths, + basegfx::B2DLineJoin, + com::sun::star::drawing::LineCap); virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, @@ -175,10 +174,10 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual SystemGraphicsData GetGraphicsData() const; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; #endif diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 5f4a6e6..176002e 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -32,7 +32,7 @@ #include <list> -#include <time.h> // timeval +#include <time.h> #define VIRTUAL_DESKTOP_WIDTH 1024 #define VIRTUAL_DESKTOP_HEIGHT 768 @@ -52,18 +52,19 @@ public: class SvpSalFrame; class GenPspGraphics; + class SvpSalInstance : public SalGenericInstance { - timeval m_aTimeout; - sal_uLong m_nTimeoutMS; - int m_pTimeoutFDS[2]; + timeval m_aTimeout; + sal_uLong m_nTimeoutMS; + int m_pTimeoutFDS[2]; // internal event queue struct SalUserEvent { const SalFrame* m_pFrame; void* m_pData; - sal_uInt16 m_nEvent; + sal_uInt16 m_nEvent; SalUserEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT ) : m_pFrame( pFrame ), @@ -72,35 +73,36 @@ class SvpSalInstance : public SalGenericInstance {} }; - oslMutex m_aEventGuard; + oslMutex m_aEventGuard; std::list< SalUserEvent > m_aUserEvents; - std::list< SalFrame* > m_aFrames; + std::list< SalFrame* > m_aFrames; - bool isFrameAlive( const SalFrame* pFrame ) const; + bool isFrameAlive( const SalFrame* pFrame ) const; protected: - virtual void DoReleaseYield( int nTimeoutMS ); + virtual void DoReleaseYield( int nTimeoutMS ); public: - static SvpSalInstance* s_pDefaultInstance; + static SvpSalInstance* s_pDefaultInstance; SvpSalInstance( SalYieldMutex *pMutex ); virtual ~SvpSalInstance(); - void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); + void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); - bool PostedEventsInQueue(); + bool PostedEventsInQueue(); - void StartTimer( sal_uLong nMS ); - void StopTimer(); - void Wakeup(); + void StartTimer( sal_uLong nMS ); + void StopTimer(); + void Wakeup(); - void registerFrame( SalFrame* pFrame ) { m_aFrames.push_back( pFrame ); } - void deregisterFrame( SalFrame* pFrame ); - const std::list< SalFrame* >& getFrames() const { return m_aFrames; } + void registerFrame( SalFrame* pFrame ) { m_aFrames.push_back( pFrame ); } + void deregisterFrame( SalFrame* pFrame ); + const std::list< SalFrame* >& + getFrames() const { return m_aFrames; } - bool CheckTimeout( bool bExecuteTimers = true ); + bool CheckTimeout( bool bExecuteTimers = true ); // Frame virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); commit 56396bd6dc63536608561ccb528377dc07023bc2 Author: Tor Lillqvist <[email protected]> Date: Mon Mar 18 19:06:23 2013 +0200 Bin pointless __cplusplus ifdefs Change-Id: I82974eb68e6daf1c6781e2133fd22d7e4e62de82 diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index f69f41a..1132c38 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -23,9 +23,7 @@ #include <tools/solar.h> #include <vcl/dllapi.h> -#ifdef __cplusplus #include <vcl/ptrstyle.hxx> -#endif // __cplusplus #include <salwtype.hxx> #include <salgeom.hxx> @@ -96,8 +94,6 @@ typedef sal_uInt64 SalExtStyle; #define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004) #define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008) -#ifdef __cplusplus - using ::rtl::OUString; using ::rtl::OString; @@ -248,8 +244,6 @@ public: // public for Sal Implementation { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; } }; -#endif // __cplusplus - #endif // _SV_SALFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 7196326..b2c54aa 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -187,8 +187,6 @@ struct SalMouseActivateEvent long mnY; // Y-Position (Pixel, TopLeft-Output) }; -#ifdef __cplusplus - // EXTTEXTINPUT struct SalExtTextInputEvent { @@ -201,8 +199,6 @@ struct SalExtTextInputEvent sal_Bool mbOnlyCursor; // sal_True: Only Cursor-Position has been changed }; -#endif // __cplusplus - // EXTTEXTINPUTPOS struct SalExtTextInputPosEvent { @@ -214,18 +210,12 @@ struct SalExtTextInputPosEvent bool mbVertical; // true if in vertical mode }; -#ifdef __cplusplus - // INPUTCONTEXTCHANGE struct SalInputContextChangeEvent { LanguageType meLanguage; // new language }; -#endif // __cplusplus - -#ifdef __cplusplus - // SURROUNDINGTEXTREQUEST struct SalSurroundingTextRequestEvent { @@ -234,10 +224,6 @@ struct SalSurroundingTextRequestEvent sal_uLong mnEnd; // The end index of selected range }; -#endif // __cplusplus - -#ifdef __cplusplus - // SURROUNDINGTEXTSELECTIONCHANGE struct SalSurroundingTextSelectionChangeEvent { @@ -245,8 +231,6 @@ struct SalSurroundingTextSelectionChangeEvent sal_uLong mnEnd; // The end index of selected range }; -#endif // __cplusplus - // ------------------ // - SalFrame-Types - // ------------------ @@ -318,8 +302,6 @@ struct SalFrameState #define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) #define SAL_INPUTCONTEXT_CHANGELANGUAGE ((sal_uLong)0x00000010) -#ifdef __cplusplus - struct SalInputContext { FontSelectPattern* mpFont; @@ -327,8 +309,6 @@ struct SalInputContext sal_uLong mnOptions; }; -#endif // __cplusplus - typedef void (*SALTIMERPROC)(); #endif // _SV_SALWTYPE_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
