summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/osx/salprn.h2
-rw-r--r--vcl/inc/regband.hxx2
-rw-r--r--vcl/inc/regionband.hxx5
-rw-r--r--vcl/inc/salbmp.hxx3
-rw-r--r--vcl/inc/sallayout.hxx2
-rw-r--r--vcl/inc/salobj.hxx4
-rw-r--r--vcl/inc/salprn.hxx2
-rw-r--r--vcl/inc/textlayout.hxx4
-rw-r--r--vcl/inc/unx/fontmanager.hxx12
-rw-r--r--vcl/inc/unx/genprn.h2
-rw-r--r--vcl/inc/unx/glyphcache.hxx4
-rw-r--r--vcl/inc/unx/i18n_ic.hxx2
-rw-r--r--vcl/inc/unx/i18n_im.hxx4
-rw-r--r--vcl/inc/unx/printergfx.hxx8
-rw-r--r--vcl/inc/unx/printerjob.hxx2
-rw-r--r--vcl/inc/unx/saldisp.hxx5
-rw-r--r--vcl/inc/unx/salframe.h3
-rw-r--r--vcl/inc/unx/salgdi.h2
18 files changed, 29 insertions, 39 deletions
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 03c41f0a7fbd..7522bbc501b6 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -138,7 +138,7 @@ class AquaSalPrinter : public SalPrinter
virtual bool EndJob() override;
virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) override;
- virtual bool EndPage() override;
+ virtual void EndPage() override;
virtual sal_uLong GetErrorCode() override;
private:
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 205626ab2e70..51a62de931b2 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -92,7 +92,7 @@ public:
long GetXRightBoundary() const;
// combine overlapping bands
- bool OptimizeBand();
+ void OptimizeBand();
// generate separations from lines and process
// union with existing separations
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 14606f25a7f7..91a13ebffcbf 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -45,7 +45,6 @@ public:
~RegionBand();
bool operator==( const RegionBand& rRegionBand ) const;
- bool operator!=( const RegionBand& rRegionBand ) const { return !(RegionBand::operator==( rRegionBand )); }
void load(SvStream& rIStrm);
void save(SvStream& rIStrm) const;
@@ -56,8 +55,8 @@ public:
void InsertBand(ImplRegionBand* pPreviousBand, ImplRegionBand* pBandToInsert);
void processPoints();
void CreateBandRange(long nYTop, long nYBottom);
- bool InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId);
- bool InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint, LineType eLineType);
+ void InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId);
+ void InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint, LineType eLineType);
bool OptimizeBandList();
void Move(long nHorzMove, long nVertMove);
void Scale(double fScaleX, double fScaleY);
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 49d26573bceb..f5301f9cbf28 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -72,14 +72,13 @@ public:
virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0;
- bool GetChecksum(ChecksumType& rChecksum) const
+ void GetChecksum(ChecksumType& rChecksum) const
{
updateChecksum();
if (!mbChecksumValid)
rChecksum = 0; // back-compat
else
rChecksum = mnChecksum;
- return mbChecksumValid;
}
void InvalidateChecksum()
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 7907f69e2bf4..b78041fc9ce0 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -247,7 +247,7 @@ public:
// used only by OutputDevice::ImplLayout, TODO: make friend
explicit MultiSalLayout( SalLayout& rBaseLayout,
const PhysicalFontFace* pBaseFont = nullptr );
- bool AddFallback( SalLayout& rFallbackLayout,
+ void AddFallback( SalLayout& rFallbackLayout,
ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
virtual bool LayoutText( ImplLayoutArgs& ) override;
virtual void AdjustLayout( ImplLayoutArgs& ) override;
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 948c36d43367..2a268a2fcf17 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -60,8 +60,8 @@ public:
void SetCallback( void* pInst, SALOBJECTPROC pProc )
{ m_pInst = pInst; m_pCallback = pProc; }
- long CallCallback( sal_uInt16 nEvent, const void* pEvent )
- { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; }
+ void CallCallback( sal_uInt16 nEvent, const void* pEvent )
+ { if (m_pCallback) m_pCallback( m_pInst, this, nEvent, pEvent ); }
void SetMouseTransparent( bool bMouseTransparent )
{ m_bMouseTransparent = bMouseTransparent; }
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 0d688bdc488a..e9ceb2828660 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -108,7 +108,7 @@ public:
virtual bool EndJob() = 0;
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0;
- virtual bool EndPage() = 0;
+ virtual void EndPage() = 0;
virtual sal_uLong GetErrorCode() = 0;
};
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 27cc5f1a0646..bb38a5c14c21 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -34,7 +34,7 @@ namespace vcl
virtual long GetTextWidth( const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength,
MetricVector* _pVector, OUString* _pDisplayText ) = 0;
- virtual bool GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
+ virtual void GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual sal_Int32 GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual bool DecomposeTextRectAction() const = 0;
@@ -66,7 +66,7 @@ namespace vcl
MetricVector* _pVector,
OUString* _pDisplayText ) override;
- virtual bool GetCaretPositions( const OUString& _rText,
+ virtual void GetCaretPositions( const OUString& _rText,
long* _pCaretXArray,
sal_Int32 _nStartIndex,
sal_Int32 _nLength ) const override;
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index a281eb3a5cb7..1fdf273700e3 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -126,8 +126,6 @@ struct CharacterMetric
short int width, height;
CharacterMetric() : width( 0 ), height( 0 ) {}
- bool operator==( const CharacterMetric& rOther ) const
- { return rOther.width == width && rOther.height == height; }
bool operator!=( const CharacterMetric& rOther ) const
{ return rOther.width != width || rOther.height != height; }
};
@@ -399,7 +397,7 @@ public:
int getFontDescend( fontID nFontID ) const;
// get a fonts glyph bounding box
- bool getFontBoundingBox( fontID nFont, int& xMin, int& yMin, int& xMax, int& yMax );
+ void getFontBoundingBox( fontID nFont, int& xMin, int& yMin, int& xMax, int& yMax );
// info whether an array of glyphs has vertical substitutions
void hasVerticalSubstitutions( fontID nFontID, const sal_Unicode* pCharacters,
@@ -492,15 +490,11 @@ public:
if <code>rLocal</code> contains non empty strings the corresponding
locale will be used for font matching also; e.g. "Sans" can result
in different fonts in e.g. english and japanese
-
- @returns
- true if a match was found
- false else
*/
- bool matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale );
+ void matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale );
static FontConfigFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*));
- bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes );
+ void Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes );
};
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index 5fee250958a3..2479dd755193 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -87,7 +87,7 @@ public:
vcl::PrinterController& i_rController ) override;
virtual bool EndJob() override;
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override;
- virtual bool EndPage() override;
+ virtual void EndPage() override;
virtual sal_uIntPtr GetErrorCode() override;
};
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index f73c87b764c3..1a7429dffafe 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -199,8 +199,8 @@ private:
void GarbageCollect( long );
void ReleaseFromGarbageCollect();
- int ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_*, bool ) const;
- bool ApplyGSUB( const FontSelectPattern& );
+ void ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_*, bool ) const;
+ void ApplyGSUB( const FontSelectPattern& );
ServerFontLayoutEngine* GetLayoutEngine();
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 62a4d9ea33c4..4410d58590ff 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -67,7 +67,7 @@ public:
void HandleDestroyIM();
void EndExtTextInput( EndExtTextInputFlags nFlags ); // unused
- int CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
+ void CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
int UpdateSpotLocation();
void Map( SalFrame *pFrame );
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 3fee4c1a617d..b081a55622ce 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -38,9 +38,9 @@ public:
bool UseMethod() { return mbUseable; }
XIM GetMethod() { return maMethod; }
void HandleDestroyIM();
- bool CreateMethod( Display *pDisplay );
+ void CreateMethod( Display *pDisplay );
XIMStyles *GetSupportedStyles() { return mpStyles; }
- bool SetLocale( const char* pLocale = "" );
+ void SetLocale( const char* pLocale = "" );
bool FilterEvent( XEvent *pEvent, ::Window window );
SalI18N_InputMethod();
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index e6eec88e53ab..e820cd729eb7 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -287,7 +287,7 @@ public:
void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts );
PrintFontManager& GetFontMgr () { return mrFontMgr; }
- bool drawVerticalizedText (const Point& rPoint,
+ void drawVerticalizedText (const Point& rPoint,
const sal_Unicode* pStr,
sal_Int16 nLen,
const sal_Int32* pDeltaArray );
@@ -303,8 +303,8 @@ public:
public:
PrinterGfx();
~PrinterGfx();
- bool Init (PrinterJob &rPrinterSpec);
- bool Init (const JobData& rData);
+ void Init (PrinterJob &rPrinterSpec);
+ void Init (const JobData& rData);
void Clear();
// query depth
@@ -313,7 +313,7 @@ public:
// clip region
void ResetClipRegion ();
void BeginSetClipRegion (sal_uInt32);
- bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY,
+ void UnionClipRegion (sal_Int32 nX, sal_Int32 nY,
sal_Int32 nDX, sal_Int32 nDY);
void EndSetClipRegion ();
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index c3738a5c3bef..111e7379ef6c 100644
--- a/vcl/inc/unx/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
@@ -119,7 +119,7 @@ public:
);
bool EndJob ();
- bool StartPage (const JobData& rJobSetup);
+ void StartPage (const JobData& rJobSetup);
bool EndPage ();
};
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index bee66fd8416c..1207fa3bfe3a 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -267,7 +267,7 @@ protected:
void InitXinerama();
void InitRandR( ::Window aRoot ) const;
void DeInitRandR();
- int processRandREvent( XEvent* );
+ void processRandREvent( XEvent* );
void doDestruct();
void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight );
@@ -332,7 +332,6 @@ public:
Time GetLastUserEventTime( bool bAlwaysReget = false ) const;
bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const;
- SalXLib* GetXLib() const { return pXLib_; }
SalI18N_InputMethod* GetInputMethod() const { return mpInputMethod; }
SalI18N_KeyboardExtension* GetKbdExtension() const { return mpKbdExtension; }
@@ -365,7 +364,7 @@ public:
virtual ~SalX11Display();
virtual bool Dispatch( XEvent *pEvent ) override;
- virtual bool Yield();
+ virtual void Yield();
virtual void PostUserEvent() override;
bool IsEvent();
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 9ba19574cbbf..94de1ca4369d 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -181,8 +181,7 @@ public:
::Window GetShellWindow() const { return mhShellWindow; }
::Window GetForeignParent() const { return mhForeignParent; }
::Window GetStackingWindow() const { return mhStackingWindow; }
- long Close() const { return CallCallback( SALEVENT_CLOSE, NULL ); }
- SalFrameStyleFlags GetStyle() const { return nStyle_; }
+ void Close() const { CallCallback( SALEVENT_CLOSE, NULL ); }
Cursor GetCursor() const { return hCursor_; }
bool IsCaptured() const { return nCaptured_ == 1; }
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index a8bbb044802a..d2cee20f7028 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -268,7 +268,7 @@ public:
ControlCacheKey& aControlCacheKey);
// fill a pixmap from a screen region
- bool FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY );
+ void FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY );
// render a pixmap to the screen
bool RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY );