Kaydet (Commit) 21e0d816 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields

fix the ReturnStmt check

Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5de151f0
......@@ -35,13 +35,7 @@ namespace comphelper
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::accessibility::XAccessible;
struct OAccImpl_Impl
{
Reference< XAccessible > m_xAccParent;
};
OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
:m_pImpl( new OAccImpl_Impl )
{
}
......@@ -50,13 +44,6 @@ namespace comphelper
{
}
const Reference< XAccessible >& OAccessibleImplementationAccess::implGetForeignControlledParent( ) const
{
return m_pImpl->m_xAccParent;
}
const Sequence< sal_Int8 > OAccessibleImplementationAccess::getUnoTunnelImplementationId()
{
static cppu::OImplementationId implID;
......
......@@ -13,6 +13,8 @@
#include <fstream>
#include <set>
#include <algorithm>
#include <sys/file.h>
#include <unistd.h>
#include "plugin.hxx"
#include "compat.hxx"
#include "check.hxx"
......@@ -769,7 +771,7 @@ void UnusedFields::checkReadOnly(const FieldDecl* fieldDecl, const Expr* memberE
{
if (binaryOp->getLHS() == child)
bPotentiallyWrittenTo = true;
else if (loplugin::TypeCheck(binaryOp->getLHS()->getType()).LvalueReference().NonConstVolatile())
else if (loplugin::TypeCheck(binaryOp->getLHS()->getType()).LvalueReference().NonConst())
// if the LHS is a non-const reference, we could write to the field later on
bPotentiallyWrittenTo = true;
}
......@@ -777,8 +779,11 @@ void UnusedFields::checkReadOnly(const FieldDecl* fieldDecl, const Expr* memberE
}
else if (isa<ReturnStmt>(parent))
{
if (insideFunctionDecl && loplugin::TypeCheck(insideFunctionDecl->getReturnType()).NonConst().LvalueReference()) {
bPotentiallyWrittenTo = true;
if (insideFunctionDecl)
{
auto tc = loplugin::TypeCheck(insideFunctionDecl->getReturnType());
if (tc.LvalueReference().NonConst())
bPotentiallyWrittenTo = true;
}
break;
}
......
avmedia/source/vlc/vlcmanager.hxx:47
avmedia::vlc::Manager mxMgr css::uno::Reference<css::lang::XMultiServiceFactory>
avmedia/source/vlc/wrapper/Types.hxx:36
libvlc_event_t p_obj void *
avmedia/source/vlc/wrapper/Types.hxx:41
libvlc_event_t::(anonymous union)::(anonymous) dummy1 const char *
avmedia/source/vlc/wrapper/Types.hxx:42
libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
avmedia/source/vlc/wrapper/Types.hxx:43
libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo3/avmedia/source/vlc/wrapper/Types.hxx:40:7)
avmedia/source/vlc/wrapper/Types.hxx:44
libvlc_event_t u union (anonymous union at /home/noel/libo3/avmedia/source/vlc/wrapper/Types.hxx:38:5)
avmedia/source/vlc/wrapper/Types.hxx:50
libvlc_track_description_t psz_name char *
basctl/source/inc/dlged.hxx:122
basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
basic/qa/cppunit/basictest.hxx:27
MacroSnippet maDll class BasicDLL
basic/source/runtime/dllmgr.hxx:48
SbiDllMgr impl_ std::unique_ptr<Impl>
canvas/source/opengl/ogl_canvasbitmap.hxx:71
oglcanvas::CanvasBitmap mbHasAlpha _Bool
canvas/source/vcl/canvasbitmap.hxx:117
vclcanvas::CanvasBitmap mxDevice css::uno::Reference<css::rendering::XGraphicDevice>
canvas/source/vcl/impltools.hxx:117
vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
chart2/source/controller/inc/RangeSelectionListener.hxx:62
chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
chart2/source/model/inc/BaseCoordinateSystem.hxx:118
chart::BaseCoordinateSystem m_xContext css::uno::Reference<css::uno::XComponentContext>
chart2/source/view/inc/GL3DRenderer.hxx:54
chart::opengl3D::MaterialParameters pad float
chart2/source/view/inc/GL3DRenderer.hxx:55
......@@ -156,12 +138,14 @@ sc/inc/interpretercontext.hxx:23
ScInterpreterContext mrDoc const class ScDocument &
sc/qa/unit/ucalc_column.cxx:103
aInputs aName const char *
sc/source/core/data/document.cxx:1269
sc/source/core/data/document.cxx:1260
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
sc/source/core/data/document.cxx:1270
sc/source/core/data/document.cxx:1261
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
sc/source/core/data/formulacell.cxx:1741
sc/source/core/data/formulacell.cxx:1742
(anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
sc/source/filter/inc/orcusinterface.hxx:557
ScOrcusFactory maRefResolver class ScOrcusRefResolver
sc/source/filter/inc/sheetdatacontext.hxx:61
oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
sc/source/ui/inc/docsh.hxx:439
......@@ -203,11 +187,13 @@ svl/source/crypto/cryptosign.cxx:281
svl/source/crypto/cryptosign.cxx:282
(anonymous namespace)::(anonymous) failInfo SECItem
svtools/source/svhtml/htmlkywd.cxx:558
HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo3/svtools/source/svhtml/htmlkywd.cxx:558:5)
HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
svtools/source/svhtml/htmlkywd.cxx:560
HTML_OptionEntry::(anonymous) sToken const sal_Char *
svtools/source/svhtml/htmlkywd.cxx:561
HTML_OptionEntry::(anonymous) pUToken const class rtl::OUString *
svx/source/dialog/crashreportui.cxx:42
(anonymous namespace)::CrashReportUI mxContext css::uno::Reference<css::uno::XComponentContext>
sw/source/core/crsr/crbm.cxx:64
(anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
sw/source/core/frmedt/fetab.cxx:90
......@@ -234,6 +220,8 @@ vcl/inc/unx/cpdmgr.hxx:62
psp::CPDPrinterOption num_supported_values int
vcl/inc/unx/cpdmgr.hxx:63
psp::CPDPrinterOption supported_values std::vector<OUString>
vcl/qt5/Qt5Object.hxx:34
Qt5Object m_aSystemData struct SystemEnvData
vcl/source/gdi/jobset.cxx:34
ImplOldJobSetupData cDeviceName char [32]
vcl/source/gdi/jobset.cxx:35
......
......@@ -154,9 +154,9 @@ cppuhelper/source/access_control.cxx:80
cppu::(anonymous namespace)::permission m_str1 rtl_uString *
cppuhelper/source/access_control.cxx:81
cppu::(anonymous namespace)::permission m_str2 rtl_uString *
cui/source/inc/cuihyperdlg.hxx:56
cui/source/inc/cuihyperdlg.hxx:57
SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
cui/source/inc/cuihyperdlg.hxx:76
cui/source/inc/cuihyperdlg.hxx:77
SvxHpLinkDlg maCtrl class SvxHlinkCtrl
dbaccess/source/core/dataaccess/documentdefinition.cxx:290
dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
......@@ -332,7 +332,7 @@ sc/inc/pivot.hxx:77
ScDPLabelData mbIsValue _Bool
sc/source/core/data/cellvalues.cxx:25
sc::(anonymous namespace)::BlockPos mnEnd size_t
sc/source/core/data/column4.cxx:1290
sc/source/core/data/column4.cxx:1293
(anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
sc/source/filter/excel/xltoolbar.hxx:23
TBCCmd cmdID sal_uInt16
......@@ -366,9 +366,9 @@ sc/source/filter/inc/exp_op.hxx:52
ExportBiff5 pExcRoot struct RootData *
sc/source/filter/inc/imp_op.hxx:88
ImportExcel::LastFormula mpCell class ScFormulaCell *
sc/source/filter/inc/orcusinterface.hxx:353
sc/source/filter/inc/orcusinterface.hxx:387
ScOrcusStyles::xf mnStyleXf size_t
sc/source/filter/inc/orcusinterface.hxx:371
sc/source/filter/inc/orcusinterface.hxx:405
ScOrcusStyles::cell_style mnBuiltInId size_t
sc/source/filter/inc/root.hxx:95
LOTUS_ROOT eActType enum Lotus123Typ
......@@ -392,7 +392,7 @@ sc/source/ui/inc/filtdlg.hxx:198
ScSpecialFilterDlg pOptionsMgr class ScFilterOptionsMgr *
sc/source/ui/inc/preview.hxx:47
ScPreview nTabPage long
sc/source/ui/inc/tabvwsh.hxx:136
sc/source/ui/inc/tabvwsh.hxx:129
ScTabViewShell pPivotSource class ScArea *
sd/source/filter/eppt/eppt.hxx:176
PPTWriter mnTxId sal_uInt32
......@@ -495,7 +495,7 @@ sw/source/filter/inc/rtf.hxx:29
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
sw/source/filter/inc/rtf.hxx:31
RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo3/sw/source/filter/inc/rtf.hxx:27:9)
RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
ucb/source/ucp/gio/gio_mount.hxx:46
OOoMountOperationClass parent_class GMountOperationClass
ucb/source/ucp/gio/gio_mount.hxx:49
......@@ -546,10 +546,14 @@ vcl/inc/salwtype.hxx:242
SalInputContext mpFont class FontSelectPattern *
vcl/inc/salwtype.hxx:250
SalSwipeEvent mnVelocityY double
vcl/inc/sft.hxx:486
vcl/inc/sft.hxx:485
vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
vcl/opengl/salbmp.cxx:426
(anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
vcl/qt5/Qt5Graphics.hxx:50
Qt5Graphics m_pFontCollection class PhysicalFontCollection *
vcl/qt5/Qt5Graphics.hxx:53
Qt5Graphics m_aTextColor SalColor
vcl/source/filter/graphicfilter.cxx:1010
ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry *
vcl/source/filter/jpeg/Exif.hxx:56
......
......@@ -85,10 +85,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32
return OUString();
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnTypeName();
return OUString();
}
......@@ -99,10 +97,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32
return getColumnName(column);
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnServiceName();
return OUString();
}
......
......@@ -269,10 +269,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32
return false;
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
{
if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnServiceName();
return OUString();
}
......@@ -283,17 +281,13 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 co
return OUString();
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
{
if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getCatalogName();
return OUString();
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ )
{
if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnTypeName();
return OUString();
}
......@@ -306,10 +300,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32
}
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column )
OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
{
if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getSchemaName();
return OUString();
}
......
......@@ -373,17 +373,6 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
OSL_ENSURE( ( _rError.getErrorCondition() == 0 ),
"OConnection::throwSQLException: unsupported error code combination!" );
const OUString& sParameter( _rError.getParameter() );
if ( !sParameter.isEmpty() )
{
const OUString sError( getResources().getResourceStringWithSubstitution(
_rError.getResId(),
"$1$", sParameter
) );
::dbtools::throwGenericSQLException( sError, _rxContext );
OSL_FAIL( "OConnection::throwSQLException: unreachable (1)!" );
}
throwGenericSQLException( _rError.getResId(), _rxContext );
OSL_FAIL( "OConnection::throwSQLException: unreachable (2)!" );
}
......@@ -391,11 +380,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
if ( _rError.getErrorCondition() != 0 )
{
SQLError aErrorHelper;
const OUString& sParameter( _rError.getParameter() );
if ( !sParameter.isEmpty() )
aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter );
else
aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext);
aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext);
OSL_FAIL( "OConnection::throwSQLException: unreachable (3)!" );
}
......
......@@ -29,13 +29,11 @@ namespace connectivity
private:
const char* m_pErrorResourceId;
sal_Int32 m_nErrorCondition;
OUString m_sParameter;
public:
ErrorDescriptor()
:m_pErrorResourceId(nullptr)
,m_nErrorCondition(0)
,m_sParameter()
{
}
......@@ -51,7 +49,6 @@ namespace connectivity
const char* getResId() const { return m_pErrorResourceId; }
sal_Int32 getErrorCondition() const { return m_nErrorCondition; }
const OUString& getParameter() const { return m_sParameter; }
bool is() const { return ( m_pErrorResourceId != nullptr ) || ( m_nErrorCondition != 0 ); }
};
......
......@@ -28,13 +28,9 @@ namespace connectivity
{
class OOO_DLLPUBLIC_DBTOOLS OColumn
{
OUString m_CatalogName;
OUString m_SchemaName;
OUString m_TableName;
OUString m_ColumnName;
OUString m_ColumnLabel;
OUString m_ColumnTypeName;
OUString m_ColumnServiceName;
sal_Int32 m_Nullable;
sal_Int32 m_ColumnDisplaySize;
......@@ -79,8 +75,6 @@ namespace connectivity
: m_TableName(_aTableName),
m_ColumnName(_aColumnName),
m_ColumnLabel(),
m_ColumnTypeName(),
m_ColumnServiceName(),
m_Nullable(_aNullable),
m_ColumnDisplaySize(_aColumnDisplaySize),
......@@ -127,12 +121,7 @@ namespace connectivity
const OUString& getColumnLabel() const { return m_ColumnLabel; }
const OUString& getColumnName() const { return m_ColumnName; }
const OUString& getSchemaName() const { return m_SchemaName; }
const OUString& getTableName() const { return m_TableName; }
const OUString& getCatalogName() const { return m_CatalogName; }
const OUString& getColumnTypeName() const { return m_ColumnTypeName; }
const OUString& getColumnServiceName() const { return m_ColumnServiceName; }
};
}
......
......@@ -209,17 +209,7 @@ void IconChoiceDialog::dispose()
for (IconChoicePageData* pData : maPageList)
{
if ( pData->pPage )
{
OUString aPageData(pData->pPage->GetUserData());
if ( !aPageData.isEmpty() )
{
//SvtViewOptions aTabPageOpt( EViewType::TabPage, OUString::number(pData->nId) );
//SetViewOptUserItem( aTabPageOpt, aPageData );
}
pData->pPage.disposeAndClear();
}
delete pData;
}
maPageList.clear();
......
......@@ -63,7 +63,6 @@ class IconChoicePage : public TabPage
{
private:
const SfxItemSet* pSet;
OUString aUserString;
bool bHasExchangeSupport;
void ImplInitSettings();
......@@ -87,7 +86,6 @@ public:
virtual void ActivatePage( const SfxItemSet& );
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet );
const OUString& GetUserData() { return aUserString; }
virtual bool QueryClose();
void StateChanged( StateChangedType nType ) override;
......
......@@ -36,7 +36,6 @@ namespace comphelper
typedef ::cppu::ImplHelper1 < css::lang::XUnoTunnel
> OAccImpl_Base;
struct OAccImpl_Impl;
/** This is a helper class which allows accessing several aspects of the implementation
of an AccessibleContext.
......@@ -62,14 +61,6 @@ namespace comphelper
*/
class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public OAccImpl_Base
{
private:
std::unique_ptr<OAccImpl_Impl> m_pImpl;
protected:
/// retrieves the parent previously set via <method>setAccessibleParent</method>
const css::uno::Reference< css::accessibility::XAccessible >&
implGetForeignControlledParent( ) const;
protected:
OAccessibleImplementationAccess( );
virtual ~OAccessibleImplementationAccess( );
......
......@@ -85,8 +85,6 @@ public:
void setTheme( const oox::drawingml::ThemePtr& rThemePtr ){ mpThemePtr = rThemePtr; }
const oox::drawingml::ThemePtr& getTheme() const { return mpThemePtr; }
const oox::drawingml::ClrSchemePtr& getClrScheme() const { return mpClrSchemePtr; }
void setClrMap( const oox::drawingml::ClrMapPtr pClrMapPtr ){ mpClrMapPtr = pClrMapPtr; }
const oox::drawingml::ClrMapPtr& getClrMap() const { return mpClrMapPtr; }
......@@ -131,7 +129,6 @@ private:
std::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
css::uno::Reference< css::drawing::XDrawPage > mxPage;
oox::drawingml::ThemePtr mpThemePtr; // the theme that is used
oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any)
oox::drawingml::ClrMapPtr mpClrMapPtr; // color mapping (if any)
SlidePersistPtr mpMasterPagePtr;
......
......@@ -102,7 +102,6 @@ protected:
SfxStyleFamily nFamily;
OUString aName, aParent, aFollow;
OUString maDisplayName;
OUString aHelpFile; // name of the help file
SfxItemSet* pSet; // ItemSet
sal_uInt16 nMask; // Flags
......@@ -130,10 +129,6 @@ public:
// SfxStyleSheetBasePool parent.
virtual bool SetName(const OUString& rNewName, bool bReindexNow = true);
/** returns the display name of this style, it is used at the user interface.
If the display name is empty, this method returns the internal name. */
OUString const & GetDisplayName() const;
virtual const OUString& GetParent() const;
virtual bool SetParent( const OUString& );
virtual const OUString& GetFollow() const;
......
......@@ -34,9 +34,6 @@
class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes
{
private:
// Compound object
Color aDefaultAmbientColor;
// Cube object
basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize;
......@@ -67,10 +64,6 @@ public:
// Reset to defaults
void Reset();
// Getter/Setter for default values of all 3D objects
// Compound object
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
// Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
......
......@@ -227,7 +227,7 @@ protected:
Color aMaterialAmbientColor;
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
void SetDefaultAttributes();
// convert given basegfx::B3DPolyPolygon to screen coor
basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate);
......@@ -235,7 +235,6 @@ protected:
public:
E3dCompoundObject();
E3dCompoundObject(E3dDefaultAttributes& rDefault);
virtual ~E3dCompoundObject() override;
virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
......
......@@ -44,9 +44,7 @@ public:
void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D);
E3dPolygonObj(const basegfx::B3DPolyPolygon& rPolyPoly3D);
E3dPolygonObj();
virtual ~E3dPolygonObj() override;
......
......@@ -95,7 +95,6 @@ public:
private:
OUString sSrchStr; // the search string
OUString sReplaceStr; // the replace string
SearchType m_eSrchType; // search normal/regular/LevDist
......@@ -116,7 +115,6 @@ public:
~SearchParam();
const OUString& GetSrchStr() const { return sSrchStr; }
const OUString& GetReplaceStr() const { return sReplaceStr; }
SearchType GetSrchType() const { return m_eSrchType; }
bool IsCaseSensitive() const { return m_bCaseSense; }
......
......@@ -205,20 +205,15 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const
pClrMapPtr->getColorMap( nToken );
}
}
oox::drawingml::ClrSchemePtr pClrSchemePtr( mpActualSlidePersist->getClrScheme() );
if ( pClrSchemePtr )
pClrSchemePtr->getColor( nToken, nColor );
::oox::drawingml::ThemePtr pTheme = mpActualSlidePersist->getTheme();
if( pTheme )
{
pTheme->getClrScheme().getColor( nToken, nColor );
}
else
{
::oox::drawingml::ThemePtr pTheme = mpActualSlidePersist->getTheme();
if( pTheme )
{
pTheme->getClrScheme().getColor( nToken, nColor );
}
else
{
SAL_WARN("oox", "OOX: PowerPointImport::mpThemePtr is NULL");
}
SAL_WARN("oox", "OOX: PowerPointImport::mpThemePtr is NULL");
}
}
return nColor;
......
......@@ -3432,7 +3432,6 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb
{
// if not found, use graphic from object (imported from IMGDATA record)
aGraphic = rPicObj.GetGraphic();
aVisArea = rPicObj.GetVisArea();
}
if( aGraphic.GetType() != GraphicType::NONE )
{
......
......@@ -813,9 +813,6 @@ public:
/** Returns the graphic imported from the IMGDATA record. */
const Graphic& GetGraphic() const { return maGraphic; }
/** Returns the visible area of the imported graphic. */
const tools::Rectangle& GetVisArea() const { return maVisArea; }
/** Returns true, if the OLE object will be shown as symbol. */
bool IsSymbol() const { return mbSymbol; }
/** Returns the storage name for the OLE object. */
......@@ -852,7 +849,6 @@ private:
private:
Graphic maGraphic; /// Picture or OLE placeholder graphic.
tools::Rectangle maVisArea; /// Size of graphic.
OUString maClassName; /// Class name of embedded OLE object.
sal_uInt32 mnStorageId; /// Identifier of the storage for this object.
std::size_t mnCtlsStrmPos; /// Position in 'Ctls' stream for this control.
......
......@@ -1045,11 +1045,11 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName )
{
const SdStyleSheet* pStyleSheet = GetPseudoStyleSheet();
if (pStyleSheet != nullptr)
aDisplayName = pStyleSheet->GetDisplayName();
aDisplayName = pStyleSheet->GetName();
}
if (aDisplayName.isEmpty())
aDisplayName = GetDisplayName();
aDisplayName = GetName();
aAny <<= aDisplayName;
}
......
......@@ -54,8 +54,7 @@ PresenterPaneBase::PresenterPaneBase (
mxPresenterHelper(),
msTitle(),
mxComponentContext(rxContext),
mpViewBackground(),
maCalloutAnchor()
mpViewBackground()
{
if (mpPresenterController.get() != nullptr)
mxPresenterHelper = mpPresenterController->GetPresenterHelper();
......@@ -125,11 +124,6 @@ const Reference<drawing::framework::XPaneBorderPainter>&
return mxBorderPainter;
}
const awt::Point& PresenterPaneBase::GetCalloutAnchor() const
{
return maCalloutAnchor;
}
//----- XInitialization -------------------------------------------------------
void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
......
......@@ -74,7 +74,6 @@ public:
void SetTitle (const OUString& rsTitle);
const OUString& GetTitle() const;
const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const;
const css::awt::Point& GetCalloutAnchor() const;
// XInitialization
......@@ -113,7 +112,6 @@ protected:
OUString msTitle;
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
SharedBitmapDescriptor mpViewBackground;
css::awt::Point maCalloutAnchor;
virtual void CreateCanvases (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
......
......@@ -759,7 +759,7 @@ void PresenterSlideSorter::PlaceCloseButton (
sal_Int32 nCloseButtonCenter (rCenterBox.Width/2);
if (rpPane.get() != nullptr && rpPane->mxPane.is())
{
const sal_Int32 nCalloutCenter (rpPane->mxPane->GetCalloutAnchor().X - nLeftBorderWidth);
const sal_Int32 nCalloutCenter (-nLeftBorderWidth);
const sal_Int32 nDistanceFromWindowCenter (abs(nCalloutCenter - rCenterBox.Width/2));
const sal_Int32 nButtonWidth (mpCloseButton->GetSize().Width);
const static sal_Int32 nMaxDistanceForCalloutCentering (nButtonWidth * 2);
......
......@@ -65,7 +65,6 @@ friend class SfxHelpWindow_Impl;
VclPtr<SfxHelpWindow_Impl> m_pWindow;
sal_uIntPtr m_nCurPos;
OUString m_aCurrentURL;
css::uno::Any m_aViewData;
void addURL( const OUString& rURL );
......@@ -76,9 +75,6 @@ public:
void setInterception( const css::uno::Reference< css::frame::XFrame >& xFrame );
const OUString& GetCurrentURL() const { return m_aCurrentURL; }
const css::uno::Any& GetViewData()const {return m_aViewData;}
bool HasHistoryPred() const; // is there a predecessor for the current in the history
bool HasHistorySucc() const; // is there a successor for the current in the history
......
......@@ -2897,7 +2897,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL ,
OUString sProperty( "IsExecuteHyperlinks" );
if ( xInfo->hasPropertyByName( sProperty ) )
xViewProps->setPropertyValue( sProperty, makeAny( true ) );
xController->restoreViewData(pHelpInterceptor->GetViewData());
xController->restoreViewData(Any());
}
}
catch( Exception& )
......
......@@ -190,18 +190,6 @@ bool SfxStyleSheetBase::SetName(const OUString& rName, bool bReIndexNow)
return true;
}
OUString const & SfxStyleSheetBase::GetDisplayName() const
{
if( maDisplayName.isEmpty() )
{
return aName;
}
else
{
return maDisplayName;
}
}
// Change Parent
const OUString& SfxStyleSheetBase::GetParent() const
{
......
......@@ -24,7 +24,7 @@ class CrashReportUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo
css::frame::XSynchronousDispatch > // => XDispatch!
{
public:
explicit CrashReportUI(const css::uno::Reference< css::uno::XComponentContext >& xContext);
explicit CrashReportUI();
// css.lang.XServiceInfo
......@@ -37,13 +37,9 @@ public:
virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;