mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedmethods

Browse Source 
Change-Id: Ifafdaf6da0225f244853a0042a6458643b570623
This commit is contained in:
Noel Grandin 2015-12-18 09:37:44 +02:00
parent 20ff8cc5c3
commit e18b08363a
57 changed files with 7 additions and 717 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
comphelper/source/misc/accimplaccess.cxx
View File

@ -65,12 +65,6 @@ namespace comphelper
}
void OAccessibleImplementationAccess::setAccessibleParent( const Reference< XAccessible >& _rxAccParent )
{
m_pImpl->m_xAccParent = _rxAccParent;
}
sal_Int64 OAccessibleImplementationAccess::implGetForeignControlledStates( ) const
{
return m_pImpl->m_nForeignControlledStates;
@ -98,39 +92,6 @@ namespace comphelper
return nReturn;
}
OAccessibleImplementationAccess* OAccessibleImplementationAccess::getImplementation( const Reference< XAccessibleContext >& _rxComponent )
{
OAccessibleImplementationAccess* pImplementation = nullptr;
try
{
Reference< XUnoTunnel > xTunnel( _rxComponent, UNO_QUERY );
if ( xTunnel.is() )
{
pImplementation = reinterpret_cast< OAccessibleImplementationAccess* >(
xTunnel->getSomething( getUnoTunnelImplementationId() ) );
}
}
catch( const Exception& )
{
OSL_FAIL( "OAccessibleImplementationAccess::setAccessibleParent: caught an exception while retrieving the implementation!" );
}
return pImplementation;
}
bool OAccessibleImplementationAccess::setAccessibleParent(
const Reference< XAccessibleContext >& _rxComponent, const Reference< XAccessible >& _rxNewParent )
{
OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent );
if ( pImplementation )
pImplementation->setAccessibleParent( _rxNewParent );
return ( nullptr != pImplementation );
}
} // namespace comphelper

6
comphelper/source/misc/documentiologring.cxx
View File

@ -60,12 +60,6 @@ OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
}
OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
{
return OUString( "com.sun.star.logging.DocumentIOLogRing" );
}
OUString SAL_CALL OSimpleLogRing::getServiceName_static()
{
return OUString( "com.sun.star.logging.SimpleLogRing" );

2
comphelper/source/misc/documentiologring.hxx
View File

@ -52,8 +52,6 @@ public:
static OUString SAL_CALL getImplementationName_static();
static OUString SAL_CALL getSingletonName_static();
static OUString SAL_CALL getServiceName_static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL

6
comphelper/source/misc/officerestartmanager.cxx
View File

@ -47,12 +47,6 @@ OUString SAL_CALL OOfficeRestartManager::getImplementationName_static()
}
OUString SAL_CALL OOfficeRestartManager::getSingletonName_static()
{
return OUString( "com.sun.star.task.OfficeRestartManager" );
}
OUString SAL_CALL OOfficeRestartManager::getServiceName_static()
{
return OUString( "com.sun.star.comp.task.OfficeRestartManager" );

2
comphelper/source/misc/officerestartmanager.hxx
View File

@ -56,8 +56,6 @@ public:
static OUString SAL_CALL getImplementationName_static();
static OUString SAL_CALL getSingletonName_static();
static OUString SAL_CALL getServiceName_static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL

7
comphelper/source/officeinstdir/officeinstallationdirectories.cxx
View File

@ -249,13 +249,6 @@ OfficeInstallationDirectories::getSupportedServiceNames_static()
}
// static
OUString SAL_CALL OfficeInstallationDirectories::getSingletonName_static()
{
return OUString("com.sun.star.util.theOfficeInstallationDirectories");
}
// static
uno::Reference< uno::XInterface > SAL_CALL
OfficeInstallationDirectories::Create(

2
comphelper/source/officeinstdir/officeinstallationdirectories.hxx
View File

@ -77,8 +77,6 @@ public:
getImplementationName_static();
static css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames_static();
static OUString SAL_CALL
getSingletonName_static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL
Create( const css::uno::Reference< css::uno::XComponentContext >& );

2
compilerplugins/clang/unusedmethods.cxx
View File

@ -255,7 +255,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
return true;
}
if( !ignoreLocation( functionDecl ))
if( functionDecl->getLocation().isValid() && !ignoreLocation( functionDecl ))
definitionSet.insert(niceName(functionDecl));
return true;
}

