Skip to content

C
core
Kaydet (Commit) 4ed70b89 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:unusedfields 

Change-Id: I21e538b8e9c7a5f0fb233019efac37a3555e3c93
Reviewed-on: https://gerrit.libreoffice.org/40438Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 88dfd1ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 149 deletions
compilerplugins/clang/unusedfields.untouched.results
Dosyayı görüntüle @ 4ed70b89
...@@ -18,8 +18,6 @@ chart2/source/view/inc/GL3DRenderer.hxx:66 ...@@ -18,8 +18,6 @@ chart2/source/view/inc/GL3DRenderer.hxx:66
chart::opengl3D::LightSource pad3 float chart::opengl3D::LightSource pad3 float
comphelper/source/container/enumerablemap.cxx:299 comphelper/source/container/enumerablemap.cxx:299
comphelper::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface> comphelper::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface>
connectivity/source/commontools/sqlerror.cxx:89
connectivity::SQLError_Impl m_aContext Reference<class com::sun::star::uno::XComponentContext>
connectivity/source/drivers/evoab2/EApi.h:122 connectivity/source/drivers/evoab2/EApi.h:122
(anonymous) address_format char * (anonymous) address_format char *
connectivity/source/drivers/evoab2/EApi.h:126 connectivity/source/drivers/evoab2/EApi.h:126
...@@ -38,14 +36,20 @@ cppu/source/threadpool/threadpool.cxx:377 ...@@ -38,14 +36,20 @@ cppu/source/threadpool/threadpool.cxx:377
_uno_ThreadPool dummy sal_Int32 _uno_ThreadPool dummy sal_Int32
cppu/source/typelib/typelib.cxx:61 cppu/source/typelib/typelib.cxx:61
AlignSize_Impl nInt16 sal_Int16 AlignSize_Impl nInt16 sal_Int16
dbaccess/source/sdbtools/connection/objectnames.cxx:73
sdbtools::PlainExistenceCheck m_aContext const Reference<class com::sun::star::uno::XComponentContext>
dbaccess/source/sdbtools/connection/objectnames.cxx:114
sdbtools::TableValidityCheck m_aContext const Reference<class com::sun::star::uno::XComponentContext>
dbaccess/source/sdbtools/connection/objectnames.cxx:153
sdbtools::QueryValidityCheck m_aContext const Reference<class com::sun::star::uno::XComponentContext>
dbaccess/source/sdbtools/inc/connectiondependent.hxx:116 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
emfio/source/emfuno/xemfparser.cxx:59 emfio/source/emfuno/xemfparser.cxx:59
emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext> emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
extensions/source/propctrlr/propertyhandler.hxx:80
pcr::PropertyHandler m_aEnsureResAccess class pcr::PcrClient
extensions/source/scanner/scanner.hxx:46 extensions/source/scanner/scanner.hxx:46
ScannerManager maProtector osl::Mutex ScannerManager maProtector osl::Mutex
filter/source/graphicfilter/icgm/cgm.hxx:138
CGM mpGDIMetaFile class GDIMetaFile *
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:71 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:71
XMLFilterListBox m_aEnsureResLocale class EnsureResLocale XMLFilterListBox m_aEnsureResLocale class EnsureResLocale
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:130 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:130
...@@ -54,19 +58,23 @@ include/comphelper/MasterPropertySet.hxx:38 ...@@ -54,19 +58,23 @@ include/comphelper/MasterPropertySet.hxx:38
comphelper::SlaveData mxSlave css::uno::Reference<css::beans::XPropertySet> comphelper::SlaveData mxSlave css::uno::Reference<css::beans::XPropertySet>
include/drawinglayer/primitive2d/textlayoutdevice.hxx:61 include/drawinglayer/primitive2d/textlayoutdevice.hxx:61
drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
include/editeng/svxrtf.hxx:196
SvxRTFParser m_xDocProps css::uno::Reference<css::document::XDocumentProperties>
include/editeng/unotext.hxx:608 include/editeng/unotext.hxx:608
SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText> SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
include/LibreOfficeKit/LibreOfficeKitGtk.h:33 include/LibreOfficeKit/LibreOfficeKitGtk.h:33
_LOKDocView aDrawingArea GtkDrawingArea _LOKDocView aDrawingArea GtkDrawingArea
include/LibreOfficeKit/LibreOfficeKitGtk.h:38 include/LibreOfficeKit/LibreOfficeKitGtk.h:38
_LOKDocViewClass parent_class GtkDrawingAreaClass _LOKDocViewClass parent_class GtkDrawingAreaClass
include/sfx2/charwin.hxx:52
SvxCharView maInsertCharHdl Link<class SvxCharView *, void>
include/sfx2/msg.hxx:117 include/sfx2/msg.hxx:117
SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/sfx2/msg.hxx:119 include/sfx2/msg.hxx:119
SfxType0 nAttribs sal_uInt16 SfxType0 nAttribs sal_uInt16
include/svtools/genericunodialog.hxx:170 include/svtools/genericunodialog.hxx:170
svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
include/svtools/unoevent.hxx:161 include/svtools/unoevent.hxx:162
SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface> SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
include/vcl/pdfwriter.hxx:550 include/vcl/pdfwriter.hxx:550
vcl::PDFWriter::PDFSignContext m_pDerEncoded sal_Int8 * vcl::PDFWriter::PDFSignContext m_pDerEncoded sal_Int8 *
...@@ -86,84 +94,10 @@ include/vcl/pdfwriter.hxx:562 ...@@ -86,84 +94,10 @@ include/vcl/pdfwriter.hxx:562
vcl::PDFWriter::PDFSignContext m_aSignPassword class rtl::OUString vcl::PDFWriter::PDFSignContext m_aSignPassword class rtl::OUString
include/vcl/pdfwriter.hxx:564 include/vcl/pdfwriter.hxx:564
vcl::PDFWriter::PDFSignContext m_rCMSHexBuffer class rtl::OStringBuffer & vcl::PDFWriter::PDFSignContext m_rCMSHexBuffer class rtl::OStringBuffer &
include/vcl/toolbox.hxx:106
ToolBox maInDockRect tools::Rectangle
include/vcl/uitest/uiobject.hxx:241 include/vcl/uitest/uiobject.hxx:241
TabPageUIObject mxTabPage VclPtr<class TabPage> TabPageUIObject mxTabPage VclPtr<class TabPage>
include/xmloff/formlayerexport.hxx:173 include/xmloff/formlayerexport.hxx:173
xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport> xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
l10ntools/inc/export.hxx:75
ResData nIdLevel enum IdLevel
l10ntools/inc/export.hxx:76
ResData bChild _Bool
l10ntools/inc/export.hxx:77
ResData bChildWithText _Bool
l10ntools/inc/export.hxx:79
ResData bText _Bool
l10ntools/inc/export.hxx:80
ResData bQuickHelpText _Bool
l10ntools/inc/export.hxx:81
ResData bTitle _Bool
l10ntools/inc/export.hxx:90
ResData sQuickHelpText OStringHashMap
l10ntools/inc/export.hxx:92
ResData sTitle OStringHashMap
l10ntools/inc/export.hxx:94
ResData sTextTyp class rtl::OString
l10ntools/inc/export.hxx:96
ResData m_aList ExportList
l10ntools/inc/export.hxx:121
Export::(anonymous) mSimple std::ofstream *
l10ntools/inc/export.hxx:122
Export::(anonymous) mPo class PoOfstream *
l10ntools/inc/export.hxx:124
Export aOutput union (anonymous union at /home/noel/libo3/l10ntools/inc/export.hxx:119:5)
l10ntools/inc/export.hxx:126
Export aResStack ResStack
l10ntools/inc/export.hxx:128
Export bDefine _Bool
l10ntools/inc/export.hxx:129
Export bNextMustBeDefineEOL _Bool
l10ntools/inc/export.hxx:130
Export nLevel std::size_t
l10ntools/inc/export.hxx:131
Export nList enum ExportListType
l10ntools/inc/export.hxx:132
Export nListLevel std::size_t
l10ntools/inc/export.hxx:133
Export bMergeMode _Bool
l10ntools/inc/export.hxx:134
Export sMergeSrc class rtl::OString
l10ntools/inc/export.hxx:136
Export bReadOver _Bool
l10ntools/inc/export.hxx:137
Export sFilename class rtl::OString
l10ntools/inc/export.hxx:139
Export aLanguages std::vector<OString>
l10ntools/inc/export.hxx:280
MergeData sGID class rtl::OString
l10ntools/inc/export.hxx:281
MergeData sLID class rtl::OString
l10ntools/inc/export.hxx:334
QueueEntry nTyp int
l10ntools/inc/export.hxx:335
QueueEntry sLine class rtl::OString
l10ntools/inc/export.hxx:346
ParserQueue bCurrentIsM _Bool
l10ntools/inc/export.hxx:347
ParserQueue bNextIsM _Bool
l10ntools/inc/export.hxx:348
ParserQueue bLastWasM _Bool
l10ntools/inc/export.hxx:349
ParserQueue bMflag _Bool
l10ntools/inc/export.hxx:353
ParserQueue aQueueNext std::queue<QueueEntry> *
l10ntools/inc/export.hxx:354
ParserQueue aQueueCur std::queue<QueueEntry> *
l10ntools/inc/export.hxx:356
ParserQueue aExport class Export &
l10ntools/inc/export.hxx:357
ParserQueue bStart _Bool
libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:50 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:50
GtvApplicationWindow parent_instance GtkApplicationWindow GtvApplicationWindow parent_instance GtkApplicationWindow
libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:54 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:54
...@@ -224,18 +158,20 @@ sd/source/ui/table/TableDesignPane.hxx:113 ...@@ -224,18 +158,20 @@ sd/source/ui/table/TableDesignPane.hxx:113
sd::TableDesignPane aImpl class sd::TableDesignWidget sd::TableDesignPane aImpl class sd::TableDesignWidget
sd/source/ui/view/DocumentRenderer.cxx:1318 sd/source/ui/view/DocumentRenderer.cxx:1318
sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1258 sd/source/ui/view/viewshel.cxx:1257
sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
sd/source/ui/view/viewshel.cxx:1259 sd/source/ui/view/viewshel.cxx:1258
sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
sd/source/ui/view/viewshel.cxx:1260 sd/source/ui/view/viewshel.cxx:1259
sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
sd/source/ui/view/viewshel.cxx:1261 sd/source/ui/view/viewshel.cxx:1260
sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
sd/source/ui/view/ViewShellBase.cxx:195 sd/source/ui/view/ViewShellBase.cxx:194
sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
sfx2/source/doc/doctempl.cxx:116 sfx2/source/doc/doctempl.cxx:116
DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
starmath/inc/smmod.hxx:70
SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
starmath/inc/view.hxx:224 starmath/inc/view.hxx:224
SmViewShell maGraphicController class SmGraphicController SmViewShell maGraphicController class SmGraphicController
svl/source/crypto/cryptosign.cxx:120 svl/source/crypto/cryptosign.cxx:120
...@@ -272,12 +208,6 @@ unoidl/source/unoidlprovider.cxx:673 ...@@ -272,12 +208,6 @@ unoidl/source/unoidlprovider.cxx:673
unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity> unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
vcl/inc/opengl/zone.hxx:46 vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone OpenGLVCLContextZone aZone class OpenGLZone
vcl/inc/unx/i18n_status.hxx:56
vcl::I18NStatus::ChoiceData aString class rtl::OUString
vcl/source/app/svapp.cxx:159
ImplEventHook mpUserData void *
vcl/source/app/svapp.cxx:160
ImplEventHook mpProc VCLEventHookProc
vcl/source/gdi/jobset.cxx:34 vcl/source/gdi/jobset.cxx:34
ImplOldJobSetupData cDeviceName char [32] ImplOldJobSetupData cDeviceName char [32]
vcl/source/gdi/jobset.cxx:35 vcl/source/gdi/jobset.cxx:35
......
dbaccess/source/sdbtools/connection/objectnames.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -70,14 +70,12 @@ namespace sdbtools ...@@ -70,14 +70,12 @@ namespace sdbtools
class PlainExistenceCheck : public INameValidation class PlainExistenceCheck : public INameValidation
{ {
private: private:
const Reference<XComponentContext> m_aContext;
Reference< XConnection > m_xConnection; Reference< XConnection > m_xConnection;
Reference< XNameAccess > m_xContainer; Reference< XNameAccess > m_xContainer;
public: public:
PlainExistenceCheck( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxContainer ) PlainExistenceCheck( const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxContainer )
:m_aContext( _rContext ) :m_xConnection( _rxConnection )
,m_xConnection( _rxConnection )
,m_xContainer( _rxContainer ) ,m_xContainer( _rxContainer )
{ {
OSL_ENSURE( m_xContainer.is(), "PlainExistenceCheck::PlainExistenceCheck: this will crash!" ); OSL_ENSURE( m_xContainer.is(), "PlainExistenceCheck::PlainExistenceCheck: this will crash!" );
...@@ -111,13 +109,11 @@ namespace sdbtools ...@@ -111,13 +109,11 @@ namespace sdbtools
// TableValidityCheck // TableValidityCheck
class TableValidityCheck : public INameValidation class TableValidityCheck : public INameValidation
{ {
const Reference<XComponentContext> m_aContext;
const Reference< XConnection > m_xConnection; const Reference< XConnection > m_xConnection;
public: public:
TableValidityCheck( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection ) TableValidityCheck( const Reference< XConnection >& _rxConnection )
:m_aContext( _rContext ) :m_xConnection( _rxConnection )
,m_xConnection( _rxConnection )
{ {
} }
...@@ -150,13 +146,11 @@ namespace sdbtools ...@@ -150,13 +146,11 @@ namespace sdbtools
// QueryValidityCheck // QueryValidityCheck
class QueryValidityCheck : public INameValidation class QueryValidityCheck : public INameValidation
{ {
const Reference<XComponentContext> m_aContext;
const Reference< XConnection > m_xConnection; const Reference< XConnection > m_xConnection;
public: public:
QueryValidityCheck( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection ) QueryValidityCheck( const Reference< XConnection >& _rxConnection )
:m_aContext( _rContext ) :m_xConnection( _rxConnection )
,m_xConnection( _rxConnection )
{ {
} }
...@@ -229,9 +223,6 @@ namespace sdbtools ...@@ -229,9 +223,6 @@ namespace sdbtools
const NameCheckFactory& operator=(const NameCheckFactory&) = delete; const NameCheckFactory& operator=(const NameCheckFactory&) = delete;
/** creates an INameValidation instance which can be used to check the existence of query or table names /** creates an INameValidation instance which can be used to check the existence of query or table names
@param _rContext
the component's context
@param _nCommandType @param _nCommandType
the type of objects (CommandType::TABLE or CommandType::QUERY) of which names shall be checked for existence the type of objects (CommandType::TABLE or CommandType::QUERY) of which names shall be checked for existence
...@@ -245,16 +236,12 @@ namespace sdbtools ...@@ -245,16 +236,12 @@ namespace sdbtools
if the given command type is neither CommandType::TABLE or CommandType::QUERY if the given command type is neither CommandType::TABLE or CommandType::QUERY
*/ */
static PNameValidation createExistenceCheck( static PNameValidation createExistenceCheck(
const Reference<XComponentContext>& _rContext,
sal_Int32 _nCommandType, sal_Int32 _nCommandType,
const Reference< XConnection >& _rxConnection const Reference< XConnection >& _rxConnection
); );
/** creates an INameValidation instance which can be used to check the validity of a query or table name /** creates an INameValidation instance which can be used to check the validity of a query or table name
@param _rContext
the component's context
@param _nCommandType @param _nCommandType
the type of objects (CommandType::TABLE or CommandType::QUERY) of which names shall be validated the type of objects (CommandType::TABLE or CommandType::QUERY) of which names shall be validated
...@@ -268,7 +255,6 @@ namespace sdbtools ...@@ -268,7 +255,6 @@ namespace sdbtools
if the given command type is neither CommandType::TABLE or CommandType::QUERY if the given command type is neither CommandType::TABLE or CommandType::QUERY
*/ */
static PNameValidation createValidityCheck( static PNameValidation createValidityCheck(
const Reference<XComponentContext>& _rContext,
const sal_Int32 _nCommandType, const sal_Int32 _nCommandType,
const Reference< XConnection >& _rxConnection const Reference< XConnection >& _rxConnection
); );
...@@ -289,7 +275,7 @@ namespace sdbtools ...@@ -289,7 +275,7 @@ namespace sdbtools
); );
} }
PNameValidation NameCheckFactory::createExistenceCheck( const Reference<XComponentContext>& _rContext, sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection ) PNameValidation NameCheckFactory::createExistenceCheck( sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection )
{ {
verifyCommandType( _nCommandType ); verifyCommandType( _nCommandType );
...@@ -312,8 +298,8 @@ namespace sdbtools ...@@ -312,8 +298,8 @@ namespace sdbtools
); );
} }
PNameValidation pTableCheck( new PlainExistenceCheck( _rContext, _rxConnection, xTables ) ); PNameValidation pTableCheck( new PlainExistenceCheck( _rxConnection, xTables ) );
PNameValidation pQueryCheck( new PlainExistenceCheck( _rContext, _rxConnection, xQueries ) ); PNameValidation pQueryCheck( new PlainExistenceCheck( _rxConnection, xQueries ) );
PNameValidation pReturn; PNameValidation pReturn;
if ( aMeta.supportsSubqueriesInFrom() ) if ( aMeta.supportsSubqueriesInFrom() )
...@@ -325,7 +311,7 @@ namespace sdbtools ...@@ -325,7 +311,7 @@ namespace sdbtools
return pReturn; return pReturn;
} }
PNameValidation NameCheckFactory::createValidityCheck( const Reference<XComponentContext>& _rContext, sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection ) PNameValidation NameCheckFactory::createValidityCheck( sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection )
{ {
verifyCommandType( _nCommandType ); verifyCommandType( _nCommandType );
...@@ -344,8 +330,8 @@ namespace sdbtools ...@@ -344,8 +330,8 @@ namespace sdbtools
} }
if ( _nCommandType == CommandType::TABLE ) if ( _nCommandType == CommandType::TABLE )
return PNameValidation( new TableValidityCheck( _rContext, _rxConnection ) ); return PNameValidation( new TableValidityCheck( _rxConnection ) );
return PNameValidation( new QueryValidityCheck( _rContext, _rxConnection ) ); return PNameValidation( new QueryValidityCheck( _rxConnection ) );
} }
// ObjectNames // ObjectNames
...@@ -363,7 +349,7 @@ namespace sdbtools ...@@ -363,7 +349,7 @@ namespace sdbtools
{ {
EntryGuard aGuard( *this ); EntryGuard aGuard( *this );
PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection() ) ); PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( CommandType, getConnection() ) );
OUString sBaseName( BaseName ); OUString sBaseName( BaseName );
if ( sBaseName.isEmpty() ) if ( sBaseName.isEmpty() )
...@@ -399,7 +385,7 @@ namespace sdbtools ...@@ -399,7 +385,7 @@ namespace sdbtools
{ {
EntryGuard aGuard( *this ); EntryGuard aGuard( *this );
PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection()) ); PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( CommandType, getConnection()) );
return !pNameCheck->validateName( Name ); return !pNameCheck->validateName( Name );
} }
...@@ -407,7 +393,7 @@ namespace sdbtools ...@@ -407,7 +393,7 @@ namespace sdbtools
{ {
EntryGuard aGuard( *this ); EntryGuard aGuard( *this );
PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), CommandType, getConnection()) ); PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( CommandType, getConnection()) );
return pNameCheck->validateName( Name ); return pNameCheck->validateName( Name );
} }
...@@ -415,10 +401,10 @@ namespace sdbtools ...@@ -415,10 +401,10 @@ namespace sdbtools
{ {
EntryGuard aGuard( *this ); EntryGuard aGuard( *this );
PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection() ) ); PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( CommandType, getConnection() ) );
pNameCheck->validateName_throw( Name ); pNameCheck->validateName_throw( Name );
pNameCheck = NameCheckFactory::createValidityCheck( getContext(), CommandType, getConnection() ); pNameCheck = NameCheckFactory::createValidityCheck( CommandType, getConnection() );
pNameCheck->validateName_throw( Name ); pNameCheck->validateName_throw( Name );
} }
......
editeng/source/editeng/eertfpar.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -65,7 +65,7 @@ RtfImportInfo::~RtfImportInfo() ...@@ -65,7 +65,7 @@ RtfImportInfo::~RtfImportInfo()
EditRTFParser::EditRTFParser( EditRTFParser::EditRTFParser(
SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine) : SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine) :
SvxRTFParser(rAttrPool, rIn, nullptr), SvxRTFParser(rAttrPool, rIn),
aCurSel(std::move(aSel)), aCurSel(std::move(aSel)),
mpEditEngine(pEditEngine), mpEditEngine(pEditEngine),
aRTFMapMode(MapUnit::MapTwip), aRTFMapMode(MapUnit::MapTwip),
......
editeng/source/rtf/svxrtf.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -57,14 +57,12 @@ static rtl_TextEncoding lcl_GetDefaultTextEncodingForRTF() ...@@ -57,14 +57,12 @@ static rtl_TextEncoding lcl_GetDefaultTextEncodingForRTF()
// -------------- Methods -------------------- // -------------- Methods --------------------
SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn, SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn )
uno::Reference<document::XDocumentProperties> const & i_xDocProps )
: SvRTFParser( rIn, 5 ) : SvRTFParser( rIn, 5 )
, aPlainMap(rPool) , aPlainMap(rPool)
, aPardMap(rPool) , aPardMap(rPool)
, pInsPos( nullptr ) , pInsPos( nullptr )
, pAttrPool( &rPool ) , pAttrPool( &rPool )
, m_xDocProps( i_xDocProps )
, pRTFDefaults( nullptr ) , pRTFDefaults( nullptr )
, nDfltFont( 0) , nDfltFont( 0)
, bNewDoc( true ) , bNewDoc( true )
...@@ -119,8 +117,6 @@ SvParserState SvxRTFParser::CallParser() ...@@ -119,8 +117,6 @@ SvParserState SvxRTFParser::CallParser()
bNewGroup = false; bNewGroup = false;
nDfltFont = 0; nDfltFont = 0;
sBaseURL.clear();
// generate the correct WhichId table from the set WhichIds. // generate the correct WhichId table from the set WhichIds.
BuildWhichTable(); BuildWhichTable();
......
filter/source/graphicfilter/icgm/cgm.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -63,7 +63,6 @@ CGM::CGM(uno::Reference< frame::XModel > const & rModel) ...@@ -63,7 +63,6 @@ CGM::CGM(uno::Reference< frame::XModel > const & rModel)
, mnElementClass(0) , mnElementClass(0)
, mnElementID(0) , mnElementID(0)
, mnElementSize(0) , mnElementSize(0)
, mpGDIMetaFile(nullptr)
{ {
pElement = new CGMElements; pElement = new CGMElements;
pCopyOfE = new CGMElements; pCopyOfE = new CGMElements;
......
filter/source/graphicfilter/icgm/cgm.hxx
Dosyayı görüntüle @ 4ed70b89
...@@ -135,7 +135,6 @@ class CGM ...@@ -135,7 +135,6 @@ class CGM
~CGM(); ~CGM();
CGM(css::uno::Reference< css::frame::XModel > const & rModel); CGM(css::uno::Reference< css::frame::XModel > const & rModel);
GDIMetaFile* mpGDIMetaFile;
sal_uInt32 GetBackGroundColor(); sal_uInt32 GetBackGroundColor();
bool IsValid() const { return mbStatus; }; bool IsValid() const { return mbStatus; };
bool IsFinished() const { return mbIsFinished; }; bool IsFinished() const { return mbIsFinished; };
......
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -1160,7 +1160,6 @@ void FormulaDlg_Impl::SetData( sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int ...@@ -1160,7 +1160,6 @@ void FormulaDlg_Impl::SetData( sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int
FormEditData* pData = m_pHelper->getFormEditData(); FormEditData* pData = m_pHelper->getFormEditData();
pData->SetFStart( nNextFStart ); pData->SetFStart( nNextFStart );
pData->SetOffset( 0 ); pData->SetOffset( 0 );
pData->SetEdFocus( 0 );
FillDialog(); FillDialog();
} }
...@@ -1314,7 +1313,6 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) ...@@ -1314,7 +1313,6 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
OUString aFormula = m_pHelper->getCurrentFormula(); OUString aFormula = m_pHelper->getCurrentFormula();
sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, nEdFocus + pData->GetOffset() ); sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, nEdFocus + pData->GetOffset() );
pData->SetEdFocus( nEdFocus );
pData->SaveValues(); pData->SaveValues();
pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA ); pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
pData->SetFStart( n1 ); pData->SetFStart( n1 );
...@@ -1961,7 +1959,6 @@ void FormEditData::Reset() ...@@ -1961,7 +1959,6 @@ void FormEditData::Reset()
nMode = 0; nMode = 0;
nFStart = 0; nFStart = 0;
nOffset = 0; nOffset = 0;
nEdFocus = 0;
bMatrix = false; bMatrix = false;
xFocusWin.clear(); xFocusWin.clear();
aSelection.Min() = 0; aSelection.Min() = 0;
...@@ -1974,7 +1971,6 @@ FormEditData& FormEditData::operator=( const FormEditData& r ) ...@@ -1974,7 +1971,6 @@ FormEditData& FormEditData::operator=( const FormEditData& r )
nMode = r.nMode; nMode = r.nMode;
nFStart = r.nFStart; nFStart = r.nFStart;
nOffset = r.nOffset; nOffset = r.nOffset;
nEdFocus = r.nEdFocus;
aUndoStr = r.aUndoStr; aUndoStr = r.aUndoStr;
bMatrix = r.bMatrix ; bMatrix = r.bMatrix ;
xFocusWin = r.xFocusWin; xFocusWin = r.xFocusWin;
......
include/editeng/svxrtf.hxx
Dosyayı görüntüle @ 4ed70b89
...@@ -187,13 +187,11 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser ...@@ -187,13 +187,11 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
RTFPlainAttrMapIds aPlainMap; RTFPlainAttrMapIds aPlainMap;
RTFPardAttrMapIds aPardMap; RTFPardAttrMapIds aPardMap;
std::vector<sal_uInt16> aWhichMap; std::vector<sal_uInt16> aWhichMap;
OUString sBaseURL;
EditPosition* pInsPos; EditPosition* pInsPos;
SfxItemPool* pAttrPool; SfxItemPool* pAttrPool;
Color* pDfltColor; Color* pDfltColor;
vcl::Font* pDfltFont; vcl::Font* pDfltFont;
css::uno::Reference< css::document::XDocumentProperties> m_xDocProps;
SfxItemSet *pRTFDefaults; SfxItemSet *pRTFDefaults;
int nDfltFont; int nDfltFont;
...@@ -273,9 +271,7 @@ protected: ...@@ -273,9 +271,7 @@ protected:
// if no-one would like to have any twips // if no-one would like to have any twips
virtual void CalcValue(); virtual void CalcValue();
SvxRTFParser( SfxItemPool& rAttrPool, SvxRTFParser( SfxItemPool& rAttrPool, SvStream& rIn );
SvStream& rIn,
css::uno::Reference< css::document::XDocumentProperties> const & i_xDocProps );
virtual ~SvxRTFParser() override; virtual ~SvxRTFParser() override;
void SetNewDoc( bool bFlag ) { bNewDoc = bFlag; } void SetNewDoc( bool bFlag ) { bNewDoc = bFlag; }
......
include/formula/formdata.hxx
Dosyayı görüntüle @ 4ed70b89
...@@ -48,7 +48,6 @@ public: ...@@ -48,7 +48,6 @@ public:
void SetMode( sal_uInt16 nNew ) { nMode = nNew; } void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
void SetFStart( sal_Int32 nNew ) { nFStart = nNew; } void SetFStart( sal_Int32 nNew ) { nFStart = nNew; }
void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; } void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; }
void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; }
void SetMatrixFlag(bool bNew) { bMatrix=bNew;} void SetMatrixFlag(bool bNew) { bMatrix=bNew;}
void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;} void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;}
...@@ -62,7 +61,6 @@ private: ...@@ -62,7 +61,6 @@ private:
sal_uInt16 nMode; // enum ScFormulaDlgMode sal_uInt16 nMode; // enum ScFormulaDlgMode
sal_Int32 nFStart; sal_Int32 nFStart;
sal_uInt16 nOffset; sal_uInt16 nOffset;
sal_uInt16 nEdFocus;
OUString aUndoStr; OUString aUndoStr;
bool bMatrix; bool bMatrix;
VclPtr<vcl::Window> xFocusWin; VclPtr<vcl::Window> xFocusWin;
......
include/sfx2/charwin.hxx
Dosyayı görüntüle @ 4ed70b89
...@@ -57,7 +57,6 @@ private: ...@@ -57,7 +57,6 @@ private:
Point maPosition; Point maPosition;
vcl::Font maFont; vcl::Font maFont;
Link<SvxCharView*, void> maInsertCharHdl;
Link<SvxCharView*, void> maMouseClickHdl; Link<SvxCharView*, void> maMouseClickHdl;
Link<SvxCharView*, void> maClearClickHdl; Link<SvxCharView*, void> maClearClickHdl;
Link<SvxCharView*, void> maClearAllClickHdl; Link<SvxCharView*, void> maClearAllClickHdl;
......
include/svx/deflt3d.hxx
Dosyayı görüntüle @ 4ed70b89
...@@ -38,13 +38,10 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes ...@@ -38,13 +38,10 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes
private: private:
// Compound object // Compound object
Color aDefaultAmbientColor; Color aDefaultAmbientColor;
bool bDefaultCreateNormals;
bool bDefaultCreateTexture;
// Cube object // Cube object
basegfx::B3DPoint aDefaultCubePos; basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize; basegfx::B3DVector aDefaultCubeSize;
CubeFaces nDefaultCubeSideFlags;
bool bDefaultCubePosIsCenter; bool bDefaultCubePosIsCenter;
// Sphere object // Sphere object
......
svx/source/engine3d/deflt3d.cxx
Dosyayı görüntüle @ 4ed70b89
...@@ -33,14 +33,9 @@ E3dDefaultAttributes::E3dDefaultAttributes() ...@@ -33,14 +33,9 @@ E3dDefaultAttributes::E3dDefaultAttributes()
void E3dDefaultAttributes::Reset() void E3dDefaultAttributes::Reset()
{ {
// Compound object
bDefaultCreateNormals = true;
bDefaultCreateTexture = true;
// Cube object // Cube object
aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
nDefaultCubeSideFlags = CubeFaces::Full;
bDefaultCubePosIsCenter = false; bDefaultCubePosIsCenter = false;
// Sphere object // Sphere object
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment