[Libreoffice-commits] core.git: include/vcl sd/source sfx2/source svx/source vcl/headless vcl/inc vcl/source vcl/unx
Noel Grandin
noel at peralex.com
Tue Mar 8 11:46:10 UTC 2016
include/vcl/outdev.hxx | 2
include/vcl/print.hxx | 6 +-
include/vcl/threadex.hxx | 4 -
include/vcl/window.hxx | 8 +--
include/vcl/wrkwin.hxx | 5 --
sd/source/ui/slideshow/slideshow.cxx | 2
sfx2/source/appl/newhelp.cxx | 2
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 4 -
vcl/headless/svpframe.cxx | 4 -
vcl/headless/svpinst.cxx | 2
vcl/inc/PhysicalFontCollection.hxx | 2
vcl/inc/headless/svpframe.hxx | 2
vcl/inc/unx/gtk/gtkprintwrapper.hxx | 2
vcl/source/filter/sgvspln.cxx | 12 ++---
vcl/source/font/PhysicalFontCollection.cxx | 4 -
vcl/source/gdi/pdfwriter_impl.cxx | 8 +--
vcl/source/gdi/print.cxx | 29 ++++++--------
vcl/source/gdi/virdev.cxx | 2
vcl/source/helper/threadex.cxx | 4 -
vcl/source/outdev/font.cxx | 10 ++--
vcl/source/window/mouse.cxx | 2
vcl/source/window/paint.cxx | 8 +--
vcl/source/window/printdlg.cxx | 2
vcl/source/window/window.cxx | 25 +++++-------
vcl/source/window/winproc.cxx | 4 -
vcl/source/window/wrkwin.cxx | 4 -
vcl/unx/gtk/gtkprintwrapper.cxx | 6 +-
vcl/unx/gtk/salprn-gtk.cxx | 2
28 files changed, 78 insertions(+), 89 deletions(-)
New commits:
commit 2600220f53f51be2d017b012c56293bf8cf835ef
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 8 10:51:28 2016 +0200
loplugin:constantparams in vcl
Change-Id: I2114436f4bef3ac71a3035a206186cefaf88bca1
Reviewed-on: https://gerrit.libreoffice.org/23023
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 2d8eeec..fc0f765 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1303,7 +1303,7 @@ public:
const OutputDevice* pOutDev = nullptr );
SAL_DLLPRIVATE void ImplInitFontList() const;
- SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists );
+ SAL_DLLPRIVATE void ImplUpdateFontData();
//drop font data for all outputdevices.
//If bNewFontLists is true then empty lists of system fonts
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a36d7b2..7664bc4 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -209,7 +209,7 @@ private:
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
- SAL_DLLPRIVATE void ImplInitDisplay( const vcl::Window* pWindow );
+ SAL_DLLPRIVATE void ImplInitDisplay();
SAL_DLLPRIVATE static SalPrinterQueueInfo*
ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver );
SAL_DLLPRIVATE void ImplUpdatePageData();
@@ -323,8 +323,8 @@ public:
Paper GetPaper() const;
static OUString GetPaperName( Paper ePaper );
- /** @return A UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER */
- OUString GetPaperName( bool i_bPaperUser = true ) const;
+ /** @return A UI string for the current paper; an empty string for PAPER_USER */
+ OUString GetPaperName() const;
/** @return Number of available paper formats */
int GetPaperInfoCount() const;
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 358f1ca..7572444 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -45,10 +45,10 @@ namespace vcl
virtual ~SolarThreadExecutor();
virtual long doIt() = 0;
- long execute() { return impl_execute( nullptr ); }
+ long execute() { return impl_execute(); }
private:
- long impl_execute( const TimeValue* _pTimeout );
+ long impl_execute();
};
namespace solarthread {
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 6abc34b..e1922d7 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -603,7 +603,7 @@ protected:
SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion );
SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, ValidateFlags nFlags );
- SAL_DLLPRIVATE void ImplValidate( const vcl::Region* rRegion, ValidateFlags nFlags );
+ SAL_DLLPRIVATE void ImplValidate( ValidateFlags nFlags );
SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
@@ -844,7 +844,7 @@ public:
void IncrementLockCount();
void DecrementLockCount();
- bool IsLocked( bool bChildren = false ) const;
+ bool IsLocked() const;
// returns the input language used for the last key stroke
// may be LANGUAGE_DONTKNOW if not supported by the OS
@@ -905,7 +905,7 @@ public:
void SetInputContext( const InputContext& rInputContext );
const InputContext& GetInputContext() const;
- void EndExtTextInput( EndExtTextInputFlags nFlags );
+ void EndExtTextInput();
void SetCursorRect( const Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 );
const Rectangle* GetCursorRect() const;
long GetCursorExtTextInputWidth() const;
@@ -1074,7 +1074,7 @@ public:
// window extents including border and decoration
Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const;
// window extents of the client window, coordinates to be used in SetPosPixel
- Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const;
+ Rectangle GetClientWindowExtentsRelative() const;
bool IsScrollable() const;
virtual void Scroll( long nHorzScroll, long nVertScroll,
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 0fb812c..e5e1336 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -87,10 +87,9 @@ public:
PresentationFlags nFlags,
sal_uInt32 nDisplayScreen );
/**
- @overload void StartPresentationMode( bool bPresentation, PresentationFlags nFlags, sal_uInt32 nDisplayScreen)
+ @overload void StartPresentationMode( PresentationFlags nFlags, sal_uInt32 nDisplayScreen)
*/
- void StartPresentationMode( bool bPresentation = true,
- PresentationFlags nFlags = PresentationFlags::NONE );
+ void StartPresentationMode( PresentationFlags nFlags = PresentationFlags::NONE );
bool IsPresentationMode() const { return mbPresentationMode; }
bool IsMinimized() const;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 20a7231..10de5f9 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -675,7 +675,7 @@ void SAL_CALL SlideShow::end()
WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
if( pWorkWindow )
{
- pWorkWindow->StartPresentationMode( false, isAlwaysOnTop() ? PresentationFlags::HideAllApps : PresentationFlags::NONE );
+ pWorkWindow->StartPresentationMode( isAlwaysOnTop() ? PresentationFlags::HideAllApps : PresentationFlags::NONE );
}
}
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index e8716e3..da3da96 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2690,7 +2690,7 @@ void SfxHelpWindow_Impl::MakeLayout()
if ( aRect.Width > 0 && aRect.Height > 0 )
{
- Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative( nullptr );
+ Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative();
Point aNewPos = aScreenRect.TopLeft();
sal_Int32 nDiffWidth = nOldWidth - nWidth;
aNewPos.X() += nDiffWidth;
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 62e9fd5..64caf64 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -597,8 +597,8 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx
//Modified by lq, 09/26
//return AWTRectangle( GetBoundingBox() );
awt::Rectangle rect = AWTRectangle( GetBoundingBox() );
- rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Left()-mrParentWindow.GetWindowExtentsRelative(nullptr).Left();
- rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Top()-mrParentWindow.GetWindowExtentsRelative(nullptr).Top();
+ rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative().Left()-mrParentWindow.GetWindowExtentsRelative(nullptr).Left();
+ rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative().Top()-mrParentWindow.GetWindowExtentsRelative(nullptr).Top();
return rect;
// End
}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index e8536ed..6269b5e 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -163,12 +163,12 @@ bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
return true;
}
-void SvpSalFrame::PostPaint(bool bImmediate) const
+void SvpSalFrame::PostPaint() const
{
if( m_bVisible )
{
SalPaintEvent aPEvt(0, 0, maGeometry.nWidth, maGeometry.nHeight);
- aPEvt.mbImmediateUpdate = bImmediate;
+ aPEvt.mbImmediateUpdate = false;
CallCallback( SALEVENT_PAINT, &aPEvt );
}
}
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 8897a1f..ed3159a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -291,7 +291,7 @@ SalYieldResult SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
{
// this would be a good time to post a paint
const SvpSalFrame* pSvpFrame = static_cast<const SvpSalFrame*>(it->m_pFrame);
- pSvpFrame->PostPaint(false);
+ pSvpFrame->PostPaint();
}
}
}
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 3066212..967cefc 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -62,7 +62,7 @@ public:
void SetFallbackHook( ImplGlyphFallbackFontSubstitution* );
// misc utilities
- PhysicalFontCollection* Clone( bool bScalable, bool bEmbeddable ) const;
+ PhysicalFontCollection* Clone( bool bEmbeddable ) const;
ImplDeviceFontList* GetDeviceFontList() const;
ImplDeviceFontSizeList* GetDeviceFontSizeList( const OUString& rFontName ) const;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 9cbe8e7..4b0be15 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -64,7 +64,7 @@ public:
void GetFocus();
void LoseFocus();
- void PostPaint(bool bImmediate) const;
+ void PostPaint() const;
// SalFrame
virtual SalGraphics* AcquireGraphics() override;
diff --git a/vcl/inc/unx/gtk/gtkprintwrapper.hxx b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
index 8840d6c..4862c8c 100644
--- a/vcl/inc/unx/gtk/gtkprintwrapper.hxx
+++ b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
@@ -53,7 +53,7 @@ public:
GtkPageRange* print_settings_get_page_ranges(GtkPrintSettings* settings, gint* num_ranges) const;
void print_settings_set_print_pages(GtkPrintSettings* settings, GtkPrintPages pages) const;
- GtkWidget* print_unix_dialog_new(const gchar* title, GtkWindow* parent) const;
+ GtkWidget* print_unix_dialog_new() const;
void print_unix_dialog_add_custom_tab(GtkPrintUnixDialog* dialog, GtkWidget* child, GtkWidget* tab_label) const;
GtkPrinter* print_unix_dialog_get_selected_printer(GtkPrintUnixDialog* dialog) const;
void print_unix_dialog_set_manual_capabilities(GtkPrintUnixDialog* dialog, GtkPrintCapabilities capabilities) const;
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 40f168a..7129b0a 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -124,7 +124,7 @@ short basis() /* calculate BASE machine independence */
/*---------------------- MODULE tridiagonal -----------------------*/
-sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower,
+sal_uInt16 TriDiagGS(sal_uInt16 n, double* lower,
double* diag, double* upper, double* b)
/*************************/
/* Gaussian methods for */
@@ -212,11 +212,10 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower,
if ( n < 2 ) return 1; /* n at least 2 */
- /* if rep = false, */
/* determine the */
/* triangular */
/* decomposition of */
- if (!rep) /* matrix and determinant*/
+ /* matrix and determinant*/
{
for (i = 1; i < n; i++)
{ if ( fabs(diag[i-1]) < MACH_EPS ) /* do not decompose */
@@ -248,7 +247,7 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower,
/*---------------- Module cyclic tridiagonal -----------------------*/
-sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag,
+sal_uInt16 ZyklTriDiagGS(sal_uInt16 n, double* lower, double* diag,
double* upper, double* lowrow, double* ricol, double* b)
/******************************/
/* Systems with cyclic */
@@ -335,7 +334,6 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag,
if ( n < 3 ) return 1;
- if (!rep) /* If rep = false, */
{ /* calculate decomposition */
lower[0] = upper[n-1] = 0.0; /* of the matrix. */
@@ -449,7 +447,7 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y,
if (n==2) {
c[1]=a[0]/d[0];
} else {
- error=TriDiagGS(false,n-1,b,d,c,a.get());
+ error=TriDiagGS(n-1,b,d,c,a.get());
if (error!=0) return error+2;
for (i=0;i<n-1;i++) c[i+1]=a[i];
}
@@ -528,7 +526,7 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y,
lowrow[0]=hr;
ricol[0]=hr;
a[nm1]=3.0*((y[1]-y[0])/hr-(y[n]-y[nm1])/hl);
- Error=ZyklTriDiagGS(false,n,b,d,c,lowrow.get(),ricol.get(),a.get());
+ Error=ZyklTriDiagGS(n,b,d,c,lowrow.get(),ricol.get(),a.get());
if ( Error != 0 )
{
return Error+4;
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index dabc766..823c06d 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -923,7 +923,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co
return pFoundData;
}
-PhysicalFontCollection* PhysicalFontCollection::Clone( bool bScalable, bool bEmbeddable ) const
+PhysicalFontCollection* PhysicalFontCollection::Clone( bool bEmbeddable ) const
{
PhysicalFontCollection* pClonedCollection = new PhysicalFontCollection;
pClonedCollection->mbMapNames = mbMapNames;
@@ -937,7 +937,7 @@ PhysicalFontCollection* PhysicalFontCollection::Clone( bool bScalable, bool bEmb
for(; it != maPhysicalFontFamilies.end(); ++it )
{
const PhysicalFontFamily* pFontFace = (*it).second;
- pFontFace->UpdateCloneFontList( *pClonedCollection, bScalable, bEmbeddable );
+ pFontFace->UpdateCloneFontList( *pClonedCollection, true/*bScalable*/, bEmbeddable );
}
return pClonedCollection;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7a08891..5989355 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2211,7 +2211,7 @@ OutputDevice* PDFWriterImpl::getReferenceDevice()
pVDev->SetMapMode( MAP_MM );
m_pReferenceDevice->mpPDFWriter = this;
- m_pReferenceDevice->ImplUpdateFontData( true );
+ m_pReferenceDevice->ImplUpdateFontData();
}
return m_pReferenceDevice;
}
@@ -6392,7 +6392,7 @@ OUString PKIStatusInfoToString(const PKIStatusInfo& rStatusInfo)
// not exported from libsmime, so copy them here. Sigh.
SECStatus
-my_SEC_StringToOID(PLArenaPool *pool, SECItem *to, const char *from, PRUint32 len)
+my_SEC_StringToOID(SECItem *to, const char *from, PRUint32 len)
{
PRUint32 decimal_numbers = 0;
PRUint32 result_bytes = 0;
@@ -6478,7 +6478,7 @@ bad_data:
SECItem result_item = {siBuffer, nullptr, 0 };
result_item.data = result;
result_item.len = result_bytes;
- rv = SECITEM_CopyItem(pool, to, &result_item);
+ rv = SECITEM_CopyItem(nullptr, to, &result_item);
}
return rv;
}
@@ -7091,7 +7091,7 @@ bool PDFWriterImpl::finalizeSignature()
// id-aa-timeStampToken OBJECT IDENTIFIER ::= { iso(1)
// member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)
// smime(16) aa(2) 14 }
- if (my_SEC_StringToOID(nullptr, &typetag.oid, "1.2.840.113549.1.9.16.2.14", 0) != SECSuccess)
+ if (my_SEC_StringToOID(&typetag.oid, "1.2.840.113549.1.9.16.2.14", 0) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "SEC_StringToOID failed");
free(pass);
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2d3cfe0..9e9156a 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -712,14 +712,14 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
if ( !mpInfoPrinter )
{
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
return;
}
// we need a graphics
if ( !AcquireGraphics() )
{
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
return;
}
@@ -730,7 +730,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
mpGraphics->GetDevFontList( mpFontCollection );
}
-void Printer::ImplInitDisplay( const vcl::Window* pWindow )
+void Printer::ImplInitDisplay()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -738,10 +738,7 @@ void Printer::ImplInitDisplay( const vcl::Window* pWindow )
mpPrinter = nullptr;
mpJobGraphics = nullptr;
- if ( pWindow )
- mpDisplayDev = VclPtr<VirtualDevice>::Create( *pWindow );
- else
- mpDisplayDev = VclPtr<VirtualDevice>::Create();
+ mpDisplayDev = VclPtr<VirtualDevice>::Create();
mpFontCollection = pSVData->maGDIData.mpScreenFontList;
mpFontCache = pSVData->maGDIData.mpScreenFontCache;
mnDPIX = mpDisplayDev->mnDPIX;
@@ -896,7 +893,7 @@ void Printer::ImplUpdatePageData()
void Printer::ImplUpdateFontList()
{
- ImplUpdateFontData( true );
+ ImplUpdateFontData();
}
long Printer::GetGradientStepCount( long nMinRect )
@@ -918,7 +915,7 @@ Printer::Printer()
mbDefPrinter = true;
}
else
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
}
Printer::Printer( const JobSetup& rJobSetup ) :
@@ -934,7 +931,7 @@ Printer::Printer( const JobSetup& rJobSetup ) :
}
else
{
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
maJobSetup = JobSetup();
}
}
@@ -947,7 +944,7 @@ Printer::Printer( const QueueInfo& rQueueInfo )
if ( pInfo )
ImplInit( pInfo );
else
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
}
Printer::Printer( const OUString& rPrinterName )
@@ -957,7 +954,7 @@ Printer::Printer( const OUString& rPrinterName )
if ( pInfo )
ImplInit( pInfo );
else
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
}
Printer::~Printer()
@@ -1164,7 +1161,7 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
}
// Construct new printer
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
return true;
}
@@ -1213,7 +1210,7 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
SetJobSetup( pPrinter->GetJobSetup() );
}
else
- ImplInitDisplay( nullptr );
+ ImplInitDisplay();
}
else
SetJobSetup( pPrinter->GetJobSetup() );
@@ -1537,13 +1534,13 @@ OUString Printer::GetPaperName( Paper ePaper )
return (it != pSVData->mpPaperNames->end()) ? it->second : OUString();
}
-OUString Printer::GetPaperName( bool i_bPaperUser ) const
+OUString Printer::GetPaperName() const
{
Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM );
Paper ePaper = ImplGetPaperFormat( aPageSize.Width(), aPageSize.Height() );
if( ePaper == PAPER_USER )
ePaper = ImplGetPaperFormat( aPageSize.Height(), aPageSize.Width() );
- return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString();
+ return (ePaper != PAPER_USER) ? GetPaperName( ePaper ) : OUString();
}
const PaperInfo& Printer::GetPaperInfo( int nPaper ) const
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 016bf03..b32486e 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -525,7 +525,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
// get font list with scalable fonts only
AcquireGraphics();
- mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( true, false );
+ mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( false );
// prepare to use new font lists
mpFontCache = new ImplFontCache();
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 628a216..171b569 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -46,7 +46,7 @@ IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void)
}
}
-long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout )
+long SolarThreadExecutor::impl_execute()
{
if( ::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() )
{
@@ -60,7 +60,7 @@ long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout )
osl_resetCondition( m_aFinish );
SolarMutexReleaser aReleaser;
ImplSVEvent * nEvent = Application::PostUserEvent( LINK( this, SolarThreadExecutor, worker ) );
- if ( osl_cond_result_timeout == osl_waitCondition( m_aStart, _pTimeout ) )
+ if ( osl_cond_result_timeout == osl_waitCondition( m_aStart, nullptr ) )
{
m_bTimeout = true;
Application::RemoveUserEvent( nEvent );
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 751900d..7b1ed3a 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -554,7 +554,7 @@ void OutputDevice::ImplRefreshFontData( const bool bNewFontLists )
{
if( mpPDFWriter )
{
- mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( true, true );
+ mpFontCollection = pSVData->maGDIData.mpScreenFontList->Clone( true );
mpFontCache = new ImplFontCache();
}
else
@@ -577,10 +577,10 @@ void OutputDevice::ImplRefreshFontData( const bool bNewFontLists )
}
}
-void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
+void OutputDevice::ImplUpdateFontData()
{
- ImplClearFontData( bNewFontLists );
- ImplRefreshFontData( bNewFontLists );
+ ImplClearFontData( true/*bNewFontLists*/ );
+ ImplRefreshFontData( true/*bNewFontLists*/ );
}
void OutputDevice::ImplClearAllFontData(bool bNewFontLists)
@@ -1021,7 +1021,7 @@ bool OutputDevice::ImplNewFont() const
const ImplSVData* pSVData = ImplGetSVData();
if( mpFontCollection == pSVData->maGDIData.mpScreenFontList
|| mpFontCache == pSVData->maGDIData.mpScreenFontCache )
- const_cast<OutputDevice&>(*this).ImplUpdateFontData( true );
+ const_cast<OutputDevice&>(*this).ImplUpdateFontData();
}
if ( !mbNewFont )
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 913b47c..94a8f97 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -290,7 +290,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
// EndExtTextInput if it is not the same window
if ( pSVData->maWinData.mpExtTextInputWin &&
(pSVData->maWinData.mpExtTextInputWin.get() != this) )
- pSVData->maWinData.mpExtTextInputWin->EndExtTextInput( EndExtTextInputFlags::Complete );
+ pSVData->maWinData.mpExtTextInputWin->EndExtTextInput();
// mark this windows as the last FocusWindow
vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow();
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 0c49837..08ce4e4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -945,10 +945,10 @@ void Window::ImplValidateFrameRegion( const vcl::Region* pRegion, ValidateFlags
}
}
-void Window::ImplValidate( const vcl::Region* pRegion, ValidateFlags nFlags )
+void Window::ImplValidate( ValidateFlags nFlags )
{
// assemble region
- bool bValidateAll = !pRegion;
+ bool bValidateAll = true;
ValidateFlags nOrgFlags = nFlags;
if ( !(nFlags & (ValidateFlags::Children | ValidateFlags::NoChildren)) )
{
@@ -965,8 +965,6 @@ void Window::ImplValidate( const vcl::Region* pRegion, ValidateFlags nFlags )
{
Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) );
vcl::Region aRegion( aRect );
- if ( pRegion )
- aRegion.Intersect( *pRegion );
ImplClipBoundaries( aRegion, true, true );
if ( nFlags & ValidateFlags::NoChildren )
{
@@ -1225,7 +1223,7 @@ void Window::Validate()
if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) )
return;
- ImplValidate( nullptr, ValidateFlags::NONE );
+ ImplValidate( ValidateFlags::NONE );
}
bool Window::HasPaintEvent() const
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 28c739f..53d8ea7 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1344,7 +1344,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
mpPreviewWindow->setPreview( aMtf, aCurPageSize,
- aPrt->GetPaperName( false ),
+ aPrt->GetPaperName(),
nPages > 0 ? OUString() : maNoPageStr,
aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4d89a17..9f1e38c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -413,7 +413,7 @@ void Window::dispose()
// EndExtTextInputMode
if ( pSVData->maWinData.mpExtTextInputWin == this )
{
- EndExtTextInput( EndExtTextInputFlags::Complete );
+ EndExtTextInput();
if ( pSVData->maWinData.mpExtTextInputWin == this )
pSVData->maWinData.mpExtTextInputWin = nullptr;
}
@@ -1970,20 +1970,17 @@ void Window::StateChanged(StateChangedType eType)
}
}
-bool Window::IsLocked( bool bChildren ) const
+bool Window::IsLocked() const
{
if ( mpWindowImpl->mnLockCount != 0 )
return true;
- if ( bChildren || mpWindowImpl->mbChildNotify )
+ vcl::Window* pChild = mpWindowImpl->mpFirstChild;
+ while ( pChild )
{
- vcl::Window* pChild = mpWindowImpl->mpFirstChild;
- while ( pChild )
- {
- if ( pChild->IsLocked( true ) )
- return true;
- pChild = pChild->mpWindowImpl->mpNext;
- }
+ if ( pChild->IsLocked() )
+ return true;
+ pChild = pChild->mpWindowImpl->mpNext;
}
return false;
@@ -2113,11 +2110,11 @@ void Window::SetInputContext( const InputContext& rInputContext )
ImplNewInputContext();
}
-void Window::EndExtTextInput( EndExtTextInputFlags nFlags )
+void Window::EndExtTextInput()
{
if ( mpWindowImpl->mbExtTextInput )
- ImplGetFrame()->EndExtTextInput( nFlags );
+ ImplGetFrame()->EndExtTextInput( EndExtTextInputFlags::Complete );
}
void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
@@ -2967,10 +2964,10 @@ Rectangle Window::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const
return ImplGetWindowExtentsRelative( pRelativeWindow, false );
}
-Rectangle Window::GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const
+Rectangle Window::GetClientWindowExtentsRelative() const
{
// without decoration
- return ImplGetWindowExtentsRelative( pRelativeWindow, true );
+ return ImplGetWindowExtentsRelative( nullptr, true );
}
Rectangle Window::ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c680cb4..4fba05c 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -407,7 +407,7 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent
if ( pSVData->maWinData.mpExtTextInputWin &&
((nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) ||
(nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP)) )
- pSVData->maWinData.mpExtTextInputWin->EndExtTextInput( EndExtTextInputFlags::Complete );
+ pSVData->maWinData.mpExtTextInputWin->EndExtTextInput();
}
// determine mouse event data
@@ -1807,7 +1807,7 @@ IMPL_LINK_NOARG_TYPED(vcl::Window, ImplAsyncFocusHdl, void*, void)
// TrackingMode is ended in ImplHandleLoseFocus
#ifdef _WIN32
// To avoid problems with the Unix IME
- pFocusWin->EndExtTextInput( EndExtTextInputFlags::Complete );
+ pFocusWin->EndExtTextInput();
#endif
// XXX #102010# hack for accessibility: do not close the menu,
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 0d4e9d1..caeee56 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -155,9 +155,9 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr
}
}
-void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags )
+void WorkWindow::StartPresentationMode( PresentationFlags nFlags )
{
- return StartPresentationMode( bPresentation, nFlags, GetScreenNumber());
+ return StartPresentationMode( false/*bPresentation*/, nFlags, GetScreenNumber());
}
void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags, sal_uInt32 nDisplayScreen )
diff --git a/vcl/unx/gtk/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
index b7f4668..cae1658 100644
--- a/vcl/unx/gtk/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gtkprintwrapper.cxx
@@ -252,14 +252,14 @@ void GtkPrintWrapper::print_settings_set_print_pages(GtkPrintSettings* settings,
#endif
}
-GtkWidget* GtkPrintWrapper::print_unix_dialog_new(const gchar* title, GtkWindow* parent) const
+GtkWidget* GtkPrintWrapper::print_unix_dialog_new() const
{
#if !GTK_CHECK_VERSION(3,0,0)
assert(m_print_unix_dialog_new);
- return (*m_print_unix_dialog_new)(title, parent);
+ return (*m_print_unix_dialog_new)(nullptr, nullptr);
#else
(void) this; // loplugin:staticmethods
- return gtk_print_unix_dialog_new(title, parent);
+ return gtk_print_unix_dialog_new(nullptr, nullptr);
#endif
}
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 9b7828d..6ea55a5 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -404,7 +404,7 @@ void
GtkPrintDialog::impl_initDialog()
{
//To-Do, like fpicker, set UI language
- m_pDialog = m_xWrapper->print_unix_dialog_new(nullptr, nullptr);
+ m_pDialog = m_xWrapper->print_unix_dialog_new();
vcl::Window* const pTopWindow(Application::GetActiveTopWindow());
if (pTopWindow)
More information about the Libreoffice-commits
mailing list