4
connectivity/source/drivers/postgresql/pq_xtable.hxx
View File

@ -182,10 +182,6 @@ public: // XDataDescriptorFactory
};
void copyProperties(
ReflectionBase *target,
const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & source );
}

2
cui/source/inc/insdlg.hxx
View File

@ -104,8 +104,6 @@ private:
OUString m_aCommands;
DECL_LINK_TYPED(BrowseHdl, Button*, void);
OUString GetPlugInFile() const { return m_pEdFileurl->GetText(); }
OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); }
public:
SvInsertPlugInDialog(vcl::Window* pParent,

1
desktop/source/lib/init.cxx
View File

@ -62,7 +62,6 @@
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
#include <vcl/svapp.hxx>
#include <vcl/svpforlokit.hxx>
#include <tools/resmgr.hxx>
#include <tools/fract.hxx>
#include <svtools/ctrltool.hxx>

50
drawinglayer/source/primitive2d/baseprimitive2d.cxx
View File

@ -273,45 +273,6 @@ namespace drawinglayer
return true;
}
// concatenate sequence
void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource)
{
if(rSource.hasElements())
{
if(rDest.hasElements())
{
const sal_Int32 nSourceCount(rSource.getLength());
const sal_Int32 nDestCount(rDest.getLength());
const sal_Int32 nTargetCount(nSourceCount + nDestCount);
sal_Int32 nInsertPos(nDestCount);
rDest.realloc(nTargetCount);
for(sal_Int32 a(0L); a < nSourceCount; a++)
{
if(rSource[a].is())
{
rDest[nInsertPos++] = rSource[a];
}
}
if(nInsertPos != nTargetCount)
{
rDest.realloc(nInsertPos);
}
}
else
{
rDest = rSource;
}
}
}
void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource)
{
appendPrimitive2DSequenceToPrimitive2DSequence(rDest, comphelper::containerToSequence(rSource));
}
void Primitive2DContainer::append(const Primitive2DContainer& rSource)
{
insert(end(), rSource.begin(), rSource.end());
@ -332,17 +293,6 @@ namespace drawinglayer
std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this));
}
// concatenate single Primitive2D
void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource)
{
if(rSource.is())
{
const sal_Int32 nDestCount(rDest.getLength());
rDest.realloc(nDestCount + 1L);
rDest[nDestCount] = rSource;
}
}
OUString idToString(sal_uInt32 nId)
{
switch( nId )

43
drawinglayer/source/primitive3d/baseprimitive3d.cxx
View File

@ -184,38 +184,6 @@ namespace drawinglayer
return (pA->operator==(*pB));
}
bool arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB)
{
const bool bAHasElements(rA.hasElements());
if(bAHasElements != rB.hasElements())
{
return false;
}
if(!bAHasElements)
{
return true;
}
const sal_Int32 nCount(rA.getLength());
if(nCount != rB.getLength())
{
return false;
}
for(sal_Int32 a(0L); a < nCount; a++)
{
if(!arePrimitive3DReferencesEqual(rA[a], rB[a]))
{
return false;
}
}
return true;
}
bool Primitive3DContainer::operator==(const Primitive3DContainer& rB) const
{
const bool bAHasElements(!empty());
@ -263,17 +231,6 @@ namespace drawinglayer
}
}
// concatenate single Primitive3D
void appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource)
{
if(rSource.is())
{
const sal_Int32 nDestCount(rDest.getLength());
rDest.realloc(nDestCount + 1L);
rDest[nDestCount] = rSource;
}
}
} // end of namespace primitive3d
} // end of namespace drawinglayer

1
framework/inc/uielement/macrosmenucontroller.hxx
View File

@ -67,7 +67,6 @@ namespace framework
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
OUString RetrieveLabelFromCommand(const OUString& rCmdURL);
void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
};
}

1
idl/inc/basobj.hxx
View File

@ -107,7 +107,6 @@ public:
static void WriteStars( SvStream & );
virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr );
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
virtual const SvString & GetName() const { return aName; }
virtual const SvString & GetHelpText() const { return aHelpText; }
virtual const SvString & GetConfigName() const{ return aConfigName; }

