compilerplugins/clang/unusedmethods.results | 156 +++++++++++------ dbaccess/source/filter/xml/xmlColumn.cxx | 1 dbaccess/source/filter/xml/xmlComponent.cxx | 1 dbaccess/source/filter/xml/xmlEnums.hxx | 10 - dbaccess/source/filter/xml/xmlfilter.cxx | 22 -- dbaccess/source/filter/xml/xmlfilter.hxx | 4 include/svtools/valueset.hxx | 3 include/svx/colrctrl.hxx | 2 include/svx/galmisc.hxx | 1 include/svx/sidebar/LinePropertyPanelBase.hxx | 2 include/xmloff/XMLTextMasterStylesContext.hxx | 3 reportdesign/source/filter/xml/xmlfilter.cxx | 192 ---------------------- reportdesign/source/filter/xml/xmlfilter.hxx | 19 -- sc/source/filter/xml/xmlimprt.cxx | 25 -- sc/source/filter/xml/xmlimprt.hxx | 2 sd/source/ui/sidebar/LayoutMenu.hxx | 1 svtools/source/control/valueset.cxx | 43 ---- svx/inc/GalleryControl.hxx | 2 svx/source/gallery2/galbrws1.cxx | 5 svx/source/gallery2/galbrws1.hxx | 3 xmloff/source/draw/sdxmlimp.cxx | 23 -- xmloff/source/draw/sdxmlimp_impl.hxx | 2 xmloff/source/text/XMLTextMasterStylesContext.cxx | 8 23 files changed, 100 insertions(+), 430 deletions(-)
New commits: commit 470bcd37f6dead1346ab39be140045ca17516205 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jan 23 09:59:08 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Jan 23 15:33:20 2020 +0100 loplugin:unusedmethods Change-Id: Ic2212a502bbd42217934884f4fce49f6f8d4765c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87236 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index c3514bb17f83..c14adfd4b5ff 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1,18 +1,18 @@ -basctl/source/inc/bastype2.hxx:330 +basctl/source/inc/bastype2.hxx:328 void basctl::SbTreeListBox::make_unsorted() -basctl/source/inc/bastype2.hxx:331 +basctl/source/inc/bastype2.hxx:329 _Bool basctl::SbTreeListBox::get_sort_order() const -basctl/source/inc/bastype2.hxx:332 +basctl/source/inc/bastype2.hxx:330 void basctl::SbTreeListBox::set_sort_order(_Bool) -basctl/source/inc/bastype2.hxx:334 +basctl/source/inc/bastype2.hxx:332 void basctl::SbTreeListBox::set_sort_indicator(enum TriState,int) -basctl/source/inc/bastype2.hxx:338 +basctl/source/inc/bastype2.hxx:336 enum TriState basctl::SbTreeListBox::get_sort_indicator(int) -basctl/source/inc/bastype2.hxx:343 +basctl/source/inc/bastype2.hxx:341 int basctl::SbTreeListBox::get_sort_column() const -basctl/source/inc/bastype2.hxx:344 +basctl/source/inc/bastype2.hxx:342 void basctl::SbTreeListBox::set_sort_column(int) -basctl/source/inc/bastype2.hxx:346 +basctl/source/inc/bastype2.hxx:344 void basctl::SbTreeListBox::set_sort_func(const class std::function<int (const class weld::TreeIter &, const class weld::TreeIter &)> &) basegfx/source/range/b2drangeclipper.cxx:687 type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &) @@ -100,6 +100,8 @@ dbaccess/source/filter/hsqldb/fbalterparser.hxx:20 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const dbaccess/source/filter/hsqldb/parseschema.hxx:82 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/filter/xml/xmlfilter.hxx:119 + const class SvXMLTokenMap & dbaxml::ODBFilter::GetDocContentElemTokenMap() const dbaccess/source/ui/inc/dsmeta.hxx:88 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:89 @@ -622,6 +624,10 @@ include/svtools/toolbarmenu.hxx:194 class weld::Container * ToolbarPopupContainer::getContainer() include/svtools/toolbarmenu.hxx:211 class weld::Container * InterimToolbarPopup::getContainer() +include/svtools/valueset.hxx:274 + void ValueSet::StartDrag(const class CommandEvent &,class vcl::Region &) +include/svtools/valueset.hxx:371 + void ValueSet::StartSelection() include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) include/svx/ClassificationDialog.hxx:77 @@ -642,6 +648,8 @@ include/svx/dlgctrl.hxx:280 void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:194 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) +include/svx/galmisc.hxx:152 + unsigned int GalleryTransferable::GetObject() const include/svx/itemwin.hxx:113 void SvxFillAttrBox::Fill(const class rtl::Reference<class XPatternList> &) include/svx/langbox.hxx:93 @@ -656,6 +664,18 @@ include/svx/relfld.hxx:68 void RelativeField::set_size_request(int,int) include/svx/relfld.hxx:69 class Size RelativeField::get_preferred_size() const +include/svx/sidebar/LinePropertyPanelBase.hxx:74 + void svx::sidebar::LinePropertyPanelBase::setLineEndStyle(const class XLineEndItem *) +include/svx/sidebar/LinePropertyPanelBase.hxx:75 + void svx::sidebar::LinePropertyPanelBase::setLineStartStyle(const class XLineStartItem *) +include/svx/sidebar/LinePropertyPanelBase.hxx:142 + void svx::sidebar::LinePropertyPanelBase::ChangeStartHdl(class weld::ComboBox &) +include/svx/sidebar/LinePropertyPanelBase.hxx:142 + void svx::sidebar::LinePropertyPanelBase::LinkStubChangeStartHdl(void *,class weld::ComboBox &) +include/svx/sidebar/LinePropertyPanelBase.hxx:143 + void svx::sidebar::LinePropertyPanelBase::ChangeEndHdl(class weld::ComboBox &) +include/svx/sidebar/LinePropertyPanelBase.hxx:143 + void svx::sidebar::LinePropertyPanelBase::LinkStubChangeEndHdl(void *,class weld::ComboBox &) include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:455 @@ -776,11 +796,11 @@ include/vcl/commandevent.hxx:293 CommandLongPressData::CommandLongPressData() include/vcl/cursor.hxx:96 _Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const -include/vcl/customweld.hxx:41 +include/vcl/customweld.hxx:42 class rtl::OUString weld::CustomWidgetController::GetHelpText() const -include/vcl/customweld.hxx:115 +include/vcl/customweld.hxx:124 void weld::CustomWeld::queue_draw_area(int,int,int,int) -include/vcl/customweld.hxx:130 +include/vcl/customweld.hxx:139 void weld::CustomWeld::set_visible(_Bool) include/vcl/errcode.hxx:86 _Bool ErrCode::operator<(const class ErrCode &) const @@ -840,6 +860,8 @@ include/vcl/settings.hxx:637 _Bool HelpSettings::operator!=(const class HelpSettings &) const include/vcl/settings.hxx:693 _Bool AllSettings::operator!=(const class AllSettings &) const +include/vcl/split.hxx:92 + void Splitter::SetHorizontal(_Bool) include/vcl/svapp.hxx:169 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) include/vcl/svapp.hxx:800 @@ -858,8 +880,6 @@ include/vcl/TaskStopwatch.hxx:118 void TaskStopwatch::setTimeSlice(unsigned int) include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/toolbox.hxx:378 - void ToolBox::StartSelection() include/vcl/treelistbox.hxx:359 void SvTreeListBox::RemoveSelection() include/vcl/treelistbox.hxx:376 @@ -914,67 +934,65 @@ include/vcl/weld.hxx:977 void weld::TreeView::select_all() include/vcl/weld.hxx:1022 const class rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1068 +include/vcl/weld.hxx:1069 class rtl::OUString weld::IconView::get_selected_id() const -include/vcl/weld.hxx:1083 +include/vcl/weld.hxx:1084 _Bool weld::IconView::get_cursor(class weld::TreeIter *) const -include/vcl/weld.hxx:1093 +include/vcl/weld.hxx:1094 void weld::IconView::select_all() -include/vcl/weld.hxx:1099 - void weld::IconView::save_value() include/vcl/weld.hxx:1100 - const class rtl::OUString & weld::IconView::get_saved_value() const + void weld::IconView::save_value() include/vcl/weld.hxx:1101 + const class rtl::OUString & weld::IconView::get_saved_value() const +include/vcl/weld.hxx:1102 _Bool weld::IconView::get_value_changed_from_saved() const -include/vcl/weld.hxx:1198 +include/vcl/weld.hxx:1199 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1210 +include/vcl/weld.hxx:1211 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1215 +include/vcl/weld.hxx:1216 void weld::MenuButton::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1279 +include/vcl/weld.hxx:1280 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1296 +include/vcl/weld.hxx:1297 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:1312 +include/vcl/weld.hxx:1313 int weld::Entry::get_position() const -include/vcl/weld.hxx:1421 +include/vcl/weld.hxx:1422 void weld::FormattedSpinButton::set_max(double) -include/vcl/weld.hxx:1476 +include/vcl/weld.hxx:1477 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1712 +include/vcl/weld.hxx:1713 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1723 +include/vcl/weld.hxx:1724 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1769 +include/vcl/weld.hxx:1770 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:1771 - _Bool weld::TimeSpinButton::get_visible() const include/vcl/weld.hxx:1772 - void weld::TimeSpinButton::grab_focus() + _Bool weld::TimeSpinButton::get_visible() const include/vcl/weld.hxx:1773 + void weld::TimeSpinButton::grab_focus() +include/vcl/weld.hxx:1774 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1776 - void weld::TimeSpinButton::save_value() include/vcl/weld.hxx:1777 + void weld::TimeSpinButton::save_value() +include/vcl/weld.hxx:1778 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1845 +include/vcl/weld.hxx:1846 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:1939 +include/vcl/weld.hxx:1947 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1953 - int weld::Menu::n_children() const -include/vcl/weld.hxx:1976 +include/vcl/weld.hxx:1984 void weld::Toolbar::set_item_visible(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1977 +include/vcl/weld.hxx:1985 _Bool weld::Toolbar::get_item_visible(const class rtl::OString &) const -include/vcl/weld.hxx:1979 +include/vcl/weld.hxx:1987 class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const -include/vcl/weld.hxx:1983 +include/vcl/weld.hxx:1991 void weld::Toolbar::set_item_image(const class rtl::OString &,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &) -include/vcl/weld.hxx:1989 +include/vcl/weld.hxx:1997 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:2039 +include/vcl/weld.hxx:2047 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/window.hxx:410 const char * ImplDbgCheckWindow(const void *) @@ -984,6 +1002,8 @@ include/xmloff/txtimp.hxx:386 class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP() include/xmloff/txtimp.hxx:566 class rtl::OUString XMLTextImportHelper::FindActiveBookmarkName() +include/xmloff/XMLTextMasterStylesContext.hxx:43 + XMLTextMasterStylesContext::XMLTextMasterStylesContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &) libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:73 void ::operator()(struct _GtkBuilder *) const libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:32 @@ -1022,6 +1042,26 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:257 const class std::__debug::vector<class std::shared_ptr<class oox::drawingml::Shape>, class std::allocator<class std::shared_ptr<class oox::drawingml::Shape> > > & oox::drawingml::LayoutNode::getNodeShapes() const oox/source/drawingml/diagram/diagramlayoutatoms.hxx:265 const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const +reportdesign/source/filter/xml/xmlfilter.hxx:132 + const class SvXMLTokenMap & rptxml::ORptFilter::GetGroupElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:133 + const class SvXMLTokenMap & rptxml::ORptFilter::GetSectionElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:134 + const class SvXMLTokenMap & rptxml::ORptFilter::GetComponentElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:135 + const class SvXMLTokenMap & rptxml::ORptFilter::GetReportElementElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:136 + const class SvXMLTokenMap & rptxml::ORptFilter::GetControlElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:137 + const class SvXMLTokenMap & rptxml::ORptFilter::GetControlPropertyElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:138 + const class SvXMLTokenMap & rptxml::ORptFilter::GetFunctionElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:139 + const class SvXMLTokenMap & rptxml::ORptFilter::GetFormatElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:140 + const class SvXMLTokenMap & rptxml::ORptFilter::GetSubDocumentElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:141 + const class SvXMLTokenMap & rptxml::ORptFilter::GetColumnTokenMap() const sal/osl/unx/uunxapi.hxx:35 int mkdir_c(const class rtl::OString &,unsigned int) sal/osl/unx/uunxapi.hxx:70 @@ -1072,12 +1112,12 @@ sc/inc/mtvelements.hxx:79 void mdds_mtv_get_empty_value(class ScFormulaCell *&) sc/inc/mtvelements.hxx:79 void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class ScFormulaCell *&) +sc/inc/mtvelements.hxx:80 + void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&) sc/inc/mtvelements.hxx:80 void mdds_mtv_get_empty_value(class EditTextObject *&) sc/inc/mtvelements.hxx:80 struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:80 - void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&) sc/inc/mtvelements.hxx:80 void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:84 @@ -1114,8 +1154,6 @@ sc/inc/userlist.hxx:88 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > >, struct std::random_access_iterator_tag> ScUserList::begin() const sc/qa/unit/helper/qahelper.hxx:155 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > print(const class ScAddress &) -sc/qa/unit/screenshots/screenshots.cxx:326 - int main() sc/qa/unit/ucalc.hxx:143 void Test::testFormulaHashAndTag() sc/qa/unit/ucalc.hxx:181 @@ -1178,6 +1216,8 @@ sc/source/filter/inc/xiescher.hxx:154 class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const sc/source/filter/inc/xlformula.hxx:409 _Bool XclTokenArray::operator==(const class XclTokenArray &) const +sc/source/filter/xml/xmlimprt.hxx:340 + const class SvXMLTokenMap & ScXMLImport::GetDocElemTokenMap() sc/source/filter/xml/xmltransformationi.hxx:160 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) sc/source/ui/inc/condformatdlg.hxx:51 @@ -1352,8 +1392,14 @@ svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) +svx/inc/GalleryControl.hxx:46 + void svx::sidebar::GalleryControl::InitSettings() svx/inc/sdr/contact/viewcontactofgraphic.hxx:54 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() +svx/source/gallery2/galbrws1.hxx:89 + void GalleryBrowser1::ShowContextMenu(const class CommandEvent &) +svx/source/gallery2/galbrws1.hxx:90 + _Bool GalleryBrowser1::KeyInput(const class KeyEvent &,class vcl::Window *) svx/source/svdraw/svdpdf.hxx:89 double ImpSdrPdfImport::Matrix::b() const svx/source/svdraw/svdpdf.hxx:91 @@ -1516,6 +1562,8 @@ sw/inc/viscrs.hxx:206 class SwShellTableCursor * SwShellTableCursor::GetPrev() sw/inc/viscrs.hxx:207 const class SwShellTableCursor * SwShellTableCursor::GetPrev() const +sw/qa/extras/uiwriter/uiwriter.cxx:7101 + int main() sw/qa/inc/swmodeltestbase.hxx:623 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 @@ -1558,10 +1606,6 @@ sw/source/uibase/inc/numfmtlb.hxx:140 void SwNumFormatTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) sw/source/uibase/inc/swcont.hxx:85 _Bool SwContent::operator==(const class SwContent &) const -sw/source/uibase/inc/workctrl.hxx:93 - void SwScrollNaviPopup::GrabFocus() -sw/source/uibase/sidebar/PageMarginControl.hxx:100 - void sw::sidebar::PageMarginControl::StoreUserCustomValues() test/source/sheet/xsubtotalfield.cxx:28 _Bool CppUnit::assertion_traits::equal(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &) test/source/sheet/xsubtotalfield.cxx:34 @@ -1598,8 +1642,6 @@ vcl/inc/fontselect.hxx:48 _Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const vcl/inc/impgraph.hxx:59 _Bool GraphicID::operator==(const class GraphicID &) const -vcl/inc/listbox.hxx:116 - int ImplEntryList::FindEntry(const void *) const vcl/inc/opengl/BufferObject.hxx:50 void vcl::BufferObject::unbind() vcl/inc/opengl/gdiimpl.hxx:108 @@ -1698,7 +1740,7 @@ vcl/inc/unx/salframe.h:184 enum SalFrameStyleFlags X11SalFrame::GetStyle() const vcl/qa/cppunit/lifecycle.cxx:234 (anonymous namespace)::LeakTestClass::LeakTestClass(_Bool &,type-parameter-?-? &&...) -vcl/skia/salbmp.cxx:422 +vcl/skia/salbmp.cxx:424 void ::operator()(void *,void *) const vcl/source/app/scheduler.cxx:83 basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &) @@ -1730,6 +1772,8 @@ writerfilter/source/ooxml/OOXMLPropertySet.hxx:177 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:180 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:212 + const class SvXMLTokenMap & SdXMLImport::GetDocElemTokenMap() xmlsecurity/source/gpg/XMLEncryption.hxx:25 XMLEncryptionGpg::XMLEncryptionGpg() xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:45 diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 91dc85582883..50e56df9ef41 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -23,7 +23,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlEnums.hxx" #include <stringconstants.hxx> #include <strings.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index dde08cd1fe23..c842d0c3ccd8 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -22,7 +22,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlEnums.hxx" #include <stringconstants.hxx> #include <strings.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 0a52cd22f8bd..0f4be1aaa9dc 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -21,16 +21,6 @@ #define PROGRESS_BAR_STEP 20 -namespace dbaxml -{ - enum XMLDocContentTokens - { - XML_TOK_CONTENT_AUTOSTYLES, - XML_TOK_CONTENT_STYLES, - XML_TOK_CONTENT_SCRIPTS, - XML_TOK_CONTENT_BODY, - }; -} // namespace dbaxml #endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLENUMS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 97dd78c21c01..eb0e3d505202 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -588,28 +588,6 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap) } -const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() const -{ - if (!m_pDocContentElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_CONTENT_STYLES }, - { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_CONTENT_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_CONTENT_AUTOSTYLES }, - { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_CONTENT_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_CONTENT_SCRIPTS }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_CONTENT_BODY }, - { XML_NAMESPACE_OOO, XML_BODY, XML_TOK_CONTENT_BODY }, - XML_TOKEN_MAP_END - }; - m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pDocContentElemTokenMap; -} - - - SvXMLImportContext* ODBFilter::CreateStylesContext( bool bIsAutoStyle ) { SvXMLImportContext *pContext = new OTableStylesContext(*this, bIsAutoStyle); diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 16e4b2c557cf..7025c49b655c 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -63,8 +63,6 @@ private: TPropertyNameMap m_aTablesSettings; std::vector< css::beans::PropertyValue> m_aInfoSequence; - mutable std::unique_ptr<SvXMLTokenMap> m_pDocContentElemTokenMap; - mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; @@ -116,8 +114,6 @@ public: const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;} - const SvXMLTokenMap& GetDocContentElemTokenMap() const; - rtl::Reference < XMLPropertySetMapper > const & GetTableStylesPropertySetMapper() const; rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const; rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index bc62b131c2ef..0f40dc3a04da 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -271,8 +271,6 @@ private: SVT_DLLPRIVATE void Format(vcl::RenderContext& rRenderContext); protected: - void StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; public: @@ -367,7 +365,6 @@ public: void SetFormat(); - void StartSelection(); void EndSelection(); Size CalcWindowSizePixel(const Size& rItemSize, diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index d99e6c0ea0f8..de0fe888dd28 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -47,8 +47,6 @@ class SAL_WARN_UNUSED SvxColorValueSet_docking final : public SvxColorValueSet, bool mbLeftButton; Point aDragPosPixel; - using SvxColorValueSet::StartDrag; - void DoDrag(); // ValueSet diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 2ac010e0ed06..9fdd02ba3e5a 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -149,7 +149,6 @@ public: virtual ~GalleryTransferable() override; void SelectObject(sal_uInt32 nObjectPos); - sal_uInt32 GetObject() const { return mnObjectPos; } // TransferableHelper virtual void AddSupportedFormats() override; diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index f8e534ddf1a4..c4515a4560d8 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -137,8 +137,6 @@ private: DECL_LINK(ChangeLineStyleHdl, weld::ComboBox&, void); DECL_LINK(ToolboxWidthSelectHdl, const OString&, void); DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void ); - DECL_LINK(ChangeStartHdl, weld::ComboBox&, void); - DECL_LINK(ChangeEndHdl, weld::ComboBox&, void); DECL_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void); DECL_LINK(ChangeCapStyleHdl, weld::ComboBox&, void); }; diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 99f595a98c37..7264ba2a58ff 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -40,9 +40,6 @@ protected: public: - XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList); XMLTextMasterStylesContext( SvXMLImport& rImport ); virtual ~XMLTextMasterStylesContext() override; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 3897a5200b5f..f7160a765014 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -789,198 +789,6 @@ const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const return *m_pReportElemTokenMap; } -const SvXMLTokenMap& ORptFilter::GetSubDocumentElemTokenMap() const -{ - if (!m_pSubDocumentElemTokenMap) - m_pSubDocumentElemTokenMap = OXMLHelper::GetSubDocumentElemTokenMap(); - return *m_pSubDocumentElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const -{ - if (!m_pFunctionElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, - { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, - { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, - { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, - { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, - XML_TOKEN_MAP_END - }; - m_pFunctionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pFunctionElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const -{ - if (!m_pFormatElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, - { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, - { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, - XML_TOKEN_MAP_END - }; - m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pFormatElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const -{ - if (!m_pGroupElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION , XML_TOK_SORT_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, - { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, - { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, - XML_TOKEN_MAP_END - }; - m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pGroupElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const -{ - if (!m_pElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, - { XML_NAMESPACE_REPORT, XML_PRINT_WHEN_GROUP_CHANGE ,XML_TOK_PRINT_WHEN_GROUP_CHANGE }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, - { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, - XML_TOKEN_MAP_END - }; - m_pElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const -{ - if (!m_pControlElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, - { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, - { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, - { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, - { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, - { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, - { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, - { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, - { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, - XML_TOKEN_MAP_END - }; - m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pControlElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const -{ - if (!m_pControlElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, - { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, - { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, - { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, - { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, - { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, - { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, - { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, - { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, - XML_TOKEN_MAP_END - }; - m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pControlElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const -{ - if (!m_pComponentElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, - XML_TOKEN_MAP_END - }; - m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pComponentElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const -{ - if (!m_pColumnTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, - XML_TOKEN_MAP_END - }; - m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pColumnTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const -{ - if (!m_pSectionElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, - - XML_TOKEN_MAP_END - }; - m_pSectionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pSectionElemTokenMap; -} - const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { if (!m_pCellElemTokenMap) diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index ec8ba1509e67..23f71a25fb85 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -69,15 +69,6 @@ private: mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocContentElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pControlElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pColumnTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pCellElemTokenMap; rtl::Reference < XMLPropertyHandlerFactory > m_xPropHdlFactory; @@ -129,16 +120,6 @@ public: const SvXMLTokenMap& GetDocContentElemTokenMap() const; const SvXMLTokenMap& GetReportElemTokenMap() const; - const SvXMLTokenMap& GetGroupElemTokenMap() const; - const SvXMLTokenMap& GetSectionElemTokenMap() const; - const SvXMLTokenMap& GetComponentElemTokenMap() const; - const SvXMLTokenMap& GetReportElementElemTokenMap() const; - const SvXMLTokenMap& GetControlElemTokenMap() const; - const SvXMLTokenMap& GetControlPropertyElemTokenMap() const; - const SvXMLTokenMap& GetFunctionElemTokenMap() const; - const SvXMLTokenMap& GetFormatElemTokenMap() const; - const SvXMLTokenMap& GetSubDocumentElemTokenMap() const; - const SvXMLTokenMap& GetColumnTokenMap() const; const SvXMLTokenMap& GetCellElemTokenMap() const; const rtl::Reference< XMLPropertySetMapper >& GetCellStylesPropertySetMapper() const { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index e1bcfa4e176a..4fda0e3c5583 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -397,30 +397,6 @@ void SAL_CALL ScXMLDocContext_Impl::characters(const OUString &) { } -const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() -{ - if( !pDocElemTokenMap ) - { - static const SvXMLTokenMapEntry aDocTokenMap[] = - { - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - XML_TOKEN_MAP_END - }; - - pDocElemTokenMap.reset(new SvXMLTokenMap( aDocTokenMap )); - - } // if( !pDocElemTokenMap ) - - return *pDocElemTokenMap; -} - const SvXMLTokenMap& ScXMLImport::GetContentValidationElemTokenMap() { if( !pContentValidationElemTokenMap ) @@ -675,7 +651,6 @@ ScXMLImport::ScXMLImport( ScXMLImport::~ScXMLImport() throw() { // delete pI18NMap; - pDocElemTokenMap.reset(); pContentValidationElemTokenMap.reset(); pContentValidationMessageElemTokenMap.reset(); pTableElemTokenMap.reset(); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index b887796f730e..0769d8b934f1 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -243,7 +243,6 @@ class ScXMLImport: public SvXMLImport rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper; rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper; - std::unique_ptr<SvXMLTokenMap> pDocElemTokenMap; std::unique_ptr<SvXMLTokenMap> pContentValidationElemTokenMap; std::unique_ptr<SvXMLTokenMap> pContentValidationMessageElemTokenMap; std::unique_ptr<SvXMLTokenMap> pTableElemTokenMap; @@ -337,7 +336,6 @@ public: const rtl::Reference < XMLPropertySetMapper >& GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; } const rtl::Reference < XMLPropertySetMapper >& GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; } - const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetContentValidationElemTokenMap(); const SvXMLTokenMap& GetContentValidationMessageElemTokenMap(); const SvXMLTokenMap& GetTableElemTokenMap(); diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index fabf89b6664e..8146479cd3c9 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -104,7 +104,6 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent) override; using Window::GetWindow; - using ValueSet::StartDrag; private: ViewShellBase& mrBase; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index e05e316e0e64..d9ce31ad08c4 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1981,13 +1981,6 @@ void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) } } -void ValueSet::StartSelection() -{ - mbHighlight = true; - mbSelection = true; - mnHighItemId = mnSelItemId; -} - void ValueSet::EndSelection() { if ( mbHighlight ) @@ -2006,42 +1999,6 @@ void ValueSet::SetFormat() mbFormat = true; } -void ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) -{ - if ( rEvent.GetCommand() != CommandEventId::StartDrag ) - return; - - // if necessary abort an existing action - EndSelection(); - - // Check out if the clicked on page is selected. If this is not the - // case set it as the current item. We only check mouse actions since - // drag-and-drop can also be triggered by the keyboard - sal_uInt16 nSelId; - if ( rEvent.IsMouseEvent() ) - nSelId = GetItemId( rEvent.GetMousePosPixel() ); - else - nSelId = mnSelItemId; - - // don't activate dragging if no item was clicked on - if ( !nSelId ) - return; - - // Check out if the page was selected. If not set as current page and - // call select. - if ( nSelId != mnSelItemId ) - { - SelectItem( nSelId ); - Update(); - Select(); - } - - vcl::Region aRegion; - - // assign region - rRegion = aRegion; -} - Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols, sal_uInt16 nDesireLines ) const { diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 8e65bb50d13a..72f02a52407f 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -43,8 +43,6 @@ private: std::unique_ptr<GalleryBrowser1> mxBrowser1; std::unique_ptr<GalleryBrowser2> mxBrowser2; - void InitSettings(); - virtual void GetFocus() override; virtual ~GalleryControl() override; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index aefb42511d1f..cbe8d93efbbf 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -373,11 +373,6 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -void GalleryBrowser1::ShowContextMenu(const CommandEvent& rCEvt) -{ - PopupMenuHdl(rCEvt); -} - IMPL_LINK(GalleryBrowser1, KeyInputHdl, const KeyEvent&, rKEvt, bool) { bool bRet = false; diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index de87788fc023..6cd5963374f4 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -85,9 +85,6 @@ public: void SelectTheme( sal_uInt16 nThemePos ) { mxThemes->select( nThemePos ); SelectThemeHdl( *mxThemes ); } OUString GetSelectedTheme() const { return mxThemes->get_selected_text(); } void GrabFocus(); - - void ShowContextMenu(const CommandEvent& rCEvt); - bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); }; #endif // INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index d41b52b88173..19381ce870d2 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -434,29 +434,6 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen } } -const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap() -{ - if(!mpDocElemTokenMap) - { - static const SvXMLTokenMapEntry aDocElemTokenMap[] = -{ - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - XML_TOKEN_MAP_END -}; - - mpDocElemTokenMap = std::make_unique<SvXMLTokenMap>(aDocElemTokenMap); - } - - return *mpDocElemTokenMap; -} - const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap() { if(!mpBodyElemTokenMap) diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index dc304c92a263..98d3f647dad0 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -150,7 +150,6 @@ class SdXMLImport: public SvXMLImport rtl::Reference<SdXMLMasterStylesContext> mxMasterStylesContext; // token map lists - std::unique_ptr<SvXMLTokenMap> mpDocElemTokenMap; std::unique_ptr<SvXMLTokenMap> mpBodyElemTokenMap; std::unique_ptr<SvXMLTokenMap> mpStylesElemTokenMap; std::unique_ptr<SvXMLTokenMap> mpMasterPageElemTokenMap; @@ -209,7 +208,6 @@ public: // Styles and AutoStyles contexts - const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); const SvXMLTokenMap& GetStylesElemTokenMap(); const SvXMLTokenMap& GetMasterPageElemTokenMap(); diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index 228e36cc1ee9..5a157441690a 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -36,14 +36,6 @@ bool XMLTextMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const return true; } -XMLTextMasterStylesContext::XMLTextMasterStylesContext( - SvXMLImport& rImport, - sal_uInt16 nPrfx, const OUString& rLName, - const Reference< XAttributeList > & xAttrList ) : - SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ) -{ -} - XMLTextMasterStylesContext::XMLTextMasterStylesContext( SvXMLImport& rImport ) : SvXMLStylesContext( rImport ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
