[Libreoffice-commits] core.git: 5 commits - canvas/source comphelper/source dbaccess/source include/comphelper include/tools sw/qa sw/source tools/source unusedcode.easy vcl/android vcl/generic vcl/headless vcl/opengl vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx vcl/win vcl/workben writerperfect/qa writerperfect/source xmlhelp/source
Caolán McNamara
caolanm at redhat.com
Mon May 25 04:33:27 PDT 2015
canvas/source/directx/dx_devicehelper.cxx | 10 ---
canvas/source/directx/dx_devicehelper.hxx | 3 -
canvas/source/directx/dx_spritedevicehelper.cxx | 12 ----
canvas/source/directx/dx_spritedevicehelper.hxx | 3 -
canvas/source/vcl/devicehelper.cxx | 6 --
canvas/source/vcl/devicehelper.hxx | 1
comphelper/source/misc/accimplaccess.cxx | 13 ----
dbaccess/source/ui/inc/TableDesignControl.hxx | 4 -
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 11 ---
include/comphelper/accimplaccess.hxx | 3 -
include/tools/color.hxx | 10 ---
sw/qa/extras/ooxmlexport/data/hyperlink-field.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 8 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 10 +--
tools/source/generic/color.cxx | 28 ----------
unusedcode.easy | 3 -
vcl/android/androidinst.cxx | 4 -
vcl/generic/fontmanager/fontsubst.cxx | 2
vcl/generic/glyphs/gcach_ftyp.hxx | 2
vcl/generic/glyphs/gcach_layout.cxx | 2
vcl/generic/print/bitmap_gfx.cxx | 6 +-
vcl/generic/print/genpspgraphics.cxx | 8 +-
vcl/generic/print/prtsetup.hxx | 4 -
vcl/generic/print/text_gfx.cxx | 2
vcl/headless/headlessinst.cxx | 4 -
vcl/headless/svpdata.cxx | 2
vcl/headless/svptextrender.cxx | 2
vcl/opengl/salbmp.cxx | 6 +-
vcl/osx/documentfocuslistener.hxx | 2
vcl/qa/cppunit/dndtest.cxx | 8 +-
vcl/qa/cppunit/lifecycle.cxx | 5 -
vcl/qa/cppunit/timer.cxx | 6 +-
vcl/quartz/salbmp.cxx | 6 +-
vcl/source/app/IconThemeInfo.cxx | 2
vcl/source/app/IconThemeScanner.cxx | 2
vcl/source/app/IconThemeSelector.cxx | 2
vcl/source/app/session.cxx | 2
vcl/source/app/svmain.cxx | 2
vcl/source/bitmap/bitmapscalesuper.cxx | 2
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/edit/textundo.hxx | 6 +-
vcl/source/edit/textview.cxx | 4 -
vcl/source/edit/vclmedit.cxx | 2
vcl/source/filter/FilterConfigCache.hxx | 2
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/igif/decode.hxx | 2
vcl/source/filter/igif/gifread.hxx | 2
vcl/source/filter/ixbm/xbmread.hxx | 12 ++--
vcl/source/filter/ixpm/xpmread.hxx | 2
vcl/source/filter/wmf/emfwr.hxx | 2
vcl/source/filter/wmf/winmtf.hxx | 6 +-
vcl/source/fontsubset/sft.cxx | 2
vcl/source/gdi/bmpfast.cxx | 2
vcl/source/gdi/pdfextoutdevdata.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 10 +--
vcl/source/window/layout.cxx | 2
vcl/source/window/menubarwindow.hxx | 2
vcl/source/window/mnemonicengine.cxx | 2
vcl/source/window/openglwin.cxx | 2
vcl/source/window/scrwnd.hxx | 2
vcl/unx/generic/app/i18n_status.cxx | 4 -
vcl/unx/generic/app/randrwrapper.cxx | 4 -
vcl/unx/generic/app/wmadaptor.cxx | 4 -
vcl/unx/generic/dtrans/X11_selection.hxx | 2
vcl/unx/generic/gdi/gcach_xpeer.hxx | 2
vcl/unx/generic/gdi/gdiimpl.hxx | 2
vcl/unx/generic/gdi/openglx11cairotextrender.hxx | 2
vcl/unx/generic/gdi/x11cairotextrender.hxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 2
vcl/unx/gtk/a11y/atklistener.hxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 -
vcl/unx/gtk/gdi/salprn-gtk.cxx | 2
vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx | 2
vcl/unx/kde/UnxFilePicker.hxx | 2
vcl/unx/kde4/KDE4FilePicker.hxx | 2
vcl/unx/kde4/KDEData.hxx | 2
vcl/unx/kde4/KDESalDisplay.hxx | 2
vcl/unx/kde4/KDESalInstance.hxx | 2
vcl/win/source/app/salinst.cxx | 2
vcl/win/source/gdi/cairo_win32_cairo.hxx | 2
vcl/win/source/gdi/gdiimpl.hxx | 2
vcl/workben/mtfdemo.cxx | 4 -
writerperfect/qa/unit/WPXSvStreamTest.cxx | 2
writerperfect/source/calc/MSWorksCalcImportFilter.hxx | 2
writerperfect/source/calc/MWAWCalcImportFilter.hxx | 2
writerperfect/source/calc/NumbersImportFilter.hxx | 2
writerperfect/source/common/DirectoryStream.cxx | 2
writerperfect/source/common/WPXSvInputStream.cxx | 4 -
writerperfect/source/draw/CDRImportFilter.hxx | 2
writerperfect/source/draw/CMXImportFilter.hxx | 2
writerperfect/source/draw/FreehandImportFilter.hxx | 2
writerperfect/source/draw/MSPUBImportFilter.hxx | 2
writerperfect/source/draw/MWAWDrawImportFilter.hxx | 2
writerperfect/source/draw/PageMakerImportFilter.hxx | 2
writerperfect/source/draw/VisioImportFilter.hxx | 2
writerperfect/source/draw/WPGImportFilter.hxx | 2
writerperfect/source/impress/KeynoteImportFilter.hxx | 2
writerperfect/source/impress/MWAWPresentationImportFilter.hxx | 2
writerperfect/source/writer/AbiWordImportFilter.hxx | 2
writerperfect/source/writer/EBookImportFilter.hxx | 2
writerperfect/source/writer/MSWorksImportFilter.hxx | 2
writerperfect/source/writer/MWAWImportFilter.hxx | 2
writerperfect/source/writer/PagesImportFilter.hxx | 2
writerperfect/source/writer/WordPerfectImportFilter.hxx | 4 -
xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.hxx | 2
xmlhelp/source/cxxhelp/provider/inputstream.hxx | 2
xmlhelp/source/cxxhelp/provider/provider.hxx | 2
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
112 files changed, 148 insertions(+), 248 deletions(-)
New commits:
commit 3185b6c8caf97afa602c864f588d079cbbe04038
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 11:06:46 2015 +0100
fix assert on export of ooo40760-1.sxw to docx
and a pile more
Change-Id: I7334233c789bb0ed7a60387ef7d84dd34ab5a187
diff --git a/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
new file mode 100644
index 0000000..0c265cf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 47589f6..f97d6a3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -270,6 +270,14 @@ DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeTableInTable, "ooo96040-2.odt")
return;
}
+DECLARE_OOXMLEXPORT_TEST(testHyperlinkContainingPlaceholderField, "hyperlink-field.odt")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+ if (!pXmlDoc)
+ return;
+}
+
DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3694f3f..430025a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1058,11 +1058,6 @@ void DocxAttributeOutput::EndRun()
{
StartField_Impl( *pIt );
- if ( m_pHyperlinkAttrList )
- {
- m_nFieldsInHyperlink++;
- }
-
// Remove the field from the stack if only the start has to be written
// Unknown fields should be removed too
if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
@@ -1070,6 +1065,11 @@ void DocxAttributeOutput::EndRun()
pIt = m_Fields.erase( pIt );
continue;
}
+
+ if ( m_pHyperlinkAttrList )
+ {
+ m_nFieldsInHyperlink++;
+ }
}
++pIt;
}
commit acad8441cc40b7b0f91681d6827f8364de05046e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 09:35:57 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I62076450ab77472bfd09b3fb9824f54b6ea1e0f7
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 82c4a33..ea91e7a 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -33,12 +33,12 @@ static int viewWidth = 1, viewHeight = 1;
class AndroidSalData : public SalGenericData
{
public:
- AndroidSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_ANDROID, pInstance ) {}
+ explicit AndroidSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_ANDROID, pInstance ) {}
virtual void ErrorTrapPush() {}
virtual bool ErrorTrapPop( bool ) { return false; }
};
-void AndroidSalInstance::damaged(AndroidSalFrame */* frame */)
+void AndroidSalInstance::damaged(AndroidSalFrame* /* frame */)
{
static bool beenHere = false;
static jmethodID nCallbackDamaged = 0;
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 8ac1e1e..c84b7dd 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -134,7 +134,7 @@ namespace
private:
const FontSelectPatternAttributes& mrAttributes;
public:
- equal(const FontSelectPatternAttributes& rAttributes)
+ explicit equal(const FontSelectPatternAttributes& rAttributes)
: mrAttributes(rAttributes)
{
}
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 590fb90..ff411a6 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -45,7 +45,7 @@ public:
int GetLangBoost() const { return mnLangBoost; }
private:
- FtFontFile( const OString& rNativeFileName );
+ explicit FtFontFile( const OString& rNativeFileName );
const OString maNativeFileName;
unsigned char* mpFileMap;
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index bc65eaf..0eecae5 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -311,7 +311,7 @@ private:
int mnUnitsPerEM;
public:
- HbLayoutEngine(ServerFont&);
+ explicit HbLayoutEngine(ServerFont&);
virtual ~HbLayoutEngine();
virtual bool Layout(ServerFontLayout&, ImplLayoutArgs&) SAL_OVERRIDE;
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index ca6495f..a5c9699 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -66,7 +66,7 @@ private:
public:
- HexEncoder (osl::File* pFile);
+ explicit HexEncoder (osl::File* pFile);
virtual ~HexEncoder ();
void WriteAscii (sal_uInt8 nByte);
virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE;
@@ -140,7 +140,7 @@ private:
public:
- Ascii85Encoder (osl::File* pFile);
+ explicit Ascii85Encoder (osl::File* pFile);
virtual ~Ascii85Encoder ();
virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE;
void WriteAscii (sal_uInt8 nByte);
@@ -286,7 +286,7 @@ private:
public:
- LZWEncoder (osl::File* pOutputFile);
+ explicit LZWEncoder (osl::File* pOutputFile);
virtual ~LZWEncoder ();
virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE;
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index beedfaa..0a1bedc 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -78,8 +78,8 @@ private:
public:
- SalPrinterBmp (BitmapBuffer* pBitmap);
- virtual ~SalPrinterBmp ();
+ explicit SalPrinterBmp (BitmapBuffer* pBitmap);
+ virtual ~SalPrinterBmp ();
virtual sal_uInt32 GetPaletteColor (sal_uInt32 nIdx) const SAL_OVERRIDE;
virtual sal_uInt32 GetPaletteEntryCount () const SAL_OVERRIDE;
virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE;
@@ -566,7 +566,7 @@ private:
sal_IntPtr mnFontId;
public:
- ImplPspFontData( const psp::FastPrintFontInfo& );
+ explicit ImplPspFontData( const psp::FastPrintFontInfo& );
virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mnFontId; }
virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPspFontData( *this ); }
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
@@ -586,7 +586,7 @@ ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) co
class PspFontLayout : public GenericSalLayout
{
public:
- PspFontLayout( ::psp::PrinterGfx& );
+ explicit PspFontLayout( ::psp::PrinterGfx& );
virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
virtual void InitFont() const SAL_OVERRIDE;
virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE;
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 67b6cd2..240d78e1 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -86,7 +86,7 @@ class RTSPaperPage : public TabPage
DECL_LINK( SelectHdl, ListBox* );
public:
- RTSPaperPage( RTSDialog* );
+ explicit RTSPaperPage( RTSDialog* );
virtual ~RTSPaperPage();
virtual void dispose() SAL_OVERRIDE;
@@ -113,7 +113,7 @@ class RTSDevicePage : public TabPage
DECL_LINK( SelectHdl, ListBox* );
DECL_LINK( ModifyHdl, Edit* );
public:
- RTSDevicePage( RTSDialog* );
+ explicit RTSDevicePage( RTSDialog* );
virtual ~RTSDevicePage();
virtual void dispose() SAL_OVERRIDE;
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 569a10e..a30a2b3 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -56,7 +56,7 @@ class Font2
bool IsSymbolFont () const
{ return mbSymbol; }
- Font2 (const PrinterGfx &rGfx);
+ explicit Font2 (const PrinterGfx &rGfx);
~Font2 () {}
};
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index f204b5f..a8c3085 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -13,7 +13,7 @@
class HeadlessSalInstance : public SvpSalInstance
{
public:
- HeadlessSalInstance( SalYieldMutex *pMutex );
+ explicit HeadlessSalInstance( SalYieldMutex *pMutex );
virtual ~HeadlessSalInstance();
virtual SalSystem* CreateSalSystem();
@@ -53,7 +53,7 @@ SalSystem *HeadlessSalInstance::CreateSalSystem()
class HeadlessSalData : public SalGenericData
{
public:
- HeadlessSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_HEADLESS, pInstance ) {}
+ explicit HeadlessSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_HEADLESS, pInstance ) {}
virtual void ErrorTrapPush() {}
virtual bool ErrorTrapPop( bool ) { return false; }
};
diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx
index 56e7b8d..0d0abdb 100644
--- a/vcl/headless/svpdata.cxx
+++ b/vcl/headless/svpdata.cxx
@@ -13,7 +13,7 @@
class SvpSalData : public SalGenericData
{
public:
- SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) {}
+ explicit SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) {}
virtual void ErrorTrapPush() SAL_OVERRIDE {}
virtual bool ErrorTrapPop( bool ) SAL_OVERRIDE { return false; }
};
diff --git a/vcl/headless/svptextrender.cxx b/vcl/headless/svptextrender.cxx
index f25e534..2ed928f 100644
--- a/vcl/headless/svptextrender.cxx
+++ b/vcl/headless/svptextrender.cxx
@@ -67,7 +67,7 @@ protected:
class SvpGlyphCache : public GlyphCache
{
public:
- SvpGlyphCache( SvpGlyphPeer& rPeer ) : GlyphCache( rPeer) {}
+ explicit SvpGlyphCache( SvpGlyphPeer& rPeer ) : GlyphCache( rPeer) {}
SvpGlyphPeer& GetPeer() { return reinterpret_cast<SvpGlyphPeer&>( mrPeer ); }
static SvpGlyphCache& GetInstance();
};
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 982de8b..39218fa 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -227,7 +227,7 @@ private:
const BitmapPalette& mrPalette;
public:
- ImplPixelFormat8( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat8( const BitmapPalette& rPalette )
: mrPalette( rPalette )
{
}
@@ -246,7 +246,7 @@ private:
sal_uInt32 mnShift;
public:
- ImplPixelFormat4( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat4( const BitmapPalette& rPalette )
: mrPalette( rPalette )
, mnX(0)
, mnShift(4)
@@ -276,7 +276,7 @@ private:
sal_uInt32 mnX;
public:
- ImplPixelFormat1( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat1( const BitmapPalette& rPalette )
: mrPalette(rPalette)
, mnX(0)
{
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 05b1fc2..002819c 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -36,7 +36,7 @@ class DocumentFocusListener :
public:
- DocumentFocusListener(AquaA11yFocusTracker& rTracker);
+ explicit DocumentFocusListener(AquaA11yFocusTracker& rTracker);
void attachRecursive(
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible
diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx
index 7e502fa..64da307 100644
--- a/vcl/qa/cppunit/dndtest.cxx
+++ b/vcl/qa/cppunit/dndtest.cxx
@@ -65,7 +65,7 @@ class MyDragAndDropListener: public ::cppu::WeakImplHelper3 < XDropTargetListene
public:
- MyDragAndDropListener( vcl::Window * pWindow ) : m_pWindow( pWindow ) {};
+ explicit MyDragAndDropListener( vcl::Window * pWindow ) : m_pWindow( pWindow ) {};
virtual void SAL_CALL dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException);
virtual void SAL_CALL drop( const DropTargetDropEvent& dtde ) throw(RuntimeException);
@@ -86,7 +86,7 @@ class MyInfoBox : public InfoBox
public:
- MyInfoBox( vcl::Window* pParent );
+ explicit MyInfoBox( vcl::Window* pParent );
};
class MyListBox : public ListBox
@@ -94,7 +94,7 @@ class MyListBox : public ListBox
public:
- MyListBox( vcl::Window* pParent );
+ explicit MyListBox( vcl::Window* pParent );
};
class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable >
@@ -103,7 +103,7 @@ class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable >
Sequence< DataFlavor > m_aFlavorList;
public:
- StringTransferable( const OUString& rString ) : m_aData( rString ), m_aFlavorList( 1 )
+ explicit StringTransferable( const OUString& rString ) : m_aData( rString ), m_aFlavorList( 1 )
{
DataFlavor df;
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 2a63e79..d3b15d0 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -114,7 +114,7 @@ void LifecycleTest::testParentedWidgets()
class DisposableChild : public vcl::Window
{
public:
- DisposableChild(vcl::Window *pParent) : vcl::Window(pParent) {}
+ explicit DisposableChild(vcl::Window *pParent) : vcl::Window(pParent) {}
virtual ~DisposableChild()
{
disposeOnce();
@@ -149,7 +149,7 @@ void LifecycleTest::testPostDispose()
class FocusCrashPostDispose : public TabControl
{
public:
- FocusCrashPostDispose(vcl::Window *pParent) :
+ explicit FocusCrashPostDispose(vcl::Window *pParent) :
TabControl(pParent, 0)
{
}
@@ -159,7 +159,6 @@ public:
}
virtual bool Notify( NotifyEvent& ) SAL_OVERRIDE
{
-// CPPUNIT_FAIL("notify");
return false;
}
virtual void GetFocus() SAL_OVERRIDE
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 5b81281..976853c 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -24,7 +24,7 @@ class WatchDog : public osl::Thread
{
sal_Int32 mnSeconds;
public:
- WatchDog(sal_Int32 nSeconds) :
+ explicit WatchDog(sal_Int32 nSeconds) :
Thread(),
mnSeconds( nSeconds )
{
@@ -86,7 +86,7 @@ class IdleBool : public Idle
{
bool &mrBool;
public:
- IdleBool( bool &rBool ) :
+ explicit IdleBool( bool &rBool ) :
Idle(), mrBool( rBool )
{
SetPriority( SchedulerPriority::LOWEST );
@@ -176,7 +176,7 @@ void TimerTest::testAutoTimer()
class YieldTimer : public Timer
{
public:
- YieldTimer( sal_uLong nMS ) : Timer()
+ explicit YieldTimer( sal_uLong nMS ) : Timer()
{
SetTimeout( nMS );
Start();
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 06b55ac..4ee39d3 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -428,7 +428,7 @@ private:
const BitmapPalette& mrPalette;
public:
- ImplPixelFormat8( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat8( const BitmapPalette& rPalette )
: mrPalette( rPalette )
{
}
@@ -457,7 +457,7 @@ private:
sal_uInt32 mnShift;
public:
- ImplPixelFormat4( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat4( const BitmapPalette& rPalette )
: mrPalette( rPalette )
{
}
@@ -498,7 +498,7 @@ private:
sal_uInt32 mnX;
public:
- ImplPixelFormat1( const BitmapPalette& rPalette )
+ explicit ImplPixelFormat1( const BitmapPalette& rPalette )
: mrPalette( rPalette )
{
}
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 869eb85..9531bf4 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -132,7 +132,7 @@ namespace
private:
const OUString& m_rThemeId;
public:
- SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
+ explicit SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
bool operator()(const vcl::IconThemeInfo &rInfo)
{
return m_rThemeId == rInfo.GetThemeId();
diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx
index 45346cb..29f1a91 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -181,7 +181,7 @@ namespace
private:
const OUString& m_rThemeId;
public:
- SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
+ explicit SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
bool operator()(const vcl::IconThemeInfo &rInfo)
{
return m_rThemeId == rInfo.GetThemeId();
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index f7971dd..1a31f41 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -30,7 +30,7 @@ namespace {
private:
const OUString& m_rThemeId;
public:
- SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
+ explicit SameTheme(const OUString &rThemeId) : m_rThemeId(rThemeId) {}
bool operator()(const vcl::IconThemeInfo &rInfo)
{
return m_rThemeId == rInfo.GetThemeId();
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5db137f..5686ec1 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -56,7 +56,7 @@ class VCLSession:
bool m_bInteractionDone;
bool m_bSaveDone;
- Listener( const css::uno::Reference< XSessionManagerListener >& xListener )
+ explicit Listener( const css::uno::Reference< XSessionManagerListener >& xListener )
: m_xListener( xListener ),
m_bInteractionRequested( false ),
m_bInteractionDone( false ),
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index fce2961..3f9026e 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -206,7 +206,7 @@ static oslSignalHandler pExceptionHandler = NULL;
class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >
{
public:
- DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx)
+ explicit DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx)
: m_xNextContext( ctx ) {}
// XCurrentContext
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx
index 116b233..2172aa5 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -89,7 +89,7 @@ class ScaleTask : public comphelper::ThreadTask
ScaleRangeFn mpFn;
std::vector< ScaleRangeContext > maStrips;
public:
- ScaleTask( ScaleRangeFn pFn ) : mpFn( pFn ) {}
+ explicit ScaleTask( ScaleRangeFn pFn ) : mpFn( pFn ) {}
void push( ScaleRangeContext &aRC ) { maStrips.push_back( aRC ); }
virtual void doWork() SAL_OVERRIDE
{
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index f9acf5b..2ed4d8e 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -36,7 +36,7 @@ namespace vcl
::boost::optional< sal_Unicode > aSingleSearchChar;
Timer aSearchTimeout;
- QuickSelectionEngine_Data( ISearchableStringList& _entryList )
+ explicit QuickSelectionEngine_Data( ISearchableStringList& _entryList )
:rEntryList( _entryList )
,sCurrentSearchString()
,aSingleSearchChar()
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index ff24a0b..d51465e 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -40,8 +40,8 @@ protected:
TextView* GetView() const { return mpTextEngine->GetActiveView(); }
public:
- TextUndoManager( TextEngine* pTextEngine );
- virtual ~TextUndoManager();
+ explicit TextUndoManager( TextEngine* pTextEngine );
+ virtual ~TextUndoManager();
using SfxUndoManager::Undo;
virtual bool Undo() SAL_OVERRIDE;
@@ -65,7 +65,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
- TextUndo( TextEngine* pTextEngine );
+ explicit TextUndo( TextEngine* pTextEngine );
virtual ~TextUndo();
TextEngine* GetTextEngine() const { return mpTextEngine; }
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 87afc81..679a983 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -67,8 +67,8 @@ private:
SvMemoryStream maHTMLStream;
public:
- TETextDataObject( const OUString& rText );
- virtual ~TETextDataObject();
+ explicit TETextDataObject( const OUString& rText );
+ virtual ~TETextDataObject();
OUString& GetText() { return maText; }
SvMemoryStream& GetHTMLStream() { return maHTMLStream; }
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 3b11cbb..84bd570 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -46,7 +46,7 @@ private:
bool mbTextSelectable;
public:
- TextWindow( vcl::Window* pParent );
+ explicit TextWindow( vcl::Window* pParent );
virtual ~TextWindow();
virtual void dispose() SAL_OVERRIDE;
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index ee83a39..c288132 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -119,7 +119,7 @@ public:
bool IsExportInternalFilter( sal_uInt16 nFormat );
bool IsExportPixelFormat( sal_uInt16 nFormat );
- FilterConfigCache( bool bUseConfig );
+ explicit FilterConfigCache( bool bUseConfig );
~FilterConfigCache();
};
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index a77e973..0a8afa2 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -106,7 +106,7 @@ protected:
public:
- ImpFilterOutputStream( SvStream& rStm ) : mrStm( rStm ) {}
+ explicit ImpFilterOutputStream( SvStream& rStm ) : mrStm( rStm ) {}
virtual ~ImpFilterOutputStream() {}
};
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index ee093bf..4f5edde 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -48,7 +48,7 @@ class GIFLZWDecompressor
public:
- GIFLZWDecompressor( sal_uInt8 cDataSize );
+ explicit GIFLZWDecompressor( sal_uInt8 cDataSize );
~GIFLZWDecompressor();
HPBYTE DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, bool& rEOI );
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index 5816fe5..dc161c2 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -106,7 +106,7 @@ public:
ReadState ReadGIF( Graphic& rGraphic );
const Graphic& GetIntermediateGraphic();
- GIFReader( SvStream& rStm );
+ explicit GIFReader( SvStream& rStm );
virtual ~GIFReader();
};
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 4f3b52e..55e1a96 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -51,18 +51,18 @@ class XBMReader : public GraphicReader
long nHeight;
bool bStatus;
- void InitTable();
- OString FindTokenLine( SvStream* pInStm, const char* pTok1,
+ void InitTable();
+ OString FindTokenLine( SvStream* pInStm, const char* pTok1,
const char* pTok2 = NULL, const char* pTok3 = NULL );
- long ParseDefine( const sal_Char* pDefine );
+ long ParseDefine( const sal_Char* pDefine );
bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat );
public:
- XBMReader( SvStream& rStm );
- virtual ~XBMReader();
+ explicit XBMReader( SvStream& rStm );
+ virtual ~XBMReader();
- ReadState ReadXBM( Graphic& rGraphic );
+ ReadState ReadXBM( Graphic& rGraphic );
};
#endif // _XBMPRIVATE
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index 0c9b9d3..14543ca 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -95,7 +95,7 @@ private:
sal_uLong ImplGetULONG( sal_uLong nPara );
public:
- XPMReader( SvStream& rStm );
+ explicit XPMReader( SvStream& rStm );
virtual ~XPMReader();
ReadState ReadXPM( Graphic& rGraphic );
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index d037bde..80fc6e3 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -89,7 +89,7 @@ private:
public:
- EMFWriter(SvStream &rStream)
+ explicit EMFWriter(SvStream &rStream)
: maVDev( VclPtr<VirtualDevice>::Create() )
, m_rStm(rStream)
, mpHandlesUsed(NULL)
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index d50fb37..babad4e 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -287,7 +287,7 @@ struct WinMtfFontStyle
{
vcl::Font aFont;
- WinMtfFontStyle( LOGFONTW& rLogFont );
+ explicit WinMtfFontStyle( LOGFONTW& rLogFont );
};
@@ -316,7 +316,7 @@ struct WinMtfFillStyle
, aType(FillStyleSolid)
{}
- WinMtfFillStyle(Bitmap& rBmp)
+ explicit WinMtfFillStyle(Bitmap& rBmp)
: bTransparent(false)
, aType(FillStylePattern)
, aBmp(rBmp)
@@ -718,7 +718,7 @@ public:
void PassEMFPlus( void* pBuffer, sal_uInt32 nLength );
void PassEMFPlusHeaderInfo();
- WinMtfOutput( GDIMetaFile& rGDIMetaFile );
+ explicit WinMtfOutput( GDIMetaFile& rGDIMetaFile );
virtual ~WinMtfOutput();
};
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index dfd5d20..ede244c 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -75,7 +75,7 @@ struct PSPathElement
int x2, y2;
int x3, y3;
- PSPathElement( PathSegmentType i_eType ) : type( i_eType ),
+ explicit PSPathElement( PathSegmentType i_eType ) : type( i_eType ),
x1( 0 ), y1( 0 ),
x2( 0 ), y2( 0 ),
x3( 0 ), y3( 0 )
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 10348c9..10d18ba 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -30,7 +30,7 @@ typedef unsigned char PIXBYTE;
class BasePixelPtr
{
public:
- BasePixelPtr( PIXBYTE* p = NULL ) : mpPixel( p ) {}
+ explicit BasePixelPtr( PIXBYTE* p = NULL ) : mpPixel( p ) {}
void SetRawPtr( PIXBYTE* pRawPtr ) { mpPixel = pRawPtr; }
PIXBYTE* GetRawPtr() const { return mpPixel; }
void AddByteOffset( int nByteOffset ) { mpPixel += nByteOffset; }
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 3cab7d1..ca69548 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -300,7 +300,7 @@ struct PageSyncData
bool mbGroupIgnoreGDIMtfActions;
- PageSyncData( GlobalSyncData* pGlobal ) : mbGroupIgnoreGDIMtfActions ( false ) { mpGlobalData = pGlobal; }
+ explicit PageSyncData( GlobalSyncData* pGlobal ) : mbGroupIgnoreGDIMtfActions ( false ) { mpGlobalData = pGlobal; }
void PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct );
bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 99433c2..37ab711 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2245,7 +2245,7 @@ private:
public:
enum {PDF_FONT_MAGIC = 0xBDFF0A1C };
- ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont& );
+ explicit ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont& );
const PDFWriterImpl::BuiltinFont& GetBuiltinFont() const { return mrBuiltin; }
virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPdfBuiltinFontData(*this); }
@@ -6051,7 +6051,7 @@ char *PDFSigningPKCS7PasswordCallback(PK11SlotInfo * /*slot*/, PRBool /*retry*/,
class HashContextScope {
HASHContext *mpPtr;
public:
- HashContextScope(HASHContext *pPtr) : mpPtr(pPtr) {}
+ explicit HashContextScope(HASHContext *pPtr) : mpPtr(pPtr) {}
~HashContextScope() { clear(); }
void clear() { if (mpPtr) { HASH_Destroy(mpPtr); } mpPtr = NULL; }
HASHContext *get() { return mpPtr; }
@@ -8181,7 +8181,7 @@ struct AnnotSorterLess
{
std::vector< PDFWriterImpl::PDFWidget >& m_rWidgets;
- AnnotSorterLess( std::vector< PDFWriterImpl::PDFWidget >& rWidgets ) : m_rWidgets( rWidgets ) {}
+ explicit AnnotSorterLess( std::vector< PDFWriterImpl::PDFWidget >& rWidgets ) : m_rWidgets( rWidgets ) {}
bool operator()( const AnnotationSortEntry& rLeft, const AnnotationSortEntry& rRight )
{
@@ -8270,7 +8270,7 @@ class PDFStreamIf :
PDFWriterImpl* m_pWriter;
bool m_bWrite;
public:
- PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {}
+ explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {}
virtual ~PDFStreamIf();
virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) SAL_OVERRIDE;
@@ -10785,7 +10785,7 @@ class AccessReleaser
{
BitmapReadAccess* m_pAccess;
public:
- AccessReleaser( BitmapReadAccess* pAccess ) : m_pAccess( pAccess ){}
+ explicit AccessReleaser( BitmapReadAccess* pAccess ) : m_pAccess( pAccess ){}
~AccessReleaser() { delete m_pAccess; }
};
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2263596..090a70c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -694,7 +694,7 @@ class sortButtons
{
bool m_bVerticalContainer;
public:
- sortButtons(bool bVerticalContainer)
+ explicit sortButtons(bool bVerticalContainer)
: m_bVerticalContainer(bVerticalContainer)
{
}
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 0ebb19a..23d8741 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -111,7 +111,7 @@ private:
void GetFocus() SAL_OVERRIDE;
public:
- MenuBarWindow( vcl::Window* pParent );
+ explicit MenuBarWindow( vcl::Window* pParent );
virtual ~MenuBarWindow();
virtual void dispose() SAL_OVERRIDE;
diff --git a/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx
index 3fbf592..f9f7439 100644
--- a/vcl/source/window/mnemonicengine.cxx
+++ b/vcl/source/window/mnemonicengine.cxx
@@ -30,7 +30,7 @@ namespace vcl
{
IMnemonicEntryList& rEntryList;
- MnemonicEngine_Data( IMnemonicEntryList& _rEntryList )
+ explicit MnemonicEngine_Data( IMnemonicEntryList& _rEntryList )
:rEntryList( _rEntryList )
{
}
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 30094e4..46628c6 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -15,7 +15,7 @@
class OpenGLWindowImpl
{
public:
- OpenGLWindowImpl(vcl::Window* pWindow);
+ explicit OpenGLWindowImpl(vcl::Window* pWindow);
~OpenGLWindowImpl() { mxChildWindow.disposeAndClear(); }
OpenGLContext& getContext() { return maContext;}
private:
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index 2db56ce..8ce1c6b 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -69,7 +69,7 @@ protected:
public:
- ImplWheelWindow( vcl::Window* pParent );
+ explicit ImplWheelWindow( vcl::Window* pParent );
virtual ~ImplWheelWindow();
virtual void dispose() SAL_OVERRIDE;
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index f7070e5..36f0ebc 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -50,7 +50,7 @@ namespace vcl {
class StatusWindow : public WorkWindow
{
protected:
- StatusWindow( WinBits nWinBits );
+ explicit StatusWindow( WinBits nWinBits );
public:
virtual void setPosition( SalFrame* );
@@ -94,7 +94,7 @@ class XIMStatusWindow : public StatusWindow
DECL_LINK( DelayedShowHdl, void* );
public:
- XIMStatusWindow( bool bOn );
+ explicit XIMStatusWindow( bool bOn );
virtual ~XIMStatusWindow();
virtual void setPosition( SalFrame* ) SAL_OVERRIDE;
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index ecdfce3..321e29f 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -49,7 +49,7 @@ class RandRWrapper
void initFromModule();
- RandRWrapper(Display*);
+ explicit RandRWrapper(Display*);
~RandRWrapper();
public:
static RandRWrapper& get(Display*);
@@ -176,7 +176,7 @@ class RandRWrapper
{
bool m_bValid;
- RandRWrapper(Display*);
+ explicit RandRWrapper(Display*);
public:
static RandRWrapper& get(Display*);
static void releaseWrapper();
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index e3239fd..31d7969 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -50,7 +50,7 @@ class NetWMAdaptor : public WMAdaptor
void initAtoms();
virtual bool isValid() const SAL_OVERRIDE;
public:
- NetWMAdaptor( SalDisplay* );
+ explicit NetWMAdaptor( SalDisplay* );
virtual ~NetWMAdaptor();
virtual void setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const SAL_OVERRIDE;
@@ -78,7 +78,7 @@ class GnomeWMAdaptor : public WMAdaptor
void initAtoms();
virtual bool isValid() const SAL_OVERRIDE;
public:
- GnomeWMAdaptor( SalDisplay * );
+ explicit GnomeWMAdaptor( SalDisplay * );
virtual ~GnomeWMAdaptor();
virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const SAL_OVERRIDE;
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 5289ee4..616b17f 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -228,7 +228,7 @@ namespace x11 {
::Window m_aRootWindow;
DropTargetEntry() : m_pTarget( NULL ), m_aRootWindow( None ) {}
- DropTargetEntry( DropTarget* pTarget ) :
+ explicit DropTargetEntry( DropTarget* pTarget ) :
m_pTarget( pTarget ),
m_aRootWindow( None )
{}
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index b31dfbf..ecd21a7 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -32,7 +32,7 @@ public:
class X11GlyphCache : public GlyphCache
{
public:
- X11GlyphCache( X11GlyphPeer& );
+ explicit X11GlyphCache( X11GlyphPeer& );
static X11GlyphCache& GetInstance();
static void KillInstance();
};
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 9b2b9d5..509ac1d 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -101,7 +101,7 @@ private:
public:
- X11SalGraphicsImpl(X11SalGraphics& rParent);
+ explicit X11SalGraphicsImpl(X11SalGraphics& rParent);
virtual void freeResources() SAL_OVERRIDE;
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
index ed2b79c..c193937 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
@@ -15,7 +15,7 @@
class OpenGLX11CairoTextRender : public X11CairoTextRender
{
public:
- OpenGLX11CairoTextRender(X11SalGraphics& rParent);
+ explicit OpenGLX11CairoTextRender(X11SalGraphics& rParent);
virtual cairo_t* getCairoContext() SAL_OVERRIDE;
virtual void getSurfaceOffset(double& nDX, double& nDY) SAL_OVERRIDE;
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index b029702..c0c4192 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -37,7 +37,7 @@ protected:
size_t GetHeight() const;
public:
- X11CairoTextRender(X11SalGraphics& rParent);
+ explicit X11CairoTextRender(X11SalGraphics& rParent);
virtual GlyphCache& getPlatformGlyphCache() SAL_OVERRIDE;
virtual cairo_t* getCairoContext() SAL_OVERRIDE;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index c1de369..d32f60d4 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -278,7 +278,7 @@ private:
OUString maFileName;
public:
- PPDDecompressStream( const OUString& rFile );
+ explicit PPDDecompressStream( const OUString& rFile );
~PPDDecompressStream();
bool IsOpen() const;
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index 3255bcf..a1380c4 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -32,7 +32,7 @@ typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessi
class AtkListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
{
public:
- AtkListener(AtkObjectWrapper * pWrapper);
+ explicit AtkListener(AtkObjectWrapper * pWrapper);
// XEventListener
virtual void disposing( const ::com::sun::star::lang::EventObject& Source )
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index d47e35d..6c98ca6 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -447,7 +447,7 @@ namespace {
const OUString& rTitle;
public:
- FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
+ explicit FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
bool operator () ( const FilterEntry& _rEntry )
{
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 6eb6043..39b44cd 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -182,7 +182,7 @@ private:
std::vector<NWFWidgetData> mData;
public:
- WidgetDataVector(size_t nElems = 0) : mData( nElems ) {}
+ explicit WidgetDataVector(size_t nElems = 0) : mData( nElems ) {}
size_t size() const { return mData.size(); }
NWFWidgetData &operator [](size_t i) { return mData.at(i); }
NWFWidgetData &operator [](const SalX11Screen &s) { return mData.at(s.getXScreen()); }
@@ -363,7 +363,7 @@ class NWPixmapCache
int m_screen;
NWPixmapCacheData* pData;
public:
- NWPixmapCache( SalX11Screen nScreen );
+ explicit NWPixmapCache( SalX11Screen nScreen );
~NWPixmapCache();
void SetSize( int n)
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 7adc88a..d05f71b 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -61,7 +61,7 @@ using uno::UNO_QUERY;
class GtkPrintDialog
{
public:
- GtkPrintDialog(vcl::PrinterController& io_rController);
+ explicit GtkPrintDialog(vcl::PrinterController& io_rController);
bool run();
GtkPrinter* getPrinter() const
{
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx b/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
index e134182..fdf01bd 100644
--- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
+++ b/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
@@ -19,7 +19,7 @@ protected:
GtkSalGraphics& mrParent;
public:
- GtkCairoTextRender(GtkSalGraphics& rParent);
+ explicit GtkCairoTextRender(GtkSalGraphics& rParent);
virtual GlyphCache& getPlatformGlyphCache() SAL_OVERRIDE;
virtual cairo_t* getCairoContext() SAL_OVERRIDE;
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index edf8be9..8371d0f 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -69,7 +69,7 @@ protected:
ResMgr *m_pResMgr;
public:
- UnxFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
+ explicit UnxFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~UnxFilePicker();
// XComponent
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 98e9af6..f2ac942 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -79,7 +79,7 @@ protected:
bool allowRemoteUrls;
public:
- KDE4FilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
+ explicit KDE4FilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~KDE4FilePicker();
// XFilePickerNotifier
diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index b7099da..af4f7f9 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -25,7 +25,7 @@
class KDEData : public X11SalData
{
public:
- KDEData( SalInstance *pInstance )
+ explicit KDEData( SalInstance *pInstance )
: X11SalData( SAL_DATA_KDE4, pInstance ) {}
virtual ~KDEData();
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index f4a4146..ca95ac7 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -24,7 +24,7 @@
class SalKDEDisplay : public SalX11Display
{
public:
- SalKDEDisplay( Display* pDisp );
+ explicit SalKDEDisplay( Display* pDisp );
virtual ~SalKDEDisplay();
static SalKDEDisplay* self();
virtual void Yield() SAL_OVERRIDE;
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 5d042aa..498af3b 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -27,7 +27,7 @@ class SalFrame;
class KDESalInstance : public X11SalInstance
{
public:
- KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {}
+ explicit KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {}
virtual ~KDESalInstance() {}
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 1ef22b2..3fb511a 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -118,7 +118,7 @@ public: // for ImplSalYield()
DWORD mnThreadId;
public:
- SalYieldMutex( WinSalInstance* pInstData );
+ explicit SalYieldMutex( WinSalInstance* pInstData );
virtual void acquire();
virtual void release();
diff --git a/vcl/win/source/gdi/cairo_win32_cairo.hxx b/vcl/win/source/gdi/cairo_win32_cairo.hxx
index 5dee0ea..46a5024 100644
--- a/vcl/win/source/gdi/cairo_win32_cairo.hxx
+++ b/vcl/win/source/gdi/cairo_win32_cairo.hxx
@@ -36,7 +36,7 @@ namespace cairo {
/// create surface on subarea of given drawable
Win32Surface( HDC hDC, int x, int y );
/// create surface for given bitmap data
- Win32Surface( const BitmapSystemData& rBmpData );
+ explicit Win32Surface( const BitmapSystemData& rBmpData );
// Surface interface
virtual CairoSharedPtr getCairo() const;
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx
index 2890664..2985f3b 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/source/gdi/gdiimpl.hxx
@@ -48,7 +48,7 @@ private:
public:
- WinSalGraphicsImpl(WinSalGraphics& rParent);
+ explicit WinSalGraphicsImpl(WinSalGraphics& rParent);
virtual ~WinSalGraphicsImpl();
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index e7da7a9..8f5171e 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -40,10 +40,10 @@ class DemoMtfWin : public WorkWindow
GDIMetaFile maMtf;
public:
- DemoMtfWin(OUString& aFileName)
+ explicit DemoMtfWin(const OUString& rFileName)
: WorkWindow(NULL, WB_APP | WB_STDWORK)
{
- SvFileStream aFileStream(aFileName, StreamMode::READ);
+ SvFileStream aFileStream(rFileName, StreamMode::READ);
if (aFileStream.IsOpen())
{
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
index 6814a19..d9ef946 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
@@ -23,7 +23,7 @@
class MSWorksCalcImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
- MSWorksCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MSWorksCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx
index 0dc91ac..176c04a 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx
@@ -23,7 +23,7 @@
class MWAWCalcImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
- MWAWCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MWAWCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/calc/NumbersImportFilter.hxx b/writerperfect/source/calc/NumbersImportFilter.hxx
index 5b38964..73f9853 100644
--- a/writerperfect/source/calc/NumbersImportFilter.hxx
+++ b/writerperfect/source/calc/NumbersImportFilter.hxx
@@ -22,7 +22,7 @@
class NumbersImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
- NumbersImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit NumbersImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index 1f46389..064f51c 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -95,7 +95,7 @@ uno::Reference<io::XInputStream> findStream(ucbhelper::Content &rContent, const
struct DirectoryStream::Impl
{
- Impl(const uno::Reference<ucb::XContent> &rxContent);
+ explicit Impl(const uno::Reference<ucb::XContent> &rxContent);
uno::Reference<ucb::XContent> xContent;
};
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index e0fff43..59895c9 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -285,7 +285,7 @@ struct ZipStreamData
*/
struct ZipStorageImpl
{
- ZipStorageImpl(const Reference<container::XNameAccess> &rxContainer);
+ explicit ZipStorageImpl(const Reference<container::XNameAccess> &rxContainer);
/** Initialize for access.
*
@@ -400,7 +400,7 @@ Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString &rPath)
class WPXSvInputStreamImpl
{
public :
- WPXSvInputStreamImpl(::com::sun::star::uno::Reference<
+ explicit WPXSvInputStreamImpl(::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream);
~WPXSvInputStreamImpl();
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx
index 1316aec..3113f10 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -21,7 +21,7 @@
class CDRImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- CDRImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit CDRImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx
index 03ffaff..f2cb885 100644
--- a/writerperfect/source/draw/CMXImportFilter.hxx
+++ b/writerperfect/source/draw/CMXImportFilter.hxx
@@ -21,7 +21,7 @@
class CMXImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- CMXImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit CMXImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx
index 485c389..b1fd4aa 100644
--- a/writerperfect/source/draw/FreehandImportFilter.hxx
+++ b/writerperfect/source/draw/FreehandImportFilter.hxx
@@ -18,7 +18,7 @@
class FreehandImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- FreehandImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit FreehandImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx
index 6e49353..d6213f5 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.hxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.hxx
@@ -18,7 +18,7 @@
class MSPUBImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- MSPUBImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MSPUBImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
index 01bb2d2..30be7d3 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
@@ -23,7 +23,7 @@
class MWAWDrawImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- MWAWDrawImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MWAWDrawImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx
index 1812877..70a042b 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.hxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.hxx
@@ -18,7 +18,7 @@
class PageMakerImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- PageMakerImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit PageMakerImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx
index b82e526..a69c31f 100644
--- a/writerperfect/source/draw/VisioImportFilter.hxx
+++ b/writerperfect/source/draw/VisioImportFilter.hxx
@@ -18,7 +18,7 @@
class VisioImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- VisioImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit VisioImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx
index b7ac071..7456fdc 100644
--- a/writerperfect/source/draw/WPGImportFilter.hxx
+++ b/writerperfect/source/draw/WPGImportFilter.hxx
@@ -23,7 +23,7 @@
class WPGImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
- WPGImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit WPGImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx
index d176643..2bf14e6 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.hxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.hxx
@@ -22,7 +22,7 @@
class KeynoteImportFilter : public writerperfect::ImportFilter<OdpGenerator>
{
public:
- KeynoteImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit KeynoteImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
virtual ~KeynoteImportFilter() {}
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
index f8ff94a..4f8e4c0 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
@@ -23,7 +23,7 @@
class MWAWPresentationImportFilter : public writerperfect::ImportFilter<OdpGenerator>
{
public:
- MWAWPresentationImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MWAWPresentationImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx
index 4268d32..ae91394 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.hxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.hxx
@@ -23,7 +23,7 @@
class AbiWordImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
- AbiWordImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit AbiWordImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx
index 9f1560f..a4218de 100644
--- a/writerperfect/source/writer/EBookImportFilter.hxx
+++ b/writerperfect/source/writer/EBookImportFilter.hxx
@@ -23,7 +23,7 @@
class EBookImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
- EBookImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit EBookImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx
index 32f4d74..b5afa42 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.hxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.hxx
@@ -23,7 +23,7 @@
class MSWorksImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
- MSWorksImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MSWorksImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx
index fdece1e..959ab15 100644
--- a/writerperfect/source/writer/MWAWImportFilter.hxx
+++ b/writerperfect/source/writer/MWAWImportFilter.hxx
@@ -23,7 +23,7 @@
class MWAWImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
- MWAWImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit MWAWImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/PagesImportFilter.hxx b/writerperfect/source/writer/PagesImportFilter.hxx
index e527b07..74c674b 100644
--- a/writerperfect/source/writer/PagesImportFilter.hxx
+++ b/writerperfect/source/writer/PagesImportFilter.hxx
@@ -22,7 +22,7 @@
class PagesImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
- PagesImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit PagesImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index 60f720f..ed96f4e 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -45,7 +45,7 @@ protected:
throw (css::uno::RuntimeException, std::exception);
public:
- WordPerfectImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ explicit WordPerfectImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
: mxContext(rxContext) {}
virtual ~WordPerfectImportFilter() {}
@@ -129,7 +129,7 @@ class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 <
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext);
+ explicit WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext);
};
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index 80f4128..0a7796a 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -42,7 +42,7 @@ namespace chelp {
public:
- BufferedInputStream(
+ explicit BufferedInputStream(
const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
virtual ~BufferedInputStream();
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index a228272..98a6bb2 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -662,7 +662,7 @@ namespace chelp {
struct KeywordElementComparator
{
- KeywordElementComparator( const Reference< XCollator >& xCollator )
+ explicit KeywordElementComparator( const Reference< XCollator >& xCollator )
: m_xCollator( xCollator )
{ }
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 95f0be7..38660c9 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -116,7 +116,7 @@ namespace chelp {
void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids );
};
- KeywordInfo( const std::vector< KeywordElement >& aVector );
+ explicit KeywordInfo( const std::vector< KeywordElement >& aVector );
~KeywordInfo() { };
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index bbf91b0..c97d991 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -38,7 +38,7 @@ namespace chelp {
{
public:
- XInputStream_impl( const OUString& aUncPath );
+ explicit XInputStream_impl( const OUString& aUncPath );
virtual ~XInputStream_impl();
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 0e3994d..05f0a76 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -52,7 +52,7 @@ namespace chelp {
public ::com::sun::star::lang::XComponent
{
public:
- ContentProvider(
+ explicit ContentProvider(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 05bca6d..a6fb981 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -38,7 +38,7 @@ namespace chelp {
{
public:
- DbtToStringConverter( const sal_Char* ptr )
+ explicit DbtToStringConverter( const sal_Char* ptr )
: m_ptr( ptr )
{
}
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index ea779f6..5518470 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -47,7 +47,7 @@ namespace treeview {
public:
- TVDom( TVDom* arent = 0 )
+ explicit TVDom( TVDom* arent = 0 )
: kind( other ),
parent( arent ),
children( 0 )
commit 12b6bca821a7b0137fcac243f8aa078ba1a152ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 09:36:48 2015 +0100
cppcheck: unreadVariable
Change-Id: Ideb029385a4a6aad5b7edf709c79de0836276566
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index cf2609e..9be7362 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -171,8 +171,6 @@ void WPXSvStreamTest::testRead()
// trying to read nothing
pInput->seek(0, RVNG_SEEK_SET);
- pText = pTextOrig;
-
pData = pInput->read(0UL, nReadBytes);
CPPUNIT_ASSERT_EQUAL(0UL, nReadBytes);
CPPUNIT_ASSERT_EQUAL(0L, pInput->tell());
commit 95ee84ea630b62c528164ed21bc79efbd1f53cf3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 09:18:45 2015 +0100
m_bUpdatable is always false
Change-Id: Ia9d13d9bbf1b6aaef0bcfd786b602a7a63f256c1
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index 66c036c..7fce3fd8 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -42,7 +42,6 @@ namespace dbaui
protected:
bool m_bCurrentModified;
- bool m_bUpdatable;
bool m_bClipboardFilled;
public:
@@ -75,8 +74,6 @@ namespace dbaui
virtual bool IsInsertNewAllowed( long nRow ) = 0;
virtual bool IsDeleteAllowed( long nRow ) = 0;
- bool IsUpdatable() const {return m_bUpdatable;}
-
virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE;
virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 1e8bc67..550bc3f 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -42,7 +42,6 @@ OTableRowView::OTableRowView(vcl::Window* pParent)
,m_nCurrentPos(-1)
,m_nCurUndoActId(0)
,m_bCurrentModified(false)
- ,m_bUpdatable(false)
,m_bClipboardFilled(false)
{
@@ -66,8 +65,6 @@ void OTableRowView::Init()
BrowserMode nMode = BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::KEEPHIGHLIGHT |
BrowserMode::HLINES | BrowserMode::VLINES | BrowserMode::AUTOSIZE_LASTCOL;
- if (IsUpdatable())
- nMode |= BrowserMode::HIDECURSOR;
SetMode(nMode);
}
@@ -116,7 +113,7 @@ void OTableRowView::Command(const CommandEvent& rEvt)
aContextMenu.EnableItem( SID_CUT, nSelectRowCount != 0);
aContextMenu.EnableItem( SID_COPY, nSelectRowCount != 0);
aContextMenu.EnableItem( SID_PASTE, m_bClipboardFilled );
- aContextMenu.EnableItem( SID_DELETE, IsUpdatable() && nSelectRowCount != 0 );
+ aContextMenu.EnableItem( SID_DELETE, false );
switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel()))
{
case SID_CUT:
commit bfd33a826cf842de8fce9e331b24d25c1bc58b28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 09:17:33 2015 +0100
callcatcher: update unused code
Change-Id: I735264eb32ebdd165d23a4717f0329f666b8b140
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 759bb0b..76e891a 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -178,16 +178,6 @@ namespace dxcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
- bool DeviceHelper::hasFullScreenMode()
- {
- return false;
- }
-
- bool DeviceHelper::enterFullScreenMode( bool /*bEnter*/ )
- {
- return false;
- }
-
uno::Any DeviceHelper::isAccelerated() const
{
return ::com::sun::star::uno::makeAny(false);
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index cdf1e94..c178153 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -79,9 +79,6 @@ namespace dxcanvas
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;
::com::sun::star::uno::Any getSurfaceHandle() const;
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 1581d52..5b24ff2f 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -158,18 +158,6 @@ namespace dxcanvas
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;
- }
-
void SpriteDeviceHelper::destroyBuffers()
{
// TODO(F3): implement XBufferStrategy interface. For now, we
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index daced3b..3b52f2d 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -64,9 +64,6 @@ namespace dxcanvas
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 );
-
void destroyBuffers( );
sal_Bool showBuffer( bool bIsVisible, sal_Bool bUpdateAll );
sal_Bool switchBuffer( bool bIsVisible, sal_Bool bUpdateAll );
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 63fdc8a..0761351 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -149,12 +149,6 @@ namespace vclcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
- bool DeviceHelper::enterFullScreenMode( bool bEnter )
- {
- (void)bEnter;
- return false;
- }
-
void DeviceHelper::disposing()
{
// release all references
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 55bf9bf..08d2270 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 enterFullScreenMode( bool bEnter );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 9042b37..757dbb5 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -76,19 +76,6 @@ namespace comphelper
return m_pImpl->m_nForeignControlledStates;
}
-
- void OAccessibleImplementationAccess::setStateBit( const sal_Int16 _nState, const bool _bSet )
- {
- OSL_ENSURE( _nState >= 0 && static_cast< sal_uInt16 >(_nState) < sizeof( sal_Int64 ) * 8, "OAccessibleImplementationAccess::setStateBit: no more bits (shutting down the universe now)!" );
-
- sal_uInt64 nBitMask( 1 );
- nBitMask <<= _nState;
- if ( _bSet )
- m_pImpl->m_nForeignControlledStates |= nBitMask;
- else
- m_pImpl->m_nForeignControlledStates &= ~nBitMask;
- }
-
namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index 97acc01..66c036c 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -76,7 +76,6 @@ namespace dbaui
virtual bool IsDeleteAllowed( long nRow ) = 0;
bool IsUpdatable() const {return m_bUpdatable;}
- void SetUpdatable( bool bUpdate=true );
virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE;
virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 5aced5b..1e8bc67 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -93,12 +93,6 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt )
EditBrowseBox::KeyInput(rEvt);
}
-void OTableRowView::SetUpdatable( bool bUpdate )
-{
- m_bUpdatable = bUpdate;
-
-}
-
void OTableRowView::Command(const CommandEvent& rEvt)
{
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index e8eb5e2..5d15839 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -79,9 +79,6 @@ namespace comphelper
void setAccessibleParent(
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccParent );
- /// sets or resets a bit of the foreign controlled states
- void setStateBit( const sal_Int16 _nState, const bool _bSet );
-
protected:
OAccessibleImplementationAccess( );
virtual ~OAccessibleImplementationAccess( );
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index c382f87..f940dbc 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -161,16 +161,6 @@ public:
void IncreaseLuminance(sal_uInt8 cLumInc);
void DecreaseLuminance(sal_uInt8 cLumDec);
- /**
- * Apply tint or shade to a color.
- *
- * The input value is the percentage (in 100th of percent) of how much the
- * color changes towards the black (shade) or white (tint). If the value
- * is positive, the color is tinted, if the value is negative, the color is
- * shaded.
- **/
- void ApplyTintOrShade(sal_Int16 n100thPercent);
-
void DecreaseContrast(sal_uInt8 cContDec);
void Invert();
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 453feae..07fdd00 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -115,34 +115,6 @@ bool Color::IsBright() const
return GetLuminance() >= 245;
}
-void Color::ApplyTintOrShade(sal_Int16 n100thPercent)
-{
- if (n100thPercent > 0)
- {
- basegfx::BColor aBColor = basegfx::tools::rgb2hsl(getBColor());
-
- double fFactor = std::abs(n100thPercent) / 10000.0;
- aBColor.setBlue(aBColor.getBlue() * fFactor + (100.0 - aBColor.getBlue()));
- aBColor = basegfx::tools::hsl2rgb(aBColor);
-
- SetRed(sal_uInt8((aBColor.getRed() * 255.0) + 0.5));
- SetGreen(sal_uInt8((aBColor.getGreen() * 255.0) + 0.5));
- SetBlue(sal_uInt8((aBColor.getBlue() * 255.0) + 0.5));
- }
- else if (n100thPercent < 0)
- {
- basegfx::BColor aBColor = basegfx::tools::rgb2hsl(getBColor());
-
- double fFactor = std::abs(n100thPercent) / 10000.0;
- aBColor.setBlue(aBColor.getBlue() * fFactor);
- aBColor = basegfx::tools::hsl2rgb(aBColor);
-
- SetRed(sal_uInt8((aBColor.getRed() * 255.0) + 0.5));
- SetGreen(sal_uInt8((aBColor.getGreen() * 255.0) + 0.5));
- SetBlue(sal_uInt8((aBColor.getBlue() * 255.0) + 0.5));
- }
-}
-
// color space conversion
void Color::RGBtoHSB( sal_uInt16& nHue, sal_uInt16& nSat, sal_uInt16& nBri ) const
diff --git a/unusedcode.easy b/unusedcode.easy
index 7f9c734..d9780e0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
BigInt::BigInt(unsigned int)
BitmapFilterStackBlur::filter(BitmapEx&)
-Color::ApplyTintOrShade(short)
FontCharMap::GetDefaultMap(bool)
NotifyEvent::NotifyEvent()
OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int)
@@ -73,7 +72,6 @@ apitest::XText::testInsertRemoveTextContent()
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::DataBrowser::SetCellModifiedHdl(Link<void*, long> const&)
-comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&)
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(std::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&)
@@ -83,7 +81,6 @@ connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
dbaccess::OBookmarkContainer::dispose()
dbaccess::StorageInputStream::close()
-dbaui::OTableRowView::SetUpdatable(bool)
oglcanvas::CanvasHelper::drawPoint(com::sun::star::rendering::XCanvas const*, com::sun::star::geometry::RealPoint2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&)
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::drawingml::TextListStyle::dump() const
More information about the Libreoffice-commits
mailing list