3
include/canvas/canvastools.hxx
View File

@ -102,9 +102,6 @@ namespace canvas
*
*/
// mickey's math tricks...
inline unsigned int pow2( unsigned int c ) { return 0x1 << c; }
/** Round given floating point value down to next integer
*/
inline sal_Int32 roundDown( const double& rVal )

32
include/comphelper/accimplaccess.hxx
View File

@ -75,10 +75,6 @@ namespace comphelper
*/
sal_Int64 implGetForeignControlledStates( ) const;
/// sets the accessible parent component
void setAccessibleParent(
const css::uno::Reference< css::accessibility::XAccessible >& _rxAccParent );
protected:
OAccessibleImplementationAccess( );
virtual ~OAccessibleImplementationAccess( );
@ -87,34 +83,6 @@ namespace comphelper
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
public:
/** tries to access the implementation of an OAccessibleImplementationAccess derivee which is known as
interface only.
@param _rxComponent
is the component which should be examined.
@return
the pointer to the implementation, if successful. The only known error condition so far
is an invalid context (which means it is <NULL/>, or the implementation is not derived
from OAccessibleImplementationAccess, or retrieving the implementation failed).
*/
static OAccessibleImplementationAccess* getImplementation(
const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent
);
/** sets the parent for a derived implementation
@param _rxComponent
is the component which's new parent should be set
@param _rxNewParent
is the new parent of the component
@return
<TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at
<method>getImplementation</method>.
*/
static bool setAccessibleParent(
const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxNewParent
);
private:
COMPHELPER_DLLPRIVATE static const css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();

10
include/drawinglayer/primitive2d/baseprimitive2d.hxx
View File

@ -282,9 +282,6 @@ namespace drawinglayer
{
namespace primitive2d
{
/// support to handle a sequence of primitives as stl vector and convert it during creation
Primitive2DSequence DRAWINGLAYER_DLLPUBLIC Primitive2DVectorToPrimitive2DSequence(const Primitive2DContainer& rSource, bool bInvert = false);
/// get B2DRange from a given Primitive2DReference
basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation);
@ -296,13 +293,6 @@ namespace drawinglayer
/// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally
bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB);
/// concatenate sequence
void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource);
void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource);
/// concatenate single Primitive2D
void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource);
OUString DRAWINGLAYER_DLLPUBLIC idToString(sal_uInt32 nId);
} // end of namespace primitive2d

10
include/drawinglayer/primitive3d/baseprimitive3d.hxx
View File

@ -64,7 +64,6 @@ namespace drawinglayer { namespace primitive3d {
Primitive3DContainer( std::initializer_list<Primitive3DReference> init ) : vector(init) {}
void append(const Primitive3DContainer& rSource);
void append(const Primitive3DSequence& rSource);
void append(Primitive3DContainer&& rSource);
Primitive3DContainer& operator=(const Primitive3DContainer& r) { vector::operator=(r); return *this; }
Primitive3DContainer& operator=(const Primitive3DContainer&& r) { vector::operator=(r); return *this; }
@ -209,15 +208,6 @@ namespace drawinglayer
*/
bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB);
/// compare two Primitive3DReferences for equality, uses arePrimitive3DReferencesEqual internally
bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB);
/// concatenate sequence
void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DContainer& rSource);
/// concatenate single Primitive3D
void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource);
} // end of namespace primitive3d
} // end of namespace drawinglayer

7
include/oox/core/fastparser.hxx
View File

@ -75,13 +75,6 @@ public:
void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false )
throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
OUString getNamespaceURL( const OUString& rPrefix )
throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
bool hasNamespaceURL( const OUString& rPrefix ) const;
sal_Int32 getNamespaceId( const OUString& aUrl );
css::uno::Reference< css::xml::sax::XFastTokenHandler >
getTokenHandler() const { return mxTokenHandler; }

6
include/oox/core/xmlfilterbase.hxx
View File

@ -220,12 +220,6 @@ public:
*/
XmlFilterBase& exportDocumentProperties( css::uno::Reference< css::document::XDocumentProperties > xProperties );
OUString getNamespaceURL( const OUString& rPrefix );
bool hasNamespaceURL( const OUString& rPrefix ) const;
sal_Int32 getNamespaceId( const OUString& rUrl );
void importDocumentProperties();
FastParser* createParser() const;

29
include/sfx2/titledockwin.hxx
View File

@ -44,31 +44,6 @@ namespace sfx2
*/
void SetTitle( const OUString& i_rTitle );
/** adds a drop down item to the toolbox. Usually, this is used to add some kind of menu to the toolbox.
@param i_rItemText
the text to display for the item
@param i_nHelpId
the help ID for the new toolbox item
@param i_rCallback
the callback to invoke when the drop item has been clicked
@return
the ID of the newly created toolbox item
*/
sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback )
{
return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
}
void SetEndDockingHdl( const Link<TitledDockingWindow*,void>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
/** resets the toolbox. Upon return, the only item in the toolbox is the closer.
*/
void ResetToolBox()
{
impl_resetToolBox();
}
/** returns the content window, which is to be used as parent window for any content to be displayed
in the docking window.
*/
@ -100,10 +75,6 @@ namespace sfx2
*/
void impl_resetToolBox();
/** internal version of AddDropDownToolBoxItem
*/
sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback );
/** returns the current title.
If no title has been set via SetTitle, then the window text (Window::GetText) is returned.

1
include/svl/ilstitem.hxx
View File

@ -37,7 +37,6 @@ public:
SfxIntegerListItem( const SfxIntegerListItem& rItem );
virtual ~SfxIntegerListItem();
std::vector< sal_Int32 >& GetList() { return m_aList; }
const std::vector< sal_Int32 >& GetList() const { return m_aList; }
virtual bool operator==( const SfxPoolItem& ) const override;

3
include/svl/ownlist.hxx
View File

@ -74,9 +74,6 @@ public:
return aCommandList[ i ];
}
void clear() {
aCommandList.clear();
}
};
#endif // INCLUDED_SVL_OWNLIST_HXX

47
include/tools/appendunixshellword.hxx
View File

@ -1,47 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX
#define INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX
#include <rtl/strbuf.hxx>
#if defined UNX
#include <tools/toolsdllapi.h>
namespace tools {
/** append arbitrary bytes as a properly quoted Unix-style shell word
@param accumulator
the string buffer to which the word is appended (without any surrounding
whitespace); must not be null
@param text
the text to add
*/
TOOLS_DLLPUBLIC void appendUnixShellWord(
OStringBuffer * accumulator, OString const & text);
}
#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

15
include/tools/gen.hxx
View File

@ -324,7 +324,6 @@ public:
/// Move the top and left edges by a delta, preserving width and height
inline void Move( long nHorzMoveDelta, long nVertMoveDelta );
inline void Transpose();
inline void SetPos( const Point& rPoint );
void SetSize( const Size& rSize );
inline Size GetSize() const;
@ -497,20 +496,6 @@ inline void Rectangle::Move( long nHorzMove, long nVertMove )
nBottom += nVertMove;
}
void Rectangle::Transpose()
{
if ( !IsEmpty() )
{
long swap( nLeft );
nLeft = nTop;
nTop = swap;
swap = nRight;
nRight = nBottom;
nBottom = swap;
}
}
inline void Rectangle::SetPos( const Point& rPoint )
{
if ( nRight != RECT_EMPTY )

3
include/unotools/confignode.hxx
View File

@ -86,9 +86,6 @@ namespace utl
/// returns the local name of the node
OUString getLocalName() const;
/// returns the fully qualified path of the node
OUString getNodePath() const;
/** open a sub node
@param _rPath access path of the to-be-opened sub node. May be a hierarchical path.
*/

1
include/vcl/bitmap.hxx
View File

@ -728,7 +728,6 @@ public:
SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const;
SAL_DLLPRIVATE bool ImplScaleFast( const double& rScaleX, const double& rScaleY );
SAL_DLLPRIVATE bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY );
SAL_DLLPRIVATE bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const vcl::Kernel& rKernel);
SAL_DLLPRIVATE bool ImplConvolutionPass(
Bitmap& aNewBitmap,

13
include/vcl/builder.hxx
View File

@ -106,19 +106,6 @@ public:
static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
/// Get label of the command (like of .uno:Save) from the description service
static OUString getCommandProperty(const OUString& rProperty, const OUString& rCommand,
const css::uno::Reference<css::uno::XComponentContext>& rContext,
const OUString& rModuleId);
/// Get image of the command (like of .uno:Save) from the description service
static Image getCommandImage(
const OUString& rCommand,
bool bLarge,
const css::uno::Reference<css::uno::XComponentContext>& rContext,
const css::uno::Reference<css::frame::XFrame>& rFrame,
const OUString& rModuleId );
css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; }
private:

5
include/vcl/opengl/OpenGLContext.hxx
View File

@ -195,11 +195,6 @@ public:
return mbInitialized;
}
bool requestedLegacy()
{
return mbRequestLegacyContext;
}
/// VCL promiscuously re-uses its own contexts:
void setVCLOnly() { mbVCLOnly = true; }
bool isVCLOnly() { return mbVCLOnly; }

26
include/vcl/svpforlokit.hxx
View File

@ -1,26 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_VCL_SVPFORLOKIT_HXX
#define INCLUDED_VCL_SVPFORLOKIT_HXX
#include <vcl/virdev.hxx>
#include <vcl/dllapi.h>
// These functions are for use by LibreOfficeKit only, I think
class SalFrame;
VCL_DLLPUBLIC void InitSvpForLibreOfficeKit();
VCL_DLLPUBLIC SalFrame* GetSvpFocusFrameForLibreOfficeKit();
VCL_DLLPUBLIC vcl::Window* GetSalFrameWindowForLibreOfficeKit(SalFrame *pSF);
#endif // INCLUDED_VCL_SVPFORLOKIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

29
mysqlc/source/mysqlc_connection.cxx
View File

@ -571,35 +571,6 @@ void OConnection::disposing()
OConnection_BASE::disposing();
}
/* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */
rtl::OUString OConnection::getMysqlVariable(const char *varname)
throw(SQLException, RuntimeException)
{
OSL_TRACE("OConnection::getMysqlVariable");
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
rtl::OUString ret;
rtl::OUStringBuffer aStatement;
aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
aStatement.appendAscii( varname );
aStatement.append( '\'' );
try {
XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement());
Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() );
if (rs.is() && rs->next()) {
Reference< XRow > xRow(rs, UNO_QUERY);
ret = xRow->getString(2);
}
} catch (const sql::SQLException & e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
}
return ret;
}
sal_Int32 OConnection::getMysqlVersion()
throw(SQLException, RuntimeException)
{

5
mysqlc/source/mysqlc_connection.hxx
View File

@ -112,9 +112,6 @@ namespace connectivity
bool m_bUseCatalog; // should we use the catalog on filebased databases
public:
rtl::OUString getMysqlVariable(const char *varname)
throw(SQLException, RuntimeException);
sal_Int32 getMysqlVersion()
throw(SQLException, RuntimeException);
@ -215,9 +212,7 @@ namespace connectivity
// should we use the catalog on filebased databases
inline bool isCatalogUsed() const { return m_bUseCatalog; }
inline rtl::OUString getUserName() const { return m_sUser; }
inline const MysqlCDriver& getDriver() const { return m_rDriver;}
inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; }
}; /* OConnection */
// TODO: Not used.

32
mysqlc/source/mysqlc_databasemetadata.cxx
View File

@ -97,38 +97,6 @@ ODatabaseMetaData::~ODatabaseMetaData()
OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData");
}
rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
rtl::OUString stringMetaData;
try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
} catch (const sql::SQLException& e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
}
return stringMetaData;
}
rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
rtl::OUString stringMetaData;
try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this);
} catch (const sql::SQLException& e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding());
}
return stringMetaData;
}
rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);

2
mysqlc/source/mysqlc_databasemetadata.hxx
View File

@ -49,8 +49,6 @@ namespace connectivity
bool identifier_quote_string_set;
private:
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() );
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() );
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() );
sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() );

33
oox/source/core/fastparser.cxx
View File

