[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang connectivity/source cui/source include/comphelper include/oox include/svl include/svx include/unotools oox/source sc/source sdext/source sd/source sfx2/source svl/source svx/source sw/inc sw/source toolkit/source unotools/source uui/source xmlhelp/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jan 4 06:17:50 UTC 2018
comphelper/source/misc/accimplaccess.cxx | 13 -
compilerplugins/clang/unusedfields.cxx | 11 -
compilerplugins/clang/unusedfields.readonly.results | 102 ++++++++--
compilerplugins/clang/unusedfields.untouched.results | 32 ---
compilerplugins/clang/unusedfields.writeonly.results | 20 +
connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx | 8
connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 16 -
connectivity/source/drivers/mork/MConnection.cxx | 17 -
connectivity/source/drivers/mork/MErrorResource.hxx | 3
connectivity/source/inc/OColumn.hxx | 11 -
cui/source/dialogs/iconcdlg.cxx | 10
cui/source/inc/iconcdlg.hxx | 2
include/comphelper/accimplaccess.hxx | 9
include/oox/ppt/slidepersist.hxx | 3
include/svl/style.hxx | 5
include/svx/deflt3d.hxx | 7
include/svx/obj3d.hxx | 3
include/svx/polygn3d.hxx | 4
include/unotools/textsearch.hxx | 2
oox/source/ppt/pptimport.cxx | 19 -
sc/source/filter/excel/xiescher.cxx | 1
sc/source/filter/inc/xiescher.hxx | 4
sd/source/core/stlsheet.cxx | 4
sdext/source/presenter/PresenterPaneBase.cxx | 8
sdext/source/presenter/PresenterPaneBase.hxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 2
sfx2/source/appl/helpinterceptor.hxx | 4
sfx2/source/appl/newhelp.cxx | 2
svl/source/items/style.cxx | 12 -
svx/source/dialog/crashreportui.cxx | 12 -
svx/source/dialog/dlgctl3d.cxx | 2
svx/source/engine3d/cube3d.cxx | 2
svx/source/engine3d/extrud3d.cxx | 2
svx/source/engine3d/lathe3d.cxx | 2
svx/source/engine3d/obj3d.cxx | 15 -
svx/source/engine3d/polygn3d.cxx | 3
svx/source/engine3d/sphere3d.cxx | 2
svx/source/form/navigatortreemodel.cxx | 4
svx/source/inc/fmexpl.hxx | 2
sw/inc/hints.hxx | 6
sw/source/core/attr/hints.cxx | 2
sw/source/core/text/txtfrm.cxx | 20 -
sw/source/core/unocore/unostyle.cxx | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 80 +------
toolkit/source/controls/accessiblecontrolcontext.cxx | 19 -
unotools/source/i18n/textsearch.cxx | 3
uui/source/iahndl-authentication.cxx | 3
uui/source/loginerr.hxx | 2
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 3
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 1
50 files changed, 174 insertions(+), 349 deletions(-)
New commits:
commit 21e0d8162a0e683558c4d042ce688fc9a6833809
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jan 3 14:08:19 2018 +0200
loplugin:unusedfields
fix the ReturnStmt check
Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 9593b787d3a6..94ac52405517 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -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;
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index 0709acbe2e9f..4454a0d28b04 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -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;
}
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 50584b0a35ca..8a099b3ef0d5 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1,9 +1,3 @@
-avmedia/source/vlc/wrapper/Types.hxx:35
- libvlc_event_t type int
-avmedia/source/vlc/wrapper/Types.hxx:49
- libvlc_track_description_t i_id int
-avmedia/source/vlc/wrapper/Types.hxx:51
- libvlc_track_description_t p_next struct libvlc_track_description_t *
basegfx/source/polygon/b2dtrapezoid.cxx:201
basegfx::trapezoidhelper::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
basic/source/inc/expr.hxx:93
@@ -54,6 +48,8 @@ bridges/source/jni_uno/jni_java2uno.cxx:151
jni_uno::largest a uno_Any
chart2/source/model/main/DataPoint.hxx:107
chart::DataPoint m_bNoParentPropAllowed _Bool
+comphelper/source/misc/accimplaccess.cxx:40
+ comphelper::OAccImpl_Impl m_xAccParent Reference<class com::sun::star::accessibility::XAccessible>
connectivity/source/drivers/evoab2/EApi.h:125
(anonymous) po char *
connectivity/source/drivers/evoab2/EApi.h:127
@@ -70,10 +66,22 @@ connectivity/source/drivers/firebird/Driver.hxx:52
connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory ::utl::TempFile
connectivity/source/drivers/firebird/Driver.hxx:53
connectivity::firebird::FirebirdDriver m_firebirdLockDirectory ::utl::TempFile
+connectivity/source/drivers/mork/MErrorResource.hxx:32
+ connectivity::mork::ErrorDescriptor m_sParameter class rtl::OUString
connectivity/source/inc/dbase/DIndexIter.hxx:36
connectivity::dbase::OIndexIterator m_pOperator file::OBoolOperator *
connectivity/source/inc/dbase/DIndexIter.hxx:37
connectivity::dbase::OIndexIterator m_pOperand const file::OOperand *
+connectivity/source/inc/FDatabaseMetaDataResultSet.hxx:114
+ connectivity::ODatabaseMetaDataResultSet m_aEmptyValue class connectivity::ORowSetValue
+connectivity/source/inc/OColumn.hxx:31
+ connectivity::OColumn m_CatalogName class rtl::OUString
+connectivity/source/inc/OColumn.hxx:32
+ connectivity::OColumn m_SchemaName class rtl::OUString
+connectivity/source/inc/OColumn.hxx:36
+ connectivity::OColumn m_ColumnTypeName class rtl::OUString
+connectivity/source/inc/OColumn.hxx:37
+ connectivity::OColumn m_ColumnServiceName class rtl::OUString
connectivity/source/inc/OColumn.hxx:45
connectivity::OColumn m_AutoIncrement _Bool
connectivity/source/inc/OColumn.hxx:46
@@ -86,6 +94,8 @@ connectivity/source/inc/OColumn.hxx:51
connectivity::OColumn m_Writable _Bool
connectivity/source/inc/OColumn.hxx:52
connectivity::OColumn m_DefinitelyWritable _Bool
+connectivity/source/inc/TConnection.hxx:55
+ connectivity::OMetaConnection m_aResources class connectivity::SharedResources
connectivity/source/inc/writer/WTable.hxx:70
connectivity::writer::OWriterTable m_nStartCol sal_Int32
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:34
@@ -148,6 +158,8 @@ cppu/source/uno/check.cxx:138
(anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
cui/source/inc/cuicharmap.hxx:86
SvxCharacterMap m_pFavCharView VclPtr<class SvxCharView> [16]
+cui/source/inc/iconcdlg.hxx:66
+ IconChoicePage aUserString class rtl::OUString
cui/source/options/optcolor.cxx:250
ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
cui/source/options/optpath.cxx:79
@@ -158,16 +170,24 @@ cui/source/options/personalization.hxx:85
SelectPersonaDialog m_vResultList VclPtr<class PushButton> [9]
cui/source/options/personalization.hxx:86
SelectPersonaDialog m_vSearchSuggestions VclPtr<class PushButton> [6]
+dbaccess/source/core/api/RowSetBase.hxx:87
+ dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
dbaccess/source/core/api/RowSetBase.hxx:98
dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
dbaccess/source/core/dataaccess/documentcontainer.cxx:65
dbaccess::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:110
+dbaccess/source/core/inc/ContentHelper.hxx:109
dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
dbaccess/source/ui/control/tabletree.cxx:184
dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
dbaccess/source/ui/inc/charsetlistbox.hxx:42
dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
+dbaccess/source/ui/inc/WCopyTable.hxx:269
+ dbaui::OCopyTableWizard m_aLocale css::lang::Locale
+drawinglayer/source/processor2d/vclprocessor2d.hxx:83
+ drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
+editeng/source/editeng/impedit.hxx:448
+ ImpEditEngine maColorConfig svtools::ColorConfig
embeddedobj/source/inc/commonembobj.hxx:104
OCommonEmbeddedObject m_aClassName class rtl::OUString
embeddedobj/source/inc/oleembobj.hxx:119
@@ -212,6 +232,8 @@ filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:143
XMLFilterSettingsDialog maModuleOpt class SvtModuleOptions
framework/inc/dispatch/dispatchprovider.hxx:81
framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache
+framework/source/fwe/classes/addonsoptions.cxx:299
+ framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
i18npool/inc/textconversion.hxx:80
i18npool::(anonymous) code sal_Unicode
i18npool/inc/textconversion.hxx:81
@@ -228,6 +250,10 @@ include/connectivity/DriversConfig.hxx:76
connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
include/connectivity/sdbcx/VDescriptor.hxx:56
connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
+include/connectivity/sqlparse.hxx:115
+ connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
+include/drawinglayer/processor3d/defaultprocessor3d.hxx:94
+ drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer
include/editeng/brushitem.hxx:53
SvxBrushItem maSecOptions class SvtSecurityOptions
include/editeng/charsetcoloritem.hxx:35
@@ -242,6 +268,8 @@ include/filter/msfilter/svdfppt.hxx:888
ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
include/oox/core/contexthandler2.hxx:220
oox::core::ContextHandler2Helper mnRootStackSize size_t
+include/oox/ppt/slidepersist.hxx:134
+ oox::ppt::SlidePersist mpClrSchemePtr oox::drawingml::ClrSchemePtr
include/registry/refltype.hxx:65
RTUik m_Data1 sal_uInt32
include/registry/refltype.hxx:66
@@ -272,12 +300,20 @@ include/sfx2/sidebar/ResourceManager.hxx:107
sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions
include/svl/ondemand.hxx:59
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
+include/svl/style.hxx:105
+ SfxStyleSheetBase maDisplayName class rtl::OUString
include/svtools/editsyntaxhighlighter.hxx:33
MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
+include/svx/deflt3d.hxx:38
+ E3dDefaultAttributes aDefaultAmbientColor class Color
+include/svx/sdr/overlay/overlaymanager.hxx:73
+ sdr::overlay::OverlayManager maDrawinglayerOpt class SvtOptionsDrawinglayer
include/svx/svdmark.hxx:140
SdrMarkList maPointName class rtl::OUString
include/svx/svdmark.hxx:141
SdrMarkList maGluePointName class rtl::OUString
+include/svx/svdpntv.hxx:142
+ SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
include/test/sheet/xdatapilottable.hxx:31
apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell>
include/test/sheet/xdatapilottable.hxx:32
@@ -287,7 +323,7 @@ include/test/sheet/xnamedranges.hxx:38
include/test/sheet/xspreadsheets2.hxx:46
apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
include/unoidl/unoidl.hxx:443
- unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo3/include/unoidl/unoidl.hxx:443:5)
+ unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
include/unoidl/unoidl.hxx:444
unoidl::ConstantValue::(anonymous) booleanValue _Bool
include/unoidl/unoidl.hxx:445
@@ -308,6 +344,8 @@ include/unoidl/unoidl.hxx:452
unoidl::ConstantValue::(anonymous) floatValue float
include/unoidl/unoidl.hxx:453
unoidl::ConstantValue::(anonymous) doubleValue double
+include/unotools/textsearch.hxx:98
+ utl::SearchParam sReplaceStr class rtl::OUString
include/vcl/bitmap.hxx:176
BmpFilterParam::(anonymous) mnSepiaPercent sal_uInt16
include/vcl/bitmap.hxx:177
@@ -338,6 +376,8 @@ oox/qa/token/tokenmap-test.cxx:34
oox::TokenmapTest tokenMap class oox::TokenMap
oox/source/drawingml/chart/objectformatter.cxx:708
oox::drawingml::chart::ObjectFormatterData maFromLocale struct com::sun::star::lang::Locale
+oox/source/drawingml/diagram/diagramlayoutatoms.hxx:208
+ oox::drawingml::ChooseAtom maEmptyChildren const std::vector<LayoutAtomPtr>
registry/source/reflwrit.cxx:140
writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
registry/source/reflwrit.cxx:141
@@ -369,7 +409,7 @@ sal/rtl/uuid.cxx:65
sc/inc/compiler.hxx:126
ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
sc/inc/compiler.hxx:127
- ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo3/sc/inc/compiler.hxx:124:9)
+ ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:124:9)
sc/inc/compiler.hxx:132
ScRawToken::(anonymous) pMat class ScMatrix *
sc/inc/formulagroup.hxx:42
@@ -384,6 +424,8 @@ sc/source/filter/inc/commentsbuffer.hxx:42
oox::xls::CommentModel maAnchor css::awt::Rectangle
sc/source/filter/inc/defnamesbuffer.hxx:84
oox::xls::DefinedNameBase maRefAny css::uno::Any
+sc/source/filter/inc/htmlpars.hxx:56
+ ScHTMLStyles maEmpty const class rtl::OUString
sc/source/filter/inc/qproform.hxx:57
QProToSc mnAddToken struct TokenId
sc/source/filter/inc/stylesbuffer.hxx:675
@@ -394,21 +436,25 @@ sc/source/filter/inc/workbooksettings.hxx:71
oox::xls::CalcSettingsModel mbUseNlr _Bool
sc/source/filter/inc/xepage.hxx:122
XclExpChartPageSettings maData struct XclPageData
+sc/source/filter/inc/xiescher.hxx:855
+ XclImpPictureObj maVisArea tools::Rectangle
sc/source/filter/inc/xltracer.hxx:82
XclTracer mbEnabled _Bool
sc/source/ui/inc/csvruler.hxx:35
ScCsvRuler maBackgrDev ScopedVclPtrInstance<class VirtualDevice>
sc/source/ui/inc/csvruler.hxx:36
ScCsvRuler maRulerDev ScopedVclPtrInstance<class VirtualDevice>
+sc/source/ui/vba/vbaformatconditions.hxx:44
+ ScVbaFormatConditions mxSheetConditionalEntries css::uno::Reference<css::sheet::XSheetConditionalEntries>
sc/source/ui/vba/vbaformatconditions.hxx:45
ScVbaFormatConditions mxStyles css::uno::Reference<ov::excel::XStyles>
sc/source/ui/vba/vbaformatconditions.hxx:46
ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
sc/source/ui/vba/vbaformatconditions.hxx:47
ScVbaFormatConditions mxParentRangePropertySet css::uno::Reference<css::beans::XPropertySet>
-sd/inc/sdmod.hxx:117
- SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
sd/inc/sdmod.hxx:118
+ SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
+sd/inc/sdmod.hxx:119
SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
sd/source/core/CustomAnimationCloner.cxx:69
sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
@@ -430,6 +476,10 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:101
pdfi::GraphicsContext BlendMode sal_Int8
sdext/source/pdfimport/tree/style.hxx:42
pdfi::StyleContainer::Style Contents class rtl::OUString
+sdext/source/presenter/PresenterPaneBase.hxx:116
+ sdext::presenter::PresenterPaneBase maCalloutAnchor css::awt::Point
+sfx2/source/appl/helpinterceptor.hxx:68
+ HelpInterceptor_Impl m_aViewData css::uno::Any
sfx2/source/appl/lnkbase2.cxx:95
sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
slideshow/source/engine/slideshowimpl.cxx:154
@@ -474,14 +524,16 @@ svtools/source/table/gridtablerenderer.cxx:70
svt::table::CachedSortIndicator m_sortAscending class BitmapEx
svtools/source/table/gridtablerenderer.cxx:71
svt::table::CachedSortIndicator m_sortDescending class BitmapEx
-svx/source/inc/datanavi.hxx:238
+svx/source/inc/datanavi.hxx:224
svxform::XFormsPage m_aMethodString class svxform::MethodString
-svx/source/inc/datanavi.hxx:239
+svx/source/inc/datanavi.hxx:225
svxform::XFormsPage m_aReplaceString class svxform::ReplaceString
-svx/source/inc/datanavi.hxx:551
+svx/source/inc/datanavi.hxx:548
svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString
-svx/source/inc/datanavi.hxx:552
+svx/source/inc/datanavi.hxx:549
svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString
+svx/source/inc/fmexpl.hxx:236
+ FmFormData m_xContainer css::uno::Reference<css::container::XContainer>
svx/source/inc/gridcell.hxx:525
DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
svx/source/inc/gridcell.hxx:526
@@ -490,6 +542,8 @@ sw/inc/acmplwrd.hxx:43
SwAutoCompleteWord m_LookupTree editeng::Trie
sw/inc/calc.hxx:162
SwCalc m_aSysLocale class SvtSysLocale
+sw/inc/hints.hxx:105
+ SwUpdateAttr m_aWhichFormatAttr std::vector<sal_uInt16>
sw/inc/hints.hxx:195
SwAttrSetChg m_bDelSet _Bool
sw/inc/shellio.hxx:142
@@ -522,6 +576,8 @@ sw/source/uibase/inc/fldmgr.hxx:77
SwInsertField_Data m_aDBDataSource css::uno::Any
sw/source/uibase/inc/labimg.hxx:49
SwLabItem m_aBin class rtl::OUString
+sw/source/uibase/inc/optload.hxx:94
+ CaptionComboBox aDefault class rtl::OUString
toolkit/source/awt/vclxtoolkit.cxx:179
(anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
ucb/source/ucp/gio/gio_mount.hxx:46
@@ -536,6 +592,8 @@ ucb/source/ucp/gio/gio_mount.hxx:52
OOoMountOperationClass _gtk_reserved4 void (*)(void)
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:73
hierarchy_ucp::DataSupplier_Impl m_aIterator class HierarchyEntry::iterator
+ucbhelper/source/client/proxydecider.cxx:118
+ ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const struct ucbhelper::InternetProxyServer
unoidl/source/sourceprovider-scanner.hxx:147
unoidl::detail::SourceProviderInterfaceTypeEntityPad directMandatoryBases std::vector<DirectBase>
unoidl/source/sourceprovider-scanner.hxx:148
@@ -562,9 +620,13 @@ unoidl/source/unoidlprovider.cxx:455
unoidl::detail::MapEntry name struct unoidl::detail::(anonymous namespace)::Memory32
unoidl/source/unoidlprovider.cxx:456
unoidl::detail::MapEntry data struct unoidl::detail::(anonymous namespace)::Memory32
-unotools/source/config/saveopt.cxx:82
+unotools/source/config/pathoptions.cxx:90
+ SvtPathOptions_Impl m_aEmptyString class rtl::OUString
+unotools/source/config/saveopt.cxx:78
SvtSaveOptions_Impl bROUserAutoSave _Bool
-vcl/inc/printerinfomanager.hxx:72
+uui/source/loginerr.hxx:43
+ LoginErrorInfo m_aPath class rtl::OUString
+vcl/inc/printerinfomanager.hxx:73
psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
vcl/inc/salwtype.hxx:153
SalWheelMouseEvent mbDeltaIsPixel _Bool
@@ -590,6 +652,8 @@ vcl/inc/svdata.hxx:296
ImplSVNWFData mbRolloverMenubar _Bool
vcl/inc/unx/i18n_status.hxx:56
vcl::I18NStatus m_aCurrentIM class rtl::OUString
+vcl/inc/unx/saldisp.hxx:266
+ SalDisplay m_aInvalidScreenData struct SalDisplay::ScreenData
vcl/source/filter/jpeg/Exif.hxx:62
Exif::TiffHeader byteOrder sal_uInt16
vcl/source/filter/jpeg/transupp.h:132
@@ -642,7 +706,7 @@ vcl/source/gdi/dibtools.cxx:115
(anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
vcl/source/gdi/dibtools.cxx:116
(anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/window/menuitemlist.hxx:54
+vcl/source/window/menuitemlist.hxx:55
MenuItemData aAccessibleName class rtl::OUString
vcl/unx/generic/print/bitmap_gfx.cxx:67
psp::HexEncoder mpFileBuffer sal_Char [16400]
@@ -662,6 +726,8 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:62
writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType
writerfilter/source/ooxml/OOXMLFactory.hxx:63
writerfilter::ooxml::AttributeInfo m_nRef Id
+xmlhelp/source/cxxhelp/provider/urlparameter.hxx:184
+ chelp::URLParameter m_aDefaultLanguage class rtl::OUString
xmloff/inc/MultiPropertySetHelper.hxx:78
MultiPropertySetHelper aEmptyAny css::uno::Any
xmloff/source/chart/SchXMLChartContext.cxx:447
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index e3fb40d10ac1..b168d51926e6 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -1,33 +1,15 @@
-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
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 02c7462e0ce9..0817e9b57879 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -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
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 812009d423ab..3a034b45d9a3 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -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();
}
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index cbb9c9ff116b..cadf6fe2c793 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -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();
}
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 95718217d445..8ede63eb25fb 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -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)!" );
}
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx
index aa4c7c201572..f8ab0a7ef983 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -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 ); }
};
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index cd1bd903ad1a..375f6ce9dc5a 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -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; }
-
};
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 1b1009389595..bd04dc4400c8 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -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();
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 040444abb324..0ef081c08543 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -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;
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 943c12b864c1..a304ccc3cc94 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -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( );
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index cd1ca4ec4e07..a2378b82aefb 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -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;
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index b23c4fee6e26..d8b6e9aeb75f 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -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;
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index d4d083287c87..e69a62a1625e 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -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; }
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 36da39e1e2a4..8f664c815a60 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -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;
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 345024d271fb..98778dd493e3 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -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;
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 5571fca7c15f..32ec831784ea 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -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; }
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 3b622792282e..9af79983d28f 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -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;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index fac3b9425865..35c27f948e6e 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -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 )
{
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 24d50ce2cefd..58bdecf82f11 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -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.
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index e0aacc949efa..507c5e787eb1 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -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;
}
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index c7bfa0b02fa0..4f8dc23e2573 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -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)
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 41e53f3f5309..f47ccbfd4c44 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -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,
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 191c2a5010a5..805eb4053da0 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -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);
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 6f3f4beadf35..41d9665f264b 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -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
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 0d7584e98337..fc86a0711c93 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -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& )
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 281a4d8d8472..673874496093 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -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
{
diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx
index b91aee8dafe9..f0f95e6cee35 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -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;
-
-private:
- css::uno::Reference< css::uno::XComponentContext > mxContext;
};
-CrashReportUI::CrashReportUI(const css::uno::Reference<css::uno::XComponentContext>& xContext):
- mxContext(xContext)
+CrashReportUI::CrashReportUI()
{
}
@@ -77,10 +73,10 @@ css::uno::Any SAL_CALL CrashReportUI::dispatchWithReturnValue(const css::util::U
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_svx_CrashReportUI_get_implementation(
- css::uno::XComponentContext *context,
+ css::uno::XComponentContext */*context*/,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new CrashReportUI(context));
+ return cppu::acquire(new CrashReportUI());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index ce75eacf7991..6c790e52ab79 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -309,7 +309,6 @@ void Svx3DLightControl::Construct2()
// create object for it
mpLampBottomObject = new E3dPolygonObj(
- mp3DView->Get3DDefaultAttributes(),
basegfx::B3DPolyPolygon(a3DCircle));
mpScene->Insert3DObj( mpLampBottomObject );
@@ -323,7 +322,6 @@ void Svx3DLightControl::Construct2()
// create object for it
mpLampShaftObject = new E3dPolygonObj(
- mp3DView->Get3DDefaultAttributes(),
basegfx::B3DPolyPolygon(a3DHalfCircle));
mpScene->Insert3DObj( mpLampShaftObject );
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 4dfe5ba4ea12..6583969bb771 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -36,7 +36,7 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact()
E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& aPos, const basegfx::B3DVector& r3DSize)
-: E3dCompoundObject(rDefault)
+: E3dCompoundObject()
{
// Set Defaults
SetDefaultAttributes(rDefault);
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index be2b99b9ac61..c873a30f1f4f 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -56,7 +56,7 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties()
// surfaces rectangles from the passed PolyPolygon
E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth)
-: E3dCompoundObject(rDefault),
+: E3dCompoundObject(),
maExtrudePolygon(rPP)
{
// since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 7a6f54efe540..c2fb0f5ac1b1 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -53,7 +53,7 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties()
// Constructor from 3D polygon, scale is the conversion factor for the coordinates
E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D)
-: E3dCompoundObject(rDefault),
+: E3dCompoundObject(),
maPolyPoly2D(rPoly2D)
{
// since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index db658f6515a4..c740c9369367 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -749,22 +749,13 @@ E3dCompoundObject::E3dCompoundObject()
aMaterialAmbientColor()
{
// Set defaults
- E3dDefaultAttributes aDefault;
- SetDefaultAttributes(aDefault);
+ SetDefaultAttributes();
}
-E3dCompoundObject::E3dCompoundObject(E3dDefaultAttributes& rDefault)
-: E3dObject(),
- aMaterialAmbientColor()
-{
- // Set defaults
- SetDefaultAttributes(rDefault);
-}
-
-void E3dCompoundObject::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
+void E3dCompoundObject::SetDefaultAttributes()
{
// Set defaults
- aMaterialAmbientColor = rDefault.GetDefaultAmbientColor();
+ aMaterialAmbientColor = COL_BLACK;
}
E3dCompoundObject::~E3dCompoundObject ()
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index dc41fd66cb6d..190c0ca89ee5 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -34,9 +34,8 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
}
E3dPolygonObj::E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D)
-: E3dCompoundObject(rDefault),
+: E3dCompoundObject(),
bLineOnly(true)
{
// Set geometry
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 4c70359c21ff..ecac05170094 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -51,7 +51,7 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties()
// Build Sphere from polygon facets in latitude and longitude
E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize)
-: E3dCompoundObject(rDefault)
+: E3dCompoundObject()
{
// Set defaults
SetDefaultAttributes(rDefault);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 3d54e3aea7f7..4d19f399f470 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -463,10 +463,6 @@ namespace svxform
Reference< XPropertySet > xSet( pFormData->GetPropertySet() );
if ( xSet.is() )
xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList.get() );
-
- Reference< XContainer > xContainer( pFormData->GetContainer() );
- if (xContainer.is())
- xContainer->removeContainerListener(m_pPropChangeList.get());
}
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 469b9edf35be..a089f10f015d 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -233,7 +233,6 @@ public:
class FmFormData : public FmEntryData
{
css::uno::Reference< css::form::XForm > m_xForm;
- css::uno::Reference< css::container::XContainer > m_xContainer;
public:
FmFormData(const css::uno::Reference< css::form::XForm >& _rxForm, FmFormData* _pParent);
@@ -241,7 +240,6 @@ public:
virtual ~FmFormData() override;
const css::uno::Reference< css::form::XForm >& GetFormIface() const { return m_xForm; }
- const css::uno::Reference< css::container::XContainer >& GetContainer() const { return m_xContainer; }
virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override;
virtual FmEntryData* Clone() override;
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 06904cbd311f..1c35871b611d 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -102,7 +102,6 @@ private:
sal_Int32 m_nStart;
sal_Int32 m_nEnd;
sal_uInt16 m_nWhichAttr;
- std::vector<sal_uInt16> m_aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT
public:
SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
@@ -121,11 +120,6 @@ public:
{
return m_nWhichAttr;
}
-
- const std::vector<sal_uInt16>& getFormatAttr() const
- {
- return m_aWhichFormatAttr;
- }
};
/** SwRefMarkFieldUpdate is sent when the referencemarks should be updated.
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 4fa04d0c62d7..7a9af119c0e6 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -45,7 +45,7 @@ SwDelText::SwDelText( sal_Int32 nS, sal_Int32 nL )
}
SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW )
- : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ), m_nWhichAttr( nW ), m_aWhichFormatAttr()
+ : SwMsgPoolItem( RES_UPDATE_ATTR ), m_nStart( nS ), m_nEnd( nE ), m_nWhichAttr( nW )
{
}
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 65dbf5193ce5..87b6d3721274 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -926,16 +926,6 @@ static bool isA11yRelevantAttribute(sal_uInt16 nWhich)
return nWhich != RES_CHRATR_RSID;
}
-static bool hasA11yRelevantAttribute( const std::vector<sal_uInt16>& nWhich )
-{
- for( std::vector<sal_uInt16>::const_iterator nItr = nWhich.begin();
- nItr < nWhich.end(); ++nItr )
- if ( isA11yRelevantAttribute( *nItr ) )
- return true;
-
- return false;
-}
-
void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
@@ -1056,16 +1046,6 @@ void SwTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
lcl_SetScriptInval( *this, nPos );
}
}
-
- if( isA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr() ) &&
- hasA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getFormatAttr() ) )
- {
- SwViewShell* pViewSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr;
- if ( pViewSh )
- {
- pViewSh->InvalidateAccessibleParaAttrs( *this );
- }
- }
}
break;
case RES_OBJECTDYING:
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index cb9b4c1d58ae..9365b12a26ef 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2204,7 +2204,7 @@ template<>
uno::Any SwXStyle::GetStyleProperty<FN_UNO_DISPLAY_NAME>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase)
{
PrepareStyleBase(rBase);
- return uno::makeAny(rBase.getNewBase()->GetDisplayName());
+ return uno::makeAny(rBase.getNewBase()->GetName());
}
template<>
uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase)
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 40a40d2dddcd..fde43fd16a89 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -527,10 +527,9 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
{
OExternalLockGuard aGuard( this );
- uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() );
- if ( !xAcc.is() )
- // we do _not_ have a foreign-controlled parent -> default to our VCL parent
- xAcc = getVclParent();
+ uno::Reference< accessibility::XAccessible > xAcc;
+ // we do _not_ have a foreign-controlled parent -> default to our VCL parent
+ xAcc = getVclParent();
return xAcc;
}
@@ -541,39 +540,30 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( )
sal_Int32 nIndex = -1;
- uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() );
- if ( xAcc.is() )
- { // we _do_ have a foreign-controlled parent -> use the base class' implementation,
- // which goes the UNO way
- nIndex = OAccessibleExtendedComponentHelper::getAccessibleIndexInParent( );
- }
- else
+ if ( GetWindow() )
{
- if ( GetWindow() )
+ vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow();
+ if ( pParent )
{
- vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow();
- if ( pParent )
+ // Iterate over all the parent's children and search for this object.
+ // this should be compatible with the code in SVX
+ uno::Reference< accessibility::XAccessible > xParentAcc( pParent->GetAccessible() );
+ if ( xParentAcc.is() )
{
- // Iterate over all the parent's children and search for this object.
- // this should be compatible with the code in SVX
- uno::Reference< accessibility::XAccessible > xParentAcc( pParent->GetAccessible() );
- if ( xParentAcc.is() )
+ uno::Reference< accessibility::XAccessibleContext > xParentContext ( xParentAcc->getAccessibleContext() );
+ if ( xParentContext.is() )
{
- uno::Reference< accessibility::XAccessibleContext > xParentContext ( xParentAcc->getAccessibleContext() );
- if ( xParentContext.is() )
+ sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
+ for ( sal_Int32 i=0; i<nChildCount; i++ )
{
- sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
- for ( sal_Int32 i=0; i<nChildCount; i++ )
+ uno::Reference< accessibility::XAccessible > xChild( xParentContext->getAccessibleChild(i) );
+ if ( xChild.is() )
{
- uno::Reference< accessibility::XAccessible > xChild( xParentContext->getAccessibleChild(i) );
- if ( xChild.is() )
+ uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
+ if ( xChildContext == static_cast<accessibility::XAccessibleContext*>(this) )
{
- uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
- if ( xChildContext == static_cast<accessibility::XAccessibleContext*>(this) )
- {
- nIndex = i;
- break;
- }
+ nIndex = i;
+ break;
}
}
}
@@ -699,36 +689,6 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds()
}
}
- uno::Reference< accessibility::XAccessible > xParent( implGetForeignControlledParent() );
- if ( xParent.is() )
- { // hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave
- // us a parent which is different from our VCL parent
- // (actually, we did not check if it's really different ...)
-
- // the screen location of the foreign parent
- uno::Reference< accessibility::XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY );
- DBG_ASSERT( xParentComponent.is(), "VCLXAccessibleComponent::implGetBounds: invalid (foreign) parent component!" );
-
- awt::Point aScreenLocForeign( 0, 0 );
- if ( xParentComponent.is() )
- aScreenLocForeign = xParentComponent->getLocationOnScreen();
-
- // the screen location of the VCL parent
- xParent = getVclParent();
- if ( xParent.is() )
- xParentComponent.set(xParent->getAccessibleContext(), css::uno::UNO_QUERY);
-
- awt::Point aScreenLocVCL( 0, 0 );
- if ( xParentComponent.is() )
- aScreenLocVCL = xParentComponent->getLocationOnScreen();
-
- // the difference between them
- awt::Size aOffset( aScreenLocVCL.X - aScreenLocForeign.X, aScreenLocVCL.Y - aScreenLocForeign.Y );
- // move the bounds
- aBounds.X += aOffset.Width;
- aBounds.Y += aOffset.Height;
- }
-
return aBounds;
}
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index cde540b577d9..a2685eae8d07 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -133,11 +133,7 @@ namespace toolkit
Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( )
{
- OContextEntryGuard aGuard( this );
- OSL_ENSURE( implGetForeignControlledParent().is(), "OAccessibleControlContext::getAccessibleParent: somebody forgot to set a parent!" );
- // this parent of us is foreign controlled - somebody has to set it using the OAccessibleImplementationAccess
- // class, before integrating our instance into an AccessibleDocumentModel
- return implGetForeignControlledParent();
+ return Reference< XAccessible >();
}
@@ -275,21 +271,12 @@ namespace toolkit
if ( pVCLParent )
aVCLParentScreenPos = pVCLParent->GetPosPixel();
- // the screen position of the "accessible parent" of the control
- Reference< XAccessible > xParentAcc( implGetForeignControlledParent() );
- Reference< XAccessibleComponent > xParentAccComponent;
- if ( xParentAcc.is() )
- xParentAccComponent.set(xParentAcc->getAccessibleContext(), css::uno::UNO_QUERY);
- awt::Point aAccParentScreenPos( 0, 0 );
- if ( xParentAccComponent.is() )
- aAccParentScreenPos = xParentAccComponent->getLocationOnScreen();
-
// now the size of the control
aBounds = xWindow->getPosSize();
// correct the pos
- aBounds.X = aWindowRelativePos.X() + aVCLParentScreenPos.X() - aAccParentScreenPos.X;
- aBounds.Y = aWindowRelativePos.Y() + aVCLParentScreenPos.Y() - aAccParentScreenPos.Y;
+ aBounds.X = aWindowRelativePos.X() + aVCLParentScreenPos.X();
+ aBounds.Y = aWindowRelativePos.Y() + aVCLParentScreenPos.Y();
}
return aBounds;
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index bcf9efc4d718..baddd527d2b3 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -60,7 +60,6 @@ SearchParam::SearchParam( const OUString &rText,
SearchParam::SearchParam( const SearchParam& rParam )
{
sSrchStr = rParam.sSrchStr;
- sReplaceStr = rParam.sReplaceStr;
m_eSrchType = rParam.m_eSrchType;
m_cWildEscChar = rParam.m_cWildEscChar;
@@ -203,7 +202,7 @@ void TextSearch::Init( const SearchParam & rParam,
for (;;) std::abort();
}
aSOpt.searchString = rParam.GetSrchStr();
- aSOpt.replaceString = rParam.GetReplaceStr();
+ aSOpt.replaceString = "";
aSOpt.Locale = rLocale;
aSOpt.transliterateFlags = TransliterationFlags::NONE;
if( !rParam.IsCaseSensitive() )
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 3ce9a7957c84..b5ec2ed481fd 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -74,8 +74,7 @@ executeLoginDialog(
bool bCanUseSysCreds = rInfo.GetCanUseSystemCredentials();
LoginFlags nFlags = LoginFlags::NONE;
- if (rInfo.GetPath().isEmpty())
- nFlags |= LoginFlags::NoPath;
+ nFlags |= LoginFlags::NoPath;
if (rInfo.GetErrorText().isEmpty())
nFlags |= LoginFlags::NoErrorText;
if (!bAccount)
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 5fe7dbb8cbd4..bdfb7f06c19a 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -40,7 +40,6 @@ private:
OUString m_aUserName;
OUString m_aPassword;
OUString m_aPasswordToModify;
- OUString m_aPath;
OUString m_aErrorText;
sal_uInt8 m_nFlags;
DialogMask m_nRet;
@@ -60,7 +59,6 @@ public:
const OUString& GetPassword() const { return m_aPassword; }
const OUString& GetPasswordToModify() const { return m_aPasswordToModify; }
bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; }
- const OUString& GetPath() const { return m_aPath; }
const OUString& GetErrorText() const { return m_aErrorText; }
bool GetCanRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
bool GetIsRememberPersistent() const { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 5a93c3075b5c..2d8a984ef957 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -154,9 +154,6 @@ OUString URLParameter::get_title()
OUString const & URLParameter::get_language()
{
- if( m_aLanguage.isEmpty() )
- return m_aDefaultLanguage;
-
return m_aLanguage;
}
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 2c339a5d072a..527019eda24c 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -181,7 +181,6 @@ namespace chelp {
OUString m_aEid;
OUString m_aDbPar;
- OUString m_aDefaultLanguage;
OUString m_aLanguage;
OUString m_aPrefix;
More information about the Libreoffice-commits
mailing list