ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:unusedfields

Browse Source 
Change-Id: Icac4ac1a2614e72bc9ff070819533e09eeb1a864
This commit is contained in:
Noel Grandin
2015-11-30 10:34:38 +02:00
parent d2df035740
commit ec3f724158
86 changed files with 38 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/view/inc/GL3DBarChart.hxx
-1
View File
@@ -135,7 +135,6 @@ private:
glm::vec3 maDefaultCameraPosition;
glm::vec3 maDefaultCameraDirection;
glm::vec3 maStepDirection;
float mnMaxX;
float mnMaxY;
float mnDistance;
chart2/source/view/main/OpenGLRender.hxx
-1
View File
@@ -131,7 +131,6 @@ private:
#if 0
GLint m_RenderProID;
#endif
glm::vec4 m_ClearColor;
GLuint m_VertexBuffer;
compilerplugins/clang/unusedfields.cxx
+2 -2
View File
@@ -180,7 +180,7 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl )
// unwrap array types
while (type->isArrayType())
type = type->getAsArrayTypeUnsafe()->getElementType();
/*
if( CXXRecordDecl* recordDecl = type->getAsCXXRecordDecl() )
{
bool warn_unused = recordDecl->hasAttr<WarnUnusedAttr>();
@@ -196,7 +196,7 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl )
if (!warn_unused)
return true;
}
*/
definitionSet.insert(niceName(canonicalDecl));
return true;
}
connectivity/source/drivers/firebird/Connection.cxx
-2
View File
@@ -86,7 +86,6 @@ Connection::Connection(FirebirdDriver* _pDriver)
, m_bIsEmbedded(false)
, m_xEmbeddedStorage(nullptr)
, m_bIsFile(false)
, m_sUser()
, m_bIsAutoCommit(false)
, m_bIsReadOnly(false)
, m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
@@ -408,7 +407,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement(
OUString sSqlStatement (transformPreparedStatement( _sSql ));
Reference< XPreparedStatement > xReturn = new OPreparedStatement(this,
m_aTypeInfo,
sSqlStatement);
m_aStatements.push_back(WeakReferenceHelper(xReturn));
connectivity/source/drivers/firebird/Connection.hxx
+2 -5
View File
@@ -124,12 +124,9 @@ namespace connectivity
/** We are using an external (local) file */
bool m_bIsFile;
/* REMOTE CONNECTION DATA */
::rtl::OUString m_sUser;
/* CONNECTION PROPERTIES */
bool m_bIsAutoCommit;
bool m_bIsReadOnly;
bool m_bIsAutoCommit;
bool m_bIsReadOnly;
sal_Int32 m_aTransactionIsolation;
isc_db_handle m_aDBHandle;
connectivity/source/drivers/firebird/PreparedStatement.cxx
-2
View File
@@ -51,10 +51,8 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS
OPreparedStatement::OPreparedStatement( Connection* _pConnection,
const TTypeInfoVector& _TypeInfo,
const OUString& sql)
:OStatementCommonBase(_pConnection)
,m_aTypeInfo(_TypeInfo)
,m_sSqlStatement(sql)
,m_pOutSqlda(nullptr)
,m_pInSqlda(nullptr)
connectivity/source/drivers/firebird/PreparedStatement.hxx
-19
View File
@@ -48,24 +48,6 @@ namespace connectivity
public OPreparedStatement_Base
{
protected:
struct Parameter
{
::com::sun::star::uno::Any aValue;
sal_Int32 nDataType;
Parameter(const ::com::sun::star::uno::Any& rValue,
sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType)
{
}
};
::std::vector< Parameter> m_aParameters;
TTypeInfoVector m_aTypeInfo; // Hashtable containing an entry
// for each row returned by
// DatabaseMetaData.getTypeInfo.
::rtl::OUString m_sSqlStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
@@ -105,7 +87,6 @@ namespace connectivity
DECLARE_SERVICE_INFO();
// a constructor, which is required for returning objects:
OPreparedStatement( Connection* _pConnection,
const TTypeInfoVector& _TypeInfo,
const ::rtl::OUString& sql);
//XInterface
connectivity/source/drivers/firebird/StatementCommonBase.cxx
+1 -2
View File
@@ -47,8 +47,7 @@ OStatementCommonBase::OStatementCommonBase(Connection* _pConnection)
: OStatementCommonBase_Base(m_aMutex),
OPropertySetHelper(OStatementCommonBase_Base::rBHelper),
m_pConnection(_pConnection),
m_aStatementHandle( 0 ),
rBHelper(OStatementCommonBase_Base::rBHelper)
m_aStatementHandle( 0 )
{
}
connectivity/source/drivers/firebird/StatementCommonBase.hxx
-3
View File
@@ -58,8 +58,6 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created
// for this Statement
::std::list< ::rtl::OUString> m_aBatchList;
::rtl::Reference<Connection> m_pConnection;
ISC_STATUS_ARRAY m_statusVector;
@@ -103,7 +101,6 @@ namespace connectivity
public:
::cppu::OBroadcastHelper& rBHelper;
explicit OStatementCommonBase(Connection* _pConnection);
using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
connectivity/source/drivers/firebird/SubComponent.hxx
-9
View File
@@ -132,15 +132,6 @@ namespace connectivity
return s_pProps;
}
class OBase_Mutex
{
public:
::osl::Mutex m_aMutex;
};
}
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX
connectivity/source/drivers/mork/MConnection.hxx
-1
View File
@@ -43,7 +43,6 @@ namespace connectivity
// Data attributes
::com::sun::star::sdbc::SQLWarning m_aLastWarning;
MorkDriver* m_pDriver; // Pointer to the owning
// driver object
OColumnAlias m_aColumnAlias;
connectivity/source/drivers/mork/MPreparedStatement.cxx
-2
View File
@@ -43,9 +43,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedState
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql)
:OCommonStatement(_pConnection)
,m_nNumParams(0)
,m_sSqlStatement(sql)
,m_bPrepared(false)
,m_pResultSet()
{
}
connectivity/source/drivers/mork/MPreparedStatement.hxx
-17
View File
@@ -44,27 +44,10 @@ namespace connectivity
public OPreparedStatement_BASE
{
protected:
struct Parameter
{
::com::sun::star::uno::Any aValue;
sal_Int32 nDataType;
Parameter(const ::com::sun::star::uno::Any& rValue,
sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType)
{
}
};
::std::vector< Parameter> m_aParameters;
// Data attributes
sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
OUString m_sSqlStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
bool m_bPrepared;
::rtl::Reference< OResultSet > m_pResultSet;
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
OValueRow m_aParameterRow;
connectivity/source/drivers/mork/MQueryHelper.hxx
-1
View File
@@ -170,7 +170,6 @@ namespace connectivity
typedef std::vector< MQueryHelperResultEntry* > resultsArray;
mutable ::osl::Mutex m_aMutex;
::osl::Condition m_aCondition;
resultsArray m_aResults;
sal_uInt32 m_nIndex;
bool m_bHasMore;
connectivity/source/drivers/mork/MResultSet.cxx
-1
View File
@@ -108,7 +108,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,m_pKeySet(nullptr)
,m_nNewRow(0)
,m_nUpdatedRow(0)
,m_RowStates(0)
,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
connectivity/source/drivers/mork/MResultSet.hxx
-1
View File
@@ -241,7 +241,6 @@ protected:
::rtl::Reference<OKeySet> m_pKeySet;
sal_Int32 m_nNewRow; //inserted row
sal_Int32 m_nUpdatedRow; //updated row
sal_Int32 m_RowStates;
TriState m_bIsReadOnly;
inline void resetParameters() { m_nParamIndex = 0; }
connectivity/source/drivers/mork/MStatement.cxx
-1
View File
@@ -81,7 +81,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
,m_pConnection(_pConnection)
,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) )
,rBHelper(OCommonStatement_IBASE::rBHelper)
{
m_xDBMetaData = _pConnection->getMetaData();
m_pParseTree = nullptr;
connectivity/source/drivers/mork/MStatement.hxx
-4
View File
@@ -76,8 +76,6 @@ namespace connectivity
// for this Statement
::std::list< OUString> m_aBatchList;
OTable* m_pTable;
OConnection* m_pConnection; // The owning Connection object
@@ -93,8 +91,6 @@ namespace connectivity
::std::vector<sal_Int32> m_aOrderbyColumnNumber;
::std::vector<TAscendingOrder> m_aOrderbyAscending;
::cppu::OBroadcastHelper& rBHelper;
protected:
// OPropertyArrayUsageHelper
connectivity/source/drivers/postgresql/pq_statics.cxx
+1 -3
View File
@@ -715,9 +715,7 @@ Statics & getStatics()
defTypeInfoMetaData[i].scale,
defTypeInfoMetaData[i].isCurrency,
defTypeInfoMetaData[i].isNullable,
defTypeInfoMetaData[i].isAutoIncrement,
defTypeInfoMetaData[i].isReadOnly,
defTypeInfoMetaData[i].isSigned ) );
defTypeInfoMetaData[i].isAutoIncrement ) );
}
p = &statics;
connectivity/source/drivers/postgresql/pq_statics.hxx
+2 -17
View File
@@ -61,9 +61,7 @@ struct ColumnMetaData
sal_Int32 _scale,
bool _isCurrency,
bool _isNullable,
bool _isAutoIncrement,
bool _isReadOnly,
bool _isSigned ) :
bool _isAutoIncrement ) :
columnName( _columnName ),
tableName( _tableName ),
schemaTableName( _schemaTableName ),
@@ -73,9 +71,7 @@ struct ColumnMetaData
scale( _scale ),
isCurrency( _isCurrency ),
isNullable( _isNullable ),
isAutoIncrement( _isAutoIncrement ),
isReadOnly( _isReadOnly ),
isSigned( _isSigned )
isAutoIncrement( _isAutoIncrement )
{}
OUString columnName;
@@ -88,21 +84,10 @@ struct ColumnMetaData
bool isCurrency;
bool isNullable;
bool isAutoIncrement;
bool isReadOnly;
bool isSigned;
};
typedef std::vector< ColumnMetaData > ColumnMetaDataVector;
struct TypeDetails
{
sal_Int32 dataType;
sal_Int32 minScale;
sal_Int32 maxScale; // in case nothing is given in getTypeInfo
bool isAutoIncrement;
bool isSearchable;
};
typedef std::unordered_map
<
OUString,
connectivity/source/inc/file/FConnection.hxx
-2
View File
@@ -54,8 +54,6 @@ namespace connectivity
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog;
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
OUString m_aFilenameExtension;
OFileDriver* m_pDriver; // Pointer to the owning
// driver object
cui/source/inc/cuitabline.hxx
-4
View File
@@ -147,10 +147,6 @@ private:
RECT_POINT m_eRP;
bool m_bObjSelected;
XLineStyleItem m_aXLStyle;
XLineWidthItem m_aXWidth;
XLineDashItem m_aXDash;
XLineColorItem m_aXColor;
XLineAttrSetItem m_aXLineAttr;
SfxItemSet& m_rXLSet;
cui/source/tabpages/tpline.cxx
-4
View File
@@ -98,10 +98,6 @@ SvxLineTabPage::SvxLineTabPage
m_eRP( RP_LT ),
m_bObjSelected( false ),
m_aXLStyle ( drawing::LineStyle_DASH ),
m_aXWidth ( 1 ),
m_aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ),
m_aXColor ( OUString(), COL_LIGHTRED ),
m_aXLineAttr ( rInAttrs.GetPool() ),
m_rXLSet ( m_aXLineAttr.GetItemSet() ),
m_pnLineEndListState( nullptr ),
desktop/source/migration/migration.cxx
-1
View File
@@ -228,7 +228,6 @@ void Migration::migrateSettingsIfNecessary()
}
MigrationImpl::MigrationImpl()
: m_vrVersions(new strings_v)
{
}
desktop/source/migration/migration_impl.hxx
-2
View File
@@ -173,8 +173,6 @@ class MigrationImpl
{
private:
strings_vr m_vrVersions;
migrations_available m_vMigrationsAvailable; // list of all available migrations
migrations_vr m_vrMigrations; // list of all migration specs from config
install_info m_aInfo; // info about the version being migrated
editeng/source/xml/xmltxtexp.cxx
+1 -3
View File
@@ -332,7 +332,6 @@ public:
private:
css::uno::Reference< css::text::XText > mxText;
ESelection maSelection;
};
@@ -343,8 +342,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
const ESelection& rSel,
const OUString& rFileName,
const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler)
: SvXMLExport( xContext, "", rFileName, xHandler, (static_cast<frame::XModel*>(new SvxSimpleUnoModel())), FUNIT_CM ),
maSelection( rSel )
: SvXMLExport( xContext, "", rFileName, xHandler, (static_cast<frame::XModel*>(new SvxSimpleUnoModel())), FUNIT_CM )
{
SvxEditEngineSource aEditSource( pEditEngine );
filter/source/graphicfilter/idxf/dxfentrd.hxx
-1
View File
@@ -428,7 +428,6 @@ class DXFHatchEntity : public DXFBasicEntity
public:
DXFVector aElevationPoint;
sal_Int32 nFlags; // 70 (solid fill = 1, pattern fill = 0)
sal_Int32 nAssociativityFlag; // 71 (associative = 1, non-associative = 0)
sal_Int32 nBoundaryPathCount; // 91
forms/source/xforms/submission/serialization.hxx
-1
View File
@@ -39,7 +39,6 @@ class CSerialization
{
protected:
css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
std::map<OUString, OUString> m_properties;
public:
virtual ~CSerialization() {}
helpcompiler/inc/HelpLinker.hxx
-2
View File
@@ -30,7 +30,6 @@
class L10N_DLLPUBLIC IndexerPreProcessor
{
private:
fs::path m_fsIndexBaseDir;
fs::path m_fsCaptionFilesDirName;
fs::path m_fsContentFilesDirName;
@@ -82,7 +81,6 @@ private:
std::string extensionPath;
std::string extensionDestination;
bool bExtensionMode;
fs::path indexDirName;
fs::path indexDirParentName;
IndexerPreProcessor* m_pIndexerPreProcessor;
bool m_bUseLangRoot;
helpcompiler/source/HelpLinker.cxx
-1
View File
@@ -41,7 +41,6 @@
IndexerPreProcessor::IndexerPreProcessor
( const fs::path& fsIndexBaseDir,
const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet )
: m_fsIndexBaseDir( fsIndexBaseDir )
{
m_fsCaptionFilesDirName = fsIndexBaseDir / "caption";
fs::create_directory( m_fsCaptionFilesDirName );
idl/inc/database.hxx
-1
View File
@@ -92,7 +92,6 @@ public:
// list of used types while writing
SvMetaTypeMemberList aUsedTypes;
OString aIFaceName;
SvIdentifier aStructSlotId;
void StartNewFile( const OUString& rName );
void SetExportFile( const OUString& rName )
idl/inc/module.hxx
-7
View File
@@ -23,13 +23,6 @@
#include <slot.hxx>
#include <object.hxx>
struct SvNamePos
{
SvGlobalName aUUId;
SvNamePos( const SvGlobalName & rName )
: aUUId( rName ) {}
};
class SvMetaModule : public SvMetaExtern
{
SvMetaClassMemberList aClassList;
idl/inc/types.hxx
-1
View File
@@ -89,7 +89,6 @@ class SvMetaType : public SvMetaExtern
SvBOOL aIn; // input parameter
SvBOOL aOut; // return parameter
Svint aCall0, aCall1;
Svint aSbxDataType;
SvIdentifier aSvName;
SvIdentifier aSbxName;
SvIdentifier aOdlName;
idl/source/objects/types.cxx
-1
View File
@@ -222,7 +222,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
#define CTOR \
: aCall0( CALL_VALUE, false ) \
, aCall1( CALL_VALUE, false ) \
, aSbxDataType( 0, false ) \
, pAttrList( nullptr ) \
, nType( TYPE_BASE ) \
, bIsItem( false ) \
include/basic/sbx.hxx
+2 -3
View File
@@ -50,12 +50,11 @@ class SfxBroadcaster;
struct SbxParamInfo
{
const OUString aName; // Name of the parameter
SbxBaseRef aTypeRef; // Object, if object type
SbxDataType eType; // Data type
SbxFlagBits nFlags; // Flag-Bits
sal_uInt32 nUserData; // IDs etc.
SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n, SbxBase* b = nullptr )
: aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n )
: aName( s ), eType( t ), nFlags( n ), nUserData( 0 ) {}
~SbxParamInfo() {}
};
include/filter/msfilter/svdfppt.hxx
-1
View File
@@ -104,7 +104,6 @@ struct SdHyperlinkEntry
sal_Int32 nEndPos;
OUString aConvSubString;
ESelection aESelection;
};
// Helper class for reading the PPT InteractiveInfoAtom
include/sfx2/childwin.hxx
-1
View File
@@ -97,7 +97,6 @@ struct SfxChildWinContextFactory
{
SfxChildWinContextCtor pCtor; // Factory method
sal_uInt16 nContextId; // Idenifier for SfxInterface
SfxChildWinInfo aInfo; // Configuration
SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID )
: pCtor(pTheCtor)
include/sfx2/dinfdlg.hxx
-1
View File
@@ -420,7 +420,6 @@ private:
sal_Int32 m_nLineHeight;
sal_Int32 m_nScrollPos;
SvtSysLocale m_aSysLocale;
std::vector< CustomPropertyLine* > m_aCustomPropertiesLines;
CustomPropertyLine* m_pCurrentLine;
SvNumberFormatter m_aNumberFormatter;
include/sot/storinfo.hxx
-1
View File
@@ -31,7 +31,6 @@ class SvStorageInfo
{
friend class SotStorage;
OUString aName;
SvGlobalName aClassName;
sal_uLong nSize;
bool bStream;
bool bStorage;
include/svl/itemset.hxx
-1
View File
@@ -167,7 +167,6 @@ class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet
// Handles all Ranges. Ranges are automatically modified by putting items.
{
SfxVoidItem aDefault;
sal_uInt16 nFree;
public:
include/svx/gridctrl.hxx
-1
View File
@@ -217,7 +217,6 @@ public:
};
private:
vcl::Font m_aDefaultFont;
Link<sal_uInt16,int> m_aMasterStateProvider;
Link<sal_uInt16,bool> m_aMasterSlotExecutor;
include/svx/svddrgv.hxx
+4 -5
View File
@@ -35,13 +35,12 @@ protected:
SdrDragMethod* mpCurrentSdrDragMethod;
SdrUndoGeoObj* mpInsPointUndo;
Rectangle maDragLimit;
OUString maInsPointUndoStr;
SdrMarkList maFollowingEdges; // If nodes are dragged, all edges should follow as Xor
OUString maInsPointUndoStr;
SdrHdlKind meDragHdl;
sal_uIntPtr mnDragXorPolyLimit;
sal_uIntPtr mnDragXorPointLimit;
sal_uInt16 mnDetailedEdgeDraggingLimit;
sal_uIntPtr mnDragXorPolyLimit;
sal_uIntPtr mnDragXorPointLimit;
sal_uInt16 mnDetailedEdgeDraggingLimit;
bool mbFramDrag : 1; // currently frame dragging
bool mbDragSpecial : 1; // currently Special Obj-dragging
include/svx/svdpntv.hxx
-1
View File
@@ -143,7 +143,6 @@ protected:
// All windows this view is displayed on
SdrPaintWindowVector maPaintWindows;
MapMode maActualMapMode;
Size maGridBig; // FIXME: We need to get rid of this eventually
Size maGridFin; // FIXME: We need to get rid of this eventually
SdrDragStat maDragStat;
io/source/connector/connector.hxx
-1
View File
@@ -119,7 +119,6 @@ namespace stoc_connector
void completeConnectionString();
::osl::ConnectorSocket m_socket;
::osl::SocketAddr m_addr;
oslInterlockedCount m_nStatus;
OUString m_sDescription;
linguistic/source/spelldsp.hxx
-1
View File
@@ -54,7 +54,6 @@ class SpellCheckerDispatcher :
typedef std::shared_ptr< LangSvcEntries_Spell > LangSvcEntries_Spell_Ptr_t;
typedef std::map< LanguageType, LangSvcEntries_Spell_Ptr_t > SpellSvcByLangMap_t;
SpellSvcByLangMap_t aSvcMap;
LinguOptions aOpt;
css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet;
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > xDicList;
mysqlc/source/mysqlc_connection.hxx
-2
View File
@@ -104,8 +104,6 @@ namespace connectivity
// of all the Statement objects
// for this Connection
SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation
rtl::OUString m_aURL; // URL of connection
rtl::OUString m_sUser; // the user name
MysqlCDriver& m_rDriver; // Pointer to the owning driver object
sql::Driver* cppDriver;
reportdesign/source/filter/xml/xmlExport.hxx
-1
View File
@@ -101,7 +101,6 @@ public:
typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid;
typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap;
private:
::std::unique_ptr< TStringPair > m_aAutoIncrement;
TSectionsGrid m_aSectionsGrid;
TPropertyStyleMap m_aAutoStyleNames;
reportdesign/source/filter/xml/xmlfilter.hxx
-1
View File
@@ -74,7 +74,6 @@ private:
mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pGroupElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pSectionElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap;
sc/inc/scabstdlg.hxx
+1 -1
View File
@@ -343,7 +343,7 @@ public:
virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0;
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ) = 0;
int nId ) = 0;
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0;
sc/source/filter/excel/xiformula.cxx
+1 -4
View File
@@ -38,13 +38,10 @@ public:
const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr );
private:
XclFunctionProvider maFuncProv; /// Excel function data provider.
};
XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) :
XclImpRoot( rRoot ),
maFuncProv( rRoot )
XclImpRoot( rRoot )
{
}
sc/source/filter/inc/orcusinterface.hxx
-4
View File
@@ -139,7 +139,6 @@ private:
ScDocument& mrDoc;
std::unique_ptr<ScConditionalFormat> mpCurrentFormat;
std::unique_ptr<ScFormatEntry> mpCurrentEntry;
condformat::ScFormatEntryType meEntryType;
};
@@ -197,9 +196,6 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
ScOrcusSheetProperties maProperties;
ScOrcusConditionalFormat maConditionalFormat;
typedef std::map<size_t, ScRangeData*> SharedFormulaContainer;
SharedFormulaContainer maSharedFormulas;
int mnCellCount;
void cellInserted();
sc/source/filter/inc/qproform.hxx
-2
View File
@@ -55,8 +55,6 @@ class QProToSc : public ConverterBase
{
private:
TokenId mnAddToken;
TokenId mnSubToken;
TokenId mn0Token;
SvStream& maIn;
public:
sc/source/filter/inc/richstringcontext.hxx
-1
View File
@@ -41,7 +41,6 @@ private:
RichStringRef mxString; /// Processed string.
RichStringPortionRef mxPortion; /// Processed portion in the string.
RichStringPhoneticRef mxPhonetic; /// Processed phonetic text portion.
FontRef mxFont; /// Processed font of the portion.
};
template< typename ParentType >
sc/source/ui/attrdlg/scdlgfact.cxx
+2 -2
View File
@@ -632,13 +632,13 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg(
}
AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId )
int nId )
{
VclPtr<ScCondFormatManagerDlg> pDlg;
switch( nId )
{
case RID_SCDLG_COND_FORMAT_MANAGER:
pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList, rPos );
pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList );
break;
default:
break;
sc/source/ui/attrdlg/scdlgfact.hxx
+1 -1
View File
@@ -409,7 +409,7 @@ public:
virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override;
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ) override;
int nId ) override;
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override;
sc/source/ui/condformat/condformatmgr.cxx
+1 -2
View File
@@ -102,11 +102,10 @@ void ScCondFormatManagerWindow::setColSizes()
SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
}
ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos):
ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList):
ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"),
mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr),
mpDoc(pDoc),
maPos(rPos),
mbModified(false)
{
SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("CONTAINER");
sc/source/ui/inc/acredlin.hxx
-1
View File
@@ -61,7 +61,6 @@ private:
VclPtr<SvxAcceptChgCtr> m_pAcceptChgCtr;
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
VclPtr<SvxTPFilter> pTPFilter;
VclPtr<SvxTPView> pTPView;
VclPtr<SvxRedlinTable> pTheView; // #i48648 now SvHeaderTabListBox
sc/source/ui/inc/condformatmgr.hxx
+1 -2
View File
@@ -47,7 +47,7 @@ public:
class ScCondFormatManagerDlg : public ModalDialog
{
public:
ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos);
ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList);
virtual ~ScCondFormatManagerDlg();
virtual void dispose() override;
@@ -65,7 +65,6 @@ private:
VclPtr<ScCondFormatManagerWindow> m_pCtrlManager;
ScDocument* mpDoc;
ScAddress maPos;
DECL_LINK_TYPED(RemoveBtnHdl, Button*, void);
DECL_LINK_TYPED(EditBtnClickHdl, Button*, void);
sc/source/ui/inc/highred.hxx
-2
View File
@@ -54,8 +54,6 @@ private:
ScViewData* pViewData;
ScDocument* pDoc;
ScRangeName aLocalRangeName;
ScRangeList aRangeList;
ScChangeViewSettings aChangeViewSet;
void Init();
sc/source/ui/miscdlgs/acredlin.cxx
-1
View File
@@ -85,7 +85,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window
"AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui"),
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
aStrInsertCols (SC_RESSTR(STR_CHG_INSERT_COLS)),
aStrInsertRows (SC_RESSTR(STR_CHG_INSERT_ROWS)),
aStrInsertTabs (SC_RESSTR(STR_CHG_INSERT_TABS)),
sc/source/ui/miscdlgs/highred.cxx
-1
View File
@@ -44,7 +44,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl:
"modules/scalc/ui/showchangesdialog.ui")
, pViewData(ptrViewData)
, pDoc(ptrViewData->GetDocument())
, aLocalRangeName(*(pDoc->GetRangeName()))
{
m_pFilterCtr = VclPtr<SvxTPFilter>::Create(get<VclContainer>("box"));
get(m_pHighlightBox, "showchanges");
sc/source/ui/view/cellsh1.cxx
+1 -1
View File
@@ -2438,7 +2438,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() );
std::unique_ptr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg(
pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER));
pTabViewShell->GetDialogParent(), pDoc, pList, RID_SCDLG_COND_FORMAT_MANAGER));
short nRet = pDlg->Execute();
if(nRet == RET_OK && pDlg->CondFormatsChanged())
{
sd/source/filter/eppt/pptx-text.cxx
-4
View File
@@ -647,8 +647,6 @@ ParagraphObj::ParagraphObj(const css::uno::Reference< css::beans::XPropertySet >
: PropStateValue()
, SOParagraph()
, mvPortions()
, maMapModeSrc(MAP_100TH_MM)
, maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
, mnTextSize(0)
, mbFirstParagraph(false)
, mbLastParagraph(false)
@@ -677,8 +675,6 @@ ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > & rXTe
: PropStateValue()
, SOParagraph()
, mvPortions()
, maMapModeSrc(MAP_100TH_MM)
, maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
, mnTextSize(0)
, mbIsBullet(false)
, mbFirstParagraph( aParaFlags.bFirstParagraph )
sd/source/filter/eppt/text.hxx
-2
View File
@@ -178,8 +178,6 @@ class ParagraphObj : public PropStateValue, public SOParagraph
friend struct PPTExParaSheet;
std::vector<std::unique_ptr<PortionObj> > mvPortions;
MapMode maMapModeSrc;
MapMode maMapModeDest;
protected:
sd/source/ui/sidebar/MasterPagesSelector.cxx
-1
View File
@@ -77,7 +77,6 @@ MasterPagesSelector::MasterPagesSelector (
mrDocument(rDocument),
mrBase(rBase),
mnDefaultClickAction(SID_TP_APPLY_TO_ALL_SLIDES),
maPreviewUpdateQueue(),
maCurrentItemList(),
maTokenToValueSetIndex(),
maLockedMasterPages(),
sd/source/ui/sidebar/MasterPagesSelector.hxx
-5
View File
@@ -116,11 +116,6 @@ protected:
clicked over a master page.
*/
sal_uInt16 mnDefaultClickAction;
/** Pages with pointers in this queue have their previews updated
eventually. Filled by InvalidatePreview() and operated upon by
UpdatePreviews().
*/
::std::queue<sal_uInt16> maPreviewUpdateQueue;
SdPage* GetSelectedMasterPage();
sd/source/ui/slideshow/slideshowimpl.hxx
-2
View File
@@ -341,8 +341,6 @@ private:
Size maPresSize;
AnimationMode meAnimationMode;
OUString maCharBuffer;
Pointer maOldPointer;
Pointer maPencil;
VclPtr< ::sd::Window> mpOldActiveWindow;
Link<StarBASIC*,bool> maStarBASICGlobalErrorHdl;
unsigned long mnChildMask;
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+1 -2
View File
@@ -112,8 +112,7 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet);
} // end of anonymous namespace
SlotManager::SlotManager (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
maCommandQueue()
: mrSlideSorter(rSlideSorter)
{
}
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
-3
View File
@@ -78,9 +78,6 @@ private:
/// The controller for which we manage the slot calls.
SlideSorter& mrSlideSorter;
typedef ::std::queue<Command*> CommandQueue;
CommandQueue maCommandQueue;
/** Called by FuTemporary to show the slide show.
*/
void ShowSlideShow (SfxRequest& rRequest);
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
-3
View File
@@ -58,9 +58,6 @@ private:
with a different map mode or by a call to Invalidate().
*/
SharedFontPointer maFont;
/** The map mode for which maFont was created.
*/
MapMode maMapMode;
FontProvider();
virtual ~FontProvider();
sd/source/ui/slidesorter/view/SlsFontProvider.cxx
+1 -2
View File
@@ -63,8 +63,7 @@ FontProvider& FontProvider::Instance()
}
FontProvider::FontProvider()
: maFont(),
maMapMode()
: maFont()
{
}
sdext/source/presenter/PresenterTextView.cxx
-1
View File
@@ -79,7 +79,6 @@ PresenterTextView::PresenterTextView (
rInvalidator)),
mnLeftOffset(0),
mnTopOffset(0),
maInvalidator(rInvalidator),
mbIsFormatPending(false),
mnCharacterCount(-1),
maTextChangeBroadcaster()
sdext/source/presenter/PresenterTextView.hxx
-1
View File
@@ -264,7 +264,6 @@ private:
SharedPresenterTextCaret mpCaret;
double mnLeftOffset;
double mnTopOffset;
const ::std::function<void (const css::awt::Rectangle&)> maInvalidator;
bool mbIsFormatPending;
sal_Int32 mnCharacterCount;
::std::function<void ()> maTextChangeBroadcaster;
slideshow/source/engine/slide/layer.cxx
+6 -10
View File
@@ -34,23 +34,20 @@ namespace slideshow
{
namespace internal
{
Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds,
Dummy ) :
Layer::Layer( Dummy ) :
maViewEntries(),
maBounds(),
maNewBounds(),
maMaxBounds( rMaxLayerBounds ),
mbBoundsDirty(false),
mbBackgroundLayer(true),
mbClipSet(false)
{
}
Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) :
Layer::Layer() :
maViewEntries(),
maBounds(),
maNewBounds(),
maMaxBounds( rMaxLayerBounds ),
mbBoundsDirty(false),
mbBackgroundLayer(false),
mbClipSet(false)
@@ -264,15 +261,14 @@ namespace slideshow
return maUpdateAreas.overlaps( rShape->getUpdateArea() );
}
LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds )
LayerSharedPtr Layer::createBackgroundLayer()
{
return LayerSharedPtr(new Layer( rMaxLayerBounds,
BackgroundLayer ));
return LayerSharedPtr(new Layer( BackgroundLayer ));
}
LayerSharedPtr Layer::createLayer( const basegfx::B2DRange& rMaxLayerBounds )
LayerSharedPtr Layer::createLayer( )
{
return LayerSharedPtr( new Layer( rMaxLayerBounds ) );
return LayerSharedPtr( new Layer );
}
}
slideshow/source/engine/slide/layer.hxx
+4 -26
View File
@@ -70,26 +70,16 @@ namespace slideshow
This method will create a layer without a ViewLayer,
i.e. one that displays directly on the background.
@param rMaxLayerBounds
Maximal bounds of this layer, in user
coordinates. This layer will never be larger or extend
outside these bounds.
*/
static ::boost::shared_ptr< Layer > createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds );
static ::boost::shared_ptr< Layer > createBackgroundLayer();
/** Create non-background layer
This method will create a layer in front of the
background, to contain shapes that should appear in
front of animated objects.
@param rMaxLayerBounds
Maximal bounds of this layer, in user
coordinates. This layer will never be larger or extend
outside these bounds.
*/
static ::boost::shared_ptr< Layer > createLayer( const basegfx::B2DRange& rMaxLayerBounds );
static ::boost::shared_ptr< Layer > createLayer();
@@ -227,30 +217,19 @@ namespace slideshow
ViewLayer, i.e. one that displays directly on the
background.
@param rMaxLayerBounds
Maximal bounds of this layer, in user
coordinates. This layer will never be larger or extend
outside these bounds.
@param eFlag
Dummy parameter, to disambiguate from normal layer
constructor
*/
Layer( const basegfx::B2DRange& rMaxLayerBounds,
Dummy eFlag );
Layer( Dummy eFlag );
/** Create non-background layer
This constructor will create a layer in front of the
background, to contain shapes that should appear in
front of animated objects.
@param rMaxLayerBounds
Maximal bounds of this layer, in user
coordinates. This layer will never be larger or extend
outside these bounds.
*/
explicit Layer( const basegfx::B2DRange& rMaxLayerBounds );
explicit Layer();
struct ViewEntry
{
@@ -274,7 +253,6 @@ namespace slideshow
basegfx::B2DPolyRange maUpdateAreas;
basegfx::B2DRange maBounds;
basegfx::B2DRange maNewBounds;
const basegfx::B2DRange maMaxBounds; // maBounds is clipped against this
bool mbBoundsDirty; // true, if view layers need resize
bool mbBackgroundLayer; // true, if this
// layer is the
slideshow/source/engine/slide/layermanager.cxx
+2 -5
View File
@@ -86,9 +86,7 @@ namespace slideshow
maLayers.reserve(4);
// create initial background layer
maLayers.push_back(
Layer::createBackgroundLayer(
maPageBounds ));
maLayers.push_back( Layer::createBackgroundLayer() );
// init views
for( const auto& rView : mrViews )
@@ -700,8 +698,7 @@ namespace slideshow
{
OSL_ASSERT( mbActive );
LayerSharedPtr pLayer( Layer::createLayer(
maPageBounds ));
LayerSharedPtr pLayer( Layer::createLayer() );
// create ViewLayers for all registered views, and add to
// newly created layer.
svl/source/items/itemset.cxx
-3
View File
@@ -1601,7 +1601,6 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const
SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
: SfxItemSet(rPool, nullptr),
aDefault(0),
nFree(nInitCount)
{
// Initially no Items
@@ -1614,7 +1613,6 @@ SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
: SfxItemSet(rCopy),
aDefault(0),
nFree(0)
{
}
@@ -1625,7 +1623,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
*/
SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy)
: SfxItemSet(rCopy),
aDefault(0),
nFree(0)
{
}
svtools/source/config/helpopt.cxx
-3
View File
@@ -55,9 +55,6 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
OUString aSystem;
OUString sHelpStyleSheet;
typedef std::map <OUString, sal_Int32> MapString2Int;
MapString2Int aURLIgnoreCounters;
static Sequence< OUString > GetPropertyNames();
virtual void ImplCommit() override;
svtools/source/inc/unoiface.hxx
-1
View File
@@ -244,7 +244,6 @@ class SVTXRoadmap : public SVTXRoadmap_Base
private:
ItemListenerMultiplexer maItemListeners;
RMItemData CurRMItemData;
static RMItemData GetRMItemData( const css::container::ContainerEvent& _rEvent );
protected:
sw/source/filter/inc/fltshell.hxx
-1
View File
@@ -132,7 +132,6 @@ class SW_DLLPUBLIC SwFltControlStack : private ::boost::noncopyable
Entries m_Entries;
sal_uLong nFieldFlags;
vcl::KeyCode aEmptyKeyCode; // fuer Bookmarks
private:
bool bHasSdOD;
sw/source/filter/xml/xmltexte.cxx
+1 -2
View File
@@ -178,8 +178,7 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport(
sGraphicObjectProtocol( "vnd.sun.star.GraphicObject:" ),
aAppletClassId( SO3_APPLET_CLASSID ),
aPluginClassId( SO3_PLUGIN_CLASSID ),
aIFrameClassId( SO3_IFRAME_CLASSID ),
aOutplaceClassId( SO3_OUT_CLASSID )
aIFrameClassId( SO3_IFRAME_CLASSID )
{
}
sw/source/filter/xml/xmltexte.hxx
-1
View File
@@ -38,7 +38,6 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
const SvGlobalName aAppletClassId;
const SvGlobalName aPluginClassId;
const SvGlobalName aIFrameClassId;
const SvGlobalName aOutplaceClassId;
static SwNoTextNode *GetNoTextNode(
const css::uno::Reference < css::beans::XPropertySet >& rPropSet );
sw/source/uibase/inc/formedt.hxx
-18
View File
@@ -39,24 +39,6 @@ class SwIdxFormDlg : public SvxStandardDialog
{
void Apply() override;
VclPtr<ListBox> m_aEntryLB;
VclPtr<OKButton> m_aOKBtn;
VclPtr<CancelButton> m_aCancelBT;
VclPtr<FixedText> m_aLevelFT;
VclPtr<Edit> m_aEntryED;
VclPtr<PushButton> m_aEntryBT;
VclPtr<PushButton> m_aTabBT;
VclPtr<PushButton> m_aPageBT;
VclPtr<PushButton> m_aJumpBT;
VclPtr<FixedLine> m_aEntryFL;
VclPtr<FixedText> m_aLevelFT2;
VclPtr<ListBox> m_aLevelLB;
VclPtr<FixedText> m_aTemplateFT;
VclPtr<ListBox> m_aParaLayLB;
VclPtr<PushButton> m_aStdBT;
VclPtr<PushButton> m_aAssignBT;
VclPtr<FixedLine> m_aFormatFL;
public:
SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
virtual ~SwIdxFormDlg();
vcl/source/edit/textund2.hxx
-3
View File
@@ -105,9 +105,6 @@ public:
class TextUndoSetAttribs: public TextUndo
{
private:
TextSelection maSelection;
public:
TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
virtual ~TextUndoSetAttribs();
vcl/source/gdi/impanmvw.hxx
-1
View File
@@ -43,7 +43,6 @@ private:
Size maSzPix;
Size maDispSz;
Size maRestSz;
MapMode maMap;
vcl::Region maClip;
VclPtr<VirtualDevice> mpBackground;
VclPtr<VirtualDevice> mpRestore;
vcl/source/window/scrwnd.hxx
-1
View File
@@ -40,7 +40,6 @@ private:
ImageList maImgList;
Bitmap maWheelBmp;
CommandScrollData maCommandScrollData;
Point maLastMousePos;
Point maCenter;
Timer* mpTimer;