@ -131,39 +131,6 @@ void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName
parseStream( rStorage.openInputStream( rStreamName ), rStreamName, bCloseStream );
}
OUString FastParser::getNamespaceURL( const OUString& rPrefix ) throw( IllegalArgumentException, RuntimeException )
{
if( !mxParser.is() )
throw RuntimeException();
return mxParser->getNamespaceURL( rPrefix );
}
bool FastParser::hasNamespaceURL( const OUString& rPrefix ) const
{
if (!mxParser.is())
throw RuntimeException();
if (!mpParser)
return false;
return mpParser->hasNamespaceURL(rPrefix);
}
sal_Int32 FastParser::getNamespaceId( const OUString& rUrl )
{
for( NamespaceMap::const_iterator aIt = mrNamespaceMap.maTransitionalNamespaceMap.begin(),
aEnd = mrNamespaceMap.maTransitionalNamespaceMap.end(); aIt != aEnd; ++aIt )
if( rUrl == aIt->second )
return aIt->first;
for( NamespaceMap::const_iterator aIt = mrNamespaceMap.maStrictNamespaceMap.begin(),
aEnd = mrNamespaceMap.maStrictNamespaceMap.end(); aIt != aEnd; ++aIt )
if( rUrl == aIt->second )
return aIt->first;
return 0;
}
} // namespace core
} // namespace oox

15
oox/source/core/xmlfilterbase.cxx
View File

@ -364,21 +364,6 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
return false;
}
OUString XmlFilterBase::getNamespaceURL( const OUString& rPrefix )
{
return mxImpl->maFastParser.getNamespaceURL( rPrefix );
}
bool XmlFilterBase::hasNamespaceURL( const OUString& rPrefix ) const
{
return mxImpl->maFastParser.hasNamespaceURL(rPrefix);
}
sal_Int32 XmlFilterBase::getNamespaceId( const OUString& rUrl )
{
return mxImpl->maFastParser.getNamespaceId( rUrl );
}
Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPath )
{
Reference<XDocument> xRet;

48
registry/source/regimpl.cxx
View File

@ -946,54 +946,6 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
// saveKey
RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName,
bool bWarnings, bool bReport)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
std::unique_ptr< ORegistry > pReg (new ORegistry());
RegError _ret = pReg->initRegistry(regFileName, RegAccessMode::READWRITE, true/*bCreate*/);
if (_ret != RegError::NO_ERROR)
return _ret;
ORegKey* pRootKey = pReg->getRootKey();
REG_GUARD(m_mutex);
OStoreDirectory::iterator iter;
OStoreDirectory rStoreDir(pKey->getStoreDir());
storeError _err = rStoreDir.first(iter);
while ( _err == store_E_None )
{
OUString const keyName = iter.m_pszName;
if ( iter.m_nAttrib & STORE_ATTRIB_ISDIR )
{
_ret = loadAndSaveKeys(pRootKey, pKey, keyName,
pKey->getName().getLength(),
bWarnings, bReport);
}
else
{
_ret = loadAndSaveValue(pRootKey, pKey, keyName,
pKey->getName().getLength(),
bWarnings, bReport);
}
if (_ret != RegError::NO_ERROR)
break;
_err = rStoreDir.next(iter);
}
(void) pReg->releaseKey(pRootKey);
return _ret;
}
// loadAndSaveValue()
RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,

5
registry/source/regimpl.hxx
View File

@ -80,11 +80,6 @@ public:
bool bWarings=false,
bool bReport=false);
RegError saveKey(RegKeyHandle hKey,
const OUString& regFileName,
bool bWarings=false,
bool bReport=false);
RegError dumpRegistry(RegKeyHandle hKey) const;
~ORegistry();

2
sc/source/ui/inc/tphfedit.hxx
View File

@ -43,8 +43,6 @@ class SvxFieldItem;
class ScAccessibleEditObject;
class ScEditWindow;
SC_DLLPUBLIC ScEditWindow* GetScEditWindow ();
enum ScEditWindowLocation
{
Left,

1
sd/inc/TransitionPreset.hxx
View File

@ -54,7 +54,6 @@ public:
sal_Int32 getFadeColor() const { return mnFadeColor; }
const OUString& getPresetId() const { return maPresetId; }
const OUString& getGroupId() const { return maGroupId; }
const OUString& getSetId() const { return maSetId; }
const OUString& getSetLabel() const { return maSetLabel; }
const OUString& getVariantLabel() const { return maVariantLabel; }

1
sd/inc/sdpage.hxx
View File

@ -371,7 +371,6 @@ public:
void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex = -1 );
void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
sal_Int32 getHash() const;
OString stringify() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;

5
sd/source/core/sdpage2.cxx
View File

