[Libreoffice-commits] core.git: 2 commits - cui/source include/svx svx/source vcl/inc vcl/osx vcl/source vcl/unx
Miklos Vajna
vmiklos at collabora.co.uk
Mon Jan 18 00:40:10 PST 2016
cui/source/tabpages/connect.cxx | 2
include/svx/connctrl.hxx | 2
svx/source/dialog/connctrl.cxx | 2
vcl/inc/osx/salprn.h | 2
vcl/inc/regband.hxx | 2
vcl/inc/regionband.hxx | 5 -
vcl/inc/salbmp.hxx | 3 -
vcl/inc/sallayout.hxx | 2
vcl/inc/salobj.hxx | 4 -
vcl/inc/salprn.hxx | 2
vcl/inc/textlayout.hxx | 4 -
vcl/inc/unx/fontmanager.hxx | 12 +---
vcl/inc/unx/genprn.h | 2
vcl/inc/unx/glyphcache.hxx | 4 -
vcl/inc/unx/i18n_ic.hxx | 2
vcl/inc/unx/i18n_im.hxx | 4 -
vcl/inc/unx/printergfx.hxx | 8 +--
vcl/inc/unx/printerjob.hxx | 2
vcl/inc/unx/saldisp.hxx | 5 -
vcl/inc/unx/salframe.h | 3 -
vcl/inc/unx/salgdi.h | 2
vcl/osx/salprn.cxx | 4 -
vcl/source/edit/textdat2.hxx | 6 --
vcl/source/edit/textdoc.cxx | 4 -
vcl/source/edit/textdoc.hxx | 2
vcl/source/filter/FilterConfigCache.cxx | 10 ---
vcl/source/filter/FilterConfigCache.hxx | 3 -
vcl/source/filter/igif/gifread.cxx | 6 --
vcl/source/filter/igif/gifread.hxx | 2
vcl/source/filter/jpeg/Exif.cxx | 9 +--
vcl/source/filter/jpeg/Exif.hxx | 4 -
vcl/source/filter/jpeg/JpegTransform.cxx | 5 -
vcl/source/filter/jpeg/JpegTransform.hxx | 2
vcl/source/filter/wmf/winmtf.cxx | 3 -
vcl/source/filter/wmf/winmtf.hxx | 19 -------
vcl/source/filter/wmf/winwmf.cxx | 4 -
vcl/source/fontsubset/cff.cxx | 11 +---
vcl/source/gdi/pdffontcache.hxx | 7 --
vcl/source/gdi/pdfwriter_impl.cxx | 63 +++++++++++--------------
vcl/source/gdi/pdfwriter_impl.hxx | 8 +--
vcl/source/gdi/regband.cxx | 4 -
vcl/source/gdi/regionband.cxx | 16 ++----
vcl/source/gdi/sallayout.cxx | 5 -
vcl/source/gdi/textlayout.cxx | 15 ++---
vcl/unx/generic/app/i18n_ic.cxx | 6 --
vcl/unx/generic/app/i18n_im.cxx | 8 ---
vcl/unx/generic/app/randrwrapper.cxx | 9 +--
vcl/unx/generic/app/saldisp.cxx | 8 +--
vcl/unx/generic/fontmanager/fontconfig.cxx | 11 +---
vcl/unx/generic/fontmanager/fontmanager.cxx | 5 -
vcl/unx/generic/gdi/salgdi2.cxx | 4 -
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 16 ++----
vcl/unx/generic/print/common_gfx.cxx | 11 +---
vcl/unx/generic/print/genprnpsp.cxx | 5 -
vcl/unx/generic/print/glyphset.cxx | 18 ++-----
vcl/unx/generic/print/glyphset.hxx | 4 -
vcl/unx/generic/print/printerjob.cxx | 7 --
vcl/unx/generic/print/text_gfx.cxx | 5 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 7 --
59 files changed, 149 insertions(+), 261 deletions(-)
New commits:
commit d0054bfd21043a9f48dcb0bb7024edac9c60f453
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 18 09:39:14 2016 +0100
svx: SvxXConnectionPreview::GetLineDeltaAnz -> GetLineDeltaCount
Change-Id: I1632ef3698004870a273fd85afb11c20ad4b8db3
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 80ca0fa..0f1af81 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -463,7 +463,7 @@ void SvxConnectionPage::ChangeAttrHdl_Impl(void* p)
if( p == m_pLbType )
{
// get the number of line displacements
- sal_uInt16 nCount = m_pCtlPreview->GetLineDeltaAnz();
+ sal_uInt16 nCount = m_pCtlPreview->GetLineDeltaCount();
m_pFtLine3->Enable( nCount > 2 );
m_pMtrFldLine3->Enable( nCount > 2 );
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index e74b480..b9b388e 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -54,7 +54,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
void SetAttributes( const SfxItemSet& rInAttrs );
- sal_uInt16 GetLineDeltaAnz();
+ sal_uInt16 GetLineDeltaCount();
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index ff9e3bd..79e01c4 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -246,7 +246,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs )
// Get number of lines which are offset based on the preview object
-sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz()
+sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount()
{
const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet();
sal_uInt16 nCount(0);
commit c88165dfb46c771eba6324ec061bf4455732194e
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jan 18 09:36:03 2016 +0200
loplugin: unused return values in vcl/
Change-Id: I879bd3bec4dd2cf002681f1e50b6c33cce0934a9
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 03c41f0..7522bbc 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 205626a..51a62de 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 14606f2..91a13eb 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 49d2657..f5301f9 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 7907f69..b78041f 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 948c36d..2a268a2 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 0d688bd..e9ceb28 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 27cc5f1..bb38a5c 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 a281eb3..1fdf273 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 5fee250..2479dd7 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 f73c87b..1a7429d 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 62a4d9e..4410d58 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 3fee4c1..b081a55 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 e6eec88..e820cd7 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 c3738a5..111e737 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 bee66fd..1207fa3 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 9ba1957..94de1ca 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 a8bbb04..d2cee20 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 );
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index bd78549..b63f8a1 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -609,9 +609,9 @@ SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJ
return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData );
}
-bool AquaSalPrinter::EndPage()
+void AquaSalPrinter::EndPage()
{
- return mpInfoPrinter->EndPage();
+ mpInfoPrinter->EndPage();
}
sal_uLong AquaSalPrinter::GetErrorCode()
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 7abb7f0..ef1141f 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -149,7 +149,6 @@ public:
void SetStartX( short n ) { mnStartX = n; }
inline bool operator == ( const TextLine& rLine ) const;
- inline bool operator != ( const TextLine& rLine ) const;
};
inline bool TextLine::operator == ( const TextLine& rLine ) const
@@ -160,11 +159,6 @@ inline bool TextLine::operator == ( const TextLine& rLine ) const
mnEndPortion == rLine.mnEndPortion;
}
-inline bool TextLine::operator != ( const TextLine& rLine ) const
-{
- return !( *this == rLine );
-}
-
class TEParaPortion
{
private:
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 9c7eb49..edbfbad 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -540,12 +540,10 @@ TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, TextNode* pRight )
return aPaM;
}
-TextPaM TextDoc::RemoveChars( const TextPaM& rPaM, sal_Int32 nChars )
+void TextDoc::RemoveChars( const TextPaM& rPaM, sal_Int32 nChars )
{
TextNode* pNode = maTextNodes[ rPaM.GetPara() ];
pNode->RemoveText( rPaM.GetIndex(), nChars );
-
- return rPaM;
}
bool TextDoc::IsValidPaM( const TextPaM& rPaM )
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index cf5f62e..c23b11e 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -107,7 +107,7 @@ public:
std::vector<TextNode*>& GetNodes() { return maTextNodes; }
const std::vector<TextNode*>& GetNodes() const { return maTextNodes; }
- TextPaM RemoveChars( const TextPaM& rPaM, sal_Int32 nChars );
+ void RemoveChars( const TextPaM& rPaM, sal_Int32 nChars );
TextPaM InsertText( const TextPaM& rPaM, sal_Unicode c );
TextPaM InsertText( const TextPaM& rPaM, const OUString& rStr );
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 0defc8f..4e315b8 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -62,7 +62,7 @@ sal_Int32 FilterConfigCache::nIndUserData = -1;
sal_Int32 FilterConfigCache::nIndFileFormatVersion = -1;
sal_Int32 FilterConfigCache::nIndTemplateName = -1;
-bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString& rUserDataEntry )
+void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString& rUserDataEntry )
{
bIsPixelFormat = bIsInternalFilter = false;
sFilterName = rUserDataEntry;
@@ -90,7 +90,6 @@ bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString
sExternalFilterName = sFilterName;
sFilterName = SVLIBRARY("gie");
}
- return ! sFilterName.isEmpty();
}
OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
@@ -371,13 +370,6 @@ OUString FilterConfigCache::GetImportFormatName( sal_uInt16 nFormat )
return OUString("");
}
-OUString FilterConfigCache::GetImportFormatMediaType( sal_uInt16 nFormat )
-{
- if( nFormat < aImport.size() )
- return aImport[ nFormat ].sMediaType;
- return OUString("");
-}
-
OUString FilterConfigCache::GetImportFormatShortName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 8c52991..7cde7dd 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -48,7 +48,7 @@ class FilterConfigCache
bool bIsInternalFilter : 1;
bool bIsPixelFormat : 1;
- bool CreateFilterName( const OUString& rUserDataEntry );
+ void CreateFilterName( const OUString& rUserDataEntry );
OUString GetShortName( );
static const char* InternalPixelFilterNameList[];
@@ -88,7 +88,6 @@ public:
OUString GetImportFilterName( sal_uInt16 nFormat );
OUString GetImportFormatName( sal_uInt16 nFormat );
OUString GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
- OUString GetImportFormatMediaType( sal_uInt16 nFormat );
OUString GetImportFormatShortName( sal_uInt16 nFormat );
OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
OUString GetImportFilterType( sal_uInt16 nFormat );
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index cb0e0ee..7322ed2 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -84,7 +84,7 @@ void GIFReader::ClearImageExtensions()
nTimer = 0;
}
-bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal,
+void GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal,
bool bWatchForBackgroundColor )
{
const Size aSize( nWidth, nHeight );
@@ -99,7 +99,7 @@ bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal,
if (nWidth >= 64000 && nHeight >= 64000)
{
bStatus = false;
- return bStatus;
+ return;
}
#endif
@@ -135,8 +135,6 @@ bool GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal,
pAcc8 = aBmp8.AcquireWriteAccess();
bStatus = ( pAcc8 != nullptr );
}
-
- return bStatus;
}
bool GIFReader::ReadGlobalHeader()
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index b6489a0..25120aa 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -92,7 +92,7 @@ class GIFReader : public GraphicReader
void ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount );
void ClearImageExtensions();
- bool CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, bool bWatchForBackgroundColor );
+ void CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, bool bWatchForBackgroundColor );
bool ReadGlobalHeader();
bool ReadExtension();
bool ReadLocalHeader();
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index b1a4034..d585329 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -75,13 +75,11 @@ bool Exif::read(SvStream& rStream)
return result;
}
-bool Exif::write(SvStream& rStream)
+void Exif::write(SvStream& rStream)
{
sal_Int32 nStreamPosition = rStream.Tell();
- bool result = processJpeg(rStream, true);
+ processJpeg(rStream, true);
rStream.Seek( nStreamPosition );
-
- return result;
}
bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
@@ -150,7 +148,7 @@ bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
return false;
}
-bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bSwap)
+void Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bSwap)
{
ExifIFD* ifd = nullptr;
@@ -189,7 +187,6 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffs
aNumberOfTags--;
aOffset += 12;
}
- return true;
}
bool Exif::processExif(SvStream& rStream, sal_uInt16 aSectionLength, bool bSetValue)
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 2f440f6..ee7099a 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -54,7 +54,7 @@ private:
bool processJpeg(SvStream& rStream, bool bSetValue);
bool processExif(SvStream& rStream, sal_uInt16 aLength, bool bSetValue);
- bool processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto);
+ void processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto);
struct ExifIFD {
sal_uInt16 tag;
@@ -83,7 +83,7 @@ public:
void setOrientation(Orientation orientation);
bool read(SvStream& rStream);
- bool write(SvStream& rStream);
+ void write(SvStream& rStream);
};
diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx
index a71b816..f3b1e77 100644
--- a/vcl/source/filter/jpeg/JpegTransform.cxx
+++ b/vcl/source/filter/jpeg/JpegTransform.cxx
@@ -32,10 +32,9 @@ JpegTransform::JpegTransform(SvStream& rInputStream, SvStream& rOutputStream) :
JpegTransform::~JpegTransform()
{}
-bool JpegTransform::perform()
+void JpegTransform::perform()
{
- long result = Transform( &mrInputStream, &mrOutputStream, maRotate );
- return result;
+ Transform( &mrInputStream, &mrOutputStream, maRotate );
}
void JpegTransform::setRotate(sal_uInt16 aRotate)
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index 0711f23..7892443 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -34,7 +34,7 @@ public:
virtual ~JpegTransform();
void setRotate(sal_uInt16 aRotate);
- bool perform();
+ void perform();
};
#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 17db14d..acad54e 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -503,14 +503,13 @@ tools::Polygon& WinMtfOutput::ImplMap( tools::Polygon& rPolygon )
return rPolygon;
}
-tools::Polygon& WinMtfOutput::ImplScale( tools::Polygon& rPolygon )
+void WinMtfOutput::ImplScale( tools::Polygon& rPolygon )
{
sal_uInt16 nPoints = rPolygon.GetSize();
for ( sal_uInt16 i = 0; i < nPoints; i++ )
{
rPolygon[ i ] = ImplScale( rPolygon[ i ] );
}
- return rPolygon;
}
tools::PolyPolygon& WinMtfOutput::ImplScale( tools::PolyPolygon& rPolyPolygon )
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index dc8074f..3e84183 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -330,13 +330,6 @@ struct WinMtfFillStyle
&& aType == rStyle.aType;
}
- bool operator==(WinMtfFillStyle* pStyle)
- {
- return aFillColor == pStyle->aFillColor
- && bTransparent == pStyle->bTransparent
- && aType == pStyle->aType;
- }
-
WinMtfFillStyle& operator=(const WinMtfFillStyle& rStyle)
{
aFillColor = rStyle.aFillColor;
@@ -385,13 +378,6 @@ struct WinMtfLineStyle
&& aLineInfo == rStyle.aLineInfo;
}
- bool operator==(WinMtfLineStyle* pStyle)
- {
- return aLineColor == pStyle->aLineColor
- && bTransparent == pStyle->bTransparent
- && aLineInfo == pStyle->aLineInfo;
- }
-
WinMtfLineStyle& operator=( const WinMtfLineStyle& rStyle )
{
aLineColor = rStyle.aLineColor;
@@ -600,7 +586,7 @@ class WinMtfOutput
void ImplMap( vcl::Font& rFont );
tools::Polygon& ImplMap( tools::Polygon& rPolygon );
tools::PolyPolygon& ImplMap( tools::PolyPolygon& rPolyPolygon );
- tools::Polygon& ImplScale( tools::Polygon& rPolygon );
+ void ImplScale( tools::Polygon& rPolygon );
tools::PolyPolygon& ImplScale( tools::PolyPolygon& rPolyPolygon );
void ImplResizeObjectArry( sal_uInt32 nNewEntry );
void ImplSetNonPersistentLineColorTransparenz();
@@ -646,7 +632,6 @@ public:
void DeleteObject( sal_Int32 nIndex );
void SelectObject( sal_Int32 nIndex );
rtl_TextEncoding GetCharSet(){ return maFont.GetCharSet(); };
- WinMtfFillStyle& GetFillStyle () { return maFillStyle; }
const vcl::Font& GetFont() const { return maFont;}
void SetTextLayoutMode( ComplexTextLayoutMode nLayoutMode );
@@ -805,7 +790,7 @@ private:
Point ReadYX(); // reads and converts a point (first Y then X)
Rectangle ReadRectangle(); // reads and converts a rectangle
Size ReadYXExt();
- bool GetPlaceableBound( Rectangle& rSize, SvStream* pStrm );
+ void GetPlaceableBound( Rectangle& rSize, SvStream* pStrm );
public:
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 025d367c..3184a43 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1418,7 +1418,7 @@ void WMFReader::ReadWMF()
pWMF->Seek( nStartPos );
}
-bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
+void WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
{
bool bRet = true;
@@ -1794,8 +1794,6 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
<< " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
}
}
-
- return bRet;
}
WMFReader::WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile,
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 3a46f47..7370733 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1716,7 +1716,7 @@ public:
void emitAllHex();
void emitAllCrypted();
int tellPos() const;
- size_t updateLen( int nTellPos, size_t nLength);
+ void updateLen( int nTellPos, size_t nLength);
void emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
private:
FILE* mpFileOut;
@@ -1765,7 +1765,7 @@ int Type1Emitter::tellPos() const
return nTellPos;
}
-size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
+void Type1Emitter::updateLen( int nTellPos, size_t nLength)
{
// update PFB segment header length
U8 cData[4];
@@ -1775,13 +1775,12 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
cData[3] = static_cast<U8>(nLength >> 24);
const long nCurrPos = ftell(mpFileOut);
if (nCurrPos < 0)
- return 0;
+ return;
if (fseek( mpFileOut, nTellPos, SEEK_SET) != 0)
- return 0;
- size_t nWrote = fwrite(cData, 1, sizeof(cData), mpFileOut);
+ return;
+ fwrite(cData, 1, sizeof(cData), mpFileOut);
if( nCurrPos >= 0)
(void)fseek(mpFileOut, nCurrPos, SEEK_SET);
- return nWrote;
}
inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 8192bf1..8bca64e 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -40,13 +40,6 @@ namespace vcl
FontIdentifier( const PhysicalFontFace*, bool bVertical );
FontIdentifier() : m_nFontId(0), m_bVertical( false ) {}
- bool operator==( const FontIdentifier& rRight ) const
- {
- return m_nFontId == rRight.m_nFontId &&
- m_typeFontFace == rRight.m_typeFontFace &&
- m_bVertical == rRight.m_bVertical;
- }
-
// Less than needed for std::set and std::map
bool operator<( const FontIdentifier& rRight ) const
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3197ed3..72f4225 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -970,7 +970,7 @@ public:
void scale( double sx, double sy );
void rotate( double angle );
void translate( double tx, double ty );
- bool invert();
+ void invert();
void append( PDFWriterImpl::PDFPage& rPage, OStringBuffer& rBuffer, Point* pBack = nullptr );
@@ -1047,20 +1047,20 @@ void Matrix3::translate( double tx, double ty )
f[5] += ty;
}
-bool Matrix3::invert()
+void Matrix3::invert()
{
// short circuit trivial cases
if( f[1]==f[2] && f[1]==0.0 && f[0]==f[3] && f[0]==1.0 )
{
f[4] = -f[4];
f[5] = -f[5];
- return true;
+ return;
}
// check determinant
const double fDet = f[0]*f[3]-f[1]*f[2];
if( fDet == 0.0 )
- return false;
+ return;
// invert the matrix
double fn[6];
@@ -1074,7 +1074,6 @@ bool Matrix3::invert()
fn[5] = -(f[4]*fn[1] + f[5]*fn[3]);
set( fn );
- return true;
}
void Matrix3::append( PDFWriterImpl::PDFPage& rPage, OStringBuffer& rBuffer, Point* pBack )
@@ -2378,6 +2377,7 @@ bool PDFWriterImpl::updateObject( sal_Int32 n )
}
#define CHECK_RETURN( x ) if( !(x) ) return 0
+#define CHECK_RETURN2( x ) if( !(x) ) return
sal_Int32 PDFWriterImpl::emitStructParentTree( sal_Int32 nObject )
{
@@ -8397,7 +8397,7 @@ sal_Int32 PDFWriterImpl::getSystemFont( const vcl::Font& i_rFont )
return nFontID;
}
-bool PDFWriterImpl::registerGlyphs( int nGlyphs,
+void PDFWriterImpl::registerGlyphs( int nGlyphs,
sal_GlyphId* pGlyphs,
sal_Int32* pGlyphWidths,
sal_Ucs* pUnicodes,
@@ -8409,7 +8409,7 @@ bool PDFWriterImpl::registerGlyphs( int nGlyphs,
SalGraphics *pGraphics = m_pReferenceDevice->GetGraphics();
if (!pGraphics)
- return false;
+ return;
const PhysicalFontFace* pDevFont = m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData;
sal_Ucs* pCurUnicode = pUnicodes;
@@ -8455,7 +8455,7 @@ bool PDFWriterImpl::registerGlyphs( int nGlyphs,
rNewGlyph.m_nSubsetGlyphID = nNewId;
}
if (!getReferenceDevice()->AcquireGraphics())
- return false;
+ return;
const bool bVertical = ((pGlyphs[i] & GF_ROTMASK) != 0);
pGlyphWidths[i] = m_aFontCache.getGlyphWidth( pCurrentFont,
nFontGlyphId,
@@ -8479,7 +8479,7 @@ bool PDFWriterImpl::registerGlyphs( int nGlyphs,
const Ucs2SIntMap* pEncoding = nullptr;
const Ucs2OStrMap* pNonEncoded = nullptr;
if (!getReferenceDevice()->AcquireGraphics())
- return false;
+ return;
pEncoding = pGraphics->GetFontEncodingVector( pCurrentFont, &pNonEncoded, nullptr);
Ucs2SIntMap::const_iterator enc_it;
@@ -8552,7 +8552,6 @@ bool PDFWriterImpl::registerGlyphs( int nGlyphs,
pGraphics );
}
}
- return true;
}
void PDFWriterImpl::drawRelief( SalLayout& rLayout, const OUString& rText, bool bTextLines )
@@ -10735,9 +10734,9 @@ void PDFWriterImpl::drawPixel( const Point& rPoint, const Color& rColor )
setFillColor( aOldFillColor );
}
-bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
+void PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
{
- CHECK_RETURN( updateObject( rObject.m_nObject ) );
+ CHECK_RETURN2( updateObject( rObject.m_nObject ) );
bool bFlateFilter = compressStream( rObject.m_pContentStream );
rObject.m_pContentStream->Seek( STREAM_SEEK_TO_END );
@@ -10747,7 +10746,7 @@ bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
emitComment( "PDFWriterImpl::writeTransparentObject" );
#endif
OStringBuffer aLine( 512 );
- CHECK_RETURN( updateObject( rObject.m_nObject ) );
+ CHECK_RETURN2( updateObject( rObject.m_nObject ) );
aLine.append( rObject.m_nObject );
aLine.append( " 0 obj\n"
"<</Type/XObject\n"
@@ -10783,15 +10782,15 @@ bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
aLine.append( "/Filter/FlateDecode\n" );
aLine.append( ">>\n"
"stream\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) );
checkAndEnableStreamEncryption( rObject.m_nObject );
- CHECK_RETURN( writeBuffer( rObject.m_pContentStream->GetData(), nSize ) );
+ CHECK_RETURN2( writeBuffer( rObject.m_pContentStream->GetData(), nSize ) );
disableStreamEncryption();
aLine.setLength( 0 );
aLine.append( "\n"
"endstream\n"
"endobj\n\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) );
// write ExtGState dict for this XObject
aLine.setLength( 0 );
@@ -10854,23 +10853,21 @@ bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
aMask.append( nMaskSize );
aMask.append( ">>\n"
"stream\n" );
- CHECK_RETURN( updateObject( nMaskObject ) );
+ CHECK_RETURN2( updateObject( nMaskObject ) );
checkAndEnableStreamEncryption( nMaskObject );
- CHECK_RETURN( writeBuffer( aMask.getStr(), aMask.getLength() ) );
- CHECK_RETURN( writeBuffer( rObject.m_pSoftMaskStream->GetData(), nMaskSize ) );
+ CHECK_RETURN2( writeBuffer( aMask.getStr(), aMask.getLength() ) );
+ CHECK_RETURN2( writeBuffer( rObject.m_pSoftMaskStream->GetData(), nMaskSize ) );
disableStreamEncryption();
aMask.setLength( 0 );
aMask.append( "\nendstream\n"
"endobj\n\n" );
- CHECK_RETURN( writeBuffer( aMask.getStr(), aMask.getLength() ) );
+ CHECK_RETURN2( writeBuffer( aMask.getStr(), aMask.getLength() ) );
}
}
aLine.append( ">>\n"
"endobj\n\n" );
- CHECK_RETURN( updateObject( rObject.m_nExtGStateObject ) );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-
- return true;
+ CHECK_RETURN2( updateObject( rObject.m_nExtGStateObject ) );
+ CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) );
}
bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
@@ -11084,10 +11081,10 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
return true;
}
-bool PDFWriterImpl::writeJPG( JPGEmit& rObject )
+void PDFWriterImpl::writeJPG( JPGEmit& rObject )
{
- CHECK_RETURN( rObject.m_pStream );
- CHECK_RETURN( updateObject( rObject.m_nObject ) );
+ CHECK_RETURN2( rObject.m_pStream );
+ CHECK_RETURN2( updateObject( rObject.m_nObject ) );
sal_Int32 nLength = 0;
rObject.m_pStream->Seek( STREAM_SEEK_TO_END );
@@ -11134,15 +11131,15 @@ bool PDFWriterImpl::writeJPG( JPGEmit& rObject )
aLine.append( " 0 R " );
}
aLine.append( ">>\nstream\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) );
checkAndEnableStreamEncryption( rObject.m_nObject );
- CHECK_RETURN( writeBuffer( rObject.m_pStream->GetData(), nLength ) );
+ CHECK_RETURN2( writeBuffer( rObject.m_pStream->GetData(), nLength ) );
disableStreamEncryption();
aLine.setLength( 0 );
aLine.append( "\nendstream\nendobj\n\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ CHECK_RETURN2( writeBuffer( aLine.getStr(), aLine.getLength() ) );
if( nMaskObject )
{
@@ -11154,8 +11151,6 @@ bool PDFWriterImpl::writeJPG( JPGEmit& rObject )
aEmit.m_aBitmap = BitmapEx( rObject.m_aMask, AlphaMask( rObject.m_aMask ) );
writeBitmapObject( aEmit, true );
}
-
- return true;
}
bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
@@ -12117,11 +12112,11 @@ void PDFWriterImpl::moveClipRegion( sal_Int32 nX, sal_Int32 nY )
}
}
-bool PDFWriterImpl::intersectClipRegion( const Rectangle& rRect )
+void PDFWriterImpl::intersectClipRegion( const Rectangle& rRect )
{
basegfx::B2DPolyPolygon aRect( basegfx::tools::createPolygonFromRect(
basegfx::B2DRectangle( rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() ) ) );
- return intersectClipRegion( aRect );
+ intersectClipRegion( aRect );
}
bool PDFWriterImpl::intersectClipRegion( const basegfx::B2DPolyPolygon& rRegion )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 67a465c..9a1d861 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -791,7 +791,7 @@ i12626
void appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
/* creates fonts and subsets that will be emitted later */
- bool registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] );
+ void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] );
/* emits a text object according to the passed layout */
/* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */
@@ -809,14 +809,14 @@ i12626
void updateGraphicsState(Mode mode = DEFAULT);
/* writes a transparency group object */
- bool writeTransparentObject( TransparencyEmit& rObject );
+ void writeTransparentObject( TransparencyEmit& rObject );
/* writes an XObject of type image, may create
a second for the mask
*/
bool writeBitmapObject( BitmapEmit& rObject, bool bMask = false );
- bool writeJPG( JPGEmit& rEmit );
+ void writeJPG( JPGEmit& rEmit );
/* tries to find the bitmap by its id and returns its emit data if exists,
else creates a new emit data block */
@@ -1131,7 +1131,7 @@ public:
void moveClipRegion( sal_Int32 nX, sal_Int32 nY );
- bool intersectClipRegion( const Rectangle& rRect );
+ void intersectClipRegion( const Rectangle& rRect );
bool intersectClipRegion( const basegfx::B2DPolyPolygon& rRegion );
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index a729fa9..4961a17 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -323,7 +323,7 @@ void ImplRegionBand::ScaleX( double fHorzScale )
// combine overlapping separations
-bool ImplRegionBand::OptimizeBand()
+void ImplRegionBand::OptimizeBand()
{
ImplRegionBandSep* pPrevSep = nullptr;
ImplRegionBandSep* pSep = mpFirstSep;
@@ -360,8 +360,6 @@ bool ImplRegionBand::OptimizeBand()
pPrevSep = pSep;
pSep = pSep->mpNextSep;
}
-
- return true;
}
void ImplRegionBand::Union( long nXLeft, long nXRight )
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 55f4904..a5b62c2 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -426,14 +426,14 @@ void RegionBand::CreateBandRange(long nYTop, long nYBottom)
}
-bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId)
+void RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLineId)
{
long nX, nY;
// lines consisting of a single point do not interest here
if ( rStartPt == rEndPt )
{
- return true;
+ return;
}
LineType eLineType = (rStartPt.Y() > rEndPt.Y()) ? LINE_DESCENDING : LINE_ASCENDING;
@@ -513,18 +513,16 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
// last point
InsertPoint( Point( nEndX, nEndY ), nLineId, true, eLineType );
}
-
- return true;
}
-bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint, LineType eLineType)
+void RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint, LineType eLineType)
{
DBG_ASSERT( mpFirstBand != nullptr, "RegionBand::InsertPoint - no bands available!" );
if ( rPoint.Y() == mpLastCheckedBand->mnYTop )
{
mpLastCheckedBand->InsertPoint( rPoint.X(), nLineID, bEndPoint, eLineType );
- return true;
+ return;
}
if ( rPoint.Y() > mpLastCheckedBand->mnYTop )
@@ -536,7 +534,7 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
if ( rPoint.Y() == mpLastCheckedBand->mnYTop )
{
mpLastCheckedBand->InsertPoint( rPoint.X(), nLineID, bEndPoint, eLineType );
- return true;
+ return;
}
mpLastCheckedBand = mpLastCheckedBand->mpNextBand;
@@ -553,7 +551,7 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
if ( rPoint.Y() == mpLastCheckedBand->mnYTop )
{
mpLastCheckedBand->InsertPoint( rPoint.X(), nLineID, bEndPoint, eLineType );
- return true;
+ return;
}
mpLastCheckedBand = mpLastCheckedBand->mpPrevBand;
@@ -566,8 +564,6 @@ bool RegionBand::InsertPoint(const Point &rPoint, long nLineID, bool bEndPoint,
// reinitialize pointer (should never be reached!)
mpLastCheckedBand = mpFirstBand;
-
- return false;
}
bool RegionBand::OptimizeBandList()
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 9d45ff2..c5d0b73 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1457,17 +1457,16 @@ MultiSalLayout::~MultiSalLayout()
mpLayouts[ i ]->Release();
}
-bool MultiSalLayout::AddFallback( SalLayout& rFallback,
+void MultiSalLayout::AddFallback( SalLayout& rFallback,
ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont )
{
if( mnLevel >= MAX_FALLBACK )
- return false;
+ return;
mpFallbackFonts[ mnLevel ] = pFallbackFont;
mpLayouts[ mnLevel ] = &rFallback;
maFallbackRuns[ mnLevel-1 ] = rFallbackRuns;
++mnLevel;
- return true;
}
bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 872b0bd..b10965e 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -56,10 +56,10 @@ namespace vcl
m_rTargetDevice.DrawText( _rStartPoint, _rText, _nStartIndex, _nLength, _pVector, _pDisplayText );
}
- bool DefaultTextLayout::GetCaretPositions( const OUString& _rText, long* _pCaretXArray,
+ void DefaultTextLayout::GetCaretPositions( const OUString& _rText, long* _pCaretXArray,
sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
{
- return m_rTargetDevice.GetCaretPositions( _rText, _pCaretXArray, _nStartIndex, _nLength );
+ m_rTargetDevice.GetCaretPositions( _rText, _pCaretXArray, _nStartIndex, _nLength );
}
sal_Int32 DefaultTextLayout::GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
@@ -81,7 +81,7 @@ namespace vcl
// ITextLayout
virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const override;
virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ) override;
- virtual bool GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override;
+ virtual void GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override;
virtual sal_Int32 GetTextBreak(const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const override;
virtual bool DecomposeTextRectAction() const override;
@@ -232,17 +232,14 @@ namespace vcl
m_aCompleteTextRect.Union( Rectangle( _rStartPoint, Size( nTextWidth, m_rTargetDevice.GetTextHeight() ) ) );
}
- bool ReferenceDeviceTextLayout::GetCaretPositions( const OUString& _rText, long* _pCaretXArray,
+ void ReferenceDeviceTextLayout::GetCaretPositions( const OUString& _rText, long* _pCaretXArray,
sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
{
if ( !lcl_normalizeLength( _rText, _nStartIndex, _nLength ) )
- return false;
+ return;
// retrieve the caret positions from the reference device
- if ( !m_rReferenceDevice.GetCaretPositions( _rText, _pCaretXArray, _nStartIndex, _nLength ) )
- return false;
-
- return true;
+ m_rReferenceDevice.GetCaretPositions( _rText, _pCaretXArray, _nStartIndex, _nLength );
}
sal_Int32 ReferenceDeviceTextLayout::GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index df63ead..a0ce0da 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -523,11 +523,11 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
// handle extended and normal key input
-int
+void
SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
{
if (nLength == 1 && IsControlCode(pText[0]))
- return 0;
+ return;
if( maClientData.pFrame )
{
@@ -547,8 +547,6 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
else
fprintf(stderr, "CommitKeyEvent without frame\n" );
#endif
-
- return 0;
}
int
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 61e3bf5..321832b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -195,7 +195,7 @@ IsXWindowCompatibleLocale( const char* p_locale )
// see i8988, i9188, i8930, i16318
// on Solaris the environment needs to be set equivalent to the locale (#i37047#)
-bool
+void
SalI18N_InputMethod::SetLocale( const char* pLocale )
{
// check whether we want an Input Method engine, if we don't we
@@ -229,8 +229,6 @@ SalI18N_InputMethod::SetLocale( const char* pLocale )
mbUseable = False;
}
}
-
- return mbUseable;
}
Bool
@@ -331,7 +329,7 @@ PrintInputStyle( XIMStyles *pStyle )
// this is the real constructing routine, since locale setting has to be done
// prior to xopendisplay, the xopenim call has to be delayed
-bool
+void
SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
{
if ( mbUseable )
@@ -371,8 +369,6 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
maDestroyCallback.client_data = reinterpret_cast<XPointer>(this);
if (mbUseable && maMethod != nullptr)
XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, nullptr);
-
- return mbUseable;
}
// give IM the opportunity to look at the event, and possibly hide it
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index 3e899e8..570cfcc 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -279,10 +279,10 @@ void SalDisplay::DeInitRandR()
#endif
}
-int SalDisplay::processRandREvent( XEvent* pEvent )
+void SalDisplay::processRandREvent( XEvent* pEvent )
{
+#ifdef USE_RANDR
int nRet = 0;
- #ifdef USE_RANDR
XConfigureEvent* pCnfEvent=reinterpret_cast<XConfigureEvent*>(pEvent);
if( m_bUseRandRWrapper && pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 )
{
@@ -323,11 +323,10 @@ int SalDisplay::processRandREvent( XEvent* pEvent )
emitDisplayChanged();
}
}
- #else
+#else
(void)this;
(void)pEvent;
- #endif
- return nRet;
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 02efd27..8f8f92e 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1886,10 +1886,10 @@ bool SalX11Display::IsEvent()
return false;
}
-bool SalX11Display::Yield()
+void SalX11Display::Yield()
{
if( DispatchInternalEvent() )
- return true;
+ return;
XEvent aEvent;
DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() ==
@@ -1899,7 +1899,7 @@ bool SalX11Display::Yield()
XNextEvent( pDisp_, &aEvent );
// FIXME: under-convinced by Dispatch boolean return value vs. salframe.
- bool bProcessedEvent = Dispatch( &aEvent );
+ Dispatch( &aEvent );
#ifdef DBG_UTIL
if( GetX11SalData()->HasXErrorOccurred() )
@@ -1909,8 +1909,6 @@ bool SalX11Display::Yield()
}
#endif
GetX11SalData()->ResetXErrorOccurred();
-
- return bProcessedEvent;
}
bool SalX11Display::Dispatch( XEvent *pEvent )
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 611a2ed..eb15822 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, voi
}
#endif
-bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes )
+void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes )
{
bool bRet = false;
@@ -1136,8 +1136,6 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
FcFontSetDestroy( pSet );
}
-
- return bRet;
}
FontConfigFontOptions::~FontConfigFontOptions()
@@ -1231,7 +1229,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions(
return pOptions;
}
-bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale )
+void PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale )
{
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
@@ -1255,7 +1253,6 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Loc
FcResult eResult = FcResultNoMatch;
FcFontSet *pFontSet = rWrapper.getFontSet();
FcPattern* pResult = FcFontSetMatch(pConfig, &pFontSet, 1, pPattern, &eResult);
- bool bSuccess = false;
if( pResult )
{
FcFontSet* pSet = FcFontSetCreate();
@@ -1276,7 +1273,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Loc
int nDirID = getDirectoryAtom( aDir, true );
fontID aFont = findFontFileID( nDirID, aBase, nCollectionEntry );
if( aFont > 0 )
- bSuccess = getFontFastInfo( aFont, rInfo );
+ getFontFastInfo( aFont, rInfo );
}
}
// info: destroying the pSet destroys pResult implicitly
@@ -1286,8 +1283,6 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const css::lang::Loc
// cleanup
FcPatternDestroy( pPattern );
-
- return bSuccess;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 1b895c8..1023750 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1584,9 +1584,8 @@ bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo
return pFont != nullptr;
}
-bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax )
+void PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax )
{
- bool bSuccess = false;
PrintFont* pFont = getFont( nFontID );
if( pFont )
{
@@ -1598,13 +1597,11 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin,
else if( pFont->m_eType == fonttype::TrueType )
analyzeTrueTypeFile( pFont );
}
- bSuccess = true;
xMin = pFont->m_nXMin;
yMin = pFont->m_nYMin;
xMax = pFont->m_nXMax;
yMax = pFont->m_nYMax;
}
- return bSuccess;
}
int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 456d146..0ac44aa 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -76,10 +76,10 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
}
}
-bool X11SalGraphics::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
+void X11SalGraphics::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
{
X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl.get());
- return rImpl.FillPixmapFromScreen( pPixmap, nX, nY );
+ rImpl.FillPixmapFromScreen( pPixmap, nX, nY );
}
bool X11SalGraphics::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY )
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 957450f..3bb5055 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -747,13 +747,13 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph
rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
}
-int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
+void ServerFont::ApplyGlyphTransform( int nGlyphFlags,
FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
{
int nAngle = GetFontSelData().mnOrientation;
// shortcut most common case
if( !nAngle && !nGlyphFlags )
- return nAngle;
+ return;
const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
FT_Vector aVector;
@@ -816,8 +816,6 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
pBmpGlyphFT->left += (aVector.x + 32) >> 6;
pBmpGlyphFT->top += (aVector.y + 32) >> 6;
}
-
- return nAngle;
}
sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
@@ -1303,7 +1301,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
return true;
}
-bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
+void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
{
#define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
@@ -1314,13 +1312,13 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
// TODO: request more features depending on script and language system
if( aReqFeatureTagList.empty()) // nothing to do
- return true;
+ return;
// load GSUB table into memory
sal_uLong nLength = 0;
const FT_Byte* const pGsubBase = mpFontInfo->GetTable( "GSUB", &nLength );
if( !pGsubBase )
- return false;
+ return;
// parse GSUB header
const FT_Byte* pGsubHeader = pGsubBase;
@@ -1383,7 +1381,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
}
if( aFeatureIndexList.empty() )
- return true;
+ return;
UshortList aLookupIndexList;
UshortList aLookupOffsetList;
@@ -1530,8 +1528,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
maGlyphSubstitution[ (*it).first ] = (*it).second;
}
}
-
- return true;
}
const unsigned char* ServerFont::GetTable(const char* pName, sal_uLong* pLength)
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 105de97..52387c9 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -52,7 +52,7 @@ GraphicsStatus::GraphicsStatus() :
* non graphics graphics routines
*/
-bool
+void
PrinterGfx::Init (PrinterJob &rPrinterJob)
{
mpPageHeader = rPrinterJob.GetCurrentPageHeader ();
@@ -65,11 +65,9 @@ PrinterGfx::Init (PrinterJob &rPrinterJob)
rPrinterJob.GetScale (mfScaleX, mfScaleY);
const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
mbUploadPS42Fonts = rInfo.m_pParser && rInfo.m_pParser->isType42Capable();
-
- return true;
}
-bool
+void
PrinterGfx::Init (const JobData& rData)
{
mpPageHeader = nullptr;
@@ -83,8 +81,6 @@ PrinterGfx::Init (const JobData& rData)
mfScaleY = (double)72.0 / (double)mnDpi;
const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) );
mbUploadPS42Fonts = rInfo.m_pParser && rInfo.m_pParser->isType42Capable();
-
- return true;
}
@@ -163,12 +159,11 @@ PrinterGfx::BeginSetClipRegion( sal_uInt32 )
maClipRegion.clear();
}
-bool
+void
PrinterGfx::UnionClipRegion (sal_Int32 nX,sal_Int32 nY,sal_Int32 nDX,sal_Int32 nDY)
{
if( nDX && nDY )
maClipRegion.push_back (Rectangle(Point(nX,nY ), Size(nDX,nDY)));
- return true;
}
bool
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 4e70454..521c5f0 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -973,12 +973,11 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool )
return m_pGraphics;
}
-bool PspSalPrinter::EndPage()
+void PspSalPrinter::EndPage()
{
- bool bResult = m_aPrintJob.EndPage();
+ m_aPrintJob.EndPage();
m_aPrinterGfx.Clear();
OSL_TRACE("PspSalPrinter::EndPage");
- return bResult;
}
sal_uLong PspSalPrinter::GetErrorCode()
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index d75d942..72fc2fa 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -592,14 +592,14 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
DrawGlyphs( rGfx, rPoint, nullptr, pStr, nLen, pDeltaArray, false);
}
-bool
+void
GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
{
// only for ps fonts
if (meBaseType != fonttype::Type1)
- return false;
+ return;
if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL)
- return false;
+ return;
PrintFontManager &rMgr = rGfx.GetFontMgr();
@@ -676,8 +676,6 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx)
PSDefineReencodedFont (pOutFile, nGlyphSetID);
}
-
- return true;
}
struct EncEntry
@@ -727,12 +725,12 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile,
&aRequestedGlyphs[0], &aEncoding[0], nGlyphCount );
}
-bool
+void
GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42, std::list< OString >& rSuppliedFonts )
{
// only for truetype fonts
if (meBaseType != fonttype::TrueType)
- return false;
+ return;
#if defined( UNX )
TrueTypeFont *pTTFont;
@@ -740,13 +738,13 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
int nFace = rGfx.GetFontMgr().getFontFaceNumber(mnFontID);
sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont);
if (nSuccess != SF_OK)
- return false;
+ return;
utl::TempFile aTmpFile;
aTmpFile.EnableKillingFile();
FILE* pTmpFile = fopen(OUStringToOString(aTmpFile.GetFileName(), osl_getThreadTextEncoding()).getStr(), "w+b");
if (pTmpFile == nullptr)
- return false;
+ return;
// array of unicode source characters
sal_uInt16 pUChars[256];
@@ -836,11 +834,9 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
CloseTTFont (pTTFont);
fclose (pTmpFile);
- return true;
#else
(void)rOutFile; (void)rGfx; (void)bAllowType42; (void)rSuppliedFonts;
# warning FIXME: Missing OpenTTFontFile outside of Unix ...
- return false;
#endif
}
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 04f8f21..c35ac42 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -114,8 +114,8 @@ public:
sal_Int16 nLen,
const sal_Int32* pDeltaArray,
bool bUseGlyphs=true);
- bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx);
- bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
+ void PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx);
+ void PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
};
} /* namespace psp */
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 746ceed..4675ef7 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -579,7 +579,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
mfYScale = -1.0 * (double)72.0 / (double)mnResolution;
}
-bool
+void
PrinterJob::StartPage (const JobData& rJobSetup)
{
InitPaperSize (rJobSetup);
@@ -594,7 +594,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
maPageList.push_back (pPageBody);
if( ! (pPageHeader && pPageBody) )
- return false;
+ return;
// write page header according to Document Structuring Conventions (DSC)
WritePS (pPageHeader, "%%Page: ");
@@ -644,10 +644,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
if ( writePageSetup( pPageHeader, rJobSetup, bWriteFeatures ) )
{
m_aLastJobData = rJobSetup;
- return true;
}
-
- return false;
}
bool
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index cfe4b8c..d7a5995 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -426,7 +426,7 @@ PrinterGfx::DrawText (
);
}
-bool PrinterGfx::drawVerticalizedText(
+void PrinterGfx::drawVerticalizedText(
const Point& rPoint,
const sal_Unicode* pStr,
sal_Int16 nLen,
@@ -436,7 +436,7 @@ bool PrinterGfx::drawVerticalizedText(
PrintFontManager &rMgr = PrintFontManager::get();
PrintFontInfo aInfo;
if (!rMgr.getFontInfo(mnFontID, aInfo))
- return false;
+ return;
sal_Int32* pDelta = static_cast<sal_Int32*>(alloca( nLen * sizeof(sal_Int32) ));
@@ -521,7 +521,6 @@ bool PrinterGfx::drawVerticalizedText(
nLastPos = i;
}
mnTextAngle = nNormalAngle;
- return true;
}
void
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index cee8543..67a16c7 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -343,10 +343,8 @@ public:
bool hasSubFilters( ) const;
/** retrieves the filters belonging to the entry
- @return
- the number of sub filters
*/
- sal_Int32 getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList );
+ void getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList );
// helpers for iterating the sub filters
const css::beans::StringPair* beginSubFilters() const { return m_aSubFilters.getConstArray(); }
@@ -358,10 +356,9 @@ bool FilterEntry::hasSubFilters() const
return( 0 < m_aSubFilters.getLength() );
}
-sal_Int32 FilterEntry::getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList )
+void FilterEntry::getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList )
{
_rSubFilterList = m_aSubFilters;
- return m_aSubFilters.getLength();
}
static bool
More information about the Libreoffice-commits
mailing list