[Libreoffice-commits] core.git: package/source reportdesign/source rsc/inc rsc/source
Noel Grandin
noel at peralex.com
Thu May 19 06:42:26 UTC 2016
package/source/zipapi/MemoryByteGrabber.hxx | 3 -
reportdesign/source/core/inc/core_resource.hxx | 4 --
reportdesign/source/filter/xml/xmlExport.hxx | 3 -
reportdesign/source/ui/inc/ColorChanger.hxx | 14 --------
reportdesign/source/ui/inc/ViewsWindow.hxx | 29 -----------------
reportdesign/source/ui/inc/metadata.hxx | 3 -
rsc/inc/rscdb.hxx | 1
rsc/inc/rscdef.hxx | 2 -
rsc/inc/rsctree.hxx | 1
rsc/source/parser/rscdb.cxx | 41 -------------------------
rsc/source/tools/rscdef.cxx | 12 -------
11 files changed, 3 insertions(+), 110 deletions(-)
New commits:
commit 727d4dbebaf947593ce5caae6915238c8c4f3da2
Author: Noel Grandin <noel at peralex.com>
Date: Wed May 18 15:22:39 2016 +0200
loplugin:unusedmethods in package to rsc
Change-Id: I61c6f56a69891d656a41d3617d0ce2b34d848c84
Reviewed-on: https://gerrit.libreoffice.org/25108
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx
index 1811262..2beb8f5 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -37,9 +37,6 @@ public:
, mnEnd ( rBuffer.getLength() )
{
}
- MemoryByteGrabber()
- {
- }
const sal_Int8 * getCurrentPos () { return mpBuffer + mnCurrent; }
// XInputStream chained
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
index 2652e61..9285508 100644
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ b/reportdesign/source/core/inc/core_resource.hxx
@@ -38,10 +38,8 @@ namespace reportdesign
{
static SimpleResMgr* m_pImpl;
- private:
// no instantiation allowed
- ResourceManager() { }
- ~ResourceManager() { }
+ ResourceManager() = delete;
// we'll instantiate one static member of the following class, which, in its dtor,
// ensures that m_pImpl will be deleted
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index d885416..d597b62 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -140,9 +140,8 @@ private:
static OUString implConvertNumber(sal_Int32 _nValue);
-private:
- ORptExport();
virtual void SetBodyAttributes() override;
+
protected:
virtual void ExportStyles_( bool bUsed ) override;
diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx
index 247863a..06ecf7c 100644
--- a/reportdesign/source/ui/inc/ColorChanger.hxx
+++ b/reportdesign/source/ui/inc/ColorChanger.hxx
@@ -30,12 +30,6 @@ namespace rptui
VclPtr<OutputDevice> m_pDev;
public:
- ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor)
- :m_pDev( _pDev )
- {
- m_pDev->Push( PushFlags::LINECOLOR );
- m_pDev->SetLineColor( _rNewLineColor );
- }
ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor )
:m_pDev( _pDev )
{
@@ -43,14 +37,6 @@ namespace rptui
m_pDev->SetLineColor( _rNewLineColor );
m_pDev->SetFillColor( _rNewFillColor );
}
- ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor, const Color& _rNewTextColor )
- :m_pDev( _pDev )
- {
- m_pDev->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::TEXTCOLOR);
- m_pDev->SetLineColor( _rNewLineColor );
- m_pDev->SetFillColor( _rNewFillColor );
- m_pDev->SetTextColor( _rNewTextColor );
- }
~ColorChanger()
{
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index d97a5be..8ac2f0313 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -71,35 +71,6 @@ namespace rptui
}
};
- class OWindowPositionCorrector
- {
- ::std::vector< ::std::pair<VclPtr<vcl::Window>,Point> > m_aChildren;
- long m_nDeltaX;
- long m_nDeltaY;
- public:
- OWindowPositionCorrector(vcl::Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY)
- {
- sal_uInt16 nCount = _pWindow->GetChildCount();
- m_aChildren.reserve(nCount);
- while( nCount )
- {
- vcl::Window* pChild = _pWindow->GetChild(--nCount);
- m_aChildren.push_back(::std::pair<vcl::Window*,Point>(pChild,pChild->GetPosPixel()));
- }
- }
- ~OWindowPositionCorrector()
- {
- auto aIter = m_aChildren.begin();
- auto aEnd = m_aChildren.end();
- for (; aIter != aEnd; ++aIter)
- {
- const Point aPos = aIter->first->GetPosPixel();
- if ( aPos == aIter->second )
- aIter->first->SetPosPixel(Point(m_nDeltaX,m_nDeltaY) + aPos);
- }
- }
- };
-
class OViewsWindow : public vcl::Window
, public utl::ConfigurationListener
, public IMarkedSection
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 3f980ab..ab1c7dc 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -39,14 +39,13 @@ namespace rptui
{
OPropertyInfoService(const OPropertyInfoService&) = delete;
void operator =(const OPropertyInfoService&) = delete;
+ OPropertyInfoService() = delete;
protected:
static sal_uInt16 s_nCount;
static OPropertyInfoImpl* s_pPropertyInfos;
// TODO: a real structure which allows quick access by name as well as by id
public:
- OPropertyInfoService(){}
- virtual ~OPropertyInfoService(){}
// IPropertyInfoService
static sal_Int32 getPropertyId(const OUString& _rName);
static OUString getPropertyTranslation(sal_Int32 _nId);
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index a1dc47a..ba229fa 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -223,7 +223,6 @@ class RscTypCont
void InsWinBit( RscTop * pClass, const OString& rName,
Atom nVal );
- void WriteInc( FILE * fOutput, RscFileTab::Index lKey );
public:
RscBool aBool;
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index d2194f0..c9ef7f4 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -169,8 +169,6 @@ private:
return i;
return size_t(-1);
}
-public:
- void WriteAll( FILE * fOutput );
};
/*********** R s c E x p r e s s i o n ***********************************/
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index b569198..62db17b 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -82,7 +82,6 @@ protected:
OString m_aName;
public:
- StringNode() {}
StringNode(const OString& rStr) { m_aName = rStr; }
StringNode* Search( const char * ) const;
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 877e226..1d695fb 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -287,47 +287,6 @@ sal_uInt32 RscTypCont::PutSysName( sal_uInt32 nRscTyp, char * pFileName )
return pSysEntry->nKey;
}
-void RscTypCont::WriteInc( FILE * fOutput, RscFileTab::Index lFileKey )
-{
-
- if( lFileKey == RscFileTab::IndexNotFound )
- {
- RscFileTab::Index aIndex = aFileTab.FirstIndex();
- while( aIndex != RscFileTab::IndexNotFound )
- {
- RscFile * pFName = aFileTab.Get( aIndex );
- if( pFName->IsIncFile() )
- {
- fprintf( fOutput, "#include " );
- fprintf( fOutput, "\"%s\"\n",
- pFName->aFileName.getStr() );
- }
- aIndex = aFileTab.NextIndex( aIndex );
- }
- }
- else
- {
- RscFile * pFName = aFileTab.Get( lFileKey );
- if( pFName )
- {
- for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i )
- {
- RscDepend* pDep = pFName->aDepLst[ i ];
- if( pDep->GetFileKey() != lFileKey )
- {
- RscFile* pFile = aFileTab.GetFile( pDep->GetFileKey() );
- if( pFile )
- {
- fprintf( fOutput, "#include " );
- fprintf( fOutput, "\"%s\"\n",
- pFile->aFileName.getStr() );
- }
- }
- }
- }
- }
-}
-
class RscEnumerateObj
{
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index b632009..820c3f0 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -231,18 +231,6 @@ bool RscDefineList::Remove()
return true;
}
-void RscDefineList::WriteAll( FILE * fOutput )
-{
- for ( size_t i = 0, n = maList.size(); i < n; ++i )
- {
- RscDefine* pDefEle = maList[ i ];
- fprintf( fOutput, "#define %s %s\n",
- pDefEle->GetName().getStr(),
- pDefEle->GetMacro().getStr()
- );
- }
-}
-
bool RscExpType::Evaluate( sal_Int32 * plValue ) const
{
if( IsDefinition() )
More information about the Libreoffice-commits
mailing list