@ -577,11 +577,6 @@ OString SdPage::stringify() const
return aString.makeStringAndClear();
}
sal_Int32 SdPage::getHash() const
{
return stringify().hashCode();
}
void SdPage::createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation )
{
sd::createAnnotation( xAnnotation, this );

19
sfx2/source/dialog/titledockwin.cxx
View File

@ -234,25 +234,6 @@ namespace sfx2
}
sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback )
{
// Add the menu before the closer button.
const sal_uInt16 nItemCount( m_aToolbox->GetItemCount() );
const sal_uInt16 nItemId( nItemCount + 1 );
m_aToolbox->InsertItem( nItemId, i_rItemText, ToolBoxItemBits::DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
m_aToolbox->SetHelpId( nItemId, i_nHelpId );
m_aToolbox->SetClickHdl( i_rCallback );
m_aToolbox->SetDropdownClickHdl( i_rCallback );
// The tool box has likely changed its size. The title bar has to be
// resized.
impl_scheduleLayout();
Invalidate();
return nItemId;
}
IMPL_LINK_TYPED( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void )
{
const sal_uInt16 nId = pToolBox->GetCurItemId();

2
sw/inc/swrect.hxx
View File

@ -131,12 +131,10 @@ public:
void SetUpperLeftCorner( const Point& rNew );
void SetUpperRightCorner( const Point& rNew );
void SetLowerLeftCorner( const Point& rNew );
const Size _Size() const;
const Point TopLeft() const;
const Point TopRight() const;
const Point BottomLeft() const;
const Point BottomRight() const;
const Size SwappedSize() const;
long GetLeftDistance( long ) const;
long GetBottomDistance( long ) const;
long GetRightDistance( long ) const;

3
sw/source/core/bastyp/swrect.cxx
View File

@ -173,9 +173,6 @@ void SwRect::AddBottom( const long nAdd ){ m_Size.Height() += nAdd; }
void SwRect::SetPosX( const long nNew ){ m_Point.setX(nNew); }
void SwRect::SetPosY( const long nNew ){ m_Point.setY(nNew); }
const Size SwRect::_Size() const { return SSize(); }
const Size SwRect::SwappedSize() const { return Size( m_Size.getHeight(), m_Size.getWidth() ); }
const Point SwRect::TopLeft() const { return Pos(); }
const Point SwRect::TopRight() const { return Point( m_Point.getX() + m_Size.getWidth(), m_Point.getY() ); }
const Point SwRect::BottomLeft() const { return Point( m_Point.getX(), m_Point.getY() + m_Size.getHeight() ); }

1
tools/Library_tl.mk
View File

@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/memtools/mempool \
tools/source/memtools/multisel \
tools/source/memtools/unqidx \
tools/source/misc/appendunixshellword \
tools/source/misc/cpuid \
tools/source/misc/extendapplicationenvironment \
tools/source/misc/getprocessworkingdir \

69
tools/source/misc/appendunixshellword.cxx
View File

@ -1,69 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/config.h>
#if defined UNX
#include <cstddef>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <sal/types.h>
#include <tools/appendunixshellword.hxx>
namespace tools {
void appendUnixShellWord(
OStringBuffer * accumulator, OString const & text)
{
OSL_ASSERT(accumulator != nullptr);
if (text.isEmpty()) {
accumulator->append("''");
} else {
bool quoted = false;
for (sal_Int32 i = 0; i < text.getLength(); ++i) {
char c = text[i];
if (c == '\'') {
if (quoted) {
accumulator->append('\'');
quoted = false;
}
accumulator->append("\\'");
} else {
if (!quoted) {
accumulator->append('\'');
quoted = true;
}
accumulator->append(c);
}
}
if (quoted) {
accumulator->append('\'');
}
}
}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

15
unotools/source/config/confignode.cxx
View File

@ -132,21 +132,6 @@ namespace utl
return sLocalName;
}
OUString OConfigurationNode::getNodePath() const
{
OUString sNodePath;
try
{
Reference< XHierarchicalName > xNamed( m_xDirectAccess, UNO_QUERY_THROW );
sNodePath = xNamed->getHierarchicalName();
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
return sNodePath;
}
OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const
{
OUString sName(_rName);

11
vcl/headless/svpframe.cxx
View File

@ -18,7 +18,6 @@
*/
#include <string.h>
#include <vcl/svpforlokit.hxx>
#include <vcl/syswin.hxx>
#include "headless/svpframe.hxx"
@ -489,14 +488,4 @@ void SvpSalFrame::EndSetClipRegion()
{
}
SalFrame* GetSvpFocusFrameForLibreOfficeKit()
{
return SvpSalFrame::GetFocusFrame();
}
vcl::Window* GetSalFrameWindowForLibreOfficeKit(SalFrame *pSF)
{
return pSF->GetWindow();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
vcl/headless/svpvd.cxx
View File

@ -19,8 +19,6 @@
#ifndef IOS
#include <vcl/svpforlokit.hxx>
#include "headless/svpbmp.hxx"
#include "headless/svpinst.hxx"
#include "headless/svpvd.hxx"
@ -63,20 +61,16 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
aDevSize.setX( 1 );
if( aDevSize.getY() == 0 )
aDevSize.setY( 1 );
if( ! m_aDevice.get() || m_aDevice->getSize() != aDevSize )
{
if( ! m_aDevice.get() || m_aDevice->getSize() != aDevSize ) {
basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForDeviceFormat(m_eFormat);
if (m_eFormat == DeviceFormat::BITMASK)
{
if (m_eFormat == DeviceFormat::BITMASK) {
std::vector< basebmp::Color > aDevPal(2);
aDevPal[0] = basebmp::Color( 0, 0, 0 );
aDevPal[1] = basebmp::Color( 0xff, 0xff, 0xff );
m_aDevice = createBitmapDevice( aDevSize, true, nFormat,
PaletteMemorySharedVector( new std::vector< basebmp::Color >(aDevPal) ) );
}
else
{
} else {
m_aDevice = pBuffer ?
createBitmapDevice( aDevSize, true, nFormat, pBuffer, PaletteMemorySharedVector() )
: createBitmapDevice( aDevSize, true, nFormat );

1
vcl/inc/cairotextrender.hxx
View File

@ -130,7 +130,6 @@ public:
#if ENABLE_CAIRO_CANVAS
virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override;
#endif
SalColor GetTextColor() const { return mnTextColor; }
};
#endif

2
vcl/inc/headless/svpframe.hxx
View File

@ -131,8 +131,6 @@ public:
virtual void SetScreenNumber( unsigned int nScreen ) override { (void)nScreen; }
virtual void SetApplicationID(const OUString &rApplicationID) override { (void) rApplicationID; }
static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; }
};
#endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX

1
vcl/inc/opengl/texture.hxx
View File

@ -113,7 +113,6 @@ public:
void Unbind();
void Read( GLenum nFormat, GLenum nType, sal_uInt8* pData );
GLuint AddStencil();
bool HasStencil() const;
GLuint StencilId() const;
void SaveToFile(const OUString& rFileName);

5
vcl/opengl/texture.cxx
View File

@ -299,11 +299,6 @@ int OpenGLTexture::GetHeight() const
return maRect.GetHeight();
}
bool OpenGLTexture::HasStencil() const
{
return mpImpl && mpImpl->mnOptStencil != 0;
}
GLuint OpenGLTexture::StencilId() const
{
return mpImpl ? mpImpl->mnOptStencil : 0;

15
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
View File

@ -30,21 +30,6 @@ using namespace com::sun::star::io;
using namespace chelp;
Reference<XInputStream> chelp::turnToSeekable(const Reference<XInputStream>& xInputStream)
{
if( ! xInputStream.is() )
return xInputStream;
Reference<XSeekable> xSeekable(xInputStream,UNO_QUERY);
if( xSeekable.is() )
return xInputStream;
return new BufferedInputStream(xInputStream);
}
BufferedInputStream::BufferedInputStream(const Reference<XInputStream>& xInputStream)
: m_nBufferLocation(0),
m_nBufferSize(0),

5
xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
View File

@ -100,11 +100,6 @@ namespace chelp {
css::uno::RuntimeException, std::exception ) override;
};
extern css::uno::Reference<css::io::XInputStream>
turnToSeekable(
const css::uno::Reference<css::io::XInputStream>& xInputStream);
}
#endif // INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_BUFFEREDINPUTSTREAM_HXX