diff options
36 files changed, 250 insertions, 1270 deletions
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index de2658b9415d..0628252f5fd6 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -76,10 +76,6 @@ public: static void removeTitle( eTitleType nTitleIndex , const css::uno::Reference< css::frame::XModel >& xModel ); - static void hideTitle( eTitleType nTitleIndex - , const css::uno::Reference< css::frame::XModel >& xModel ); - - static OUString getCompleteString( const css::uno::Reference< css::chart2::XTitle >& xTitle ); static void setCompleteString( const OUString& rNewText , const css::uno::Reference< css::chart2::XTitle >& xTitle diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 3cdddbbeeb44..600ebedd2d3b 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -394,17 +394,6 @@ void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex } } -void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex - , const css::uno::Reference< css::frame::XModel >& xModel ) -{ - uno::Reference< chart2::XTitle > xTitled( TitleHelper::getTitle( nTitleIndex, xModel ) ); - if( xTitled.is()) - { - css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW); - xProps->setPropertyValue("Visible",css::uno::Any(false)); - } -} - bool TitleHelper::getTitleType( eTitleType& rType , const css::uno::Reference< css::chart2::XTitle >& xTitle , ChartModel& rModel ) diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 5cf60db1c414..34d876877891 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -40,6 +40,8 @@ canvas/inc/vclwrapper.hxx:138 void canvas::vcltools::VCLObject::swap(VCLObject<Wrappee_> &) canvas/source/vcl/impltools.hxx:102 vclcanvas::tools::LocalGuard::LocalGuard() +chart2/source/inc/TitleHelper.hxx:79 + void chart::TitleHelper::hideTitle(enum chart::TitleHelper::eTitleType,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &) connectivity/inc/sdbcx/VGroup.hxx:61 connectivity::sdbcx::OGroup::OGroup(_Bool) connectivity/inc/sdbcx/VGroup.hxx:62 @@ -332,8 +334,6 @@ 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/commoncpp.hxx:45 - class rtl::OString codemaker::cpp::translateUnoToCppType(enum codemaker::UnoType::Sort,const class rtl::OUString &) include/codemaker/global.hxx:54 class FileStream & operator<<(class FileStream &,const class rtl::OString *) include/codemaker/global.hxx:56 @@ -426,11 +426,7 @@ include/comphelper/logging.hxx:416 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const include/comphelper/logging.hxx:429 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/lok.hxx:34 - void comphelper::LibreOfficeKit::setMobilePhone(int) -include/comphelper/lok.hxx:37 - void comphelper::LibreOfficeKit::setTablet(int) -include/comphelper/lok.hxx:54 +include/comphelper/lok.hxx:48 _Bool comphelper::LibreOfficeKit::isLocalRendering() include/comphelper/propagg.hxx:60 _Bool comphelper::internal::OPropertyAccessor::operator==(const struct comphelper::internal::OPropertyAccessor &) const @@ -482,7 +478,7 @@ include/editeng/editeng.hxx:468 _Bool EditEngine::(anonymous)::__invoke(const class SvxFieldData *) include/editeng/hyphenzoneitem.hxx:64 _Bool SvxHyphenZoneItem::IsPageEnd() const -include/editeng/outliner.hxx:880 +include/editeng/outliner.hxx:879 _Bool Outliner::(anonymous)::__invoke(const class SvxFieldData *) include/filter/msfilter/mstoolbar.hxx:102 Indent::Indent(_Bool) @@ -510,6 +506,8 @@ include/o3tl/enumarray.hxx:133 _Bool o3tl::enumarray_const_iterator::operator==(const enumarray_const_iterator<EA> &) const include/o3tl/safeint.hxx:80 typename enable_if<std::is_unsigned<T>::value, type-parameter-?-?>::type o3tl::saturating_sub(type-parameter-?-?,type-parameter-?-?) +include/o3tl/safeint.hxx:240 + type-parameter-?-? o3tl::narrowing(type-parameter-?-?) include/o3tl/sorted_vector.hxx:225 _Bool o3tl::sorted_vector::operator!=(const sorted_vector<Value, Compare, Find, > &) const include/o3tl/span.hxx:51 @@ -580,15 +578,23 @@ include/sfx2/evntconf.hxx:60 struct SfxEventName & SfxEventNamesList::at(unsigned long) include/sfx2/infobar.hxx:104 void SfxInfoBarWindow::SetCommandHandler(class weld::Button &,const class rtl::OUString &) +include/sfx2/listview.hxx:65 + class rtl::OUString ListView::get_selected_id() include/sfx2/lokcharthelper.hxx:42 void LokChartHelper::Invalidate() -include/sfx2/lokhelper.hxx:62 - int SfxLokHelper::getDocumentIdOfView(int) include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const -include/sfx2/viewsh.hxx:365 +include/sfx2/sidebar/FocusManager.hxx:110 + void sfx2::sidebar::FocusManager::RemoveWindow(class vcl::Window &) +include/sfx2/sidebar/FocusManager.hxx:130 + void sfx2::sidebar::FocusManager::ClickButton(const int) +include/sfx2/templatelocalview.hxx:89 + void TemplateLocalView::showRegion(class std::basic_string_view<char16_t, struct std::char_traits<char16_t> >) +include/sfx2/templatelocalview.hxx:91 + void TemplateLocalView::createContextMenu(const _Bool) +include/sfx2/viewsh.hxx:378 enum LOKDeviceFormFactor SfxViewShell::GetLOKDeviceFormFactor() const -include/sfx2/viewsh.hxx:367 +include/sfx2/viewsh.hxx:380 _Bool SfxViewShell::isLOKDesktop() const include/svl/itempool.hxx:171 const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const @@ -596,13 +602,13 @@ include/svl/itempool.hxx:207 void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const include/svl/lockfilecommon.hxx:58 void svt::LockFileCommon::SetURL(const class rtl::OUString &) -include/svtools/asynclink.hxx:44 +include/svtools/asynclink.hxx:43 void svtools::AsynchronLink::LinkStubHandleCall_Idle(void *,class Timer *) -include/svtools/DocumentToGraphicRenderer.hxx:106 +include/svtools/DocumentToGraphicRenderer.hxx:105 _Bool DocumentToGraphicRenderer::isImpress() const include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) const -include/svx/ClassificationDialog.hxx:78 +include/svx/ClassificationDialog.hxx:86 void svx::ClassificationDialog::(anonymous)::__invoke() include/svx/ClassificationField.hxx:47 const class rtl::OUString & svx::ClassificationResult::getDisplayText() const @@ -630,19 +636,19 @@ include/svx/txencbox.hxx:146 void SvxTextEncodingTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) include/svx/xpoly.hxx:82 _Bool XPolygon::operator==(const class XPolygon &) const -include/tools/bigint.hxx:81 +include/tools/bigint.hxx:77 BigInt::BigInt(unsigned int) -include/tools/bigint.hxx:87 +include/tools/bigint.hxx:83 unsigned short BigInt::operator unsigned short() const -include/tools/bigint.hxx:89 +include/tools/bigint.hxx:85 unsigned int BigInt::operator unsigned int() const -include/tools/bigint.hxx:109 +include/tools/bigint.hxx:107 class BigInt operator-(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:112 +include/tools/bigint.hxx:110 class BigInt operator%(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:115 +include/tools/bigint.hxx:113 _Bool operator!=(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:118 +include/tools/bigint.hxx:116 _Bool operator<=(const class BigInt &,const class BigInt &) include/tools/color.hxx:31 unsigned int color::extractRGB(unsigned int) @@ -664,17 +670,17 @@ include/tools/datetime.hxx:92 class DateTime operator+(const class DateTime &,const class tools::Time &) include/tools/datetime.hxx:93 class DateTime operator-(const class DateTime &,const class tools::Time &) -include/tools/fract.hxx:66 +include/tools/fract.hxx:69 class Fraction & Fraction::operator+=(double) -include/tools/fract.hxx:67 +include/tools/fract.hxx:70 class Fraction & Fraction::operator-=(double) -include/tools/fract.hxx:83 +include/tools/fract.hxx:86 _Bool operator>=(const class Fraction &,const class Fraction &) -include/tools/fract.hxx:102 +include/tools/fract.hxx:105 class Fraction operator+(const class Fraction &,double) -include/tools/fract.hxx:103 +include/tools/fract.hxx:106 class Fraction operator-(const class Fraction &,double) -include/tools/fract.hxx:105 +include/tools/fract.hxx:108 class Fraction operator/(const class Fraction &,double) include/tools/gen.hxx:260 class Pair & Range::toPair() @@ -708,7 +714,7 @@ include/tools/weakbase.h:122 _Bool tools::WeakReference::operator>(const WeakReference<reference_type> &) const include/tools/XmlWriter.hxx:60 void tools::XmlWriter::element(const class rtl::OString &) -include/unotest/directories.hxx:43 +include/unotest/directories.hxx:44 class rtl::OUString test::Directories::getPathFromWorkdir(const class rtl::OUString &) const include/unotools/moduleoptions.hxx:166 _Bool SvtModuleOptions::IsDataBase() const @@ -726,9 +732,9 @@ include/vcl/BitmapBasicMorphologyFilter.hxx:63 BitmapDilateFilter::BitmapDilateFilter(int,unsigned char) include/vcl/BitmapColor.hxx:39 void BitmapColor::SetAlpha(unsigned char) -include/vcl/builder.hxx:103 +include/vcl/builder.hxx:104 const class rtl::OString & VclBuilder::getUIFile() const -include/vcl/builder.hxx:337 +include/vcl/builder.hxx:338 void VclBuilder::connectNumericFormatterAdjustment(const class rtl::OString &,const class rtl::OUString &) include/vcl/builderpage.hxx:36 void BuilderPage::SetHelpId(const class rtl::OString &) @@ -750,9 +756,9 @@ include/vcl/cursor.hxx:96 _Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const include/vcl/customweld.hxx:45 class rtl::OUString weld::CustomWidgetController::GetHelpText() const -include/vcl/customweld.hxx:166 +include/vcl/customweld.hxx:168 void weld::CustomWeld::queue_draw_area(int,int,int,int) -include/vcl/customweld.hxx:181 +include/vcl/customweld.hxx:183 void weld::CustomWeld::set_visible(_Bool) include/vcl/errcode.hxx:86 _Bool ErrCode::operator<(const class ErrCode &) const @@ -762,15 +768,23 @@ include/vcl/errcode.hxx:88 _Bool ErrCode::operator>(const class ErrCode &) const include/vcl/errcode.hxx:89 _Bool ErrCode::operator>=(const class ErrCode &) const -include/vcl/filter/PDFiumLibrary.hxx:61 +include/vcl/filter/pdfdocument.hxx:119 + const class std::__debug::vector<class vcl::filter::PDFReferenceElement *, class std::allocator<class vcl::filter::PDFReferenceElement *> > & vcl::filter::PDFObjectElement::GetDictionaryReferences() const +include/vcl/filter/pdfdocument.hxx:128 + unsigned long vcl::filter::PDFObjectElement::GetArrayLength() const +include/vcl/filter/pdfdocument.hxx:188 + class vcl::filter::PDFNumberElement & vcl::filter::PDFReferenceElement::GetObjectElement() const +include/vcl/filter/pdfdocument.hxx:548 + class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > vcl::filter::PDFDocument::DecodeHexString(const class vcl::filter::PDFHexStringElement *) +include/vcl/filter/PDFiumLibrary.hxx:65 class rtl::OUString vcl::pdf::PDFium::getLastError() const -include/vcl/filter/PDFiumLibrary.hxx:103 +include/vcl/filter/PDFiumLibrary.hxx:110 int vcl::pdf::PDFiumAnnotation::getValueType(const class rtl::OString &) -include/vcl/filter/PDFiumLibrary.hxx:107 +include/vcl/filter/PDFiumLibrary.hxx:114 class std::unique_ptr<class vcl::pdf::PDFiumPageObject, struct std::default_delete<class vcl::pdf::PDFiumPageObject> > vcl::pdf::PDFiumAnnotation::getObject(int) -include/vcl/filter/PDFiumLibrary.hxx:113 +include/vcl/filter/PDFiumLibrary.hxx:120 class basegfx::B2DVector vcl::pdf::PDFiumAnnotation::getBorderCornerRadius() -include/vcl/filter/PDFiumLibrary.hxx:133 +include/vcl/filter/PDFiumLibrary.hxx:140 const struct fpdf_pathsegment_t * vcl::pdf::PDFiumPathSegment::getPointer() const include/vcl/gdimtf.hxx:110 _Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const @@ -786,21 +800,21 @@ include/vcl/ITiledRenderable.hxx:214 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/lok.hxx:22 void vcl::lok::unregisterPollCallbacks() -include/vcl/menu.hxx:461 +include/vcl/menu.hxx:462 unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &) -include/vcl/menu.hxx:465 +include/vcl/menu.hxx:466 void MenuBar::SetMenuBarButtonHighlightHdl(unsigned short,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &) -include/vcl/menu.hxx:469 - class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short) include/vcl/menu.hxx:470 + class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short) +include/vcl/menu.hxx:471 void MenuBar::RemoveMenuBarButton(unsigned short) include/vcl/opengl/OpenGLHelper.hxx:67 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &) include/vcl/opengl/OpenGLHelper.hxx:100 void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &) -include/vcl/outdev.hxx:1743 +include/vcl/outdev.hxx:1742 class basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const class basegfx::B2DPolyPolygon &,const class MapMode &) const -include/vcl/outdev.hxx:1763 +include/vcl/outdev.hxx:1762 class basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolyPolygon &,const class MapMode &) const include/vcl/salnativewidgets.hxx:408 _Bool TabitemValue::isBothAligned() const @@ -854,100 +868,144 @@ include/vcl/uitest/uiobject.hxx:356 SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &) include/vcl/uitest/uiobject.hxx:364 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *) -include/vcl/wall.hxx:70 - Wallpaper::Wallpaper(const class Gradient &) -include/vcl/weld.hxx:139 +include/vcl/weld.hxx:149 _Bool weld::Widget::get_hexpand() const -include/vcl/weld.hxx:141 +include/vcl/weld.hxx:151 _Bool weld::Widget::get_vexpand() const -include/vcl/weld.hxx:143 +include/vcl/weld.hxx:153 void weld::Widget::set_secondary(_Bool) -include/vcl/weld.hxx:150 +include/vcl/weld.hxx:160 int weld::Widget::get_margin_top() const -include/vcl/weld.hxx:151 +include/vcl/weld.hxx:161 int weld::Widget::get_margin_bottom() const -include/vcl/weld.hxx:153 +include/vcl/weld.hxx:163 int weld::Widget::get_margin_right() const -include/vcl/weld.hxx:332 +include/vcl/weld.hxx:343 void weld::ScrolledWindow::hadjustment_set_step_increment(int) -include/vcl/weld.hxx:334 +include/vcl/weld.hxx:345 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const -include/vcl/weld.hxx:339 +include/vcl/weld.hxx:350 int weld::ScrolledWindow::get_hscroll_height() const -include/vcl/weld.hxx:465 +include/vcl/weld.hxx:476 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:549 +include/vcl/weld.hxx:560 class rtl::OString weld::Assistant::get_current_page_ident() const -include/vcl/weld.hxx:555 +include/vcl/weld.hxx:566 class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const -include/vcl/weld.hxx:1035 +include/vcl/weld.hxx:1048 void weld::TreeView::set_text_align(const class weld::TreeIter &,double,int) -include/vcl/weld.hxx:1130 - enum TriState weld::TreeView::get_sort_indicator(int) const -include/vcl/weld.hxx:1163 +include/vcl/weld.hxx:1176 const class rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1230 +include/vcl/weld.hxx:1243 class rtl::OUString weld::IconView::get_selected_id() const -include/vcl/weld.hxx:1245 +include/vcl/weld.hxx:1258 _Bool weld::IconView::get_cursor(class weld::TreeIter *) const -include/vcl/weld.hxx:1255 +include/vcl/weld.hxx:1268 void weld::IconView::select_all() -include/vcl/weld.hxx:1261 +include/vcl/weld.hxx:1274 void weld::IconView::save_value() -include/vcl/weld.hxx:1262 +include/vcl/weld.hxx:1275 const class rtl::OUString & weld::IconView::get_saved_value() const -include/vcl/weld.hxx:1263 +include/vcl/weld.hxx:1276 _Bool weld::IconView::get_value_changed_from_saved() const -include/vcl/weld.hxx:1372 +include/vcl/weld.hxx:1396 void weld::MenuButton::append_item_radio(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1380 +include/vcl/weld.hxx:1404 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1385 +include/vcl/weld.hxx:1409 void weld::MenuButton::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1442 +include/vcl/weld.hxx:1466 void weld::Scale::get_increments(int &,int &) const -include/vcl/weld.hxx:1459 +include/vcl/weld.hxx:1483 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1493 +include/vcl/weld.hxx:1517 int weld::Entry::get_position() const -include/vcl/weld.hxx:1667 +include/vcl/weld.hxx:1691 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1903 +include/vcl/weld.hxx:1927 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1915 +include/vcl/weld.hxx:1939 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:2015 +include/vcl/weld.hxx:2039 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:2029 - void weld::Expander::set_label(const class rtl::OUString &) -include/vcl/weld.hxx:2030 - class rtl::OUString weld::Expander::get_label() const -include/vcl/weld.hxx:2203 +include/vcl/weld.hxx:2229 class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const -include/vcl/weld.hxx:2213 +include/vcl/weld.hxx:2239 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weldutils.hxx:186 +include/vcl/weldutils.hxx:187 const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> & weld::WidgetStatusListener::getFrame() const -include/vcl/weldutils.hxx:338 +include/vcl/weldutils.hxx:339 void weld::DateFormatter::CursorChangedHdl(class weld::Entry &) -include/vcl/weldutils.hxx:338 +include/vcl/weldutils.hxx:339 void weld::DateFormatter::LinkStubCursorChangedHdl(void *,class weld::Entry &) -include/vcl/weldutils.hxx:366 - void weld::PatternFormatter::connect_focus_out(const class Link<class weld::Widget &, void> &) include/vcl/weldutils.hxx:367 + void weld::PatternFormatter::connect_focus_out(const class Link<class weld::Widget &, void> &) +include/vcl/weldutils.hxx:368 void weld::PatternFormatter::connect_focus_in(const class Link<class weld::Widget &, void> &) include/vcl/window.hxx:416 const char * ImplDbgCheckWindow(const void *) -include/xmloff/formlayerimport.hxx:72 - class SvXMLImportContext * xmloff::OFormLayerXMLImport::createOfficeFormsContext(class SvXMLImport &) -include/xmloff/namespacemap.hxx:138 - class rtl::OUString SvXMLNamespaceMap::GetQNameByIndex(unsigned short,const class rtl::OUString &) const -include/xmloff/txtimp.hxx:375 - class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP() +include/xmloff/SchXMLImportHelper.hxx:100 + const class SvXMLTokenMap & SchXMLImportHelper::GetDocElemTokenMap() +include/xmloff/SchXMLImportHelper.hxx:101 + const class SvXMLTokenMap & SchXMLImportHelper::GetTableElemTokenMap() +include/xmloff/SchXMLImportHelper.hxx:102 + const class SvXMLTokenMap & SchXMLImportHelper::GetChartElemTokenMap() +include/xmloff/SchXMLImportHelper.hxx:103 + const class SvXMLTokenMap & SchXMLImportHelper::GetPlotAreaElemTokenMap() +include/xmloff/SchXMLImportHelper.hxx:104 + const class SvXMLTokenMap & SchXMLImportHelper::GetSeriesElemTokenMap() +include/xmloff/SchXMLImportHelper.hxx:105 + const class SvXMLTokenMap & SchXMLImportHelper::GetPropMappingAttrTokenMap() +include/xmloff/SchXMLImportHelper.hxx:107 + const class SvXMLTokenMap & SchXMLImportHelper::GetChartAttrTokenMap() +include/xmloff/SchXMLImportHelper.hxx:108 + const class SvXMLTokenMap & SchXMLImportHelper::GetPlotAreaAttrTokenMap() +include/xmloff/SchXMLImportHelper.hxx:109 + const class SvXMLTokenMap & SchXMLImportHelper::GetCellAttrTokenMap() +include/xmloff/SchXMLImportHelper.hxx:110 + const class SvXMLTokenMap & SchXMLImportHelper::GetSeriesAttrTokenMap() +include/xmloff/SchXMLImportHelper.hxx:111 + const class SvXMLTokenMap & SchXMLImportHelper::GetRegEquationAttrTokenMap() +include/xmloff/shapeimport.hxx:274 + const class SvXMLTokenMap & XMLShapeImportHelper::GetGroupShapeElemTokenMap() +include/xmloff/shapeimport.hxx:275 + const class SvXMLTokenMap & XMLShapeImportHelper::GetFrameShapeElemTokenMap() +include/xmloff/shapeimport.hxx:276 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() +include/xmloff/shapeimport.hxx:277 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DObjectAttrTokenMap() +include/xmloff/shapeimport.hxx:278 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() +include/xmloff/shapeimport.hxx:279 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() +include/xmloff/shapeimport.hxx:280 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() +include/xmloff/shapeimport.hxx:281 + const class SvXMLTokenMap & XMLShapeImportHelper::Get3DLightAttrTokenMap() include/xmloff/txtimp.hxx:376 + class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP() +include/xmloff/txtimp.hxx:377 class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP() +include/xmloff/txtimp.hxx:405 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextElemTokenMap() +include/xmloff/txtimp.hxx:406 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextPElemTokenMap() +include/xmloff/txtimp.hxx:407 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextPAttrTokenMap() +include/xmloff/txtimp.hxx:408 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextFrameAttrTokenMap() +include/xmloff/txtimp.hxx:409 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextContourAttrTokenMap() +include/xmloff/txtimp.hxx:410 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextHyperlinkAttrTokenMap() +include/xmloff/txtimp.hxx:412 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextNumberedParagraphAttrTokenMap() +include/xmloff/txtimp.hxx:413 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextListBlockAttrTokenMap() include/xmloff/txtimp.hxx:414 - const class SvXMLTokenMap & XMLTextImportHelper::GetTextFieldAttrTokenMap() + const class SvXMLTokenMap & XMLTextImportHelper::GetTextListBlockElemTokenMap() +include/xmloff/xmlimp.hxx:485 + void SvXMLImport::SetError(int,const class rtl::OUString &,const class rtl::OUString &) libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:72 void ::operator()(struct _GtkBuilder *) const libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31 @@ -978,14 +1036,18 @@ o3tl/qa/cow_wrapper_clients.hxx:142 _Bool o3tltests::cow_wrapper_client4::operator<(const class o3tltests::cow_wrapper_client4 &) const o3tl/qa/cow_wrapper_clients.hxx:193 _Bool o3tltests::cow_wrapper_client5::operator!=(const class o3tltests::cow_wrapper_client5 &) const -oox/inc/drawingml/textliststyle.hxx:49 +oox/inc/drawingml/textliststyle.hxx:51 void oox::drawingml::TextListStyle::dump() const -oox/inc/drawingml/textparagraphproperties.hxx:98 +oox/inc/drawingml/textparagraphproperties.hxx:100 void oox::drawingml::TextParagraphProperties::setLineSpacing(const class oox::drawingml::TextSpacing &) oox/source/drawingml/diagram/diagramlayoutatoms.hxx:291 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:300 const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const +reportdesign/source/filter/xml/xmlfilter.hxx:103 + const class SvXMLTokenMap & rptxml::ORptFilter::GetReportElemTokenMap() const +reportdesign/source/filter/xml/xmlfilter.hxx:104 + const class SvXMLTokenMap & rptxml::ORptFilter::GetCellElemTokenMap() const sal/osl/unx/uunxapi.hxx:35 int mkdir_c(const class rtl::OString &,unsigned int) sal/osl/unx/uunxapi.hxx:70 @@ -994,15 +1056,15 @@ sc/inc/address.hxx:666 _Bool ScRange::operator<=(const class ScRange &) const sc/inc/bigrange.hxx:73 _Bool ScBigAddress::operator!=(const class ScBigAddress &) const -sc/inc/columniterator.hxx:82 +sc/inc/columniterator.hxx:83 int sc::ColumnIterator::getType() const -sc/inc/datamapper.hxx:79 +sc/inc/datamapper.hxx:76 void sc::ExternalDataSource::setUpdateFrequency(double) -sc/inc/datamapper.hxx:82 +sc/inc/datamapper.hxx:79 void sc::ExternalDataSource::setURL(const class rtl::OUString &) -sc/inc/datamapper.hxx:83 +sc/inc/datamapper.hxx:80 void sc::ExternalDataSource::setProvider(const class rtl::OUString &) -sc/inc/dpfilteredcache.hxx:143 +sc/inc/dpfilteredcache.hxx:149 void ScDPFilteredCache::dump() const sc/inc/formulacell.hxx:489 void ScFormulaCell::Dump() const @@ -1054,17 +1116,17 @@ sc/inc/postit.hxx:46 ScCaptionPtr::ScCaptionPtr(class SdrCaptionObj *) sc/inc/scdll.hxx:36 ScDLL::ScDLL() -sc/inc/scopetools.hxx:74 +sc/inc/scopetools.hxx:81 void sc::DelayFormulaGroupingSwitch::reset() sc/inc/segmenttree.hxx:144 void ScFlatUInt16RowSegments::setValueIf(int,int,unsigned short,const class std::function<_Bool (unsigned short)> &) -sc/inc/sheetlimits.hxx:41 +sc/inc/sheetlimits.hxx:42 _Bool ScSheetLimits::ValidColRow(short,int) const -sc/inc/sheetlimits.hxx:45 +sc/inc/sheetlimits.hxx:46 _Bool ScSheetLimits::ValidColRowTab(short,int,short) const -sc/inc/sheetlimits.hxx:57 - short ScSheetLimits::SanitizeCol(short) const sc/inc/sheetlimits.hxx:58 + short ScSheetLimits::SanitizeCol(short) const +sc/inc/sheetlimits.hxx:59 int ScSheetLimits::SanitizeRow(int) const sc/inc/stlalgorithm.hxx:47 sc::AlignedAllocator::AlignedAllocator(const AlignedAllocator<type-parameter-?-?, 256> &) @@ -1076,7 +1138,7 @@ sc/inc/stlalgorithm.hxx:62 _Bool sc::AlignedAllocator::operator!=(const AlignedAllocator<T, Alignment> &) const sc/inc/table.hxx:322 _Bool ScTable::IsColRowTabValid(const short,const int,const short) const -sc/inc/userlist.hxx:88 +sc/inc/userlist.hxx:90 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 &) @@ -1102,7 +1164,7 @@ sc/qa/unit/ucalc.hxx:536 void Test::testCondFormatUpdateReference() sc/qa/unit/ucalc.hxx:546 void Test::testCondFormatListenToOwnRange() -sc/source/core/inc/interpre.hxx:73 +sc/source/core/inc/interpre.hxx:72 basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &) sc/source/core/opencl/formulagroupcl.cxx:1061 _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction() const @@ -1124,13 +1186,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:4145 +sc/source/core/tool/interpr1.cxx:4141 double ::operator()(double,unsigned long) const -sc/source/core/tool/interpr1.cxx:6496 +sc/source/core/tool/interpr1.cxx:6492 double ::operator()(const struct sc::ParamIfsResult &) const -sc/source/core/tool/scmatrix.cxx:2316 +sc/source/core/tool/scmatrix.cxx:2310 type-parameter-?-? * (anonymous namespace)::wrapped_iterator::operator->() const -sc/source/core/tool/scmatrix.cxx:3322 +sc/source/core/tool/scmatrix.cxx:3316 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 &) @@ -1140,13 +1202,13 @@ sc/source/filter/inc/tokstack.hxx:213 _Bool TokenPool::GrowTripel(unsigned short) sc/source/filter/inc/xeextlst.hxx:198 void XclExtLst::AddRecord(const class rtl::Reference<class XclExpExt> &) -sc/source/filter/inc/xerecord.hxx:344 +sc/source/filter/inc/xerecord.hxx:343 void XclExpRecordList::InsertRecord(type-parameter-?-? *,unsigned long) -sc/source/filter/inc/xerecord.hxx:353 +sc/source/filter/inc/xerecord.hxx:352 void XclExpRecordList::AppendRecord(Reference<type-parameter-?-?>) -sc/source/filter/inc/xerecord.hxx:364 +sc/source/filter/inc/xerecord.hxx:363 void XclExpRecordList::AppendNewRecord(const Reference<type-parameter-?-?> &) -sc/source/filter/inc/xerecord.hxx:366 +sc/source/filter/inc/xerecord.hxx:365 void XclExpRecordList::AppendNewRecord(Reference<type-parameter-?-?>) sc/source/filter/inc/xestream.hxx:105 class XclExpStream & XclExpStream::operator<<(float) @@ -1154,6 +1216,10 @@ 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:314 + const class SvXMLTokenMap & ScXMLImport::GetTableElemTokenMap() +sc/source/filter/xml/xmlimprt.hxx:320 + const class SvXMLTokenMap & ScXMLImport::GetTableAnnotationAttrTokenMap() sc/source/filter/xml/xmltransformationi.hxx:160 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) sc/source/ui/inc/dataprovider.hxx:56 @@ -1164,13 +1230,13 @@ sc/source/ui/inc/dataprovider.hxx:58 void sc::CSVFetchThread::EndThread() sc/source/ui/inc/dataprovider.hxx:83 const class rtl::OUString & sc::DataProvider::GetURL() const -sc/source/ui/inc/datatableview.hxx:112 +sc/source/ui/inc/datatableview.hxx:111 void ScDataTableView::getRowRange(int &,int &) const sc/source/ui/inc/impex.hxx:93 ScImportExport::ScImportExport(class ScDocument &,const class rtl::OUString &) sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:66 void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class std::optional<signed char>) -sc/source/ui/inc/TableFillingAndNavigationTools.hxx:121 +sc/source/ui/inc/TableFillingAndNavigationTools.hxx:122 unsigned long DataRangeIterator::size() sc/source/ui/inc/viewdata.hxx:407 long ScViewData::GetLOKDocWidthPixel() const @@ -1190,13 +1256,13 @@ sd/source/filter/ppt/pptinanimations.hxx:108 void ppt::AnimationImporter::dump(const char *,long) sd/source/ui/inc/filedlg.hxx:55 _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const -sd/source/ui/inc/GraphicViewShell.hxx:43 +sd/source/ui/inc/GraphicViewShell.hxx:44 class SfxViewFactory * sd::GraphicViewShell::Factory() -sd/source/ui/inc/GraphicViewShell.hxx:43 +sd/source/ui/inc/GraphicViewShell.hxx:44 class SfxViewShell * sd::GraphicViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *) -sd/source/ui/inc/GraphicViewShell.hxx:43 +sd/source/ui/inc/GraphicViewShell.hxx:44 void sd::GraphicViewShell::InitFactory() -sd/source/ui/inc/GraphicViewShell.hxx:43 +sd/source/ui/inc/GraphicViewShell.hxx:44 void sd::GraphicViewShell::RegisterFactory(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>) sd/source/ui/inc/optsitem.hxx:178 _Bool SdOptionsContents::operator==(const class SdOptionsContents &) const @@ -1208,9 +1274,9 @@ sd/source/ui/inc/OutlineViewShell.hxx:41 void sd::OutlineViewShell::InitFactory() sd/source/ui/inc/OutlineViewShell.hxx:41 void sd::OutlineViewShell::RegisterFactory(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>) -sd/source/ui/inc/PaneShells.hxx:35 +sd/source/ui/inc/PaneShells.hxx:34 void sd::LeftImpressPaneShell::RegisterInterface(const class SfxModule *) -sd/source/ui/inc/PaneShells.hxx:53 +sd/source/ui/inc/PaneShells.hxx:51 void sd::LeftDrawPaneShell::RegisterInterface(const class SfxModule *) sd/source/ui/inc/unomodel.hxx:137 _Bool SdXImpressDocument::operator==(const class SdXImpressDocument &) const @@ -1228,10 +1294,14 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:111 long (anonymous namespace)::PDFGrammar<boost::spirit::classic::file_iterator<char, boost::spirit::classic::fileiter_impl::mmap_file_iterator<char> > >::pdf_string_parser::operator()(const type-parameter-?-? &,struct boost::spirit::classic::nil_t &) const sfx2/inc/autoredactdialog.hxx:74 void TargetsTable::select(int) -sfx2/inc/sidebar/Tools.hxx:48 - struct com::sun::star::awt::Gradient sfx2::sidebar::Tools::VclToAwtGradient(const class Gradient &) -sfx2/inc/sidebar/Tools.hxx:49 - class Gradient sfx2::sidebar::Tools::AwtToVclGradient(const struct com::sun::star::awt::Gradient &) +sfx2/inc/sidebar/Accessible.hxx:44 + sfx2::sidebar::Accessible::Accessible(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessibleContext> &) +sfx2/inc/sidebar/DeckTitleBar.hxx:47 + void sfx2::sidebar::DeckTitleBar::DrawGripHdl(struct std::pair<class OutputDevice &, const class tools::Rectangle &>) +sfx2/inc/sidebar/DeckTitleBar.hxx:47 + void sfx2::sidebar::DeckTitleBar::LinkStubDrawGripHdl(void *,struct std::pair<class OutputDevice &, const class tools::Rectangle &>) +sfx2/inc/sidebar/SidebarToolBox.hxx:55 + void sfx2::sidebar::SidebarToolBox::SetController(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XToolbarController> &) sfx2/source/appl/shutdownicon.hxx:79 class rtl::OUString ShutdownIcon::getShortcutName() sfx2/source/appl/shutdownicon.hxx:95 @@ -1246,11 +1316,11 @@ sfx2/source/appl/shutdownicon.hxx:112 class rtl::OUString ShutdownIcon::GetUrlDescription(const class rtl::OUString &) sfx2/source/appl/shutdownicon.hxx:114 void ShutdownIcon::SetVeto(_Bool) -shell/inc/xml_parser.hxx:46 +shell/inc/xml_parser.hxx:43 xml_parser::xml_parser() -shell/inc/xml_parser.hxx:69 +shell/inc/xml_parser.hxx:66 void xml_parser::parse(const char *,unsigned long,_Bool) -shell/inc/xml_parser.hxx:87 +shell/inc/xml_parser.hxx:84 void xml_parser::set_document_handler(class i_xml_parser_event_handler *) slideshow/source/engine/activities/activitiesfactory.cxx:172 void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation() @@ -1286,11 +1356,11 @@ slideshow/source/engine/animationfactory.cxx:736 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:160 +slideshow/source/inc/box2dtools.hxx:159 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:262 +slideshow/source/inc/box2dtools.hxx:261 _Bool box2d::utils::box2DWorld::shapesInitialized() -slideshow/source/inc/box2dtools.hxx:300 +slideshow/source/inc/box2dtools.hxx:299 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> &) @@ -1312,21 +1382,21 @@ slideshow/source/inc/listenercontainer.hxx:54 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewRepaintHandler> &) starmath/inc/format.hxx:138 _Bool SmFormat::operator!=(const class SmFormat &) const -starmath/inc/starmathdatabase.hxx:129 +starmath/inc/starmathdatabase.hxx:273 + class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> > starmathdatabase::Identify_Color_HTML(unsigned int) +starmath/inc/starmathdatabase.hxx:293 class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> > starmathdatabase::Identify_Color_DVIPSNAMES(unsigned int) -starmath/inc/starmathdatabase.hxx:153 - class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> > starmathdatabase::Identify_ColorName_DVIPSNAMES(const class rtl::OUString &) -starmath/inc/token.hxx:160 +starmath/inc/token.hxx:166 SmColorTokenTableEntry::SmColorTokenTableEntry() -starmath/inc/token.hxx:174 +starmath/inc/token.hxx:182 SmColorTokenTableEntry::SmColorTokenTableEntry(const class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> >) -starmath/inc/token.hxx:195 +starmath/inc/token.hxx:207 _Bool SmColorTokenTableEntry::operator==(const class rtl::OUString &) const -starmath/inc/token.hxx:200 +starmath/inc/token.hxx:212 _Bool SmColorTokenTableEntry::operator==(unsigned int) const -starmath/inc/token.hxx:205 +starmath/inc/token.hxx:214 _Bool SmColorTokenTableEntry::operator==(class Color) const -starmath/inc/token.hxx:220 +starmath/inc/token.hxx:223 _Bool SmColorTokenTableEntry::equals(class Color) const svgio/inc/svgstyleattributes.hxx:346 class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const @@ -1416,7 +1486,7 @@ sw/inc/docary.hxx:140 void SwVectorModifyBase::dumpAsXml(struct _xmlTextWriter *) sw/inc/docufld.hxx:494 void SwPostItField::ToggleResolved() -sw/inc/editsh.hxx:374 +sw/inc/editsh.hxx:373 void SwEditShell::ValidateCurrentParagraphSignatures(_Bool) sw/inc/extinput.hxx:47 class SwExtTextInput * SwExtTextInput::GetPrev() @@ -1466,6 +1536,8 @@ sw/inc/pagedesc.hxx:431 class SwPageDesc *const & SwPageDescs::front() const sw/inc/pagedesc.hxx:432 class SwPageDesc *const & SwPageDescs::back() const +sw/inc/paratr.hxx:121 + const class sw::FormatDropDefiner * SwFormatDrop::GetDefinedIn() const sw/inc/rdfhelper.hxx:76 void SwRDFHelper::cloneStatements(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::rdf::XResource> &,const class com::sun::star::uno::Reference<class com::sun::star::rdf::XResource> &) sw/inc/rdfhelper.hxx:94 @@ -1494,6 +1566,8 @@ sw/inc/swrect.hxx:106 class SvStream & WriteSwRect(class SvStream &,const class SwRect &) sw/inc/swrect.hxx:150 _Bool SwRect::OverStepTop(long) const +sw/inc/swtable.hxx:389 + void SwTableLine::RegisterToFormat(class SwFormat &) sw/inc/viscrs.hxx:204 class SwShellTableCursor * SwShellTableCursor::GetNext() sw/inc/viscrs.hxx:205 @@ -1504,9 +1578,9 @@ sw/inc/viscrs.hxx:207 const class SwShellTableCursor * SwShellTableCursor::GetPrev() const 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 +sw/source/core/access/accportions.cxx:57 unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) -sw/source/core/access/accportions.cxx:60 +sw/source/core/access/accportions.cxx:61 unsigned long FindLastBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?) sw/source/core/inc/AccessibilityIssue.hxx:52 const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > & sw::AccessibilityIssue::getAdditionalInfo() const @@ -1524,11 +1598,15 @@ sw/source/core/inc/mvsave.hxx:171 _Bool ZSortFly::operator==(const class ZSortFly &) const sw/source/core/text/porlin.hxx:118 _Bool SwLinePortion::IsTabRightPortion() const -sw/source/core/text/txtpaint.hxx:71 +sw/source/core/text/txtpaint.hxx:72 DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool) -sw/source/core/text/txtpaint.hxx:78 +sw/source/core/text/txtpaint.hxx:79 DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color) -sw/source/uibase/inc/swcont.hxx:85 +sw/source/filter/xml/xmlimp.hxx:152 + const class SvXMLTokenMap & SwXMLImport::GetTableElemTokenMap() +sw/source/filter/xml/xmlimp.hxx:153 + const class SvXMLTokenMap & SwXMLImport::GetTableCellAttrTokenMap() +sw/source/uibase/inc/swcont.hxx:86 _Bool SwContent::operator==(const class SwContent &) const 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> &) @@ -1550,11 +1628,11 @@ vcl/inc/bitmapwriteaccess.hxx:73 void BitmapWriteAccess::SetFillColor() vcl/inc/ControlCacheKey.hxx:35 ControlCacheKey::ControlCacheKey(enum ControlType,enum ControlPart,enum ControlState,const class Size &) -vcl/inc/ControlCacheKey.hxx:42 +vcl/inc/ControlCacheKey.hxx:43 _Bool ControlCacheKey::operator==(const class ControlCacheKey &) const -vcl/inc/ControlCacheKey.hxx:51 +vcl/inc/ControlCacheKey.hxx:50 _Bool ControlCacheKey::canCacheControl() const -vcl/inc/ControlCacheKey.hxx:82 +vcl/inc/ControlCacheKey.hxx:81 unsigned long ControlCacheHashFunction::operator()(const class ControlCacheKey &) const vcl/inc/driverblocklist.hxx:95 DriverBlocklist::DriverInfo::DriverInfo(enum DriverBlocklist::OperatingSystem,const class rtl::OUString &,enum DriverBlocklist::VersionComparisonOp,unsigned long,_Bool,const char *) @@ -1566,7 +1644,9 @@ vcl/inc/fontselect.hxx:49 _Bool FontSelectPattern::operator!=(const class FontSelectPattern &) const vcl/inc/graphic/GraphicID.hxx:39 _Bool GraphicID::operator==(const class GraphicID &) const -vcl/inc/opengl/BufferObject.hxx:50 +vcl/inc/jsdialog/jsdialogbuilder.hxx:97 + void JSDropTarget::fire_dragEnter(const struct com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent &) +vcl/inc/opengl/BufferObject.hxx:48 void vcl::BufferObject::unbind() vcl/inc/opengl/gdiimpl.hxx:108 void OpenGLSalGraphicsImpl::ImplDrawLineAA(double,double,double,double,_Bool) @@ -1588,7 +1668,7 @@ vcl/inc/opengl/texture.hxx:114 void OpenGLTexture::SaveToFile(const class rtl::OUString &) vcl/inc/opengl/texture.hxx:123 _Bool OpenGLTexture::operator!=(const class OpenGLTexture &) const -vcl/inc/opengl/zone.hxx:25 +vcl/inc/opengl/zone.hxx:26 void OpenGLZone::relaxWatchdogTimings() vcl/inc/PhysicalFontFace.hxx:67 int PhysicalFontFace::GetWidth() const @@ -1612,9 +1692,9 @@ vcl/inc/qt5/Qt5FontFace.hxx:49 int Qt5FontFace::GetFontTable(const char *,unsigned char *) const vcl/inc/qt5/Qt5FontFace.hxx:53 _Bool Qt5FontFace::HasChar(unsigned int) const -vcl/inc/qt5/Qt5Frame.hxx:159 - void Qt5Frame::deregisterDragSource(const class Qt5DragSource *) vcl/inc/qt5/Qt5Frame.hxx:161 + void Qt5Frame::deregisterDragSource(const class Qt5DragSource *) +vcl/inc/qt5/Qt5Frame.hxx:163 void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *) vcl/inc/qt5/Qt5Graphics_Controls.hxx:96 class QPoint Qt5Graphics_Controls::upscale(const class QPoint &,enum Qt5Graphics_Controls::Round) @@ -1624,7 +1704,7 @@ vcl/inc/qt5/Qt5Tools.hxx:57 class QRect toQRect(const class tools::Rectangle &,const double) vcl/inc/regionband.hxx:27 const char * ImplDbgTestRegionBand(const void *) -vcl/inc/salgdi.hxx:637 +vcl/inc/salgdi.hxx:649 void SalGraphics::FillFontSubsetInfo(const struct vcl::TTGlobalFontInfo_ &,const class rtl::OUString &,class FontSubsetInfo &) vcl/inc/salmenu.hxx:46 SalMenuButtonItem::SalMenuButtonItem() @@ -1652,7 +1732,9 @@ vcl/inc/skia/utils.hxx:49 class sk_sp<class SkSurface> SkiaHelper::createSkSurface(int,int,enum SkAlphaType) vcl/inc/skia/utils.hxx:75 void SkiaHelper::removeCachedImage(class sk_sp<class SkImage>) -vcl/inc/skia/utils.hxx:80 +vcl/inc/skia/utils.hxx:81 + void SkiaHelper::setPixelGeometry(enum SkPixelGeometry) +vcl/inc/skia/utils.hxx:85 void SkiaHelper::dump(const class SkBitmap &,const char *) vcl/inc/skia/zone.hxx:25 void SkiaZone::relaxWatchdogTimings() @@ -1692,26 +1774,18 @@ 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 +writerfilter/source/dmapper/SettingsTable.hxx:82 class rtl::OUString writerfilter::dmapper::SettingsTable::GetDecimalSymbol() const -writerfilter/source/ooxml/OOXMLPropertySet.hxx:175 +writerfilter/source/ooxml/OOXMLPropertySet.hxx:184 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 +writerfilter/source/ooxml/OOXMLPropertySet.hxx:185 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 +writerfilter/source/ooxml/OOXMLPropertySet.hxx:188 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString() -xmloff/source/forms/attriblistmerge.hxx:46 - xmloff::OAttribListMerger::OAttribListMerger() -xmloff/source/forms/attriblistmerge.hxx:50 - void xmloff::OAttribListMerger::addList(const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &) -xmloff/source/forms/elementimport.hxx:61 - enum xmloff::OControlElement::ElementType xmloff::OElementNameMap::getElementType(const class rtl::OUString &) -xmloff/source/forms/elementimport.hxx:147 - _Bool xmloff::OElementImport::tryGenericAttribute(unsigned short,const class rtl::OUString &,const class rtl::OUString &) -xmloff/source/forms/elementimport.hxx:550 - xmloff::OColumnImport::OColumnImport<BASE>(class xmloff::OFormLayerXMLImport_Impl &,class xmloff::IEventAttacherManager &,int,const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> &,enum xmloff::OControlElement::ElementType) -xmloff/source/forms/elementimport.hxx:641 - class xmloff::OControlImport * xmloff::OFormImport::implCreateChildContext(unsigned short,const class rtl::OUString &,enum xmloff::OControlElement::ElementType) +xmloff/inc/txtfldi.hxx:956 + const char * XMLBibliographyFieldImportContext::MapBibliographyFieldName(const class rtl::OUString &) +xmloff/source/forms/property_meta_data.hxx:40 + struct xmloff::AttributeDescription xmloff::metadata::getAttributeDescription(const unsigned short,const class rtl::OUString &) xmlsecurity/source/gpg/XMLEncryption.hxx:25 XMLEncryptionGpg::XMLEncryptionGpg() xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:46 diff --git a/include/sfx2/listview.hxx b/include/sfx2/listview.hxx index 0c5714caca33..cb7eb23b5a73 100644 --- a/include/sfx2/listview.hxx +++ b/include/sfx2/listview.hxx @@ -62,8 +62,6 @@ public: protected: sal_uInt16 get_nId(int pos); - OUString get_selected_id() { return mxTreeView->get_selected_id(); } - void select_id(const OUString& sId) { mxTreeView->select_id(sId); } int get_selected_index() { return mxTreeView->get_selected_index(); } diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index 0bebe247e634..9f58a76ce9b1 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -105,10 +105,6 @@ private: void RegisterWindow(weld::Widget& rWidget); static void UnregisterWindow(weld::Widget& rWidget); - /** Remove the window from the panel or the button container. - */ - void RemoveWindow(vcl::Window& rWindow); - void FocusDeckTitle(); bool IsDeckTitleVisible() const; bool IsPanelTitleVisible(const sal_Int32 nPanelIndex) const; @@ -127,7 +123,6 @@ private: void FocusPanelContent(const sal_Int32 nPanelIndex); void FocusButton(const sal_Int32 nButtonIndex); - void ClickButton(const sal_Int32 nButtonIndex); void MoveFocusInsidePanel(const FocusLocation& rLocation, const sal_Int32 nDirection); void MoveFocusInsideDeckTitle(const FocusLocation& rLocation, diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 9b8569c04b03..a045d390fa61 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -86,10 +86,6 @@ public: void showRegion (TemplateContainerItem const *pItem); - void showRegion (std::u16string_view rName); - - void createContextMenu(const bool bIsDefault ); - void ContextMenuSelectHdl(std::string_view rIdent); TemplateContainerItem* getRegion(std::u16string_view sStr); diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index f60c222cba50..7fa12e16014c 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -60,19 +60,6 @@ private: css::uno::Reference< css::chart::XChartDocument > mxChartDoc; SvXMLStylesContext* mpAutoStyles; - std::unique_ptr<SvXMLTokenMap> mpChartDocElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mpTableElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mpChartElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mpPlotAreaElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mpSeriesElemTokenMap; - - std::unique_ptr<SvXMLTokenMap> mpChartAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mpPlotAreaAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mpCellAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mpSeriesAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mpPropMappingAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mpRegEquationAttrTokenMap; - public: SchXMLImportHelper(); @@ -97,19 +84,6 @@ public: const css::uno::Reference< css::chart::XChartDocument >& GetChartDocument() const { return mxChartDoc; } - const SvXMLTokenMap& GetDocElemTokenMap(); - const SvXMLTokenMap& GetTableElemTokenMap(); - const SvXMLTokenMap& GetChartElemTokenMap(); - const SvXMLTokenMap& GetPlotAreaElemTokenMap(); - const SvXMLTokenMap& GetSeriesElemTokenMap(); - const SvXMLTokenMap& GetPropMappingAttrTokenMap(); - - const SvXMLTokenMap& GetChartAttrTokenMap(); - const SvXMLTokenMap& GetPlotAreaAttrTokenMap(); - const SvXMLTokenMap& GetCellAttrTokenMap(); - const SvXMLTokenMap& GetSeriesAttrTokenMap(); - const SvXMLTokenMap& GetRegEquationAttrTokenMap(); - static XmlStyleFamily GetChartFamilyID() { return XmlStyleFamily::SCH_CHART_ID; } /** @param bPushLastChartType If </sal_False>, in case a new chart type has to diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 54e1407efa9d..a047b0865ae7 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -229,16 +229,6 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO rtl::Reference<SvXMLStylesContext> mxStylesContext; rtl::Reference<SvXMLStylesContext> mxAutoStylesContext; - // contexts for xShape contents TokenMaps - std::unique_ptr<SvXMLTokenMap> mpGroupShapeElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mpFrameShapeElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DSceneShapeElemTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DObjectAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DPolygonBasedAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DCubeObjectAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DSphereObjectAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> mp3DLightAttrTokenMap; - rtl::Reference< XMLTableImport > mxShapeTableImport; protected: @@ -271,15 +261,6 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList, css::uno::Reference< css::drawing::XShapes > const & rShapes); - const SvXMLTokenMap& GetGroupShapeElemTokenMap(); - const SvXMLTokenMap& GetFrameShapeElemTokenMap(); - const SvXMLTokenMap& Get3DSceneShapeElemTokenMap(); - const SvXMLTokenMap& Get3DObjectAttrTokenMap(); - const SvXMLTokenMap& Get3DPolygonBasedAttrTokenMap(); - const SvXMLTokenMap& Get3DCubeObjectAttrTokenMap(); - const SvXMLTokenMap& Get3DSphereObjectAttrTokenMap(); - const SvXMLTokenMap& Get3DLightAttrTokenMap(); - // Styles and AutoStyles contexts SvXMLStylesContext* GetStylesContext() const { return mxStylesContext.get(); } void SetStylesContext(SvXMLStylesContext* pNew); diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 52438189209a..c8a1c80e4425 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -402,17 +402,6 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList, XMLTextType eType = XMLTextType::Shape ); - SvXMLTokenMap const& GetTextElemTokenMap(); - SvXMLTokenMap const& GetTextPElemTokenMap(); - SvXMLTokenMap const& GetTextPAttrTokenMap(); - SvXMLTokenMap const& GetTextFrameAttrTokenMap(); - SvXMLTokenMap const& GetTextContourAttrTokenMap(); - SvXMLTokenMap const& GetTextHyperlinkAttrTokenMap(); - - const SvXMLTokenMap& GetTextNumberedParagraphAttrTokenMap(); - const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); - const SvXMLTokenMap& GetTextListBlockElemTokenMap(); - css::uno::Reference< css::text::XText > & GetText(); css::uno::Reference< css::text::XTextCursor > & GetCursor(); css::uno::Reference< css::text::XTextRange > & GetCursorAsRange(); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 2a18accc9ccc..9c402f199ffa 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -481,8 +481,6 @@ public: void SetError( sal_Int32 nId ); void SetError( sal_Int32 nId, const OUString& rMsg1 ); - void SetError( sal_Int32 nId, const OUString& rMsg1, - const OUString& rMsg2 ); virtual void DisposingModel(); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 39d518f83b5d..808b276fba92 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -665,38 +665,6 @@ SvXMLImportContext *ORptFilter::CreateFastContext( sal_Int32 nElement, return pContext; } -const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const -{ - if (!m_pReportElemTokenMap) - m_pReportElemTokenMap = OXMLHelper::GetReportElemTokenMap(); - return *m_pReportElemTokenMap; -} - -const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const -{ - if (!m_pCellElemTokenMap) - { - static const SvXMLTokenMapEntry aElemTokenMap[]= - { - { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, - { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, - { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, - { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, - { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, - { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, - { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, - { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, - { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, - { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, - { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, - XML_TOKEN_MAP_END - }; - m_pCellElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); - } - return *m_pCellElemTokenMap; -} - SvXMLImportContext* ORptFilter::CreateStylesContext( bool bIsAutoStyle ) { SvXMLImportContext* pContext = bIsAutoStyle ? GetAutoStyles() : GetStyles(); diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 33aa2e3b5843..d6e8c2d2b486 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -58,9 +58,6 @@ private: TGroupFunctionMap m_aFunctions; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pCellElemTokenMap; - rtl::Reference < XMLPropertyHandlerFactory > m_xPropHdlFactory; rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; @@ -100,9 +97,6 @@ public: virtual void SAL_CALL startDocument() override; virtual void SAL_CALL endDocument() override; - const SvXMLTokenMap& GetReportElemTokenMap() const; - const SvXMLTokenMap& GetCellElemTokenMap() const; - const rtl::Reference< XMLPropertySetMapper >& GetCellStylesPropertySetMapper() const { return m_xCellStylesPropertySetMapper; } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index fb226b7c30ad..6af5959a66e9 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -332,40 +332,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL return pContext; } -const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() -{ - if( !pTableElemTokenMap ) - { - static const SvXMLTokenMapEntry aTableTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_TABLE_NAMED_EXPRESSIONS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, - { XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION }, - { XML_NAMESPACE_LO_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, - { XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, - { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, - { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, - { XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS }, - { XML_NAMESPACE_OFFICE_EXT, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS_EXT }, - { XML_NAMESPACE_CALC_EXT, XML_CONDITIONAL_FORMATS, XML_TOK_TABLE_CONDFORMATS }, - XML_TOKEN_MAP_END - }; - - pTableElemTokenMap.reset(new SvXMLTokenMap( aTableTokenMap )); - } // if( !pTableElemTokenMap ) - - return *pTableElemTokenMap; -} - const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { if( !pTableRowsElemTokenMap ) @@ -442,28 +408,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() return *pTableRowCellElemTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() -{ - if( !pTableAnnotationAttrTokenMap ) - { - static const SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = - { - { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, - { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, - { XML_NAMESPACE_SVG, XML_X, XML_TOK_TABLE_ANNOTATION_ATTR_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TABLE_ANNOTATION_ATTR_Y }, - XML_TOKEN_MAP_END - }; - - pTableAnnotationAttrTokenMap.reset(new SvXMLTokenMap( aTableAnnotationAttrTokenMap )); - } // if( !pTableAnnotationAttrTokenMap ) - - return *pTableAnnotationAttrTokenMap; -} - - void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) { mpPostProcessData = p; @@ -551,13 +495,11 @@ ScXMLImport::ScXMLImport( ScXMLImport::~ScXMLImport() throw() { // delete pI18NMap; - pTableElemTokenMap.reset(); pTableRowsElemTokenMap.reset(); pTableRowElemTokenMap.reset(); pTableRowAttrTokenMap.reset(); pTableRowCellElemTokenMap.reset(); pTableRowCellAttrTokenMap.reset(); - pTableAnnotationAttrTokenMap.reset(); pChangeTrackingImportHelper.reset(); pNumberFormatAttributesExportHelper.reset(); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index daae1d3a98ed..cb7d3be4b65f 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -219,13 +219,11 @@ class ScXMLImport: public SvXMLImport rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper; rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper; - std::unique_ptr<SvXMLTokenMap> pTableElemTokenMap; std::unique_ptr<SvXMLTokenMap> pTableRowsElemTokenMap; std::unique_ptr<SvXMLTokenMap> pTableRowElemTokenMap; std::unique_ptr<SvXMLTokenMap> pTableRowAttrTokenMap; std::unique_ptr<SvXMLTokenMap> pTableRowCellElemTokenMap; std::unique_ptr<SvXMLTokenMap> pTableRowCellAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> pTableAnnotationAttrTokenMap; sc::ImportPostProcessData* mpPostProcessData; /// Lift cycle managed elsewhere, no need to delete. @@ -311,13 +309,11 @@ public: const rtl::Reference < XMLPropertySetMapper >& GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; } const rtl::Reference < XMLPropertySetMapper >& GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; } - const SvXMLTokenMap& GetTableElemTokenMap(); const SvXMLTokenMap& GetTableRowsElemTokenMap(); const SvXMLTokenMap& GetTableRowElemTokenMap(); const SvXMLTokenMap& GetTableRowAttrTokenMap(); const SvXMLTokenMap& GetTableRowCellElemTokenMap(); const SvXMLTokenMap& GetTableRowCellAttrTokenMap(); - const SvXMLTokenMap& GetTableAnnotationAttrTokenMap(); void SetPostProcessData( sc::ImportPostProcessData* p ); sc::ImportPostProcessData* GetPostProcessData() { return mpPostProcessData;} diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index b7f69f1d8e5b..3f1b76ecd80f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -260,7 +260,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/sidebar/SidebarModelUpdate \ sfx2/source/sidebar/SidebarPanelBase \ sfx2/source/sidebar/SidebarToolBox \ - sfx2/source/sidebar/Accessible \ sfx2/source/sidebar/AsynchronousCall \ sfx2/source/sidebar/Context \ sfx2/source/sidebar/ContextChangeBroadcaster \ diff --git a/sfx2/inc/sidebar/Accessible.hxx b/sfx2/inc/sidebar/Accessible.hxx deleted file mode 100644 index 3f3d351ed8d8..000000000000 --- a/sfx2/inc/sidebar/Accessible.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#pragma once - -#include <com/sun/star/accessibility/XAccessible.hpp> - -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> - -namespace com::sun::star::accessibility { class XAccessibleContext; } - -typedef cppu::WeakComponentImplHelper < - css::accessibility::XAccessible - > AccessibleInterfaceBase; - -namespace sfx2::sidebar { - - -/** Simple implementation of the XAccessible interface. - Its getAccessibleContext() method returns a context object given - to its constructor. -*/ -class Accessible final - : private ::cppu::BaseMutex, - public AccessibleInterfaceBase -{ -public: - explicit Accessible ( - const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext); - virtual ~Accessible() override; - Accessible(const Accessible&) = delete; - Accessible& operator=( const Accessible& ) = delete; - - virtual void SAL_CALL disposing() override; - // XAccessible - virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override; - -private: - css::uno::Reference<css::accessibility::XAccessibleContext> mxContext; -}; - -} // end of namespace sfx2::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx index 29dec2d47c3a..cad5dac3d8f4 100644 --- a/sfx2/inc/sidebar/DeckTitleBar.hxx +++ b/sfx2/inc/sidebar/DeckTitleBar.hxx @@ -44,8 +44,6 @@ public: private: virtual void HandleToolBoxItemClick() override; - DECL_LINK(DrawGripHdl, weld::DrawingArea::draw_args, void); - std::unique_ptr<GripWidget> mxGripWidget; std::unique_ptr<weld::CustomWeld> mxGripWeld; std::unique_ptr<weld::Label> mxLabel; diff --git a/sfx2/inc/sidebar/SidebarToolBox.hxx b/sfx2/inc/sidebar/SidebarToolBox.hxx index 33bfc9ec3437..38b49b49c57d 100644 --- a/sfx2/inc/sidebar/SidebarToolBox.hxx +++ b/sfx2/inc/sidebar/SidebarToolBox.hxx @@ -52,9 +52,6 @@ public: virtual bool EventNotify(NotifyEvent& rEvent) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; - void SetController(const sal_uInt16 nItemId, - const css::uno::Reference<css::frame::XToolbarController>& rxController); - void InitToolBox(VclBuilder::stringmap& rMap); protected: diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 6c1597bea1ca..5faba8b552d1 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -177,18 +177,6 @@ void TemplateLocalView::showRegion(TemplateContainerItem const *pItem) maOpenRegionHdl.Call(nullptr); } -void TemplateLocalView::showRegion(std::u16string_view rName) -{ - for (auto const & pRegion : maRegions) - { - if (pRegion->maTitle == rName) - { - showRegion(pRegion.get()); - break; - } - } -} - TemplateContainerItem* TemplateLocalView::getRegion(std::u16string_view rName) { for (auto const & pRegion : maRegions) @@ -198,27 +186,6 @@ TemplateContainerItem* TemplateLocalView::getRegion(std::u16string_view rName) return nullptr; } -void TemplateLocalView::createContextMenu(const bool bIsDefault) -{ - mxContextMenu->clear(); - mxContextMenu->append("open",SfxResId(STR_OPEN)); - mxContextMenu->append("edit",SfxResId(STR_EDIT_TEMPLATE)); - - if(!bIsDefault) - mxContextMenu->append("default",SfxResId(STR_DEFAULT_TEMPLATE)); - else - mxContextMenu->append("default",SfxResId(STR_RESET_DEFAULT)); - - mxContextMenu->append_separator("separator"); - mxContextMenu->append("rename",SfxResId(STR_SFX_RENAME)); - mxContextMenu->append("delete",SfxResId(STR_DELETE)); - deselectItems(); - maSelectedItem->setSelection(true); - maItemStateHdl.Call(maSelectedItem); - ContextMenuSelectHdl(mxContextMenu->popup_at_rect(GetDrawingArea(), tools::Rectangle(maPosition, Size(1,1)))); - Invalidate(); -} - void TemplateLocalView::ContextMenuSelectHdl(std::string_view rIdent) { if (rIdent == "open") diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx deleted file mode 100644 index 8eb264f39085..000000000000 --- a/sfx2/source/sidebar/Accessible.cxx +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <sidebar/Accessible.hxx> - -using namespace css; -using namespace css::uno; - -namespace sfx2::sidebar { - -Accessible::Accessible ( - const Reference<accessibility::XAccessibleContext>& rxContext) - : AccessibleInterfaceBase(m_aMutex), - mxContext(rxContext) -{ -} - -Accessible::~Accessible() -{ -} - -void SAL_CALL Accessible::disposing() -{ - Reference<XComponent> xComponent (mxContext, UNO_QUERY); - if (xComponent.is()) - xComponent->dispose(); -} - -Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext() -{ - return mxContext; -} - -} // end of namespace sfx2::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 967256a46875..159bb27d6c05 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -265,21 +265,6 @@ void FocusManager::FocusButton (const sal_Int32 nButtonIndex) maButtons[nButtonIndex]->grab_focus(); } -void FocusManager::RemoveWindow (vcl::Window& rWindow) -{ - auto iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); - if (iPanel != maPanels.end()) - { - if ((*iPanel)->GetTitleBar() != nullptr) - { - UnregisterWindow((*iPanel)->GetTitleBar()->GetToolBox()); - UnregisterWindow((*iPanel)->GetTitleBar()->GetExpander()); - } - maPanels.erase(iPanel); - return; - } -} - void FocusManager::MoveFocusInsidePanel ( const FocusLocation& rFocusLocation, const sal_Int32 nDirection) diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 340c1a286cc7..8e582861fb4f 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -171,27 +171,6 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con return Reference<frame::XToolbarController>(); } -void SidebarToolBox::SetController(const sal_uInt16 nItemId, - const css::uno::Reference<css::frame::XToolbarController>& rxController) -{ - ControllerContainer::iterator iController (maControllers.find(nItemId)); - if (iController != maControllers.end()) - { - Reference<lang::XComponent> xComponent(rxController, UNO_QUERY); - if (xComponent.is()) - xComponent->dispose(); - - iController->second = rxController; - } - else - { - maControllers[nItemId] = rxController; - } - - if (rxController.is()) - RegisterHandlers(); -} - void SidebarToolBox::RegisterHandlers() { if ( ! mbAreHandlersRegistered) diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 512f6cca18df..241397937b17 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -118,8 +118,6 @@ public: virtual bool GetInfo( SfxPoolItem& ) const override; /// Get and set Modify pointer. - const sw::FormatDropDefiner* GetDefinedIn() const - { return m_pDefinedIn; }; void ChgDefinedIn( const sw::FormatDropDefiner* pDefiner ) { m_pDefinedIn = const_cast<sw::FormatDropDefiner*>(pDefiner); }; }; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index d47366da42d8..5432a24d60e4 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -386,7 +386,6 @@ public: SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const; bool hasSoftPageBreak() const; - void RegisterToFormat( SwFormat& rFormat ); }; /// SwTableBox is one table cell in the document model. diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 39fd910b599a..65f39748fd34 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2743,11 +2743,6 @@ bool SwTable::HasLayout() const return pFrameFormat && SwIterator<SwTabFrame,SwFormat>(*pFrameFormat).First(); } -void SwTableLine::RegisterToFormat( SwFormat& rFormat ) -{ - rFormat.Add( this ); -} - void SwTableBox::RegisterToFormat( SwFormat& rFormat ) { rFormat.Add( this ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index feda4bec3ff4..9e06e6e098e8 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -345,8 +345,6 @@ SwXMLImport::~SwXMLImport() throw () SAL_WARN("sw", "endDocument skipped, dropping shapes now to avoid dangling SvTextShapeImportHelper pointing to this"); ClearShapeImport(); } - m_pTableElemTokenMap.reset(); - m_pTableCellAttrTokenMap.reset(); FinitItemImport(); } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 63313c2c155e..83cee154bbc0 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -63,8 +63,6 @@ class SwXMLImport: public SvXMLImport std::unique_ptr<SvXMLUnitConverter> m_pTwipUnitConv; std::unique_ptr<SvXMLImportItemMapper> m_pTableItemMapper;// paragraph item import - std::unique_ptr<SvXMLTokenMap> m_pTableElemTokenMap; - std::unique_ptr<SvXMLTokenMap> m_pTableCellAttrTokenMap; rtl::Reference<SvXMLGraphicHelper> m_xGraphicStorageHandler; @@ -149,9 +147,6 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList, XmlStyleFamily nSubFamily, SfxItemSet& rItemSet ); - const SvXMLTokenMap& GetTableElemTokenMap(); - const SvXMLTokenMap& GetTableCellAttrTokenMap(); - bool FindAutomaticStyle( XmlStyleFamily nFamily, const OUString& rName, const SfxItemSet **ppItemSet ) const; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 39b9fabe39c3..dd0b9c895a56 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -154,22 +154,6 @@ const SvXMLTokenMapEntry aTableCellAttrTokenMap[] = XML_TOKEN_MAP_END }; -const SvXMLTokenMap& SwXMLImport::GetTableElemTokenMap() -{ - if( !m_pTableElemTokenMap ) - m_pTableElemTokenMap.reset(new SvXMLTokenMap( aTableElemTokenMap )); - - return *m_pTableElemTokenMap; -} - -const SvXMLTokenMap& SwXMLImport::GetTableCellAttrTokenMap() -{ - if( !m_pTableCellAttrTokenMap ) - m_pTableCellAttrTokenMap.reset(new SvXMLTokenMap( aTableCellAttrTokenMap )); - - return *m_pTableCellAttrTokenMap; -} - class SwXMLTableCell_Impl { OUString aStyleName; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 2a694423b640..736fa5bbd87d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -953,7 +953,6 @@ private: virtual void PrepareField( const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override; - static const char* MapBibliographyFieldName(const OUString& sName); static const char* MapBibliographyFieldName(sal_Int32 nElement); }; diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 53d10e349756..893e83fa3a95 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -120,244 +120,6 @@ void SchXMLImportHelper::FillAutoStyle(const OUString& rAutoStyleName, const uno // get various token maps -const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap() -{ - if( ! mpChartDocElemTokenMap ) - { - static const SvXMLTokenMapEntry aDocElemTokenMap[] = - { - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - XML_TOKEN_MAP_END - }; - - mpChartDocElemTokenMap = std::make_unique<SvXMLTokenMap>( aDocElemTokenMap ); - } // if( ! mpChartDocElemTokenMap ) - - return *mpChartDocElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap() -{ - if( ! mpTableElemTokenMap ) - { - static const SvXMLTokenMapEntry aTableElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - XML_TOKEN_MAP_END - }; - - mpTableElemTokenMap = std::make_unique<SvXMLTokenMap>( aTableElemTokenMap ); - } // if( ! mpTableElemTokenMap ) - - return *mpTableElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap() -{ - if( ! mpChartElemTokenMap ) - { - static const SvXMLTokenMapEntry aChartElemTokenMap[] = - { - { XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA }, - { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE }, - { XML_NAMESPACE_CHART, XML_SUBTITLE, XML_TOK_CHART_SUBTITLE }, - { XML_NAMESPACE_CHART, XML_LEGEND, XML_TOK_CHART_LEGEND }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_CHART_TABLE }, - XML_TOKEN_MAP_END - }; - - mpChartElemTokenMap = std::make_unique<SvXMLTokenMap>( aChartElemTokenMap ); - } // if( ! mpChartElemTokenMap ) - - return *mpChartElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap() -{ - if( ! mpPlotAreaElemTokenMap ) - { - static const SvXMLTokenMapEntry aPlotAreaElemTokenMap[] = -{ - { XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT }, - { XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION }, - { XML_NAMESPACE_CHART, XML_AXIS, XML_TOK_PA_AXIS }, - { XML_NAMESPACE_CHART, XML_SERIES, XML_TOK_PA_SERIES }, - { XML_NAMESPACE_CHART, XML_WALL, XML_TOK_PA_WALL }, - { XML_NAMESPACE_CHART, XML_FLOOR, XML_TOK_PA_FLOOR }, - { XML_NAMESPACE_DR3D, XML_LIGHT, XML_TOK_PA_LIGHT_SOURCE }, - { XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, XML_TOK_PA_STOCK_GAIN }, - { XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, XML_TOK_PA_STOCK_LOSS }, - { XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, XML_TOK_PA_STOCK_RANGE }, - XML_TOKEN_MAP_END -}; - - mpPlotAreaElemTokenMap = std::make_unique<SvXMLTokenMap>( aPlotAreaElemTokenMap ); - } // if( ! mpPlotAreaElemTokenMap ) - - return *mpPlotAreaElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap() -{ - if( ! mpSeriesElemTokenMap ) - { - static const SvXMLTokenMapEntry aSeriesElemTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT }, - { XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN }, - { XML_NAMESPACE_CHART, XML_MEAN_VALUE, XML_TOK_SERIES_MEAN_VALUE_LINE }, - { XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, XML_TOK_SERIES_REGRESSION_CURVE }, - { XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, XML_TOK_SERIES_ERROR_INDICATOR }, - { XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, XML_TOK_SERIES_PROPERTY_MAPPING }, - { XML_NAMESPACE_CHART, XML_DATA_LABEL, XML_TOK_SERIES_DATA_LABEL }, - XML_TOKEN_MAP_END -}; - - mpSeriesElemTokenMap = std::make_unique<SvXMLTokenMap>( aSeriesElemTokenMap ); - } // if( ! mpSeriesElemTokenMap ) - - return *mpSeriesElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap() -{ - if( ! mpChartAttrTokenMap ) - { - static const SvXMLTokenMapEntry aChartAttrTokenMap[] = -{ - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF }, - { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CHART_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CHART_HEIGHT }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_CHART_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_COLUMN_MAPPING, XML_TOK_CHART_COL_MAPPING }, - { XML_NAMESPACE_CHART, XML_ROW_MAPPING, XML_TOK_CHART_ROW_MAPPING }, - { XML_NAMESPACE_LO_EXT, XML_DATA_PILOT_SOURCE, XML_TOK_CHART_DATA_PILOT_SOURCE }, - XML_TOKEN_MAP_END -}; - - mpChartAttrTokenMap = std::make_unique<SvXMLTokenMap>( aChartAttrTokenMap ); - } // if( ! mpChartAttrTokenMap ) - - return *mpChartAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap() -{ - if( ! mpPlotAreaAttrTokenMap ) - { - static const SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PA_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PA_HEIGHT }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_PA_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_PA_CHART_ADDRESS }, - { XML_NAMESPACE_CHART, XML_DATA_SOURCE_HAS_LABELS, XML_TOK_PA_DS_HAS_LABELS }, - { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_PA_TRANSFORM }, - { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_PA_VRP }, - { XML_NAMESPACE_DR3D, XML_VPN, XML_TOK_PA_VPN }, - { XML_NAMESPACE_DR3D, XML_VUP, XML_TOK_PA_VUP }, - { XML_NAMESPACE_DR3D, XML_PROJECTION, XML_TOK_PA_PROJECTION }, - { XML_NAMESPACE_DR3D, XML_DISTANCE, XML_TOK_PA_DISTANCE }, - { XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, XML_TOK_PA_FOCAL_LENGTH }, - { XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, XML_TOK_PA_SHADOW_SLANT }, - { XML_NAMESPACE_DR3D, XML_SHADE_MODE, XML_TOK_PA_SHADE_MODE }, - { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_TOK_PA_AMBIENT_COLOR }, - { XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, XML_TOK_PA_LIGHTING_MODE }, - XML_TOKEN_MAP_END -}; - - mpPlotAreaAttrTokenMap = std::make_unique<SvXMLTokenMap>( aPlotAreaAttrTokenMap ); - } // if( ! mpPlotAreaAttrTokenMap ) - - return *mpPlotAreaAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap() -{ - if( ! mpCellAttrTokenMap ) - { - static const SvXMLTokenMapEntry aCellAttrTokenMap[] = -{ - { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE }, - { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE }, - XML_TOKEN_MAP_END -}; - - mpCellAttrTokenMap = std::make_unique<SvXMLTokenMap>( aCellAttrTokenMap ); - } // if( ! mpCellAttrTokenMap ) - - return *mpCellAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap() -{ - if( ! mpSeriesAttrTokenMap ) - { - static const SvXMLTokenMapEntry aSeriesAttrTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE }, - { XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS }, - { XML_NAMESPACE_LO_EXT, XML_LABEL_STRING, XML_TOK_SERIES_LABEL_STRING }, - { XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_TOK_SERIES_ATTACHED_AXIS }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_SERIES_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_SERIES_CHART_CLASS }, - { XML_NAMESPACE_LO_EXT, XML_HIDE_LEGEND, XML_TOK_SERIES_HIDE_LEGEND }, - XML_TOKEN_MAP_END -}; - - mpSeriesAttrTokenMap = std::make_unique<SvXMLTokenMap>( aSeriesAttrTokenMap ); - } // if( ! mpSeriesAttrTokenMap ) - - return *mpSeriesAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPropMappingAttrTokenMap() -{ - if( !mpPropMappingAttrTokenMap ) - { - static const SvXMLTokenMapEntry aPropMappingAttrTokenMap[] = - { - { XML_NAMESPACE_LO_EXT, XML_PROPERTY, XML_TOK_PROPERTY_MAPPING_PROPERTY }, - { XML_NAMESPACE_LO_EXT, XML_CELL_RANGE_ADDRESS, XML_TOK_PROPERTY_MAPPING_RANGE }, - XML_TOKEN_MAP_END - }; - - mpPropMappingAttrTokenMap = std::make_unique<SvXMLTokenMap>( aPropMappingAttrTokenMap ); - } - - return *mpPropMappingAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap() -{ - if( ! mpRegEquationAttrTokenMap ) - { - static const SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION }, - { XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, XML_TOK_REGEQ_DISPLAY_R_SQUARE }, - { XML_NAMESPACE_SVG, XML_X, XML_TOK_REGEQ_POS_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_REGEQ_POS_Y }, - XML_TOKEN_MAP_END -}; - - mpRegEquationAttrTokenMap = std::make_unique<SvXMLTokenMap>( aRegressionEquationAttrTokenMap ); - } // if( ! mpRegEquationAttrTokenMap ) - - return *mpRegEquationAttrTokenMap; -} //static void SchXMLImportHelper::DeleteDataSeries( diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index a96836829318..94eafa9f8ab2 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1747,18 +1747,6 @@ void SvXMLImport::SetError( SetError( nId, aSeq ); } -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2) -{ - Sequence<OUString> aSeq(2); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - SetError( nId, aSeq ); -} - void SvXMLImport::DisposingModel() { if( mxFontDecls.is() ) diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index e3fcfd70fd56..9bd4b3b9dd35 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -174,174 +174,6 @@ XMLShapeImportHelper::~XMLShapeImportHelper() mxAutoStylesContext->dispose(); } -const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap() -{ - if(!mpGroupShapeElemTokenMap) - { - static const SvXMLTokenMapEntry aGroupShapeElemTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT }, - { XML_NAMESPACE_DRAW, XML_LINE, XML_TOK_GROUP_LINE }, - { XML_NAMESPACE_DRAW, XML_CIRCLE, XML_TOK_GROUP_CIRCLE }, - { XML_NAMESPACE_DRAW, XML_ELLIPSE, XML_TOK_GROUP_ELLIPSE }, - { XML_NAMESPACE_DRAW, XML_POLYGON, XML_TOK_GROUP_POLYGON }, - { XML_NAMESPACE_DRAW, XML_POLYLINE, XML_TOK_GROUP_POLYLINE }, - { XML_NAMESPACE_DRAW, XML_PATH, XML_TOK_GROUP_PATH }, - - { XML_NAMESPACE_DRAW, XML_CONTROL, XML_TOK_GROUP_CONTROL }, - { XML_NAMESPACE_DRAW, XML_CONNECTOR, XML_TOK_GROUP_CONNECTOR }, - { XML_NAMESPACE_DRAW, XML_MEASURE, XML_TOK_GROUP_MEASURE }, - { XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, XML_TOK_GROUP_PAGE }, - { XML_NAMESPACE_DRAW, XML_CAPTION, XML_TOK_GROUP_CAPTION }, - - { XML_NAMESPACE_CHART, XML_CHART, XML_TOK_GROUP_CHART }, - { XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_GROUP_3DSCENE }, - - { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_GROUP_FRAME }, - - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, XML_TOK_GROUP_CUSTOM_SHAPE }, - { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_GROUP_ANNOTATION }, - { XML_NAMESPACE_DRAW, XML_A, XML_TOK_GROUP_A }, - - XML_TOKEN_MAP_END - }; - - mpGroupShapeElemTokenMap = std::make_unique<SvXMLTokenMap>(aGroupShapeElemTokenMap); - } - - return *mpGroupShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap() -{ - if(!mpFrameShapeElemTokenMap) - { - static const SvXMLTokenMapEntry aFrameShapeElemTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_TEXT_BOX, XML_TOK_FRAME_TEXT_BOX }, - { XML_NAMESPACE_DRAW, XML_IMAGE, XML_TOK_FRAME_IMAGE }, - { XML_NAMESPACE_DRAW, XML_OBJECT, XML_TOK_FRAME_OBJECT }, - { XML_NAMESPACE_DRAW, XML_OBJECT_OLE, XML_TOK_FRAME_OBJECT_OLE }, - { XML_NAMESPACE_DRAW, XML_PLUGIN, XML_TOK_FRAME_PLUGIN }, - { XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, XML_TOK_FRAME_FLOATING_FRAME}, - { XML_NAMESPACE_DRAW, XML_APPLET, XML_TOK_FRAME_APPLET }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_FRAME_TABLE }, - XML_TOKEN_MAP_END - }; - - mpFrameShapeElemTokenMap = std::make_unique<SvXMLTokenMap>(aFrameShapeElemTokenMap); - } - - return *mpFrameShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() -{ - if(!mp3DSceneShapeElemTokenMap) - { - static const SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE }, - { XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE }, - { XML_NAMESPACE_DR3D, XML_SPHERE, XML_TOK_3DSCENE_3DSPHERE }, - { XML_NAMESPACE_DR3D, XML_ROTATE, XML_TOK_3DSCENE_3DLATHE }, - { XML_NAMESPACE_DR3D, XML_EXTRUDE, XML_TOK_3DSCENE_3DEXTRUDE }, - XML_TOKEN_MAP_END - }; - - mp3DSceneShapeElemTokenMap = std::make_unique<SvXMLTokenMap>(a3DSceneShapeElemTokenMap); - } - - return *mp3DSceneShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() -{ - if(!mp3DObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_3DOBJECT_DRAWSTYLE_NAME }, - { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DOBJECT_TRANSFORM }, - XML_TOKEN_MAP_END - }; - - mp3DObjectAttrTokenMap = std::make_unique<SvXMLTokenMap>(a3DObjectAttrTokenMap); - } - - return *mp3DObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() -{ - if(!mp3DPolygonBasedAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] = - { - { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_3DPOLYGONBASED_VIEWBOX }, - { XML_NAMESPACE_SVG, XML_D, XML_TOK_3DPOLYGONBASED_D }, - XML_TOKEN_MAP_END - }; - - mp3DPolygonBasedAttrTokenMap = std::make_unique<SvXMLTokenMap>(a3DPolygonBasedAttrTokenMap); - } - - return *mp3DPolygonBasedAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() -{ - if(!mp3DCubeObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_MIN_EDGE, XML_TOK_3DCUBEOBJ_MINEDGE }, - { XML_NAMESPACE_DR3D, XML_MAX_EDGE, XML_TOK_3DCUBEOBJ_MAXEDGE }, - XML_TOKEN_MAP_END - }; - - mp3DCubeObjectAttrTokenMap = std::make_unique<SvXMLTokenMap>(a3DCubeObjectAttrTokenMap); - } - - return *mp3DCubeObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() -{ - if(!mp3DSphereObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_CENTER, XML_TOK_3DSPHEREOBJ_CENTER }, - { XML_NAMESPACE_DR3D, XML_SIZE, XML_TOK_3DSPHEREOBJ_SIZE }, - XML_TOKEN_MAP_END - }; - - mp3DSphereObjectAttrTokenMap = std::make_unique<SvXMLTokenMap>(a3DSphereObjectAttrTokenMap); - } - - return *mp3DSphereObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() -{ - if(!mp3DLightAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DLightAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR }, - { XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION }, - { XML_NAMESPACE_DR3D, XML_ENABLED, XML_TOK_3DLIGHT_ENABLED }, - { XML_NAMESPACE_DR3D, XML_SPECULAR, XML_TOK_3DLIGHT_SPECULAR }, - XML_TOKEN_MAP_END - }; - - mp3DLightAttrTokenMap = std::make_unique<SvXMLTokenMap>(a3DLightAttrTokenMap); - } - - return *mp3DLightAttrTokenMap; -} SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( SvXMLImport& rImport, diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 16307b395646..f957121daa2f 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -91,22 +91,6 @@ namespace xmloff::metadata typedef std::unordered_map< OUString, XMLTokenEnum > ReverseTokenLookup; - const ReverseTokenLookup& getReverseTokenLookup() - { - DBG_TESTSOLARMUTEX(); - static ReverseTokenLookup s_reverseTokenLookup; - if ( s_reverseTokenLookup.empty() ) - { - const PropertyDescription* desc = lcl_getPropertyMetaData(); - while ( !desc->propertyName.isEmpty() ) - { - s_reverseTokenLookup[ token::GetXMLToken( desc->attribute.attributeToken ) ] = desc->attribute.attributeToken; - ++desc; - } - } - return s_reverseTokenLookup; - } - struct AttributeHash { size_t operator()( const AttributeDescription& i_attribute ) const @@ -159,19 +143,6 @@ namespace xmloff::metadata o_propertyGroups = pos->second; } - AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) - { - AttributeDescription attribute; - const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() ); - const ReverseTokenLookup::const_iterator pos = rTokenLookup.find( i_attributeName ); - if ( pos != rTokenLookup.end() ) - { - attribute.namespacePrefix = i_namespacePrefix; - attribute.attributeToken = pos->second; - } - return attribute; - } - AttributeDescription getAttributeDescription( sal_Int32 nAttributeToken ) { AttributeDescription attribute; diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index b61a1878b745..71236d33d948 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -36,11 +36,6 @@ namespace xmloff::metadata /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name */ - AttributeDescription - getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); - - /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name - */ AttributeDescription getAttributeDescription( sal_Int32 nElement ); } // namespace xmloff::metadata diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 084a19e0f05b..f7cb315896fb 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3033,146 +3033,6 @@ void XMLBibliographyFieldImportContext::PrepareField( } const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( - const OUString& sName) -{ - const char* pName = nullptr; - - if (IsXMLToken(sName, XML_IDENTIFIER)) - { - pName = "Identifier"; - } - else if (IsXMLToken(sName, XML_BIBILIOGRAPHIC_TYPE) || - IsXMLToken(sName, XML_BIBLIOGRAPHY_TYPE) ) - { - // biblio... vs bibilio...: #96658#: also read old documents - pName = "BibiliographicType"; - } - else if (IsXMLToken(sName, XML_ADDRESS)) - { - pName = "Address"; - } - else if (IsXMLToken(sName, XML_ANNOTE)) - { - pName = "Annote"; - } - else if (IsXMLToken(sName, XML_AUTHOR)) - { - pName = "Author"; - } - else if (IsXMLToken(sName, XML_BOOKTITLE)) - { - pName = "Booktitle"; - } - else if (IsXMLToken(sName, XML_CHAPTER)) - { - pName = "Chapter"; - } - else if (IsXMLToken(sName, XML_EDITION)) - { - pName = "Edition"; - } - else if (IsXMLToken(sName, XML_EDITOR)) - { - pName = "Editor"; - } - else if (IsXMLToken(sName, XML_HOWPUBLISHED)) - { - pName = "Howpublished"; - } - else if (IsXMLToken(sName, XML_INSTITUTION)) - { - pName = "Institution"; - } - else if (IsXMLToken(sName, XML_JOURNAL)) - { - pName = "Journal"; - } - else if (IsXMLToken(sName, XML_MONTH)) - { - pName = "Month"; - } - else if (IsXMLToken(sName, XML_NOTE)) - { - pName = "Note"; - } - else if (IsXMLToken(sName, XML_NUMBER)) - { - pName = "Number"; - } - else if (IsXMLToken(sName, XML_ORGANIZATIONS)) - { - pName = "Organizations"; - } - else if (IsXMLToken(sName, XML_PAGES)) - { - pName = "Pages"; - } - else if (IsXMLToken(sName, XML_PUBLISHER)) - { - pName = "Publisher"; - } - else if (IsXMLToken(sName, XML_SCHOOL)) - { - pName = "School"; - } - else if (IsXMLToken(sName, XML_SERIES)) - { - pName = "Series"; - } - else if (IsXMLToken(sName, XML_TITLE)) - { - pName = "Title"; - } - else if (IsXMLToken(sName, XML_REPORT_TYPE)) - { - pName = "Report_Type"; - } - else if (IsXMLToken(sName, XML_VOLUME)) - { - pName = "Volume"; - } - else if (IsXMLToken(sName, XML_YEAR)) - { - pName = "Year"; - } - else if (IsXMLToken(sName, XML_URL)) - { - pName = "URL"; - } - else if (IsXMLToken(sName, XML_CUSTOM1)) - { - pName = "Custom1"; - } - else if (IsXMLToken(sName, XML_CUSTOM2)) - { - pName = "Custom2"; - } - else if (IsXMLToken(sName, XML_CUSTOM3)) - { - pName = "Custom3"; - } - else if (IsXMLToken(sName, XML_CUSTOM4)) - { - pName = "Custom4"; - } - else if (IsXMLToken(sName, XML_CUSTOM5)) - { - pName = "Custom5"; - } - else if (IsXMLToken(sName, XML_ISBN)) - { - pName = "ISBN"; - } - else - { - OSL_FAIL("Unknown bibliography info data"); - pName = nullptr; - } - - return pName; -} - -const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( sal_Int32 nElement) { const char* pName = nullptr; diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index fea37cb2ba50..5380cd2491fb 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -417,15 +417,6 @@ const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = struct XMLTextImportHelper::Impl { - std::unique_ptr<SvXMLTokenMap> m_xTextElemTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextPElemTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextPAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextNumberedParagraphAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextListBlockAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextListBlockElemTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextFrameAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextContourAttrTokenMap; - std::unique_ptr<SvXMLTokenMap> m_xTextHyperlinkAttrTokenMap; std::unique_ptr< std::vector<OUString> > m_xPrevFrmNames; std::unique_ptr< std::vector<OUString> > m_xNextFrmNames; std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper; @@ -667,66 +658,6 @@ XMLTextListsHelper & XMLTextImportHelper::GetTextListHelper() return *m_xImpl->m_xTextListsHelper; } -const SvXMLTokenMap& XMLTextImportHelper::GetTextElemTokenMap() -{ - if (!m_xImpl->m_xTextElemTokenMap) - { - m_xImpl->m_xTextElemTokenMap.reset( - new SvXMLTokenMap( aTextElemTokenMap )); - } - return *m_xImpl->m_xTextElemTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextPElemTokenMap() -{ - if (!m_xImpl->m_xTextPElemTokenMap) - { - m_xImpl->m_xTextPElemTokenMap.reset( - new SvXMLTokenMap( aTextPElemTokenMap )); - } - return *m_xImpl->m_xTextPElemTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextPAttrTokenMap() -{ - if (!m_xImpl->m_xTextPAttrTokenMap) - { - m_xImpl->m_xTextPAttrTokenMap.reset( - new SvXMLTokenMap( aTextPAttrTokenMap )); - } - return *m_xImpl->m_xTextPAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextFrameAttrTokenMap() -{ - if (!m_xImpl->m_xTextFrameAttrTokenMap) - { - m_xImpl->m_xTextFrameAttrTokenMap.reset( - new SvXMLTokenMap( aTextFrameAttrTokenMap )); - } - return *m_xImpl->m_xTextFrameAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextContourAttrTokenMap() -{ - if (!m_xImpl->m_xTextContourAttrTokenMap) - { - m_xImpl->m_xTextContourAttrTokenMap.reset( - new SvXMLTokenMap( aTextContourAttrTokenMap )); - } - return *m_xImpl->m_xTextContourAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextHyperlinkAttrTokenMap() -{ - if (!m_xImpl->m_xTextHyperlinkAttrTokenMap) - { - m_xImpl->m_xTextHyperlinkAttrTokenMap.reset( - new SvXMLTokenMap( aTextHyperlinkAttrTokenMap )); - } - return *m_xImpl->m_xTextHyperlinkAttrTokenMap; -} - namespace { class FieldParamImporter @@ -2446,36 +2377,6 @@ void XMLTextImportHelper::PopListContext() } -const SvXMLTokenMap& XMLTextImportHelper::GetTextNumberedParagraphAttrTokenMap() -{ - if (!m_xImpl->m_xTextNumberedParagraphAttrTokenMap) - { - m_xImpl->m_xTextNumberedParagraphAttrTokenMap.reset( - new SvXMLTokenMap( aTextNumberedParagraphAttrTokenMap ) ); - } - return *m_xImpl->m_xTextNumberedParagraphAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextListBlockAttrTokenMap() -{ - if (!m_xImpl->m_xTextListBlockAttrTokenMap) - { - m_xImpl->m_xTextListBlockAttrTokenMap.reset( - new SvXMLTokenMap( aTextListBlockAttrTokenMap ) ); - } - return *m_xImpl->m_xTextListBlockAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextListBlockElemTokenMap() -{ - if (!m_xImpl->m_xTextListBlockElemTokenMap) - { - m_xImpl->m_xTextListBlockElemTokenMap.reset( - new SvXMLTokenMap( aTextListBlockElemTokenMap ) ); - } - return *m_xImpl->m_xTextListBlockElemTokenMap; -} - SvI18NMap& XMLTextImportHelper::GetRenameMap() { if (!m_xImpl->m_xRenameMap) |