[Libreoffice-commits] core.git: compilerplugins/clang include/svx include/vcl include/xmloff svx/source vcl/source xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 29 14:15:54 UTC 2020
compilerplugins/clang/unusedmethods.results | 186 +++++++++++++++---------
include/svx/dbaexchange.hxx | 29 ---
include/vcl/toolkit/ivctrl.hxx | 22 --
include/vcl/toolkit/treelistbox.hxx | 5
include/vcl/toolkit/vclmedit.hxx | 3
include/xmloff/txtimp.hxx | 1
include/xmloff/xmlimppr.hxx | 12 -
include/xmloff/xmlnumfi.hxx | 2
include/xmloff/xmlnumi.hxx | 8 -
include/xmloff/xmlstyle.hxx | 2
svx/source/fmcomp/dbaexchange.cxx | 19 --
vcl/source/control/ivctrl.cxx | 26 ---
vcl/source/edit/vclmedit.cxx | 9 -
vcl/source/treelist/treelistbox.cxx | 10 -
xmloff/source/draw/sdxmlimp.cxx | 114 --------------
xmloff/source/draw/sdxmlimp_impl.hxx | 9 -
xmloff/source/style/xmlimppr.cxx | 215 ----------------------------
xmloff/source/style/xmlnumfi.cxx | 28 ---
xmloff/source/style/xmlnumi.cxx | 11 -
xmloff/source/style/xmlstyle.cxx | 9 -
xmloff/source/text/txtimp.cxx | 10 -
21 files changed, 117 insertions(+), 613 deletions(-)
New commits:
commit b25e82b903135421fbcfff646bc92e03cce366b7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Aug 29 08:45:08 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Aug 29 16:15:04 2020 +0200
loplugin:unusedmethods
Change-Id: I2be47d2faf883b519f693e2d5ad58a5ab111849f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101629
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 22e05fed5144..1f87cf481176 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -136,8 +136,6 @@ dbaccess/source/filter/hsqldb/fbalterparser.hxx:20
void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
dbaccess/source/filter/hsqldb/parseschema.hxx:81
const class std::__debug::map<class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> >, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > > > > & dbahsql::SchemaParser::getPrimaryKeys() const
-dbaccess/source/ui/inc/callbacks.hxx:105
- void dbaui::IDragTransferableListener::dragFinished()
dbaccess/source/ui/inc/dsmeta.hxx:89
class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::begin() const
dbaccess/source/ui/inc/dsmeta.hxx:90
@@ -164,8 +162,6 @@ dbaccess/source/ui/inc/sbamultiplex.hxx:385
class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &)
dbaccess/source/ui/inc/SqlNameEdit.hxx:113
void dbaui::OSQLNameEntry::set_sensitive(_Bool)
-dbaccess/source/ui/inc/tabletree.hxx:84
- void dbaui::OTableTreeListBox::checkedButton_noBroadcast(const class weld::TreeIter &)
dbaccess/source/ui/inc/WTypeSelect.hxx:76
void dbaui::OWizTypeSelectList::show()
desktop/source/lib/lokclipboard.hxx:96
@@ -388,11 +384,11 @@ include/basegfx/vector/b3dvector.hxx:75
class basegfx::B3DVector & basegfx::B3DVector::operator*=(const class basegfx::B3DVector &)
include/basic/sbxvar.hxx:136
struct SbxValues * SbxValue::data()
-include/codemaker/global.hxx:56
+include/codemaker/global.hxx:54
class FileStream & operator<<(class FileStream &,const class rtl::OString *)
-include/codemaker/global.hxx:58
+include/codemaker/global.hxx:56
class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer *)
-include/codemaker/global.hxx:59
+include/codemaker/global.hxx:57
class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer &)
include/comphelper/asyncquithandler.hxx:45
_Bool AsyncQuitHandler::IsForceQuit() const
@@ -650,7 +646,7 @@ include/sfx2/lokhelper.hxx:62
int SfxLokHelper::getDocumentIdOfView(int)
include/sfx2/msg.hxx:120
const class std::type_info * SfxType0::Type() const
-include/sfx2/thumbnailview.hxx:206
+include/sfx2/thumbnailview.hxx:208
unsigned short ThumbnailView::getNextItemId() const
include/sfx2/viewsh.hxx:365
enum LOKDeviceFormFactor SfxViewShell::GetLOKDeviceFormFactor() const
@@ -680,6 +676,10 @@ include/svx/ClassificationField.hxx:47
const class rtl::OUString & svx::ClassificationResult::getDisplayText() const
include/svx/ClassificationField.hxx:52
_Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const
+include/svx/dbaexchange.hxx:170
+ svx::ODataAccessObjectTransferable::ODataAccessObjectTransferable(const class rtl::OUString &,const int,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &)
+include/svx/dbaexchange.hxx:192
+ svx::ODataAccessObjectTransferable::ODataAccessObjectTransferable(const class rtl::OUString &,const int,const class rtl::OUString &)
include/svx/DiagramDataInterface.hxx:33
class rtl::OUString DiagramDataInterface::getString() const
include/svx/dlgctrl.hxx:244
@@ -814,7 +814,7 @@ include/vcl/BitmapColor.hxx:39
void BitmapColor::SetAlpha(unsigned char)
include/vcl/builder.hxx:337
void VclBuilder::connectNumericFormatterAdjustment(const class rtl::OString &,const class rtl::OUString &)
-include/vcl/builder.hxx:479
+include/vcl/builder.hxx:484
class rtl::OString VclBuilderContainer::getUIFile() const
include/vcl/builderpage.hxx:36
void BuilderPage::SetHelpId(const class rtl::OString &)
@@ -836,9 +836,9 @@ include/vcl/cursor.hxx:96
_Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const
include/vcl/customweld.hxx:42
class rtl::OUString weld::CustomWidgetController::GetHelpText() const
-include/vcl/customweld.hxx:138
+include/vcl/customweld.hxx:142
void weld::CustomWeld::queue_draw_area(int,int,int,int)
-include/vcl/customweld.hxx:153
+include/vcl/customweld.hxx:157
void weld::CustomWeld::set_visible(_Bool)
include/vcl/errcode.hxx:86
_Bool ErrCode::operator<(const class ErrCode &) const
@@ -916,14 +916,38 @@ include/vcl/TaskStopwatch.hxx:118
void TaskStopwatch::setTimeSlice(unsigned int)
include/vcl/textrectinfo.hxx:45
_Bool TextRectInfo::operator!=(const class TextRectInfo &) const
+include/vcl/toolkit/ivctrl.hxx:120
+ void SvxIconChoiceCtrlEntry::SetUserData(void *)
+include/vcl/toolkit/ivctrl.hxx:121
+ void * SvxIconChoiceCtrlEntry::GetUserData()
+include/vcl/toolkit/ivctrl.hxx:220
+ void SvtIconChoiceCtrl::SetChoiceWithCursor()
+include/vcl/toolkit/ivctrl.hxx:226
+ const class Link<class SvtIconChoiceCtrl *, void> & SvtIconChoiceCtrl::GetClickHdl() const
+include/vcl/toolkit/ivctrl.hxx:246
+ void SvtIconChoiceCtrl::CreateAutoMnemonics(class MnemonicGenerator &)
+include/vcl/toolkit/ivctrl.hxx:258
+ void SvtIconChoiceCtrl::InvalidateEntry(class SvxIconChoiceCtrlEntry *)
+include/vcl/toolkit/ivctrl.hxx:261
+ class SvxIconChoiceCtrlEntry * SvtIconChoiceCtrl::GetEntry(const class Point &) const
+include/vcl/toolkit/ivctrl.hxx:270
+ void SvtIconChoiceCtrl::SetSelectionMode(enum SelectionMode)
include/vcl/toolkit/longcurr.hxx:47
class BigInt LongCurrencyFormatter::GetValue() const
include/vcl/toolkit/treelist.hxx:170
const class SvTreeListEntry * SvTreeList::GetParent(const class SvTreeListEntry *) const
-include/vcl/toolkit/treelist.hxx:178
- struct std::pair<class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > *, class std::__cxx1998::vector<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> >, class std::allocator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > > > >, class std::__debug::vector<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> >, class std::allocator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > > >, struct std::random_access_iterator_tag>, class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > *, class std::__cxx1998::vector<class std::unique_ptr<class SvTreeListEntry, struct std::default_del
ete<class SvTreeListEntry> >, class std::allocator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > > > >, class std::__debug::vector<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> >, class std::allocator<class std::unique_ptr<class SvTreeListEntry, struct std::default_delete<class SvTreeListEntry> > > >, struct std::random_access_iterator_tag> > SvTreeList::GetChildIterators(class SvTreeListEntry *)
include/vcl/toolkit/treelistbox.hxx:369
void SvTreeListBox::RemoveSelection()
+include/vcl/toolkit/treelistbox.hxx:631
+ void SvTreeListBox::SetCursor(class SvTreeListEntry *)
+include/vcl/toolkit/treelistbox.hxx:670
+ class VclPtr<class PopupMenu> SvTreeListBox::CreateContextMenu()
+include/vcl/toolkit/vclmedit.hxx:89
+ void VclMultiLineEdit::LinkStubImpUpdateDataHdl(void *,class Timer *)
+include/vcl/toolkit/vclmedit.hxx:89
+ void VclMultiLineEdit::ImpUpdateDataHdl(class Timer *)
+include/vcl/toolkit/vclmedit.hxx:146
+ void VclMultiLineEdit::SetRightToLeft(_Bool)
include/vcl/txtattr.hxx:56
_Bool TextAttrib::operator!=(const class TextAttrib &) const
include/vcl/uitest/uiobject.hxx:281
@@ -934,83 +958,81 @@ include/vcl/uitest/uiobject.hxx:352
SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &)
include/vcl/uitest/uiobject.hxx:360
class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *)
-include/vcl/weld.hxx:127
+include/vcl/weld.hxx:138
_Bool weld::Widget::get_hexpand() const
-include/vcl/weld.hxx:129
+include/vcl/weld.hxx:140
_Bool weld::Widget::get_vexpand() const
-include/vcl/weld.hxx:131
+include/vcl/weld.hxx:142
void weld::Widget::set_secondary(_Bool)
-include/vcl/weld.hxx:136
+include/vcl/weld.hxx:147
void weld::Widget::set_margin_right(int)
-include/vcl/weld.hxx:138
+include/vcl/weld.hxx:149
int weld::Widget::get_margin_top() const
-include/vcl/weld.hxx:139
+include/vcl/weld.hxx:150
int weld::Widget::get_margin_bottom() const
-include/vcl/weld.hxx:141
+include/vcl/weld.hxx:152
int weld::Widget::get_margin_right() const
-include/vcl/weld.hxx:317
+include/vcl/weld.hxx:330
void weld::ScrolledWindow::hadjustment_set_step_increment(int)
-include/vcl/weld.hxx:319
+include/vcl/weld.hxx:332
enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const
-include/vcl/weld.hxx:324
+include/vcl/weld.hxx:337
int weld::ScrolledWindow::get_hscroll_height() const
-include/vcl/weld.hxx:450
+include/vcl/weld.hxx:463
struct SystemEnvData weld::Window::get_system_data() const
-include/vcl/weld.hxx:534
+include/vcl/weld.hxx:547
class rtl::OString weld::Assistant::get_current_page_ident() const
-include/vcl/weld.hxx:540
+include/vcl/weld.hxx:553
class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const
-include/vcl/weld.hxx:870
+include/vcl/weld.hxx:883
void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:879
+include/vcl/weld.hxx:892
void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
-include/vcl/weld.hxx:987
+include/vcl/weld.hxx:1000
_Bool weld::TreeView::iter_next_visible(class weld::TreeIter &) const
-include/vcl/weld.hxx:1030
+include/vcl/weld.hxx:1043
void weld::TreeView::set_text_align(const class weld::TreeIter &,double,int)
-include/vcl/weld.hxx:1158
+include/vcl/weld.hxx:1171
const class rtl::OUString & weld::TreeView::get_saved_value() const
-include/vcl/weld.hxx:1225
+include/vcl/weld.hxx:1238
class rtl::OUString weld::IconView::get_selected_id() const
-include/vcl/weld.hxx:1240
+include/vcl/weld.hxx:1253
_Bool weld::IconView::get_cursor(class weld::TreeIter *) const
-include/vcl/weld.hxx:1250
+include/vcl/weld.hxx:1263
void weld::IconView::select_all()
-include/vcl/weld.hxx:1256
+include/vcl/weld.hxx:1269
void weld::IconView::save_value()
-include/vcl/weld.hxx:1257
+include/vcl/weld.hxx:1270
const class rtl::OUString & weld::IconView::get_saved_value() const
-include/vcl/weld.hxx:1258
+include/vcl/weld.hxx:1271
_Bool weld::IconView::get_value_changed_from_saved() const
-include/vcl/weld.hxx:1356
- void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:1364
+include/vcl/weld.hxx:1377
void weld::MenuButton::append_item_radio(const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:1372
+include/vcl/weld.hxx:1385
void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
-include/vcl/weld.hxx:1377
+include/vcl/weld.hxx:1390
void weld::MenuButton::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:1428
+include/vcl/weld.hxx:1441
void weld::Scale::get_increments(int &,int &) const
-include/vcl/weld.hxx:1445
+include/vcl/weld.hxx:1458
class rtl::OUString weld::ProgressBar::get_text() const
-include/vcl/weld.hxx:1464
+include/vcl/weld.hxx:1477
void weld::Entry::signal_insert_text(class rtl::OUString &)
-include/vcl/weld.hxx:1480
+include/vcl/weld.hxx:1493
int weld::Entry::get_position() const
-include/vcl/weld.hxx:1654
+include/vcl/weld.hxx:1667
void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &)
-include/vcl/weld.hxx:1890
+include/vcl/weld.hxx:1903
class Size weld::MetricSpinButton::get_size_request() const
-include/vcl/weld.hxx:1902
+include/vcl/weld.hxx:1915
void weld::MetricSpinButton::set_position(int)
-include/vcl/weld.hxx:1983
+include/vcl/weld.hxx:2004
int weld::TextView::vadjustment_get_lower() const
-include/vcl/weld.hxx:2140
+include/vcl/weld.hxx:2161
class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const
-include/vcl/weld.hxx:2150
+include/vcl/weld.hxx:2171
void weld::Toolbar::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:2193
+include/vcl/weld.hxx:2214
class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool)
include/vcl/weldutils.hxx:304
void weld::DateFormatter::CursorChangedHdl(class weld::Entry &)
@@ -1026,10 +1048,20 @@ include/xmloff/txtimp.hxx:386
class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP()
include/xmloff/txtimp.hxx:387
class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP()
+include/xmloff/txtimp.hxx:421
+ const class SvXMLTokenMap & XMLTextImportHelper::GetTextMasterPageElemTokenMap()
include/xmloff/txtimp.hxx:572
class rtl::OUString XMLTextImportHelper::FindActiveBookmarkName()
-include/xmloff/xmlnumi.hxx:60
- SvxXMLListStyleContext::SvxXMLListStyleContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,_Bool)
+include/xmloff/xmlimppr.hxx:93
+ void SvXMLImportPropertyMapper::importXML(class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,const class SvXMLUnitConverter &,const class SvXMLNamespaceMap &,unsigned int,int,int) const
+include/xmloff/xmlnumfi.hxx:92
+ const class SvXMLTokenMap & SvXMLNumFmtHelper::GetStylesElemTokenMap()
+include/xmloff/xmlnumfi.hxx:173
+ class SvXMLNumImpData * SvXMLNumFormatContext::GetData() const
+include/xmloff/xmlnumi.hxx:53
+ SvxXMLListStyleContext::SvxXMLListStyleContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,_Bool)
+include/xmloff/xmlstyle.hxx:179
+ const class SvXMLTokenMap & SvXMLStylesContext::GetStyleStylesElemTokenMap()
include/xmlreader/pad.hxx:38
void xmlreader::Pad::add(char const (&)[size_])
include/xmlreader/span.hxx:45
@@ -1214,13 +1246,13 @@ sc/source/core/opencl/formulagroupcl.cxx:1387
_Bool sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetEndFixed() const
sc/source/core/opencl/op_statistical.hxx:206
sc::opencl::OpGeoMean::OpGeoMean()
-sc/source/core/tool/interpr1.cxx:6495
+sc/source/core/tool/interpr1.cxx:6515
double ::operator()(const struct sc::ParamIfsResult &) const
sc/source/core/tool/interpr3.cxx:4442
double ::operator()(double,unsigned long) const
-sc/source/core/tool/scmatrix.cxx:2300
+sc/source/core/tool/scmatrix.cxx:2316
type-parameter-?-? * (anonymous namespace)::wrapped_iterator::operator->() const
-sc/source/core/tool/scmatrix.cxx:3306
+sc/source/core/tool/scmatrix.cxx:3322
const class svl::SharedString & matop::(anonymous namespace)::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
sc/source/filter/inc/htmlpars.hxx:60
void ScHTMLStyles::add(const char *,unsigned long,const char *,unsigned long,const class rtl::OUString &,const class rtl::OUString &)
@@ -1368,19 +1400,23 @@ slideshow/source/engine/activities/activitiesfactory.cxx:566
void slideshow::internal::(anonymous namespace)::ValuesActivity::perform(unsigned int,unsigned int) const
slideshow/source/engine/activities/activitiesfactory.cxx:581
void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd()
-slideshow/source/engine/animationfactory.cxx:593
+slideshow/source/engine/animationfactory.cxx:613
void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch()
-slideshow/source/engine/animationfactory.cxx:596
+slideshow/source/engine/animationfactory.cxx:616
void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &)
-slideshow/source/engine/animationfactory.cxx:674
+slideshow/source/engine/animationfactory.cxx:694
_Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(const typename type-parameter-?-?::ValueType &)
-slideshow/source/engine/animationfactory.cxx:689
+slideshow/source/engine/animationfactory.cxx:711
_Bool slideshow::internal::(anonymous namespace)::GenericAnimation::operator()(typename type-parameter-?-?::ValueType)
-slideshow/source/engine/animationfactory.cxx:707
+slideshow/source/engine/animationfactory.cxx:731
typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const
slideshow/source/engine/opengl/TransitionImpl.hxx:184
void OGLTransitionImpl::cleanup()
-slideshow/source/inc/box2dtools.hxx:221
+slideshow/source/inc/box2dtools.hxx:119
+ void box2d::utils::box2DWorld::setShapeAngle(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape>,const double)
+slideshow/source/inc/box2dtools.hxx:206
+ _Bool box2d::utils::box2DWorld::shapesInitialized()
+slideshow/source/inc/box2dtools.hxx:228
class std::shared_ptr<class box2d::utils::box2DBody> box2d::utils::box2DWorld::makeShapeStatic(const class std::shared_ptr<class slideshow::internal::Shape> &)
slideshow/source/inc/listenercontainer.hxx:44
_Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &)
@@ -1578,7 +1614,7 @@ sw/inc/viscrs.hxx:206
class SwShellTableCursor * SwShellTableCursor::GetPrev()
sw/inc/viscrs.hxx:207
const class SwShellTableCursor * SwShellTableCursor::GetPrev() const
-sw/qa/inc/swmodeltestbase.hxx:317
+sw/qa/inc/swmodeltestbase.hxx:318
class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const
sw/source/core/access/accportions.cxx:56
unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?)
@@ -1712,7 +1748,7 @@ vcl/inc/qt5/Qt5Frame.hxx:163
void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *)
vcl/inc/qt5/Qt5Frame.hxx:216
struct _cairo * Qt5Frame::getCairoContext() const
-vcl/inc/qt5/Qt5Graphics_Controls.hxx:93
+vcl/inc/qt5/Qt5Graphics_Controls.hxx:94
class QPoint Qt5Graphics_Controls::upscale(const class QPoint &,enum Qt5Graphics_Controls::Round)
vcl/inc/qt5/Qt5Painter.hxx:60
void Qt5Painter::update()
@@ -1750,9 +1786,7 @@ vcl/inc/skia/utils.hxx:62
void SkiaHelper::dump(const class SkBitmap &,const char *)
vcl/inc/skia/zone.hxx:22
void SkiaZone::relaxWatchdogTimings()
-vcl/inc/svimpbox.hxx:304
- void SvImpLBox::EndSelection()
-vcl/inc/unx/gtk/gtkframe.hxx:217
+vcl/inc/unx/gtk/gtkframe.hxx:218
void ensure_dbus_setup(struct _GdkWindow *,class GtkSalFrame *)
vcl/inc/unx/printergfx.hxx:94
_Bool psp::PrinterColor::operator!=(const class psp::PrinterColor &) const
@@ -1788,12 +1822,26 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:51
void * g_lo_action_get_instance_private(struct (anonymous namespace)::GLOAction *)
vcl/unx/gtk3/gtk3glomenu.cxx:30
void * g_lo_menu_get_instance_private(struct GLOMenu *)
+writerfilter/source/dmapper/SettingsTable.hxx:81
+ class rtl::OUString writerfilter::dmapper::SettingsTable::GetDecimalSymbol() const
writerfilter/source/ooxml/OOXMLPropertySet.hxx:175
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::begin() const
writerfilter/source/ooxml/OOXMLPropertySet.hxx:176
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::end() const
writerfilter/source/ooxml/OOXMLPropertySet.hxx:179
class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString()
+xmloff/source/draw/sdxmlimp_impl.hxx:163
+ const class SvXMLTokenMap & SdXMLImport::GetBodyElemTokenMap()
+xmloff/source/draw/sdxmlimp_impl.hxx:164
+ const class SvXMLTokenMap & SdXMLImport::GetStylesElemTokenMap()
+xmloff/source/draw/sdxmlimp_impl.hxx:165
+ const class SvXMLTokenMap & SdXMLImport::GetMasterPageElemTokenMap()
+xmloff/source/draw/sdxmlimp_impl.hxx:166
+ const class SvXMLTokenMap & SdXMLImport::GetPageMasterAttrTokenMap()
+xmloff/source/draw/sdxmlimp_impl.hxx:167
+ const class SvXMLTokenMap & SdXMLImport::GetPageMasterStyleAttrTokenMap()
+xmloff/source/draw/sdxmlimp_impl.hxx:168
+ const class SvXMLTokenMap & SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
xmlsecurity/source/gpg/XMLEncryption.hxx:25
XMLEncryptionGpg::XMLEncryptionGpg()
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:46
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 1e162bfd2b17..c5bbeae01024 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -159,21 +159,6 @@ namespace svx
// needed to provide a SotClipboardFormatId::SBA_DATAEXCHANGE format
public:
- /** should be used copying and the connection is needed.
- @param _rDatasource
- The data source name.
- @param _nCommandType
- The kind of command. @see com.sun.star.sdbc.CommandType
- @param _rCommand
- The command, either a name of a table or query or a SQL statement.
- */
- ODataAccessObjectTransferable(
- const OUString& _rDatasourceOrLocation
- ,const sal_Int32 _nCommandType
- ,const OUString& _rCommand
- ,const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
- );
-
void Update(
const OUString& _rDatasourceOrLocation,
const sal_Int32 _nCommandType,
@@ -181,20 +166,6 @@ namespace svx
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
- /** should be used when copying a query object and no connection is available.
- @param _rDatasource
- The data source name.
- @param _nCommandType
- The kind of command. @see com.sun.star.sdbc.CommandType
- @param _rCommand
- The command, either a name of a table or query or a SQL statement.
- */
- ODataAccessObjectTransferable(
- const OUString& _rDatasourceOrLocation
- ,const sal_Int32 _nCommandType
- ,const OUString& _rCommand
- );
-
void Update(
const OUString& _rDatasourceOrLocation,
const sal_Int32 _nCommandType,
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx
index d07b798881c7..e6d9dd68caf5 100644
--- a/include/vcl/toolkit/ivctrl.hxx
+++ b/include/vcl/toolkit/ivctrl.hxx
@@ -117,8 +117,6 @@ public:
OUString VCL_DLLPUBLIC GetDisplayText() const;
void SetQuickHelpText( const OUString& rText ) { aQuickHelpText = rText; }
const OUString& GetQuickHelpText() const { return aQuickHelpText; }
- void SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
- void* GetUserData () { return pUserData; }
SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; }
SvxIconViewFlags GetFlags() const { return nFlags; }
@@ -217,13 +215,10 @@ public:
WinBits GetStyle() const;
- void SetChoiceWithCursor();
-
void SetFont( const vcl::Font& rFont );
void SetPointFont( const vcl::Font& rFont );
void SetClickHdl( const Link<SvtIconChoiceCtrl*,void>& rLink ) { _aClickIconHdl = rLink; }
- const Link<SvtIconChoiceCtrl*,void>& GetClickHdl() const { return _aClickIconHdl; }
using OutputDevice::SetBackground;
void SetBackground( const Wallpaper& rWallpaper );
@@ -236,15 +231,6 @@ public:
void RemoveEntry(sal_Int32 nEntryListPos);
- /** creates automatic mnemonics for all icon texts in the control
-
- @param _rUsedMnemonics
- a MnemonicGenerator at which some other mnemonics are already registered.
- This can be used if the control needs to share the "mnemonic space" with other elements,
- such as a menu bar.
- */
- void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
-
bool DoKeyInput( const KeyEvent& rKEvt );
sal_Int32 GetEntryCount() const;
@@ -254,12 +240,6 @@ public:
void SetCursor( SvxIconChoiceCtrlEntry* pEntry );
SvxIconChoiceCtrlEntry* GetCursor() const;
- // Re-calculation of cached view-data and invalidation of those in the view
- void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry );
-
- // Entry is selected, if the BoundRect is selected
- SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel ) const;
-
// sal_uLong is the position of the selected element in the list
SvxIconChoiceCtrlEntry* GetSelectedEntry() const;
@@ -267,8 +247,6 @@ public:
void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry );
#endif
- void SetSelectionMode( SelectionMode eMode );
-
tools::Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const;
tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const;
diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx
index 0af7d371659b..ea1038edeb09 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -627,9 +627,6 @@ public:
void SetFont( const vcl::Font& rFont );
- using Window::SetCursor;
- void SetCursor( SvTreeListEntry* pEntry );
-
SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const;
virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, long nLine );
@@ -667,8 +664,6 @@ public:
SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const;
void ScrollToAbsPos( long nPos );
- static VclPtr<PopupMenu> CreateContextMenu();
-
long getPreferredDimensions(std::vector<long> &rWidths) const;
virtual Size GetOptimalSize() const override;
diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
index c7e0a991191f..63bd58e35a95 100644
--- a/include/vcl/toolkit/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -86,7 +86,6 @@ private:
protected:
- DECL_LINK( ImpUpdateDataHdl, Timer*, void );
void StateChanged( StateChangedType nType ) override;
void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
@@ -143,8 +142,6 @@ public:
OUString GetText( LineEnd aSeparator ) const;
OUString GetTextLines( LineEnd aSeparator ) const;
- void SetRightToLeft( bool bRightToLeft );
-
void SetModifyHdl( const Link<Edit&,void>& rLink ) override { aModifyHdlLink = rLink; }
const Link<Edit&,void>& GetModifyHdl() const override { return aModifyHdlLink; }
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 4258c4b73bfb..1dbe504a2b09 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -418,7 +418,6 @@ public:
SvXMLTokenMap const& GetTextFrameAttrTokenMap();
SvXMLTokenMap const& GetTextContourAttrTokenMap();
SvXMLTokenMap const& GetTextHyperlinkAttrTokenMap();
- SvXMLTokenMap const& GetTextMasterPageElemTokenMap();
const SvXMLTokenMap& GetTextNumberedParagraphAttrTokenMap();
const SvXMLTokenMap& GetTextListBlockAttrTokenMap();
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 2b8594597de4..a8c91a2ba5b4 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -86,18 +86,6 @@ public:
void ChainImportMapper(
const rtl::Reference< SvXMLImportPropertyMapper>& rMapper );
- /** fills the given itemset with the attributes in the given list
- * the map is only searched within the range
- * [nStartIdx, nEndIdx[
- */
- void importXML(
- ::std::vector< XMLPropertyState >& rProperties,
- const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt32 nPropType,
- sal_Int32 nStartIdx, sal_Int32 nEndIdx ) const;
-
/** fills the given itemset with the attributes in the given list
* the map is only searched within the range
* [nStartIdx, nEndIdx[
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 2e0b258fd24c..e0f61cc1eec3 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -89,7 +89,6 @@ public:
SvXMLNumImpData* getData() { return pData.get(); }
- const SvXMLTokenMap& GetStylesElemTokenMap();
LanguageType GetLanguageForKey(sal_Int32 nKey);
// sal_uInt32 GetKeyForName( const OUString& rName );
@@ -170,7 +169,6 @@ public:
sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override;
virtual void CreateAndInsert(bool bOverwrite) override;
- SvXMLNumImpData* GetData() const { return pData; }
sal_Int32 GetKey();
sal_Int32 CreateAndInsert( SvNumberFormatter* pFormatter );
sal_Int32 CreateAndInsert( css::uno::Reference< css::util::XNumberFormatsSupplier > const & xFormatsSupplier );
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index baafeeac81ec..b1a7391acea2 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -49,14 +49,6 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext final
public:
-
- SvxXMLListStyleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
- const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
- bool bOutl = false );
-
SvxXMLListStyleContext(
SvXMLImport& rImport,
sal_Int32 nElement,
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 8ec4887bf364..4fdfcec0ebbe 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -176,8 +176,6 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
mutable rtl::Reference < SvXMLImportPropertyMapper > mxChartImpPropMapper;
mutable rtl::Reference < SvXMLImportPropertyMapper > mxPageImpPropMapper;
- SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap();
-
SvXMLStylesContext(SvXMLStylesContext const &) = delete;
SvXMLStylesContext& operator =(SvXMLStylesContext const &) = delete;
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 784b4f259a4c..18d425cc17bc 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -339,15 +339,6 @@ namespace svx
{
}
- ODataAccessObjectTransferable::ODataAccessObjectTransferable(
- const OUString& _rDatasource
- ,const sal_Int32 _nCommandType
- ,const OUString& _rCommand
- )
- {
- construct(_rDatasource,OUString(),_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand);
- }
-
void ODataAccessObjectTransferable::Update(
const OUString& _rDatasource,
const sal_Int32 _nCommandType,
@@ -356,16 +347,6 @@ namespace svx
construct(_rDatasource,OUString(),_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand);
}
- ODataAccessObjectTransferable::ODataAccessObjectTransferable(
- const OUString& _rDatasource
- ,const sal_Int32 _nCommandType
- ,const OUString& _rCommand
- ,const Reference< XConnection >& _rxConnection)
- {
- OSL_ENSURE(_rxConnection.is(),"Wrong ctor used.!");
- construct(_rDatasource,OUString(),_nCommandType,_rCommand,_rxConnection,(CommandType::COMMAND == _nCommandType),_rCommand);
- }
-
void ODataAccessObjectTransferable::Update(
const OUString& _rDatasource,
const sal_Int32 _nCommandType,
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index bb4be632334a..2e9572b8b84b 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -221,13 +221,6 @@ void SvtIconChoiceCtrl::SetPointFont(const vcl::Font& rFont)
}
}
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos ) const
-{
- Point aPos( rPixPos );
- aPos -= GetMapMode().GetOrigin();
- return const_cast<SvtIconChoiceCtrl*>(this)->_pImpl->GetEntry( aPos );
-}
-
WinBits SvtIconChoiceCtrl::GetStyle() const
{
return _pImpl->GetStyle();
@@ -258,11 +251,6 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_Int32 nPos ) const
return _pImpl ? _pImpl->GetEntry( nPos ) : nullptr;
}
-void SvtIconChoiceCtrl::CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics )
-{
- _pImpl->CreateAutoMnemonics( &_rUsedMnemonics );
-}
-
SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry() const
{
return _pImpl ? _pImpl->GetFirstSelectedEntry() : nullptr;
@@ -274,11 +262,6 @@ void SvtIconChoiceCtrl::ClickIcon()
_aClickIconHdl.Call( this );
}
-void SvtIconChoiceCtrl::SetChoiceWithCursor()
-{
- _pImpl->SetChoiceWithCursor();
-}
-
void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
{
bool bKeyUsed = DoKeyInput( rKEvt );
@@ -303,10 +286,6 @@ void SvtIconChoiceCtrl::SetCursor( SvxIconChoiceCtrlEntry* pEntry )
{
_pImpl->SetCursor( pEntry );
}
-void SvtIconChoiceCtrl::InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry )
-{
- _pImpl->InvalidateEntry( pEntry );
-}
void SvtIconChoiceCtrl::DataChanged( const DataChangedEvent& rDCEvt )
{
@@ -378,11 +357,6 @@ void SvtIconChoiceCtrl::RequestHelp( const HelpEvent& rHEvt )
Control::RequestHelp( rHEvt );
}
-void SvtIconChoiceCtrl::SetSelectionMode( SelectionMode eMode )
-{
- _pImpl->SetSelectionMode( eMode );
-}
-
tools::Rectangle SvtIconChoiceCtrl::GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const
{
return _pImpl->GetEntryBoundRect( pEntry );
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 6064787fcf9e..7a4bfce0f04e 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1452,15 +1452,6 @@ void VclMultiLineEdit::EnableFocusSelectionHide( bool bHide )
pImpVclMEdit->GetTextWindow()->SetAutoFocusHide( bHide );
}
-void VclMultiLineEdit::SetRightToLeft( bool bRightToLeft )
-{
- if ( GetTextEngine() )
- {
- GetTextEngine()->SetRightToLeft( bRightToLeft );
- GetTextView()->ShowCursor();
- }
-}
-
void VclMultiLineEdit::DisableSelectionOnFocus()
{
pImpVclMEdit->GetTextWindow()->DisableSelectionOnFocus();
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index ae09ea750100..bb7baa0dced1 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -2315,11 +2315,6 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic )
}
}
-void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry )
-{
- pImpl->SetCursor(pEntry, /*bForceNoSelect*/false);
-}
-
void SvTreeListBox::SetCurEntry( SvTreeListEntry* pEntry )
{
pImpl->SetCurEntry( pEntry );
@@ -3409,11 +3404,6 @@ void SvTreeListBox::InitSettings()
pCheckButtonData->SetDefaultImages(this);
}
-VclPtr<PopupMenu> SvTreeListBox::CreateContextMenu()
-{
- return nullptr;
-}
-
css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
{
vcl::Window* pParent = GetAccessibleParentWindow();
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 1a191743fc9a..fcd4871fcf85 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -430,120 +430,6 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
}
}
-const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
-{
- if(!mpBodyElemTokenMap)
- {
- static const SvXMLTokenMapEntry aBodyElemTokenMap[] =
- {
- { XML_NAMESPACE_DRAW, XML_PAGE, XML_TOK_BODY_PAGE },
- { XML_NAMESPACE_PRESENTATION, XML_SETTINGS, XML_TOK_BODY_SETTINGS },
- { XML_NAMESPACE_PRESENTATION, XML_HEADER_DECL, XML_TOK_BODY_HEADER_DECL },
- { XML_NAMESPACE_PRESENTATION, XML_FOOTER_DECL, XML_TOK_BODY_FOOTER_DECL },
- { XML_NAMESPACE_PRESENTATION, XML_DATE_TIME_DECL,XML_TOK_BODY_DATE_TIME_DECL },
-
- XML_TOKEN_MAP_END
- };
-
- mpBodyElemTokenMap = std::make_unique<SvXMLTokenMap>(aBodyElemTokenMap);
- }
-
- return *mpBodyElemTokenMap;
-}
-
-const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
-{
- if(!mpStylesElemTokenMap)
- {
- static const SvXMLTokenMapEntry aStylesElemTokenMap[] =
- {
- { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLES_PAGE_MASTER },
- { XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT },
- { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLES_STYLE },
- XML_TOKEN_MAP_END
- };
-
- mpStylesElemTokenMap = std::make_unique<SvXMLTokenMap>(aStylesElemTokenMap);
- }
-
- return *mpStylesElemTokenMap;
-}
-
-const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
-{
- if(!mpMasterPageElemTokenMap)
- {
- static const SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
- {
- { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_MASTERPAGE_STYLE },
- { XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_MASTERPAGE_NOTES },
- XML_TOKEN_MAP_END
- };
-
- mpMasterPageElemTokenMap = std::make_unique<SvXMLTokenMap>(aMasterPageElemTokenMap);
- }
-
- return *mpMasterPageElemTokenMap;
-}
-
-const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
-{
- if(!mpPageMasterAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
- {
- { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_PAGEMASTER_NAME },
- XML_TOKEN_MAP_END
- };
-
- mpPageMasterAttrTokenMap = std::make_unique<SvXMLTokenMap>(aPageMasterAttrTokenMap);
- }
-
- return *mpPageMasterAttrTokenMap;
-}
-
-const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
-{
- if(!mpPageMasterStyleAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
- {
- { XML_NAMESPACE_FO, XML_MARGIN_TOP, XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP },
- { XML_NAMESPACE_FO, XML_MARGIN_BOTTOM, XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM },
- { XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TOK_PAGEMASTERSTYLE_MARGIN_LEFT },
- { XML_NAMESPACE_FO, XML_MARGIN_RIGHT, XML_TOK_PAGEMASTERSTYLE_MARGIN_RIGHT },
- { XML_NAMESPACE_FO, XML_PAGE_WIDTH, XML_TOK_PAGEMASTERSTYLE_PAGE_WIDTH },
- { XML_NAMESPACE_FO, XML_PAGE_HEIGHT, XML_TOK_PAGEMASTERSTYLE_PAGE_HEIGHT },
- { XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_TOK_PAGEMASTERSTYLE_PAGE_ORIENTATION },
- XML_TOKEN_MAP_END
- };
-
- mpPageMasterStyleAttrTokenMap = std::make_unique<SvXMLTokenMap>(aPageMasterStyleAttrTokenMap);
- }
-
- return *mpPageMasterStyleAttrTokenMap;
-}
-
-const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
-{
- if(!mpPresentationPlaceholderAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
- {
- { XML_NAMESPACE_PRESENTATION, XML_OBJECT, XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME },
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_PRESENTATIONPLACEHOLDER_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PRESENTATIONPLACEHOLDER_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PRESENTATIONPLACEHOLDER_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PRESENTATIONPLACEHOLDER_HEIGHT },
- XML_TOKEN_MAP_END
- };
-
- mpPresentationPlaceholderAttrTokenMap = std::make_unique<SvXMLTokenMap>(aPresentationPlaceholderAttrTokenMap);
- }
-
- return *mpPresentationPlaceholderAttrTokenMap;
-}
-
SvXMLImportContext *SdXMLImport::CreateFastContext( sal_Int32 nElement,
const uno::Reference< xml::sax::XFastAttributeList >& xAttrList )
{
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 8d4f3e7407fd..d314caa0c576 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -158,15 +158,6 @@ public:
SvXMLImportContext* CreateMasterStylesContext();
SvXMLImportContext *CreateFontDeclsContext();
- // Styles and AutoStyles contexts
-
- const SvXMLTokenMap& GetBodyElemTokenMap();
- const SvXMLTokenMap& GetStylesElemTokenMap();
- const SvXMLTokenMap& GetMasterPageElemTokenMap();
- const SvXMLTokenMap& GetPageMasterAttrTokenMap();
- const SvXMLTokenMap& GetPageMasterStyleAttrTokenMap();
- const SvXMLTokenMap& GetPresentationPlaceholderAttrTokenMap();
-
// export local parameters concerning page access and similar
const css::uno::Reference< css::container::XNameAccess >& GetLocalDocStyleFamilies() const { return mxDocStyleFamilies; }
const css::uno::Reference< css::container::XIndexAccess >& GetLocalMasterPages() const { return mxDocMasterPages; }
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index a3600aa09890..adc23848b542 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -103,221 +103,6 @@ void SvXMLImportPropertyMapper::ChainImportMapper(
}
}
-/** fills the given itemset with the attributes in the given list */
-void SvXMLImportPropertyMapper::importXML(
- vector< XMLPropertyState >& rProperties,
- const Reference< XAttributeList >& xAttrList,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt32 nPropType,
- sal_Int32 nStartIdx,
- sal_Int32 nEndIdx ) const
-{
- sal_Int16 nAttr = xAttrList->getLength();
-
- Reference< XNameContainer > xAttrContainer;
-
- if( -1 == nStartIdx )
- nStartIdx = 0;
- if( -1 == nEndIdx )
- nEndIdx = maPropMapper->GetEntryCount();
- for( sal_Int16 i=0; i < nAttr; i++ )
- {
- const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName, aPrefix, aNamespace;
- sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix,
- &aLocalName, &aNamespace );
-
- if( XML_NAMESPACE_XMLNS == nPrefix )
- continue;
-
- const OUString& rValue = xAttrList->getValueByIndex( i );
-
- // index of actual property map entry
- // This looks very strange, but it works well:
- // If the start index is 0, the new value will become -1, and
- // GetEntryIndex will start searching with position 0.
- // Otherwise GetEntryIndex will start with the next position specified.
- sal_Int32 nIndex = nStartIdx - 1;
- sal_uInt32 nFlags = 0; // flags of actual property map entry
- bool bFound = false;
-
- // for better error reporting: this should be set true if no
- // warning is needed
- bool bNoWarning = false;
- bool bAlienImport = false;
-
- do
- {
- // find an entry for this attribute
- nIndex = maPropMapper->GetEntryIndex( nPrefix, aLocalName,
- nPropType, nIndex );
-
- if( nIndex > -1 && nIndex < nEndIdx )
- {
- // create a XMLPropertyState with an empty value
-
- nFlags = maPropMapper->GetEntryFlags( nIndex );
- if( (( nFlags & MID_FLAG_NO_PROPERTY ) == MID_FLAG_NO_PROPERTY) && (maPropMapper->GetEntryContextId( nIndex ) == CTF_ALIEN_ATTRIBUTE_IMPORT) )
- {
- bAlienImport = true;
- nIndex = -1;
- }
- else
- {
- if( ( nFlags & MID_FLAG_ELEMENT_ITEM_IMPORT ) == 0 )
- {
- XMLPropertyState aNewProperty( nIndex );
- sal_Int32 nReference = -1;
-
- // if this is a multi attribute check if another attribute already set
- // this any. If so use this as an initial value
- if( ( nFlags & MID_FLAG_MERGE_PROPERTY ) != 0 )
- {
- const OUString aAPIName( maPropMapper->GetEntryAPIName( nIndex ) );
- const sal_Int32 nSize = rProperties.size();
- for( nReference = 0; nReference < nSize; nReference++ )
- {
- sal_Int32 nRefIdx = rProperties[nReference].mnIndex;
- if( (nRefIdx != -1) && (nIndex != nRefIdx) &&
- (maPropMapper->GetEntryAPIName( nRefIdx ) == aAPIName ))
- {
- aNewProperty = rProperties[nReference];
- aNewProperty.mnIndex = nIndex;
- break;
- }
- }
-
- if( nReference == nSize )
- nReference = -1;
- }
-
- bool bSet = false;
- if( ( nFlags & MID_FLAG_SPECIAL_ITEM_IMPORT ) == 0 )
- {
- // let the XMLPropertySetMapper decide how to import the value
- bSet = maPropMapper->importXML( rValue, aNewProperty,
- rUnitConverter );
- }
- else
- {
- sal_uInt32 nOldSize = rProperties.size();
-
- bSet = handleSpecialItem( aNewProperty, rProperties,
- rValue, rUnitConverter,
- rNamespaceMap );
-
- // no warning if handleSpecialItem added properties
- bNoWarning |= ( nOldSize != rProperties.size() );
- }
-
- // no warning if we found could set the item. This
- // 'remembers' bSet across multi properties.
- bNoWarning |= bSet;
-
- // store the property in the given vector
- if( bSet )
- {
- if( nReference == -1 )
- rProperties.push_back( aNewProperty );
- else
- rProperties[nReference] = aNewProperty;
- }
- else
- {
- // warn about unknown value. Unless it's a
- // multi property: Then we get another chance
- // to set the value.
- if( !bNoWarning &&
- ((nFlags & MID_FLAG_MULTI_PROPERTY) == 0) )
- {
- Sequence<OUString> aSeq(2);
- aSeq[0] = rAttrName;
- aSeq[1] = rValue;
- rImport.SetError( XMLERROR_FLAG_WARNING |
- XMLERROR_STYLE_ATTR_VALUE,
- aSeq );
- }
- }
- }
- bFound = true;
- continue;
- }
- }
-
- if( !bFound )
- {
- SAL_INFO_IF((XML_NAMESPACE_NONE != nPrefix) &&
- !(XML_NAMESPACE_UNKNOWN_FLAG & nPrefix) &&
- !bAlienImport, "xmloff.style",
- "unknown attribute: \"" << rAttrName << "\"");
- if( (XML_NAMESPACE_UNKNOWN_FLAG & nPrefix) || (XML_NAMESPACE_NONE == nPrefix) || bAlienImport )
- {
- if( !xAttrContainer.is() )
- {
- // add an unknown attribute container to the properties
- Reference< XNameContainer > xNew( SvUnoAttributeContainer_CreateInstance(), UNO_QUERY );
- xAttrContainer = xNew;
-
- // find map entry and create new property state
- if( -1 == nIndex )
- {
- switch( nPropType )
- {
- case XML_TYPE_PROP_CHART:
- nIndex = maPropMapper->FindEntryIndex( "ChartUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- break;
- case XML_TYPE_PROP_PARAGRAPH:
- nIndex = maPropMapper->FindEntryIndex( "ParaUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- break;
- case XML_TYPE_PROP_TEXT:
- nIndex = maPropMapper->FindEntryIndex( "TextUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- break;
- default:
- break;
- }
- // other property type or property not found
- if( -1 == nIndex )
- nIndex = maPropMapper->FindEntryIndex( "UserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- }
-
- // #106963#; use userdefined attribute only if it is in the specified property range
- if( nIndex != -1 && nIndex >= nStartIdx && nIndex < nEndIdx)
- {
- XMLPropertyState aNewProperty( nIndex, Any(xAttrContainer) );
-
- // push it on our stack so we export it later
- rProperties.push_back( aNewProperty );
- }
- }
-
- if( xAttrContainer.is() )
- {
- AttributeData aData;
- aData.Type = GetXMLToken( XML_CDATA );
- aData.Value = rValue;
-
- OUStringBuffer sName;
- if( XML_NAMESPACE_NONE != nPrefix )
- {
- sName.append( aPrefix );
- sName.append( ':' );
- aData.Namespace = aNamespace;
- }
-
- sName.append( aLocalName );
-
- xAttrContainer->insertByName( sName.makeStringAndClear(), Any(aData) );
- }
- }
- }
- }
- while( ( nIndex >= 0 && nIndex + 1 < nEndIdx ) && (( nFlags & MID_FLAG_MULTI_PROPERTY ) != 0 ) );
- }
-
- finished( rProperties, nStartIdx, nEndIdx );
-}
-
/** fills the given itemset with the attributes in the given list */
void SvXMLImportPropertyMapper::importXML(
vector< XMLPropertyState >& rProperties,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 81bd3c001f4b..2c32e4745ab1 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -77,7 +77,6 @@ public:
const uno::Reference<uno::XComponentContext>& rxContext );
SvNumberFormatter* GetNumberFormatter() const { return pFormatter; }
- const SvXMLTokenMap& GetStylesElemTokenMap();
const LocaleDataWrapper& GetLocaleData( LanguageType nLang );
sal_uInt32 GetKeyForName( const OUString& rName );
void AddKey( sal_uInt32 nKey, const OUString& rName, bool bRemoveAfterUse );
@@ -372,28 +371,6 @@ void SvXMLNumImpData::RemoveVolatileFormats()
}
}
-const SvXMLTokenMap& SvXMLNumImpData::GetStylesElemTokenMap()
-{
- if( !pStylesElemTokenMap )
- {
- static const SvXMLTokenMapEntry aStylesElemMap[] =
- {
- // style elements
- { XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::NUMBER_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_CURRENCY_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::CURRENCY_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_PERCENTAGE_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::PERCENTAGE_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_DATE_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::DATE_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_TIME_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::TIME_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_BOOLEAN_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::BOOLEAN_STYLE) },
- { XML_NAMESPACE_NUMBER, XML_TEXT_STYLE, static_cast<sal_uInt16>(SvXMLStylesTokens::TEXT_STYLE) },
- XML_TOKEN_MAP_END
- };
-
- pStylesElemTokenMap = std::make_unique<SvXMLTokenMap>( aStylesElemMap );
- }
- return *pStylesElemTokenMap;
-}
-
const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang )
{
if ( !pLocaleData )
@@ -2172,11 +2149,6 @@ SvXMLStyleContext* SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
pData.get(), nStyleToken, xAttrList, rStyles );
}
-const SvXMLTokenMap& SvXMLNumFmtHelper::GetStylesElemTokenMap()
-{
- return pData->GetStylesElemTokenMap();
-}
-
LanguageType SvXMLNumFmtHelper::GetLanguageForKey(sal_Int32 nKey)
{
if (pData->GetNumberFormatter())
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index eb500be374a5..e0d09cebd366 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1017,17 +1017,6 @@ const OUStringLiteral sIsPhysical( u"IsPhysical" );
const OUStringLiteral sNumberingRules( u"NumberingRules" );
const OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering" );
-SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
- const Reference< xml::sax::XAttributeList > & xAttrList,
- bool bOutl )
-: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XmlStyleFamily::TEXT_OUTLINE : XmlStyleFamily::TEXT_LIST )
-, bConsecutive( false )
-, bOutline( bOutl )
-{
-}
-
SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 458dda8030e8..b93f50d74d8f 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -82,15 +82,6 @@ const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
const OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" );
const OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" );
-const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap()
-{
- if( !mpStyleStylesElemTokenMap )
- mpStyleStylesElemTokenMap.reset(
- new SvXMLTokenMap( aStyleStylesElemTokenMap ) );
-
- return *mpStyleStylesElemTokenMap;
-}
-
void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
const OUString& rValue )
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index a1380ac7f57b..06c997fe980a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -819,16 +819,6 @@ const SvXMLTokenMap& XMLTextImportHelper::GetTextHyperlinkAttrTokenMap()
return *m_xImpl->m_xTextHyperlinkAttrTokenMap;
}
-const SvXMLTokenMap& XMLTextImportHelper::GetTextMasterPageElemTokenMap()
-{
- if (!m_xImpl->m_xTextMasterPageElemTokenMap)
- {
- m_xImpl->m_xTextMasterPageElemTokenMap.reset(
- new SvXMLTokenMap( aTextMasterPageElemTokenMap ));
- }
- return *m_xImpl->m_xTextMasterPageElemTokenMap;
-}
-
const SvXMLTokenMap& XMLTextImportHelper::GetTextFieldAttrTokenMap()
{
if (!m_xImpl->m_xTextFieldAttrTokenMap)
More information about the Libreoffice-commits
mailing list