[Libreoffice-commits] core.git: 14 commits - basctl/source canvas/source cui/source desktop/source editeng/source filter/source include/canvas include/editeng include/filter include/linguistic include/oox include/registry include/sfx2 include/sot include/svl include/svtools include/svx include/tools include/unotools include/vcl linguistic/source oox/source registry/source sc/source sd/source sfx2/inc sfx2/source sot/source starmath/inc svl/source svtools/source svx/inc svx/source sw/inc sw/source tools/source unotools/source vcl/generic vcl/headless vcl/inc vcl/source vcl/unx vcl/win
Noel Grandin
noel at peralex.com
Thu Mar 19 01:47:08 PDT 2015
basctl/source/basicide/basdoc.hxx | 1
basctl/source/basicide/basobj2.cxx | 2
basctl/source/basicide/basobj3.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 31 ----
canvas/source/cairo/cairo_canvashelper.hxx | 27 ---
canvas/source/cairo/cairo_devicehelper.cxx | 12 -
canvas/source/cairo/cairo_devicehelper.hxx | 2
canvas/source/cairo/cairo_spritedevicehelper.cxx | 13 -
canvas/source/cairo/cairo_spritedevicehelper.hxx | 2
canvas/source/opengl/ogl_bitmapcanvashelper.cxx | 32 ----
canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 20 --
canvas/source/opengl/ogl_canvashelper.cxx | 4
canvas/source/opengl/ogl_canvashelper.hxx | 8 -
canvas/source/opengl/ogl_spritedevicehelper.cxx | 25 ---
canvas/source/opengl/ogl_spritedevicehelper.hxx | 5
canvas/source/tools/propertysethelper.cxx | 11 -
canvas/source/vcl/canvashelper.cxx | 12 -
canvas/source/vcl/canvashelper.hxx | 15 --
canvas/source/vcl/devicehelper.cxx | 5
canvas/source/vcl/devicehelper.hxx | 1
canvas/source/vcl/spritedevicehelper.cxx | 6
canvas/source/vcl/spritedevicehelper.hxx | 1
cui/source/options/optaccessibility.cxx | 3
desktop/source/app/app.cxx | 3
desktop/source/deployment/gui/dp_gui_service.cxx | 3
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 41 -----
editeng/source/editeng/editeng.cxx | 6
editeng/source/editeng/impedit.hxx | 1
editeng/source/editeng/impedit3.cxx | 9 -
editeng/source/editeng/impedit4.cxx | 8 -
editeng/source/editeng/textconv.cxx | 7 -
editeng/source/editeng/textconv.hxx | 1
editeng/source/outliner/outliner.cxx | 2
editeng/source/rtf/rtfitem.cxx | 1
editeng/source/rtf/svxrtf.cxx | 22 ---
filter/source/graphicfilter/ios2met/ios2met.cxx | 10 -
filter/source/graphicfilter/ipbm/ipbm.cxx | 22 ---
filter/source/graphicfilter/ipcd/ipcd.cxx | 17 --
filter/source/graphicfilter/ipcx/ipcx.cxx | 10 -
filter/source/graphicfilter/ipict/ipict.cxx | 10 -
filter/source/graphicfilter/itiff/itiff.cxx | 20 --
filter/source/msfilter/eschesdo.cxx | 12 -
filter/source/msfilter/eschesdo.hxx | 1
filter/source/msfilter/mscodec.cxx | 2
filter/source/msfilter/svdfppt.cxx | 12 -
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 7 -
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 1
filter/source/xsltfilter/LibXSLTTransformer.cxx | 11 -
filter/source/xsltfilter/LibXSLTTransformer.hxx | 2
include/canvas/base/bitmapcanvasbase.hxx | 14 --
include/canvas/base/bufferedgraphicdevicebase.hxx | 7 -
include/canvas/base/canvasbase.hxx | 18 --
include/canvas/base/graphicdevicebase.hxx | 24 +--
include/canvas/base/integerbitmapbase.hxx | 10 -
include/canvas/propertysethelper.hxx | 4
include/editeng/editeng.hxx | 1
include/editeng/outliner.hxx | 2
include/editeng/svxrtf.hxx | 5
include/editeng/unoedsrc.hxx | 3
include/filter/msfilter/svdfppt.hxx | 11 -
include/linguistic/lngprophelp.hxx | 2
include/oox/crypto/DocumentDecryption.hxx | 1
include/oox/dump/dffdumper.hxx | 1
include/oox/dump/oledumper.hxx | 9 -
include/oox/export/chartexport.hxx | 1
include/oox/ole/axcontrol.hxx | 2
include/oox/ole/vbaproject.hxx | 2
include/registry/registry.hxx | 26 +--
include/sfx2/app.hxx | 2
include/sfx2/childwin.hxx | 1
include/sfx2/ctrlitem.hxx | 1
include/sfx2/dockwin.hxx | 1
include/sfx2/doctempl.hxx | 1
include/sfx2/frame.hxx | 7 -
include/sfx2/module.hxx | 2
include/sfx2/objsh.hxx | 4
include/sfx2/shell.hxx | 25 ---
include/sfx2/stbitem.hxx | 3
include/sfx2/viewsh.hxx | 26 ---
include/sot/object.hxx | 3
include/svl/itemprop.hxx | 2
include/svl/macitem.hxx | 2
include/svl/numuno.hxx | 5
include/svtools/accessibilityoptions.hxx | 1
include/svtools/accessibleruler.hxx | 2
include/svtools/brwbox.hxx | 2
include/svtools/ctrltool.hxx | 4
include/svtools/grfmgr.hxx | 3
include/svtools/headbar.hxx | 1
include/svtools/imap.hxx | 3
include/svtools/imapobj.hxx | 3
include/svtools/ivctrl.hxx | 6
include/svtools/parhtml.hxx | 1
include/svtools/scrwin.hxx | 3
include/svtools/treelist.hxx | 1
include/svtools/treelistbox.hxx | 17 --
include/svx/fontwork.hxx | 1
include/svx/hdft.hxx | 7 -
include/svx/obj3d.hxx | 1
include/svx/sdr/contact/viewcontact.hxx | 6
include/svx/sdr/overlay/overlayobjectlist.hxx | 2
include/svx/svdglev.hxx | 2
include/svx/svdmodel.hxx | 2
include/svx/svdobj.hxx | 3
include/svx/svdpntv.hxx | 3
include/tools/b3dtrans.hxx | 1
include/tools/urlobj.hxx | 2
include/unotools/localedatawrapper.hxx | 6
include/unotools/moduleoptions.hxx | 2
include/vcl/button.hxx | 1
include/vcl/debugevent.hxx | 1
include/vcl/dndhelp.hxx | 15 --
include/vcl/dockwin.hxx | 8 -
include/vcl/fixed.hxx | 1
include/vcl/settings.hxx | 1
include/vcl/texteng.hxx | 2
include/vcl/toolbox.hxx | 2
include/vcl/window.hxx | 18 ++
linguistic/source/lngprophelp.cxx | 6
oox/source/core/filterdetect.cxx | 7 -
oox/source/crypto/DocumentDecryption.cxx | 5
oox/source/drawingml/chart/objectformatter.cxx | 11 -
oox/source/dump/dffdumper.cxx | 5
oox/source/dump/oledumper.cxx | 7 -
oox/source/export/chartexport.cxx | 6
oox/source/ole/axcontrol.cxx | 12 -
oox/source/ole/vbaproject.cxx | 6
registry/source/registry.cxx | 3
registry/source/regkey.cxx | 29 ----
registry/source/regkey.hxx | 4
sc/source/ui/drawfunc/drawsh4.cxx | 5
sc/source/ui/drawfunc/drtxtob2.cxx | 5
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/view/gridwin.cxx | 2
sd/source/ui/app/tmplctrl.cxx | 3
sd/source/ui/inc/DrawDocShell.hxx | 1
sd/source/ui/inc/GraphicDocShell.hxx | 2
sfx2/inc/bitset.hxx | 42 ------
sfx2/source/appl/appinit.cxx | 1
sfx2/source/appl/appmain.cxx | 46 ------
sfx2/source/appl/appquit.cxx | 3
sfx2/source/appl/childwin.cxx | 5
sfx2/source/appl/module.cxx | 4
sfx2/source/control/bindings.cxx | 5
sfx2/source/control/ctrlitem.cxx | 6
sfx2/source/control/dispatch.cxx | 21 ---
sfx2/source/control/shell.cxx | 12 -
sfx2/source/control/statcach.cxx | 13 -
sfx2/source/control/unoctitm.cxx | 19 --
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/navigat.cxx | 8 -
sfx2/source/dialog/securitypage.cxx | 5
sfx2/source/dialog/splitwin.cxx | 14 --
sfx2/source/dialog/templdlg.cxx | 7 -
sfx2/source/doc/doctempl.cxx | 9 -
sfx2/source/doc/graphhelp.cxx | 11 -
sfx2/source/doc/graphhelp.hxx | 9 +
sfx2/source/doc/objcont.cxx | 1
sfx2/source/doc/objstor.cxx | 5
sfx2/source/doc/objxtor.cxx | 11 -
sfx2/source/inc/splitwin.hxx | 1
sfx2/source/inc/statcach.hxx | 1
sfx2/source/inc/templdgi.hxx | 2
sfx2/source/statbar/stbitem.cxx | 30 ----
sfx2/source/view/frame.cxx | 5
sfx2/source/view/ipclient.cxx | 4
sfx2/source/view/sfxbasecontroller.cxx | 2
sfx2/source/view/viewfrm.cxx | 15 --
sfx2/source/view/viewsh.cxx | 38 -----
sot/source/base/object.cxx | 11 -
sot/source/sdstor/stgelem.hxx | 2
sot/source/sdstor/stgstrms.cxx | 8 -
starmath/inc/document.hxx | 1
svl/source/items/itemprop.cxx | 17 --
svl/source/items/macitem.cxx | 2
svl/source/misc/inethist.cxx | 4
svl/source/numbers/numfmuno.cxx | 3
svl/source/numbers/numuno.cxx | 10 -
svtools/source/brwbox/brwbox2.cxx | 13 -
svtools/source/config/accessibilityoptions.cxx | 6
svtools/source/contnr/imivctl.hxx | 2
svtools/source/contnr/imivctl1.cxx | 97 ++------------
svtools/source/contnr/ivctrl.cxx | 25 ---
svtools/source/contnr/svimpbox.cxx | 11 -
svtools/source/contnr/svtabbx.cxx | 1
svtools/source/contnr/treelist.cxx | 5
svtools/source/contnr/treelistbox.cxx | 44 ------
svtools/source/control/accessibleruler.cxx | 8 -
svtools/source/control/ctrltool.cxx | 7 -
svtools/source/control/headbar.cxx | 18 --
svtools/source/control/scrwin.cxx | 21 ---
svtools/source/graphic/grfmgr.cxx | 6
svtools/source/graphic/grfmgr2.cxx | 5
svtools/source/inc/svimpbox.hxx | 1
svtools/source/misc/imap.cxx | 23 ---
svx/inc/svdibrow.hxx | 1
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 8 -
svx/source/dialog/fontwork.cxx | 4
svx/source/dialog/hdft.cxx | 19 --
svx/source/form/datanavi.cxx | 17 --
svx/source/inc/datanavi.hxx | 1
svx/source/inc/svxrectctaccessiblecontext.hxx | 3
svx/source/sdr/contact/viewcontact.cxx | 23 ---
svx/source/sdr/properties/attributeproperties.cxx | 4
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 2
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdfmtf.cxx | 12 -
svx/source/svdraw/svdfmtf.hxx | 2
svx/source/svdraw/svdglev.cxx | 5
svx/source/svdraw/svdmodel.cxx | 8 -
svx/source/svdraw/svdobj.cxx | 81 ++---------
svx/source/svdraw/svdpntv.cxx | 1
svx/source/svdraw/svdtrans.cxx | 4
sw/inc/docsh.hxx | 1
sw/inc/mdiexp.hxx | 4
sw/inc/ndgrf.hxx | 1
sw/inc/wdocsh.hxx | 2
sw/source/core/doc/notxtfrm.cxx | 1
sw/source/core/fields/docufld.cxx | 1
sw/source/core/graphic/ndgrf.cxx | 25 ---
sw/source/uibase/app/docsh.cxx | 1
sw/source/uibase/docvw/edtwin.cxx | 1
sw/source/uibase/inc/glshell.hxx | 4
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/tmplctrl.cxx | 2
tools/source/fsys/urlobj.cxx | 5
tools/source/generic/b3dtrans.cxx | 7 -
unotools/source/config/moduleoptions.cxx | 5
vcl/generic/glyphs/gcach_ftyp.cxx | 8 -
vcl/generic/print/printerjob.cxx | 2
vcl/generic/print/prtsetup.cxx | 6
vcl/generic/print/prtsetup.hxx | 2
vcl/generic/print/text_gfx.cxx | 5
vcl/headless/svpframe.cxx | 11 -
vcl/inc/generic/printergfx.hxx | 1
vcl/inc/headless/svpframe.hxx | 3
vcl/inc/printdlg.hxx | 2
vcl/inc/sallayout.hxx | 5
vcl/inc/unx/gtk/gtkframe.hxx | 1
vcl/inc/unx/gtk/gtkobject.hxx | 2
vcl/inc/unx/i18n_ic.hxx | 2
vcl/inc/unx/i18n_status.hxx | 4
vcl/inc/unx/saldisp.hxx | 15 --
vcl/inc/unx/salframe.h | 1
vcl/source/app/dndhelp.cxx | 50 -------
vcl/source/app/settings.cxx | 5
vcl/source/control/button.cxx | 7 -
vcl/source/control/fixed.cxx | 9 -
vcl/source/edit/texteng.cxx | 4
vcl/source/edit/textundo.cxx | 2
vcl/source/edit/textview.cxx | 2
vcl/source/gdi/pngwrite.cxx | 13 -
vcl/source/gdi/sallayout.cxx | 5
vcl/source/window/debugevent.cxx | 6
vcl/source/window/dockmgr.cxx | 26 ---
vcl/source/window/dockwin.cxx | 20 --
vcl/source/window/printdlg.cxx | 10 -
vcl/source/window/toolbox.cxx | 12 -
vcl/source/window/toolbox2.cxx | 8 -
vcl/source/window/window.cxx | 16 --
vcl/source/window/winproc.cxx | 7 -
vcl/unx/generic/app/i18n_ic.cxx | 7 -
vcl/unx/generic/app/i18n_status.cxx | 7 -
vcl/unx/generic/app/saldisp.cxx | 2
vcl/unx/generic/dtrans/X11_dndcontext.cxx | 3
vcl/unx/generic/dtrans/X11_selection.cxx | 4
vcl/unx/generic/dtrans/X11_selection.hxx | 1
vcl/unx/generic/gdi/gdiimpl.cxx | 80 ++---------
vcl/unx/generic/gdi/salgdi.cxx | 8 -
vcl/unx/generic/window/salframe.cxx | 58 --------
vcl/unx/gtk/window/gtksalframe.cxx | 5
vcl/win/source/gdi/winlayout.cxx | 8 -
vcl/win/source/gdi/winlayout.hxx | 4
274 files changed, 203 insertions(+), 2191 deletions(-)
New commits:
commit cfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 9 08:52:44 2015 +0200
loplugin:constantfunction: filter
Change-Id: I11e616ec1e3249573797bd2a4bb2b52f11c115ee
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index e72a9d6..4a77e38 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -373,8 +373,6 @@ private:
SvStream * pOrdFile;
- bool Callback(sal_uInt16 nPercent);
-
void AddPointsToPath(const Polygon & rPoly);
void AddPointsToArea(const Polygon & rPoly);
void CloseFigure();
@@ -433,11 +431,6 @@ public:
//=================== Methods of OS2METReader ==============================
-bool OS2METReader::Callback(sal_uInt16 /*nPercent*/)
-{
- return false;
-}
-
OS2METReader::OS2METReader()
: ErrorCode(0)
, pOS2MET(NULL)
@@ -2625,7 +2618,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
sal_uInt64 const nStartPos = pOS2MET->Tell();
sal_uInt64 const nRemaining = pOS2MET->remainingSize();
- Callback(0); nLastPercent=0;
+ nLastPercent=0;
sal_uInt64 nPos = pOS2MET->Tell();
@@ -2633,7 +2626,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
nPercent = (nPos-nStartPos)*100 / nRemaining;
if (nLastPercent+4<=nPercent) {
- if (Callback((sal_uInt16)nPercent)) break;
nLastPercent=nPercent;
}
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 113b676..9547294 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -40,7 +40,6 @@ private:
sal_uLong mnWidth, mnHeight; // dimensions in pixel
sal_uLong mnCol;
sal_uLong mnMaxVal; // max value in the <missing comment>
- bool ImplCallback( sal_uInt16 nPercent );
bool ImplReadBody();
bool ImplReadHeader();
@@ -70,21 +69,6 @@ PBMReader::~PBMReader()
{
}
-bool PBMReader::ImplCallback( sal_uInt16 /*nPercent*/ )
-{
-/*
- if ( pCallback != NULL )
- {
- if ( ( (*pCallback)( pCallerData, nPercent ) ) == sal_True )
- {
- mrPBM.SetError( SVSTREAM_FILEFORMAT_ERROR );
- return sal_True;
- }
- }
-*/
- return false;
-}
-
bool PBMReader::ReadPBM(Graphic & rGraphic )
{
sal_uInt16 i;
@@ -285,7 +269,6 @@ bool PBMReader::ImplReadBody()
nShift = 0;
nWidth = 0;
nHeight++;
- ImplCallback( (sal_uInt16)( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
}
break;
@@ -304,7 +287,6 @@ bool PBMReader::ImplReadBody()
{
nWidth = 0;
nHeight++;
- ImplCallback( (sal_uInt16)( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
}
break;
@@ -327,7 +309,6 @@ bool PBMReader::ImplReadBody()
{
nWidth = 0;
nHeight++;
- ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
}
break;
@@ -366,7 +347,6 @@ bool PBMReader::ImplReadBody()
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = true;
- ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
}
else
@@ -395,7 +375,6 @@ bool PBMReader::ImplReadBody()
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = true;
- ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
continue;
}
@@ -470,7 +449,6 @@ bool PBMReader::ImplReadBody()
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = true;
- ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
continue;
}
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 5ab1cfc..3d6ca90 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -66,15 +66,13 @@ private:
sal_uLong nBMPWidth;
sal_uLong nBMPHeight;
- void MayCallback(sal_uLong nPercent);
-
void CheckPCDImagePacFile();
// checks whether it's a Photo-CD file with 'Image Pac'
void ReadOrientation();
// reads the orientation and sets nOrientation
- void ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent);
+ void ReadImage();
public:
@@ -105,8 +103,6 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
bStatus = true;
nLastPercent = 0;
- MayCallback( 0 );
-
// is it a PCD file with a picture? ( sets bStatus == sal_False, if that's not the case):
CheckPCDImagePacFile();
@@ -163,7 +159,7 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == 0 )
return false;
- ReadImage( 5 ,65 );
+ ReadImage();
aBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
rGraphic = aBmp;
@@ -173,12 +169,6 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
-void PCDReader::MayCallback(sal_uLong /*nPercent*/)
-{
-}
-
-
-
void PCDReader::CheckPCDImagePacFile()
{
char Buf[ 8 ];
@@ -203,7 +193,7 @@ void PCDReader::ReadOrientation()
-void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
+void PCDReader::ReadImage()
{
sal_uLong nx,ny,nW2,nH2,nYPair,ndy,nXPair;
long nL,nCb,nCr,nRed,nGreen,nBlue;
@@ -360,7 +350,6 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
if ( m_rPCD.GetError() )
bStatus = false;
- MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * nYPair / nH2 );
if ( bStatus == false )
break;
}
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 6bbcc07..d5cc51b 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -43,10 +43,9 @@ private:
sal_uInt16 nResX, nResY; // resolution in pixel per inch oder 0,0
sal_uInt16 nDestBitsPerPixel; // bits per pixel in destination bitmap 1,4,8 or 24
sal_uInt8* pPalette;
- bool nStatus; // from now on do not read status from stream ( SJ )
+ bool nStatus; // from now on do not read status from stream ( SJ )
- bool Callback( sal_uInt16 nPercent );
void ImplReadBody(BitmapWriteAccess * pAcc);
void ImplReadPalette( sal_uLong nCol );
void ImplReadHeader();
@@ -83,11 +82,6 @@ PCXReader::~PCXReader()
delete[] pPalette;
}
-bool PCXReader::Callback( sal_uInt16 /*nPercent*/ )
-{
- return false;
-}
-
bool PCXReader::ReadPCX(Graphic & rGraphic)
{
if ( m_rPCX.GetError() )
@@ -239,8 +233,6 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
if ( ny == 0 || nLastPercent + 4 <= nPercent )
{
nLastPercent = nPercent;
- if ( Callback( (sal_uInt16)nPercent ) )
- break;
}
for ( np = 0; np < nPlanes; np++)
{
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 683819c..ed4da5b 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -170,8 +170,6 @@ private:
Fraction aHRes;
Fraction aVRes;
- bool Callback(sal_uInt16 nPercent);
-
Point ReadPoint();
Point ReadDeltaH(Point aBase);
@@ -360,11 +358,6 @@ void PictReader::SetFillColor( const Color& rColor )
pVirDev->SetFillColor( rColor );
}
-bool PictReader::Callback(sal_uInt16 /*nPercent*/)
-{
- return false;
-}
-
Point PictReader::ReadPoint()
{
short nx,ny;
@@ -1896,7 +1889,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
sal_uInt64 const nStartPos=pPict->Tell();
sal_uInt64 const nRemaining = pPict->remainingSize();
- Callback(0); nLastPercent=0;
+ nLastPercent=0;
ReadHeader();
@@ -1909,7 +1902,6 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
nPercent = (nPos-nStartPos) * 100 / nRemaining;
if (nLastPercent+4<=nPercent) {
- if (Callback((sal_uInt16)nPercent)) break;
nLastPercent=nPercent;
}
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index edd1aa0..7bc0f03 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -99,8 +99,6 @@ private:
sal_uInt8* pMap[ 4 ]; // temporary Scanline
- void MayCallback( sal_uLong nPercent );
-
sal_uLong DataTypeSize();
sal_uLong ReadIntData();
double ReadDoubleData();
@@ -108,7 +106,7 @@ private:
void ReadHeader();
void ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen );
- bool ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent );
+ bool ReadMap();
// reads/decompresses the bitmap data and fills pMap
sal_uLong GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_uLong nBitsCount );
@@ -194,12 +192,6 @@ public:
//=================== Methods of TIFFReader ==============================
-void TIFFReader::MayCallback( sal_uLong /*nPercent*/ )
-{
-}
-
-
-
sal_uLong TIFFReader::DataTypeSize()
{
sal_uLong nSize;
@@ -538,7 +530,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
-bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
+bool TIFFReader::ReadMap()
{
if ( nCompression == 1 || nCompression == 32771 )
{
@@ -559,7 +551,6 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
pTIFF->Read( pMap[ np ], nBytesPerRow );
if ( pTIFF->GetError() )
return false;
- MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * ( np * nImageLength + ny) / ( nImageLength * nPlanes ) );
}
if ( !ConvertScanline( ny ) )
return false;
@@ -618,7 +609,6 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
return false;
if ( pTIFF->GetError() )
return false;
- MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return false;
@@ -647,7 +637,6 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
}
if ( ( aLZWDecom.Decompress( pMap[ np ], nBytesPerRow ) != nBytesPerRow ) || pTIFF->GetError() )
return false;
- MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return false;
@@ -707,7 +696,6 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
} while ( nRowBytesLeft != 0 );
if ( pTIFF->GetError() )
return false;
- MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return false;
@@ -1177,8 +1165,6 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
// number format of pTIFF at the beginning
SvStreamEndian nOrigNumberFormat = pTIFF->GetEndian();
- MayCallback( 0 );
-
// read header:
ReadHeader();
@@ -1359,7 +1345,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
pMaskAcc = pAlphaMask->AcquireWriteAccess();
}
- if (bStatus && ReadMap(10, 60))
+ if (bStatus && ReadMap())
{
nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
MakePalCol();
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 2e92270..063a2f0 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -168,13 +168,6 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
rObj.GetShapeId() ) ); \
}
-//Map from twips to export units, generally twips as well, only excel and word
-//export is happening here, so native units are export units, leave as
-//placeholder if required in future
-void ImplEESdrWriter::MapRect(ImplEESdrObject& /* rObj */ )
-{
-}
-
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolverContainer,
ImplEESdrPageType ePageType, const bool bOOxmlExport )
@@ -472,7 +465,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
{
::com::sun::star::awt::Rectangle aNewRect;
aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_LINE, false, aNewRect, NULL );
- MapRect(rObj);
//i27942: Poly/Lines/Bezier do not support text.
mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -498,7 +490,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
::com::sun::star::awt::Rectangle aNewRect;
aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, NULL );
- MapRect(rObj);
aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
rObj.SetAngle( 0 );
}
@@ -510,7 +501,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
::com::sun::star::awt::Rectangle aNewRect;
aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, NULL );
- MapRect(rObj);
aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
rObj.SetAngle( 0 );
}
@@ -522,7 +512,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
::com::sun::star::awt::Rectangle aNewRect;
aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, true, aNewRect, NULL );
- MapRect(rObj);
aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
rObj.SetAngle( 0 );
}
@@ -537,7 +526,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
::com::sun::star::awt::Rectangle aNewRect;
aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, true, aNewRect, NULL );
- MapRect(rObj);
aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
rObj.SetAngle( 0 );
}
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 7ef49a2..e655ce9 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -169,7 +169,6 @@ public:
Point ImplMapPoint( const Point& rPoint );
Size ImplMapSize( const Size& rSize );
EscherExHostAppData* ImplGetHostData() { return mpHostAppData; }
- void MapRect(ImplEESdrObject& rObj);
};
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 7a00f16..77c572e 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -280,7 +280,7 @@ static void lcl_PrintDigest(const sal_uInt8* pDigest, const char* msg)
printf("\n");
}
#else
-static void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/)
+static inline void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/)
{
}
#endif
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6f0fb86..9947068 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3099,13 +3099,6 @@ void SdrEscherImport::ImportHeaderFooterContainer( DffRecordHeader& rHd, HeaderF
}
}
-// no longer needed
-sal_Unicode SdrPowerPointImport::PPTSubstitute( sal_uInt16 /*nFont*/, sal_Unicode /*nChar*/,
- sal_uInt32& /*nMappedFontId*/, vcl::Font& /*rFont*/, char /*nDefault*/) const
-{
- return 0;
-}
-
PPTBuGraEntry::PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInst ) :
nInstance ( nInst ),
aBuGra ( rGraphic ) {}
@@ -5748,7 +5741,6 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader,
PPTParagraphObj::~PPTParagraphObj()
{
- ImplClear();
}
void PPTParagraphObj::AppendPortion( PPTPortionObj& rPPTPortion )
@@ -6280,10 +6272,6 @@ PPTPortionObj* PPTParagraphObj::Next()
return &m_PortionList[i];
}
-void PPTParagraphObj::ImplClear()
-{
-}
-
PPTFieldEntry::~PPTFieldEntry()
{
delete pField1;
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 64a390f..d6eafda 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -88,10 +88,9 @@ namespace XSLT
return tmp->read(buffer, len);
}
static int
- on_close(void * context)
+ on_close(void * )
{
- Reader * tmp = static_cast<Reader*> (context);
- return tmp->closeInput();
+ return 0;
}
};
/**
@@ -258,12 +257,6 @@ namespace XSLT
}
int
- Reader::closeInput()
- {
- return 0;
- }
-
- int
Reader::closeOutput()
{
css::uno::Reference<XOutputStream> xos = m_transformer->getOutputStream();
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index cc078b9..ce0ddbe 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -163,8 +163,6 @@ namespace XSLT
int SAL_CALL
write(const char * buffer, int len);
int SAL_CALL
- closeInput();
- int SAL_CALL
closeOutput();
private:
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 9a78411..9fefd59 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -625,13 +625,6 @@ public:
void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const SAL_OVERRIDE;
virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE;
- sal_Unicode PPTSubstitute(
- sal_uInt16 nFont,
- sal_Unicode nChar,
- sal_uInt32& nMappedFontId,
- vcl::Font& rFont,
- char nDefault
- ) const;
const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; }
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const SAL_OVERRIDE;
SdrObject* CreateTable(
@@ -1177,10 +1170,6 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj
const PPTStyleSheet& mrStyleSheet;
sal_uInt32 mnInstance;
-protected:
-
- void ImplClear();
-
public:
bool mbTab; // if true, this paragraph has tabulators in text
commit 94d3d0a27763a34c3ee72f341264fbe4fc99574b
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 5 12:51:41 2015 +0200
loplugin:constantfunction: editeng
Change-Id: I112bb65a3f470b3f179efd1cf9fa979175d5d350
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index abc1903..6a1c21c 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -130,13 +130,8 @@ namespace accessibility
void SetOffset( const Point& );
- void UpdateChildren();
void Dispose();
-#ifdef DBG_UTIL
- void CheckInvariants() const;
-#endif
-
AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const;
sal_Int32 GetParagraphCount() const;
@@ -232,15 +227,6 @@ namespace accessibility
if( mpTextParagraph )
mpTextParagraph->SetEEOffset( rPoint );
-
- // in all cases, check visibility afterwards.
- UpdateChildren();
- }
-
- void AccessibleStaticTextBase_Impl::UpdateChildren()
- {
-
- // currently no children
}
void AccessibleStaticTextBase_Impl::Dispose()
@@ -256,13 +242,6 @@ namespace accessibility
mpTextParagraph = NULL;
}
-#ifdef DBG_UTIL
- void AccessibleStaticTextBase_Impl::CheckInvariants() const
- {
- // TODO
- }
-#endif
-
AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
{
@@ -494,11 +473,8 @@ namespace accessibility
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
- mpImpl->CheckInvariants();
-
mpImpl->SetEditSource( std::move(pEditSource) );
- mpImpl->CheckInvariants();
#else
mpImpl->SetEditSource( std::move(pEditSource) );
#endif
@@ -506,15 +482,8 @@ namespace accessibility
void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
-
mpImpl->SetEventSource( rInterface );
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
}
void AccessibleStaticTextBase::SetOffset( const Point& rPoint )
@@ -523,11 +492,8 @@ namespace accessibility
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
- mpImpl->CheckInvariants();
-
mpImpl->SetOffset( rPoint );
- mpImpl->CheckInvariants();
#else
mpImpl->SetOffset( rPoint );
#endif
@@ -535,15 +501,8 @@ namespace accessibility
void AccessibleStaticTextBase::Dispose()
{
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
-
mpImpl->Dispose();
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
}
// XAccessibleContext
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 2093382..c65c891 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2462,12 +2462,6 @@ void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*n
{
}
-bool EditEngine::FormattingParagraph( sal_Int32 )
-{
- // return true, if the Attribute was changed ...
- return false;
-}
-
void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
{
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 093aa10..72c35e3 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -629,7 +629,6 @@ private:
sal_uInt32 WriteText( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteRTF( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteXML(SvStream& rOutput, const EditSelection& rSel);
- sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicode = false);
void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos,
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 70ca386..bf4f5af 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -380,15 +380,6 @@ void ImpEditEngine::FormatDoc()
ParaPortion* pParaPortion = GetParaPortions()[nPara];
if ( pParaPortion->MustRepaint() || ( pParaPortion->IsInvalid() && pParaPortion->IsVisible() ) )
{
- if ( pParaPortion->IsInvalid() )
- {
- bool bChangedByDerivedClass = GetEditEnginePtr()->FormattingParagraph( nPara );
- if ( bChangedByDerivedClass )
- {
- pParaPortion->GetTextPortions().Reset();
- pParaPortion->MarkSelectionInvalid( 0, pParaPortion->GetNode()->Len() );
- }
- }
// No formatting should be necessary for MustRepaint()!
if ( ( pParaPortion->MustRepaint() && !pParaPortion->IsInvalid() )
|| CreateLines( nPara, nY ) )
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f0aa045..5c1a506 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -213,7 +213,7 @@ void ImpEditEngine::Write(SvStream& rOutput, EETextFormat eFormat, const EditSel
else if ( eFormat == EE_FORMAT_XML )
WriteXML( rOutput, rSel );
else if ( eFormat == EE_FORMAT_HTML )
- WriteHTML( rOutput, rSel );
+ ;
else if ( eFormat == EE_FORMAT_BIN)
WriteBin( rOutput, rSel );
else
@@ -998,12 +998,6 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
}
}
-sal_uInt32 ImpEditEngine::WriteHTML( SvStream&, EditSelection )
-{
- return 0;
-}
-
-
EditTextObject* ImpEditEngine::CreateTextObject()
{
EditSelection aCompleteSelection;
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index f22478e..62c9a29 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -134,7 +134,6 @@ bool TextConvWrapper::FindConvText_impl()
}
else
{
- ConvEnd_impl();
bConvert = ConvNext_impl();
}
}
@@ -223,11 +222,6 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
}
-void TextConvWrapper::ConvEnd_impl()
-{
-}
-
-
bool TextConvWrapper::ConvContinue_impl()
{
// modified version of EditSpellWrapper::SpellContinue
@@ -572,7 +566,6 @@ void TextConvWrapper::Convert()
m_bStartChk = false;
ConvStart_impl( SVX_SPELL_BODY_END );
ConvertDocument();
- ConvEnd_impl();
}
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 712e0f9..012811c 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -56,7 +56,6 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
// from EditSpellWrapper copied and modified
void ConvStart_impl( SvxSpellArea eSpell ); // former SpellStart
- void ConvEnd_impl(); // former SpellEnd
bool ConvContinue_impl(); // former SpellContinue
void SelectNewUnit_impl( const sal_Int32 nUnitStart,
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index fe6e6ca..83a0f7a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -223,7 +223,7 @@ void Outliner::Init( sal_uInt16 nMode )
const bool bWasUndoEnabled(IsUndoEnabled());
EnableUndo(false);
- ImplInitDepth( 0, GetMinDepth(), false );
+ ImplInitDepth( 0, -1, false );
GetUndoManager().Clear();
EnableUndo(bWasUndoEnabled);
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 6083cf1..36ab605 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -222,7 +222,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
case RTF_PARD:
RTFPardPlain( true, &pSet );
- ResetPard();
nStyleNo = 0;
bPardTokenRead = true;
break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 1d3f794..552c52a 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -85,18 +85,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
pDfltColor = new Color;
}
-void SvxRTFParser::EnterEnvironment()
-{
-}
-
-void SvxRTFParser::LeaveEnvironment()
-{
-}
-
-void SvxRTFParser::ResetPard()
-{
-}
-
SvxRTFParser::~SvxRTFParser()
{
if( !aColorTbl.empty() )
@@ -224,13 +212,11 @@ INSINGLECHAR:
case '{':
if (bNewGroup) // Nesting!
_GetAttrSet();
- EnterEnvironment();
bNewGroup = true;
break;
case '}':
if( !bNewGroup ) // Empty Group ??
AttrGroupEnd();
- LeaveEnvironment();
bNewGroup = false;
break;
case RTF_INFO:
@@ -1230,11 +1216,6 @@ void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
}
}
-bool SvxRTFParser::UncompressableStackEntry(const SvxRTFItemStackType &) const
-{
- return false;
-}
-
void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
{
ENSURE_OR_RETURN_VOID(pChildList, "Compress: no ChildList" );
@@ -1270,9 +1251,6 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
return;
}
- if (rParser.UncompressableStackEntry(*pTmp))
- return;
-
if( n )
{
// Search for all which are set over the whole area
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 89b5ce3..b9bbc91 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -486,7 +486,6 @@ public:
const Color& rOverlineColor,
const Color& rTextLineColor);
virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const;
- bool FormattingParagraph( sal_Int32 nPara );
virtual bool SpellNextDocument();
virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index e1623ec..09c4012 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -719,8 +719,6 @@ public:
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const;
- sal_Int16 GetMinDepth() const { return -1; }
-
void SetMaxDepth( sal_Int16 nDepth, bool bCheckParas = false );
sal_Int16 GetMaxDepth() const { return nMaxDepth; }
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index b33cf16..cf9732f 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -240,12 +240,8 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem );
protected:
- void EnterEnvironment();
- void LeaveEnvironment();
- void ResetPard();
virtual void InsertPara() = 0;
-
OUString& DelCharAtEnd( OUString& rStr, const sal_Unicode cDel );
// is called for each token that is recognized in CallParser
@@ -341,7 +337,6 @@ public:
// get RTF default ItemSets. Must be used by pard/plain tokens or in
// reset of Style-Items
const SfxItemSet& GetRTFDefaults();
- bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const;
};
// The stack for the attributes:
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 431053f..7c94aa2 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -536,9 +536,6 @@ public:
*/
virtual bool Paste() = 0;
- bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; };
- bool IsShapeParaFocusable( ) { return true; };
- bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; };
};
#endif
commit d07bf4aad4d2edda19d9806afd6d694b873aff41
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 4 15:53:01 2015 +0200
loplugin:constantfunction: canvas
Change-Id: I2fb2c4ec0e9467d7ced05b0e815e0d5bd2ba74c3
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 9e271bd..c003431 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -243,13 +243,6 @@ namespace cairocanvas
}
}
- void CanvasHelper::drawPoint( const rendering::XCanvas* ,
- const geometry::RealPoint2D& ,
- const rendering::ViewState& ,
- const rendering::RenderState& )
- {
- }
-
void CanvasHelper::drawLine( const rendering::XCanvas* /*pCanvas*/,
const geometry::RealPoint2D& aStartPoint,
const geometry::RealPoint2D& aEndPoint,
@@ -1520,18 +1513,6 @@ namespace cairocanvas
}
- void CanvasHelper::copyRect( const rendering::XCanvas* ,
- const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/,
- const geometry::RealRectangle2D& /*sourceRect*/,
- const rendering::ViewState& /*sourceViewState*/,
- const rendering::RenderState& /*sourceRenderState*/,
- const geometry::RealRectangle2D& /*destRect*/,
- const rendering::ViewState& /*destViewState*/,
- const rendering::RenderState& /*destRenderState*/ )
- {
- // TODO(F2): copyRect NYI
- }
-
geometry::IntegerSize2D CanvasHelper::getSize()
{
if( !mpSurfaceProvider )
@@ -1591,18 +1572,6 @@ namespace cairocanvas
return uno::Sequence< sal_Int8 >();
}
- void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/,
- const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
- const geometry::IntegerRectangle2D& /*rect*/ )
- {
- }
-
- void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/,
- const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
- const geometry::IntegerPoint2D& /*pos*/ )
- {
- }
-
uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index f6f0099..a2282bc 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -87,10 +87,6 @@ namespace cairocanvas
// XCanvas (only providing, not implementing the
// interface. Also note subtle method parameter differences)
void clear();
- void drawPoint( const ::com::sun::star::rendering::XCanvas* pCanvas,
- const ::com::sun::star::geometry::RealPoint2D& aPoint,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState );
void drawLine( const ::com::sun::star::rendering::XCanvas* pCanvas,
const ::com::sun::star::geometry::RealPoint2D& aStartPoint,
const ::com::sun::star::geometry::RealPoint2D& aEndPoint,
@@ -213,16 +209,6 @@ namespace cairocanvas
// BitmapCanvasHelper functionality
// ================================
- void copyRect( const ::com::sun::star::rendering::XCanvas* pCanvas,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
- const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
- const ::com::sun::star::rendering::ViewState& sourceViewState,
- const ::com::sun::star::rendering::RenderState& sourceRenderState,
- const ::com::sun::star::geometry::RealRectangle2D& destRect,
- const ::com::sun::star::rendering::ViewState& destViewState,
- const ::com::sun::star::rendering::RenderState& destRenderState );
-
::com::sun::star::geometry::IntegerSize2D getSize();
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
@@ -233,25 +219,12 @@ namespace cairocanvas
getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
- void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
- const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect );
-
- void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
- const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos );
-
::com::sun::star::uno::Sequence< sal_Int8 >
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
- /** Called from XCanvas base classes, to notify that content
- is _about_ to change
- */
- void modifying() {}
-
bool hasAlpha() const { return mbHaveAlpha; }
enum ColorType
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 05266e4..920481e 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -205,18 +205,6 @@ namespace cairocanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
- bool DeviceHelper::hasFullScreenMode()
- {
- // TODO(F3): offer fullscreen mode the XCanvas way
- return false;
- }
-
- bool DeviceHelper::enterFullScreenMode( bool /*bEnter*/ )
- {
- // TODO(F3): offer fullscreen mode the XCanvas way
- return false;
- }
-
uno::Any DeviceHelper::isAccelerated() const
{
return ::com::sun::star::uno::makeAny(false);
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index a4b7399..d5a6ca30 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -77,8 +77,6 @@ namespace cairocanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
- bool hasFullScreenMode( );
- bool enterFullScreenMode( bool bEnter );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 672c8bb..5233548 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -72,19 +72,6 @@ namespace cairocanvas
mpSpriteCanvas = NULL;
}
- ::sal_Int32 SpriteDeviceHelper::createBuffers( ::sal_Int32 /*nBuffers*/ )
- {
- // TODO(F3): implement XBufferStrategy interface. For now, we
- // _always_ will have exactly one backbuffer
- return 1;
- }
-
- void SpriteDeviceHelper::destroyBuffers()
- {
- // TODO(F3): implement XBufferStrategy interface. For now, we
- // _always_ will have exactly one backbuffer
- }
-
bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index a8be2b6..7f0495b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -52,8 +52,6 @@ namespace cairocanvas
void disposing();
// XWindowGraphicDevice
- ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
- void destroyBuffers( );
bool showBuffer( bool, bool );
bool switchBuffer( bool, bool bUpdateAll );
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
index 1a7ce41..715cbdc 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
@@ -34,19 +34,6 @@ namespace oglcanvas
CanvasHelper::init(rDevice,rDeviceHelper);
}
- void BitmapCanvasHelper::copyRect( const rendering::XCanvas* /*pCanvas*/,
- const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/,
- const geometry::RealRectangle2D& /*sourceRect*/,
- const rendering::ViewState& /*sourceViewState*/,
- const rendering::RenderState& /*sourceRenderState*/,
- const geometry::RealRectangle2D& /*destRect*/,
- const rendering::ViewState& /*destViewState*/,
- const rendering::RenderState& /*destRenderState*/ )
- {
- // TODO(F2): copyRect NYI
- }
-
-
uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/,
bool /*beFast*/ )
{
@@ -61,20 +48,6 @@ namespace oglcanvas
return uno::Sequence< sal_Int8 >();
}
- void BitmapCanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/,
- const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
- const geometry::IntegerRectangle2D& /*rect*/ )
- {
- // TODO(F2): NYI - and improbable to ever be
- }
-
- void BitmapCanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/,
- const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
- const geometry::IntegerPoint2D& /*pos*/ )
- {
- // TODO(F2): NYI - and improbable to ever be
- }
-
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
@@ -87,11 +60,6 @@ namespace oglcanvas
return ::canvas::tools::getStdMemoryLayout(getSize());
}
- bool BitmapCanvasHelper::hasAlpha() const
- {
- return true;
- }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index 6e46ebe..0c67588 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -55,16 +55,6 @@ namespace oglcanvas
// BitmapCanvasHelper functionality
// ================================
- void copyRect( const ::com::sun::star::rendering::XCanvas* rCanvas,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
- const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
- const ::com::sun::star::rendering::ViewState& sourceViewState,
- const ::com::sun::star::rendering::RenderState& sourceRenderState,
- const ::com::sun::star::geometry::RealRectangle2D& destRect,
- const ::com::sun::star::rendering::ViewState& destViewState,
- const ::com::sun::star::rendering::RenderState& destRenderState );
-
::com::sun::star::geometry::IntegerSize2D getSize() { return maSize; }
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
@@ -77,22 +67,12 @@ namespace oglcanvas
getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
- void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
- const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerRectangle2D& rect );
-
- void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
- const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
- const ::com::sun::star::geometry::IntegerPoint2D& pos );
-
::com::sun::star::uno::Sequence< sal_Int8 >
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
- bool hasAlpha() const;
-
private:
::com::sun::star::geometry::IntegerSize2D maSize;
};
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 8c4969b..f6d641f 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -972,10 +972,6 @@ namespace oglcanvas
mpDevice->getDeviceColorSpace()->convertToARGB(renderState.DeviceColor)[0];
}
- void CanvasHelper::flush() const
- {
- }
-
bool CanvasHelper::renderRecordedActions() const
{
std::vector<Action>::const_iterator aCurr(mpRecordedActions->begin());
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index 5c7ecd2..8499c2b 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -181,14 +181,6 @@ namespace oglcanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); }
- // Flush drawing queue to screen
- void flush() const;
-
- /** Called from XCanvas base classes, to notify that content
- is _about_ to change
- */
- void modifying() {}
-
/** Write out recorded actions
*/
bool renderRecordedActions() const;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 5b712b8..da0c735 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -251,31 +251,6 @@ namespace oglcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
- bool SpriteDeviceHelper::hasFullScreenMode()
- {
- // TODO(F3): offer fullscreen mode the XCanvas way
- return false;
- }
-
- bool SpriteDeviceHelper::enterFullScreenMode( bool /*bEnter*/ )
- {
- // TODO(F3): offer fullscreen mode the XCanvas way
- return false;
- }
-
- ::sal_Int32 SpriteDeviceHelper::createBuffers( ::sal_Int32 /*nBuffers*/ )
- {
- // TODO(F3): implement XBufferStrategy interface. For now, we
- // _always_ will have exactly one backbuffer
- return 1;
- }
-
- void SpriteDeviceHelper::destroyBuffers()
- {
- // TODO(F3): implement XBufferStrategy interface. For now, we
- // _always_ will have exactly one backbuffer
- }
-
namespace
{
/** Functor providing a StrictWeakOrdering for XSprites (over
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 4eb3c4b..b1a988d 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -72,11 +72,6 @@ namespace oglcanvas
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
- bool hasFullScreenMode( );
- bool enterFullScreenMode( bool bEnter );
-
- ::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
- void destroyBuffers( );
bool showBuffer( bool bIsVisible, bool bUpdateAll );
bool switchBuffer( bool bIsVisible, bool bUpdateAll );
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 46ebc35..477fda9 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -143,12 +143,6 @@ namespace canvas
throwUnknown( aPropertyName );
}
- void PropertySetHelper::removePropertyChangeListener( const OUString& /*aPropertyName*/,
- const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
- {
- // ignore request, no listener added in the first place
- }
-
void PropertySetHelper::addVetoableChangeListener( const OUString& aPropertyName,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
{
@@ -158,11 +152,6 @@ namespace canvas
throwUnknown( aPropertyName );
}
- void PropertySetHelper::removeVetoableChangeListener( const OUString& /*aPropertyName*/,
- const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
- {
- // ignore request, no listener added in the first place
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 7b9c9ce..5bf8b37 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -899,18 +899,6 @@ namespace vclcanvas
true );
}
- void CanvasHelper::copyRect( const rendering::XCanvas* ,
- const uno::Reference< rendering::XBitmapCanvas >& ,
- const geometry::RealRectangle2D& ,
- const rendering::ViewState& ,
- const rendering::RenderState& ,
- const geometry::RealRectangle2D& ,
- const rendering::ViewState& ,
- const rendering::RenderState& )
- {
- // TODO(F1)
- }
-
geometry::IntegerSize2D CanvasHelper::getSize()
{
if( !mpOutDev.get() )
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 6920c88..0f22ea6 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -231,16 +231,6 @@ namespace vclcanvas
// BitmapCanvasHelper functionality
// ================================
- void copyRect( const ::com::sun::star::rendering::XCanvas* rCanvas,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
- const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
- const ::com::sun::star::rendering::ViewState& sourceViewState,
- const ::com::sun::star::rendering::RenderState& sourceRenderState,
- const ::com::sun::star::geometry::RealRectangle2D& destRect,
- const ::com::sun::star::rendering::ViewState& destViewState,
- const ::com::sun::star::rendering::RenderState& destRenderState );
-
::com::sun::star::geometry::IntegerSize2D getSize();
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
@@ -293,11 +283,6 @@ namespace vclcanvas
const ::com::sun::star::rendering::RenderState& renderState,
ColorType eColorType ) const;
- /** Called from XCanvas base classes, to notify that content
- is _about_ to change
- */
- void modifying() {}
-
bool hasAlpha() const { return mbHaveAlpha; }
protected:
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index d90d877..dd600fc 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -149,11 +149,6 @@ namespace vclcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
- bool DeviceHelper::hasFullScreenMode()
- {
- return false;
- }
-
bool DeviceHelper::enterFullScreenMode( bool bEnter )
{
(void)bEnter;
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 3ae48b5..55bf9bf 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -68,7 +68,6 @@ namespace vclcanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
- bool hasFullScreenMode( );
bool enterFullScreenMode( bool bEnter );
::com::sun::star::uno::Any isAccelerated() const;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index dca0451..6e347b9 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -68,12 +68,6 @@ namespace vclcanvas
return 1;
}
- void SpriteDeviceHelper::destroyBuffers()
- {
- // TODO(F3): implement XBufferStrategy interface. For now, we
- // _always_ will have exactly one backbuffer
- }
-
bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 2dc0563..b2b9805 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -49,7 +49,6 @@ namespace vclcanvas
void disposing();
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
- void destroyBuffers( );
bool showBuffer( bool bWindowVisible, bool bUpdateAll );
bool switchBuffer( bool bWindowVisible, bool bUpdateAll );
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index b7a7887..78859d3 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -77,9 +77,7 @@ namespace canvas
virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
- typename BaseType::MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maCanvasHelper.hasAlpha();
+ return sal_True;
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize,
@@ -120,16 +118,6 @@ namespace canvas
typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex );
BaseType::BaseType::mbSurfaceDirty = true;
- BaseType::BaseType::maCanvasHelper.modifying();
-
- BaseType::BaseType::maCanvasHelper.copyRect( this,
- sourceCanvas,
- sourceRect,
- sourceViewState,
- sourceRenderState,
- destRect,
- destViewState,
- destRenderState );
}
};
}
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 108bef6..102f048 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -105,16 +105,11 @@ namespace canvas
{
tools::verifyRange( nBuffers, (sal_Int32)1 );
- MutexType aGuard( BaseType::m_aMutex );
-
- return BaseType::maDeviceHelper.createBuffers( nBuffers );
+ return 1;
}
virtual void SAL_CALL destroyBuffers( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
- MutexType aGuard( BaseType::m_aMutex );
-
- BaseType::maDeviceHelper.destroyBuffers();
}
virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll )
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 420517a..4d710a5 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -127,7 +127,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
maCanvasHelper.clear();
}
@@ -146,9 +145,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
-
- maCanvasHelper.drawPoint( this, aPoint, viewState, renderState );
}
virtual void SAL_CALL drawLine(const css::geometry::RealPoint2D& aStartPoint,
@@ -166,7 +162,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
maCanvasHelper.drawLine( this, aStartPoint, aEndPoint, viewState, renderState );
}
@@ -186,7 +181,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
maCanvasHelper.drawBezier( this, aBezierSegment, aEndPoint, viewState, renderState );
}
@@ -206,7 +200,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.drawPolyPolygon( this, xPolyPolygon, viewState, renderState );
}
@@ -227,7 +220,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.strokePolyPolygon( this, xPolyPolygon, viewState, renderState, strokeAttributes );
}
@@ -247,7 +239,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.strokeTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, strokeAttributes );
}
@@ -268,7 +259,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.strokeTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes );
}
@@ -287,7 +277,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.queryStrokeShapes( this, xPolyPolygon, viewState, renderState, strokeAttributes );
}
@@ -307,7 +296,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.fillPolyPolygon( this, xPolyPolygon, viewState, renderState );
}
@@ -328,7 +316,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.fillTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures );
}
@@ -347,7 +334,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.fillTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping );
}
@@ -407,7 +393,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.drawText( this, text, xFont, viewState, renderState, textDirection );
}
@@ -428,7 +413,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.drawTextLayout( this, laidOutText, viewState, renderState );
}
@@ -446,7 +430,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.drawBitmap( this, xBitmap, viewState, renderState );
}
@@ -463,7 +446,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
- maCanvasHelper.modifying();
return maCanvasHelper.drawBitmapModulated( this, xBitmap, viewState, renderState );
}
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index a28fc06..e7c75c8 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -246,16 +246,12 @@ namespace canvas
virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{
- MutexType aGuard( BaseType::m_aMutex );
-
- return maDeviceHelper.hasFullScreenMode();
+ return sal_False;
}
- virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool bEnter ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{
- MutexType aGuard( BaseType::m_aMutex );
-
- return maDeviceHelper.enterFullScreenMode( bEnter );
+ return false;
}
// XMultiServiceFactory
@@ -329,14 +325,11 @@ namespace canvas
xListener );
}
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& ,
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) SAL_OVERRIDE
{
- MutexType aGuard( BaseType::m_aMutex );
- maPropHelper.removePropertyChangeListener( aPropertyName,
- xListener );
}
virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName,
@@ -349,14 +342,11 @@ namespace canvas
xListener );
}
- virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& ,
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) SAL_OVERRIDE
{
- MutexType aGuard( BaseType::m_aMutex );
- maPropHelper.removeVetoableChangeListener( aPropertyName,
- xListener );
}
protected:
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 0acd079..54956b3 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -55,7 +55,7 @@ namespace canvas
rect );
}
- virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
+ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
@@ -67,12 +67,9 @@ namespace canvas
typename Base::MutexType aGuard( Base::m_aMutex );
Base::mbSurfaceDirty = true;
- Base::maCanvasHelper.modifying();
-
- Base::maCanvasHelper.setData( data, bitmapLayout, rect );
}
- virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
+ virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
@@ -84,9 +81,6 @@ namespace canvas
typename Base::MutexType aGuard( Base::m_aMutex );
Base::mbSurfaceDirty = true;
- Base::maCanvasHelper.modifying();
-
- Base::maCanvasHelper.setPixel( color, bitmapLayout, pos );
}
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
diff --git a/include/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx
index d555cfc..37aea93 100644
--- a/include/canvas/propertysethelper.hxx
+++ b/include/canvas/propertysethelper.hxx
@@ -134,12 +134,8 @@ namespace canvas
::com::sun::star::uno::Any getPropertyValue( const OUString& PropertyName ) const;
void addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
- void removePropertyChangeListener( const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
void addVetoableChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
- void removeVetoableChangeListener( const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
private:
std::unique_ptr<MapType> mpMap;
commit 900e49cd27f23d2f991f902e81f471eb49232076
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 4 14:41:39 2015 +0200
loplugin:constantfunction: oox
Change-Id: Iec2bc991821aed8da4427c6efc4ec8df72554923
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index b9bf2d4..ca80a95 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -61,7 +61,6 @@ public:
com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword);
- static bool checkEncryptionData( const com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue >& rEncryptionData );
};
} // namespace core
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index f48fcd2..6ab41a5 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -44,7 +44,6 @@ protected:
virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE;
virtual void implWriteExtHeader() SAL_OVERRIDE;
virtual void implDumpRecordBody() SAL_OVERRIDE;
- void implDumpClientAnchor();
private:
sal_uInt32 dumpDffSimpleColor( const String& rName );
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index ad145a2..ea0c8fd 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -115,14 +115,13 @@ private:
sal_uInt16 dumpPropertyContents( sal_Int32 nPropId );
void dumpPropertyValue( sal_Int32 nPropId, sal_uInt16 nBaseType );
void dumpPropertyVector( sal_Int32 nPropId, sal_uInt16 nBaseType );
- void dumpPropertyArray( sal_Int32 nPropId, sal_uInt16 nBaseType );
sal_uInt16 dumpPropertyType();
void dumpBlob( sal_Int32 nPropId, const String& rName );
- OUString dumpString8( const String& rName );
- OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
- OUString dumpString16( const String& rName );
- OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
+ OUString dumpString8( const String& rName );
+ OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
+ OUString dumpString16( const String& rName );
+ OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
bool dumpTypedProperty( const String& rName, sal_uInt16 nExpectedType );
void dumpHlinks( sal_Int32 nSize );
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 8fbf9c8..170fe91 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -130,7 +130,6 @@ private:
void exportBubbleChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportDoughnutChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportLineChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
- void exportOfPieChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportPieChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportRadarChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportScatterChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 24321e9..d7987e8 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -406,8 +406,6 @@ public:
protected:
virtual void importControlData( BinaryInputStream& rInStrm ) = 0;
- void importCommonExtraData( BinaryInputStream& rInStrm );
- void importCommonTrailingData( BinaryInputStream& rInStrm );
private:
/** Returns the data part identifier according to the model version. */
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f258bb0..3c4de27 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -151,8 +151,6 @@ protected:
/** Called when the import process of the VBA project has been started. */
virtual void prepareImport();
- /** Called when the import process of the VBA project is finished. */
- void finalizeImport();
private:
VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION;
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 6fc8951..5c6dee2 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -285,12 +285,9 @@ comphelper::DocPasswordVerifierResult PasswordVerifier::verifyPassword( const OU
return rEncryptionData.hasElements() ? comphelper::DocPasswordVerifierResult_OK : comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
}
-comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData )
+comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence<NamedValue>& )
{
- comphelper::DocPasswordVerifierResult aResult = comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
- if (DocumentDecryption::checkEncryptionData(rEncryptionData))
- aResult = comphelper::DocPasswordVerifierResult_OK;
- return aResult;
+ return comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
}
} // namespace
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 5d5e646..a612dcb 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -194,11 +194,6 @@ DocumentDecryption::DocumentDecryption(oox::ole::OleStorage& rOleStorage, Refere
mCryptoType(UNKNOWN)
{}
-bool DocumentDecryption::checkEncryptionData(const Sequence<NamedValue>& /*rEncryptionData*/)
-{
- return false;
-}
-
bool DocumentDecryption::generateEncryptionKey(const OUString& rPassword)
{
if (mEngine.get())
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 95bda7b..b61b991 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -655,11 +655,6 @@ public:
ObjectFormatterData& rData,
const AutoFormatEntry* pAutoFormatEntry );
- /** Converts effect formatting to the passed property set. */
- void convertFormatting(
- ShapePropertyMap& rPropMap,
- const ModelRef< Shape >& rxShapeProp,
- sal_Int32 nSeriesIdx ) const;
};
class TextFormatter : public DetailFormatterBase
@@ -902,10 +897,6 @@ EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEn
DetailFormatterBase( rData, pAutoFormatEntry )
{
}
-//TODO :
-void EffectFormatter::convertFormatting( ShapePropertyMap& /*rPropMap*/, const ModelRef< Shape >& /*rxShapeProp*/, sal_Int32 /*nSeriesIdx*/ ) const
-{
-}
namespace {
@@ -972,7 +963,6 @@ void ObjectTypeFormatter::convertFrameFormatting( PropertySet& rPropSet, const M
maLineFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx );
if( mrEntry.mbIsFrame )
maFillFormatter.convertFormatting( aPropMap, rxShapeProp, pPicOptions, nSeriesIdx );
- maEffectFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx );
rPropSet.setProperties( aPropMap );
}
@@ -997,7 +987,6 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32
ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo );
ModelRef< Shape > xShapeProp;
maFillFormatter.convertFormatting( aPropMap, xShapeProp, 0, nSeriesIdx );
- maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx );
rPropSet.setProperties( aPropMap );
}
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index e2f76a1..220bf29 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -96,7 +96,6 @@ void DffStreamObject::implDumpRecordBody()
break;
case DFF_ID_CLIENTANCHOR:
- implDumpClientAnchor();
break;
case DFF_ID_DG:
@@ -149,10 +148,6 @@ void DffStreamObject::implDumpRecordBody()
}
}
-void DffStreamObject::implDumpClientAnchor()
-{
-}
-
sal_uInt32 DffStreamObject::dumpDffSimpleColor( const String& rName )
{
return dumpHex< sal_uInt32 >( rName, "DFF-SIMPLE-COLOR" );
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index feb51ff..100b9b1 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -347,7 +347,7 @@ sal_uInt16 OlePropertyStreamObject::dumpPropertyContents( sal_Int32 nPropId )
{
case OLEPROP_TYPE_SIMPLE: dumpPropertyValue( nPropId, nBaseType ); break;
case OLEPROP_TYPE_VECTOR: dumpPropertyVector( nPropId, nBaseType ); break;
- case OLEPROP_TYPE_ARRAY: dumpPropertyArray( nPropId, nBaseType ); break;
+ case OLEPROP_TYPE_ARRAY: /*TODO*/; break;
}
return nType;
}
@@ -393,11 +393,6 @@ void OlePropertyStreamObject::dumpPropertyVector( sal_Int32 nPropId, sal_uInt16
}
}
-void OlePropertyStreamObject::dumpPropertyArray( sal_Int32 /*nPropId*/, sal_uInt16 /*nBaseType*/ )
-{
- // TODO
-}
-
sal_uInt16 OlePropertyStreamObject::dumpPropertyType()
{
return static_cast< sal_uInt16 >( dumpHex< sal_Int32 >( "type", "OLEPROP-TYPE" ) & 0xFFFF );
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index dbd28eb..6187f67 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1089,7 +1089,6 @@ void ChartExport::exportPlotArea( )
}
case chart::TYPEID_OFPIE:
{
- exportOfPieChart( xChartType );
break;
}
case chart::TYPEID_DOUGHNUT:
@@ -1444,11 +1443,6 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType )
pFS->endElement( FSNS( XML_c, nTypeId ) );
}
-void ChartExport::exportOfPieChart( Reference< chart2::XChartType > /*xChartType*/ )
-{
- // TODO:
-}
-
void ChartExport::exportPieChart( Reference< chart2::XChartType > xChartType )
{
sal_Int32 eChartType = getChartType( );
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 08eab4c..89f612c 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -686,14 +686,6 @@ void ComCtlModelBase::convertProperties( PropertyMap& rPropMap, const ControlCon
ControlModelBase::convertProperties( rPropMap, rConv );
}
-void ComCtlModelBase::importCommonExtraData( BinaryInputStream& /*rInStrm*/ )
-{
-}
-
-void ComCtlModelBase::importCommonTrailingData( BinaryInputStream& /*rInStrm*/ )
-{
-}
-
sal_uInt32 ComCtlModelBase::getDataPartId() const
{
switch( mnVersion )
@@ -736,11 +728,7 @@ bool ComCtlModelBase::importCommonPart( BinaryInputStream& rInStrm, sal_uInt32 n
{
rInStrm.skip( 4 );
mnFlags = rInStrm.readuInt32();
- // implementations may read less than the exact amount of data
- importCommonExtraData( rInStrm );
rInStrm.seek( nEndPos );
- // implementations must read the exact amount of data, stream must point to its end afterwards
- importCommonTrailingData( rInStrm );
return !rInStrm.isEof();
}
return false;
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 8e5365f..fa32c6f 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -208,10 +208,6 @@ void VbaProject::prepareImport()
{
}
-void VbaProject::finalizeImport()
-{
-}
-
// private --------------------------------------------------------------------
Reference< XLibraryContainer > VbaProject::getLibraryContainer( sal_Int32 nPropId )
@@ -508,8 +504,6 @@ void VbaProject::importModulesAndForms( StorageBase& rVbaPrjStrg, const GraphicH
// attach macros to registered objects
attachMacros();
- // virtual call, derived classes may do some more processing
- finalizeImport();
}
void VbaProject::attachMacros()
commit 2f30600296d217751e2b18f3b971c5d0fa2b9f65
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 4 13:38:56 2015 +0200
loplugin:constantfunction: linguistic
Change-Id: If9645dc5962432af6912c98649eea9c981fb0ed1
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 3d87632..60556d9 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -227,7 +227,7 @@ public:
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Int16 GetDefaultNumberOfSuggestions() const;
+ static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
sal_Int16 GetMaxNumberOfSuggestions() const { return nResMaxNumberOfSuggestions; }
bool IsSpellUpperCase() const { return bResIsSpellUpperCase; }
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index f9a4437..24c3733 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -525,12 +525,6 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
}
}
-sal_Int16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const
-{
- return 16;
-}
-
-
static const char *aHP[] =
{
UPN_HYPH_MIN_LEADING,
commit c97ccd3b3635a53e6bdc07b83c9bf8666b66000a
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 4 11:17:25 2015 +0200
loplugin:constantfunction: svx
Change-Id: Ib8c3599d245fbc371d00f28d812138b26c3f706d
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index aae18ab..283b631 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -174,7 +174,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
virtual ~SvxFontWorkDialog();
void SetColorList(const XColorListRef &pTable);
- void SetActive(bool bActivate = true);
};
#endif // INCLUDED_SVX_FONTWORK_HXX
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index d7f15be..ad0a5cc 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -62,6 +62,8 @@ public:
void EnableDynamicSpacing();
protected:
+ static const sal_uInt16 pRanges[];
+
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -111,7 +113,8 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ // returns the Which values to the range
+ static const sal_uInt16* GetRanges() { return pRanges; }
private:
SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -123,7 +126,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
private:
SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 6aaa25d..4a0d497 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -192,7 +192,6 @@ public:
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const SAL_OVERRIDE;
virtual OUString TakeObjNamePlural() const SAL_OVERRIDE;
- sal_uInt16 GetLogicalGroup() { return 0; }
virtual E3dObject* Clone() const SAL_OVERRIDE;
E3dObject& operator=( const E3dObject& rObj );
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 8af91c7..0d07c8f 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -86,12 +86,6 @@ protected:
// never be called directly
ViewContact();
- // Methods to react on start getting viewed or stop getting
- // viewed. This info is derived from the count of members of
- // registered ViewObjectContacts. Default does nothing.
- void StartGettingViewed();
- void StopGettingViewed();
-
public:
// basic destructor with needed cleanups
virtual ~ViewContact();
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index 57f6860..f807e8c 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -44,7 +44,7 @@ namespace sdr
OverlayObjectVector maVector;
// default value for HiTestPixel
- sal_uInt32 getDefaultValueForHitTestPixel() const { return 4L; }
+ static sal_uInt32 getDefaultValueForHitTestPixel() { return 4; }
public:
OverlayObjectList() {}
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 2d20dfe..e8167dab 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -31,8 +31,6 @@ class SdrGluePoint;
class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
{
- void ImpClearVars();
-
// copy marked GluePoints and mark instead of the old ones
void ImpCopyMarkedGluePoints();
typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3f61550..ddd7330 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -297,8 +297,6 @@ public:
virtual ~SdrModel();
void ClearModel(bool bCalledFromDestructor);
- // Whether the model is being streamed in at the moment
- bool IsLoading() const { return false /*BFS01 bLoading */; }
// Override this to enable the Swap/LoadOnDemand of graphics.
// If rbDeleteAfterUse is set to sal_True the SvStream instance from
// the caller will be disposed after use.
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 1d83a02..82e1952 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -209,11 +209,9 @@ public:
sal_uInt32 GetInventor() const { return nInventor;}
sal_uInt16 GetId() const { return nIdentifier;}
- bool HasMacro (const SdrObject* pObj) const;
SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
};
@@ -382,7 +380,6 @@ public:
void SetGridOffset( const Point& rGridOffset ){ aGridOffset = rGridOffset; }
protected:
void ImpDeleteUserData();
- SdrObjUserData* ImpGetMacroUserData() const;
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// for GetDragComment
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 3c7b65d..2bde92f 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -483,9 +483,6 @@ public:
virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; }
virtual bool MouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; }
virtual bool Command(const CommandEvent& /*rCEvt*/, vcl::Window* /*pWin*/) { return false; }
- bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
- bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
- bool Paste(vcl::Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
/* new interface src537 */
bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 4de97fc..b9fbb88 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -58,9 +58,6 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if(bDeactivate)
{
- if ( pDlg )
- pDlg->SetActive(false);
-
rSet.DisableItem(XATTR_FORMTXTSTYLE);
rSet.DisableItem(XATTR_FORMTXTADJUST);
rSet.DisableItem(XATTR_FORMTXTDISTANCE);
@@ -87,8 +84,6 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( pItem )
pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
- pDlg->SetActive();
-
if ( pColorList.is() )
pDlg->SetColorList( pColorList );
}
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 91c61a9..0307722 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -226,9 +226,6 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if(bDeactivate)
{
- if ( pDlg )
- pDlg->SetActive(false);
-
rSet.DisableItem(XATTR_FORMTXTSTYLE);
rSet.DisableItem(XATTR_FORMTXTADJUST);
rSet.DisableItem(XATTR_FORMTXTDISTANCE);
@@ -255,8 +252,6 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if ( pItem )
pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
- pDlg->SetActive();
-
if ( pColorList.is() )
pDlg->SetColorList( pColorList );
}
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 8c154ed..2e44db5 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -107,7 +107,6 @@ public:
virtual void GetFocus() SAL_OVERRIDE;
void Clear() { aBrowse.Clear(); }
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); }
- void SetFloatingMode(bool /*bOn*/) {}
const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; }
_SdrItemBrowserControl& GetBrowserControl() { return aBrowse; }
};
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index bd6a339..16c07cd 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -234,11 +234,6 @@ awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeExceptio
return AWTSize( GetBoundingBox().GetSize() );
}
-bool SAL_CALL SvxRectCtlAccessibleContext::isShowing() throw( RuntimeException )
-{
- return true;
-}
-
bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -387,8 +382,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess
pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
pStateSetHelper->AddState( AccessibleStateType::OPAQUE );
- if( isShowing() )
- pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+ pStateSetHelper->AddState( AccessibleStateType::SHOWING );
if( isVisible() )
pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index a566a9d..2f4df73 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -800,10 +800,6 @@ void SvxFontWorkDialog::SetColorList(const XColorListRef &pList)
}
}
-void SvxFontWorkDialog::SetActive(bool /*bActivate*/)
-{
-}
-
void SvxFontWorkDialog::ApplyImageList()
{
if (nLastShadowTbxId == nShadowSlantId)
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index cacc9e8..ab4be91 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -62,7 +62,7 @@ static const long MINBODY = 56; // 1mm in twips rounded
static const long DEF_DIST_WRITER = 500; // 5mm (Writer)
static const long DEF_DIST_CALC = 250; // 2.5mm (Calc)
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxHFPage::pRanges[] =
{
SID_ATTR_BRUSH, SID_ATTR_BRUSH,
@@ -115,16 +115,6 @@ namespace svx {
}
}
-// returns the Which values to the range
-
-
-const sal_uInt16* SvxHeaderPage::GetRanges()
-{
- return pRanges;
-}
-
-
-
SfxTabPage* SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxHeaderPage( pParent, *rSet );
@@ -132,13 +122,6 @@ SfxTabPage* SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet
-const sal_uInt16* SvxFooterPage::GetRanges()
-{
- return pRanges;
-}
-
-
-
SfxTabPage* SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxFooterPage( pParent, *rSet );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 1b2f773..74f7c37 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2150,24 +2150,10 @@ namespace svxform
}
- void DataNavigator::Update( FmFormShell* /*pFormShell*/ )
+ void DataNavigator::StateChanged( sal_uInt16 , SfxItemState , const SfxPoolItem* )
{
}
- void DataNavigator::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
- {
- if ( !pState || SID_FM_DATANAVIGATOR_CONTROL != nSID )
- return;
-
- if ( eState >= SfxItemState::DEFAULT )
- {
- FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() );
- Update( pShell );
- }
- else
- Update( NULL );
- }
-
void DataNavigator::GetFocus()
{
@@ -2177,7 +2163,6 @@ namespace svxform
bool DataNavigator::Close()
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list