diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-12 11:34:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-12 16:54:19 +0100 |
commit | d9f0e8db9aa9e914e22f07c046c74f0c83c6e81a (patch) | |
tree | 99d7fb6805111ae841501557cf699a0af973cf13 | |
parent | 392d219b30d6e6e3e636673ed6aa528811356cd2 (diff) |
loplugin:unusedmethods
Change-Id: I90d402a5c18ab16424a042bcea1470fa8a3a5839
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105629
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | compilerplugins/clang/unusedmethods.results | 216 | ||||
-rw-r--r-- | include/vcl/wall.hxx | 1 | ||||
-rw-r--r-- | include/xmloff/formlayerimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/namespacemap.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtimp.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sidebar/Tools.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/sidebar/Tools.cxx | 33 | ||||
-rw-r--r-- | vcl/source/gdi/wall.cxx | 6 | ||||
-rw-r--r-- | xmloff/Library_xo.mk | 1 | ||||
-rw-r--r-- | xmloff/inc/txtfldi.hxx | 60 | ||||
-rw-r--r-- | xmloff/source/core/namespacemap.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/forms/attriblistmerge.cxx | 142 | ||||
-rw-r--r-- | xmloff/source/forms/attriblistmerge.hxx | 69 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.cxx | 65 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.hxx | 24 | ||||
-rw-r--r-- | xmloff/source/forms/formlayerimport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 88 |
17 files changed, 128 insertions, 597 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 06cce1594b9d..5cf60db1c414 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -30,13 +30,13 @@ canvas/inc/rendering/isurfaceproxymanager.hxx:57 class std::shared_ptr<struct canvas::ISurfaceProxy> canvas::ISurfaceProxyManager::createSurfaceProxy(const class std::shared_ptr<struct canvas::IColorBuffer> &) const canvas/inc/rendering/isurfaceproxymanager.hxx:63 class std::shared_ptr<struct canvas::ISurfaceProxyManager> canvas::createSurfaceProxyManager(const class std::shared_ptr<struct canvas::IRenderModule> &) -canvas/inc/vclwrapper.hxx:65 +canvas/inc/vclwrapper.hxx:66 canvas::vcltools::VCLObject::VCLObject<Wrappee_>(unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> >) -canvas/inc/vclwrapper.hxx:134 - type-parameter-?-? & canvas::vcltools::VCLObject::get() canvas/inc/vclwrapper.hxx:135 + type-parameter-?-? & canvas::vcltools::VCLObject::get() +canvas/inc/vclwrapper.hxx:136 const type-parameter-?-? & canvas::vcltools::VCLObject::get() const -canvas/inc/vclwrapper.hxx:137 +canvas/inc/vclwrapper.hxx:138 void canvas::vcltools::VCLObject::swap(VCLObject<Wrappee_> &) canvas/source/vcl/impltools.hxx:102 vclcanvas::tools::LocalGuard::LocalGuard() @@ -86,8 +86,6 @@ connectivity/source/inc/OTypeInfo.hxx:47 _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const cui/source/dialogs/SpellAttrib.hxx:72 _Bool svx::SpellErrorDescription::operator==(const struct svx::SpellErrorDescription &) const -cui/source/inc/chardlg.hxx:204 - class Color SvxCharEffectsPage::GetPreviewFontColor(const class Color &) const cui/source/inc/CustomNotebookbarGenerator.hxx:30 CustomNotebookbarGenerator::CustomNotebookbarGenerator() cui/source/inc/SvxNotebookbarConfigPage.hxx:40 @@ -114,11 +112,13 @@ dbaccess/source/ui/inc/indexcollection.hxx:63 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const dbaccess/source/ui/inc/sbamultiplex.hxx:384 class cppu::OInterfaceContainerHelper * dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &) +dbaccess/source/ui/inc/unodatbr.hxx:313 + _Bool dbaui::SbaTableQueryBrowser::implCopyObject(class ODataClipboard &,const class weld::TreeIter &,int) desktop/source/deployment/gui/dp_gui_dialog2.hxx:132 void dp_gui::ExtMgrDialog::LinkStubHandleUpdateBtn(void *,class weld::Button &) desktop/source/lib/lokclipboard.hxx:95 LOKClipboardFactory::LOKClipboardFactory() -drawinglayer/inc/texture/texture.hxx:41 +drawinglayer/inc/texture/texture.hxx:39 _Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const drawinglayer/source/tools/emfpcustomlinecap.hxx:37 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) @@ -361,11 +361,11 @@ include/comphelper/flagguard.hxx:37 include/comphelper/flagguard.hxx:46 ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(ValueRestorationGuard<T>) include/comphelper/flagguard.hxx:50 - ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(type-parameter-?-? &,type-parameter-?-? &&) + comphelper::ValueRestorationGuard::ValueRestorationGuard(_Bool &,type-parameter-?-? &&) include/comphelper/flagguard.hxx:50 comphelper::ValueRestorationGuard::ValueRestorationGuard(unsigned char &,type-parameter-?-? &&) include/comphelper/flagguard.hxx:50 - comphelper::ValueRestorationGuard::ValueRestorationGuard(_Bool &,type-parameter-?-? &&) + ValueRestorationGuard<T> comphelper::<deduction guide for ValueRestorationGuard>(type-parameter-?-? &,type-parameter-?-? &&) include/comphelper/interfacecontainer3.hxx:50 OInterfaceIteratorHelper3<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper3>(OInterfaceIteratorHelper3<ListenerT>) include/comphelper/interfacecontainer3.hxx:65 @@ -513,10 +513,10 @@ include/o3tl/safeint.hxx:80 include/o3tl/sorted_vector.hxx:225 _Bool o3tl::sorted_vector::operator!=(const sorted_vector<Value, Compare, Find, > &) const include/o3tl/span.hxx:51 - o3tl::span::span(int const (&)[N]) -include/o3tl/span.hxx:51 o3tl::span::span(int (&)[N]) include/o3tl/span.hxx:51 + o3tl::span::span(int const (&)[N]) +include/o3tl/span.hxx:51 o3tl::span::span(unsigned short const (&)[N]) include/o3tl/span.hxx:53 o3tl::span::span<T>(type-parameter-?-? *,unsigned long) @@ -525,19 +525,19 @@ include/o3tl/strong_int.hxx:86 include/o3tl/strong_int.hxx:112 strong_int<UNDERLYING_TYPE, PHANTOM_TYPE> o3tl::strong_int::operator--(int) include/o3tl/strong_int.hxx:126 + _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Tag_TextFrameIndex>,type-parameter-?-?...) const +include/o3tl/strong_int.hxx:126 + _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellDocIdTag>,type-parameter-?-?...) const +include/o3tl/strong_int.hxx:126 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellIdTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:126 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<short, struct Degree10Tag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:126 - _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct ViewShellDocIdTag>,type-parameter-?-?...) const + _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned char, struct SdrLayerIDTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:126 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,type-parameter-?-?...) const include/o3tl/strong_int.hxx:126 - _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned char, struct SdrLayerIDTag>,type-parameter-?-?...) const -include/o3tl/strong_int.hxx:126 _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<unsigned short, struct SfxInterfaceIdTag>,type-parameter-?-?...) const -include/o3tl/strong_int.hxx:126 - _Bool o3tl::strong_int::anyOf(struct o3tl::strong_int<int, struct Tag_TextFrameIndex>,type-parameter-?-?...) const include/o3tl/typed_flags_set.hxx:114 typename typed_flags<type-parameter-?-?>::Wrap operator~(typename typed_flags<type-parameter-?-?>::Wrap) include/o3tl/typed_flags_set.hxx:147 @@ -636,14 +636,18 @@ include/tools/bigint.hxx:87 unsigned short BigInt::operator unsigned short() const include/tools/bigint.hxx:89 unsigned int BigInt::operator unsigned int() const -include/tools/bigint.hxx:112 +include/tools/bigint.hxx:109 class BigInt operator-(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:115 +include/tools/bigint.hxx:112 class BigInt operator%(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:118 +include/tools/bigint.hxx:115 _Bool operator!=(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:121 +include/tools/bigint.hxx:118 _Bool operator<=(const class BigInt &,const class BigInt &) +include/tools/color.hxx:31 + unsigned int color::extractRGB(unsigned int) +include/tools/color.hxx:209 + _Bool Color::operator>(const class Color &) const include/tools/cpuid.hxx:61 _Bool cpuid::hasSSSE3() include/tools/cpuid.hxx:68 @@ -660,17 +664,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:69 +include/tools/fract.hxx:66 class Fraction & Fraction::operator+=(double) -include/tools/fract.hxx:70 +include/tools/fract.hxx:67 class Fraction & Fraction::operator-=(double) -include/tools/fract.hxx:86 +include/tools/fract.hxx:83 _Bool operator>=(const class Fraction &,const class Fraction &) -include/tools/fract.hxx:105 +include/tools/fract.hxx:102 class Fraction operator+(const class Fraction &,double) -include/tools/fract.hxx:106 +include/tools/fract.hxx:103 class Fraction operator-(const class Fraction &,double) -include/tools/fract.hxx:108 +include/tools/fract.hxx:105 class Fraction operator/(const class Fraction &,double) include/tools/gen.hxx:260 class Pair & Range::toPair() @@ -729,14 +733,10 @@ include/vcl/builder.hxx:337 include/vcl/builderpage.hxx:36 void BuilderPage::SetHelpId(const class rtl::OString &) include/vcl/ColorMask.hxx:110 - void ColorMask::GetColorFor8Bit(class BitmapColor &,const unsigned char *) const -include/vcl/ColorMask.hxx:111 - void ColorMask::SetColorFor8Bit(const class BitmapColor &,unsigned char *) const -include/vcl/ColorMask.hxx:113 void ColorMask::GetColorFor16BitMSB(class BitmapColor &,const unsigned char *) const -include/vcl/ColorMask.hxx:114 +include/vcl/ColorMask.hxx:111 void ColorMask::SetColorFor16BitMSB(const class BitmapColor &,unsigned char *) const -include/vcl/ColorMask.hxx:116 +include/vcl/ColorMask.hxx:113 void ColorMask::SetColorFor16BitLSB(const class BitmapColor &,unsigned char *) const include/vcl/commandevent.hxx:249 CommandMediaData::CommandMediaData(enum MediaCommand) @@ -762,15 +762,15 @@ 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:59 +include/vcl/filter/PDFiumLibrary.hxx:61 class rtl::OUString vcl::pdf::PDFium::getLastError() const -include/vcl/filter/PDFiumLibrary.hxx:99 - int vcl::pdf::PDFiumAnnotation::getValueType(const class rtl::OString &) include/vcl/filter/PDFiumLibrary.hxx:103 + int vcl::pdf::PDFiumAnnotation::getValueType(const class rtl::OString &) +include/vcl/filter/PDFiumLibrary.hxx:107 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:109 +include/vcl/filter/PDFiumLibrary.hxx:113 class basegfx::B2DVector vcl::pdf::PDFiumAnnotation::getBorderCornerRadius() -include/vcl/filter/PDFiumLibrary.hxx:129 +include/vcl/filter/PDFiumLibrary.hxx:133 const struct fpdf_pathsegment_t * vcl::pdf::PDFiumPathSegment::getPointer() const include/vcl/gdimtf.hxx:110 _Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const @@ -816,8 +816,6 @@ include/vcl/settings.hxx:510 void StyleSettings::SetSpinSize(long) include/vcl/settings.hxx:665 _Bool HelpSettings::operator!=(const class HelpSettings &) const -include/vcl/settings.hxx:703 - void AllSettings::SetLanguageTag(const class rtl::OUString &,_Bool) include/vcl/settings.hxx:723 _Bool AllSettings::operator!=(const class AllSettings &) const include/vcl/split.hxx:92 @@ -856,6 +854,8 @@ 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 _Bool weld::Widget::get_hexpand() const include/vcl/weld.hxx:141 @@ -918,9 +918,13 @@ include/vcl/weld.hxx:1915 void weld::MetricSpinButton::set_position(int) include/vcl/weld.hxx:2015 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:2201 +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 class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const -include/vcl/weld.hxx:2211 +include/vcl/weld.hxx:2213 void weld::Toolbar::append_separator(const class rtl::OUString &) include/vcl/weldutils.hxx:186 const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> & weld::WidgetStatusListener::getFrame() const @@ -934,32 +938,38 @@ include/vcl/weldutils.hxx:367 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/txtimp.hxx:376 class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP() +include/xmloff/txtimp.hxx:414 + const class SvXMLTokenMap & XMLTextImportHelper::GetTextFieldAttrTokenMap() libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:72 void ::operator()(struct _GtkBuilder *) const libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31 void * gtv_comments_sidebar_get_instance_private(struct GtvCommentsSidebar *) +libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:49 + void ::operator()(struct _GList *) const libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx:80 void ::operator()(struct _GtkTargetList *) const -libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx:255 - void ::operator()(struct _GList *) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpBackgroundStuff>::no & detail::has_clone::check_sig() + detail::has_clone<class LwpAtomHolder>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpShadow>::no & detail::has_clone::check_sig() + detail::has_clone<class LwpBackgroundStuff>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 detail::has_clone<class LwpBorderStuff>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpAtomHolder>::no & detail::has_clone::check_sig() + detail::has_clone<class LwpMargins>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpSpacingCommonOverride>::no & detail::has_clone::check_sig() + detail::has_clone<class LwpShadow>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpMargins>::no & detail::has_clone::check_sig() + detail::has_clone<class LwpSpacingCommonOverride>::no & detail::has_clone::check_sig() o3tl/qa/cow_wrapper_clients.hxx:140 _Bool o3tltests::cow_wrapper_client4::operator==(const class o3tltests::cow_wrapper_client4 &) const o3tl/qa/cow_wrapper_clients.hxx:141 @@ -986,8 +996,6 @@ sc/inc/bigrange.hxx:73 _Bool ScBigAddress::operator!=(const class ScBigAddress &) const sc/inc/columniterator.hxx:82 int sc::ColumnIterator::getType() const -sc/inc/compiler.hxx:396 - char16_t ScCompiler::GetNativeAddressSymbol(enum ScCompiler::Convention::SpecialSymbolType) const sc/inc/datamapper.hxx:79 void sc::ExternalDataSource::setUpdateFrequency(double) sc/inc/datamapper.hxx:82 @@ -1001,41 +1009,41 @@ sc/inc/formulacell.hxx:489 sc/inc/mtvcellfunc.hxx:41 class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > sc::ProcessFormula(const class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > &,class mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent> &,int,int,class std::function<void (unsigned long, class ScFormulaCell *)>) sc/inc/mtvelements.hxx:73 - void sc::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:73 struct mdds::mtv::base_element_block * sc::mdds_mtv_create_new_block(const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:77 - void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &) +sc/inc/mtvelements.hxx:73 + void sc::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const struct sc::CellTextAttr &,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:77 struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &) +sc/inc/mtvelements.hxx:77 + void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScPostIt *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:78 - void mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:78 - void mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) + struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:78 void mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:78 - void mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:78 - struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) + void mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:78 void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) +sc/inc/mtvelements.hxx:78 + void mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) +sc/inc/mtvelements.hxx:78 + void mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class SvtBroadcaster *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:79 - void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &) + struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:79 void mdds_mtv_get_empty_value(class ScFormulaCell *&) sc/inc/mtvelements.hxx:79 void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class ScFormulaCell *&) sc/inc/mtvelements.hxx:79 - struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &) -sc/inc/mtvelements.hxx:80 - void mdds_mtv_get_empty_value(class EditTextObject *&) + void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class ScFormulaCell *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:80 struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:80 - void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) + void mdds_mtv_get_empty_value(class EditTextObject *&) sc/inc/mtvelements.hxx:80 void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&) +sc/inc/mtvelements.hxx:80 + void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:84 struct mdds::mtv::base_element_block * svl::mdds_mtv_create_new_block(const class svl::SharedString &,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:84 @@ -1059,9 +1067,9 @@ sc/inc/sheetlimits.hxx:57 sc/inc/sheetlimits.hxx:58 int ScSheetLimits::SanitizeRow(int) const sc/inc/stlalgorithm.hxx:47 - sc::AlignedAllocator::AlignedAllocator<T, Alignment>(const AlignedAllocator<type-parameter-?-?, Alignment> &) -sc/inc/stlalgorithm.hxx:47 sc::AlignedAllocator::AlignedAllocator(const AlignedAllocator<type-parameter-?-?, 256> &) +sc/inc/stlalgorithm.hxx:47 + sc::AlignedAllocator::AlignedAllocator<T, Alignment>(const AlignedAllocator<type-parameter-?-?, Alignment> &) sc/inc/stlalgorithm.hxx:61 _Bool sc::AlignedAllocator::operator==(const AlignedAllocator<T, Alignment> &) const sc/inc/stlalgorithm.hxx:62 @@ -1183,21 +1191,21 @@ sd/source/filter/ppt/pptinanimations.hxx:108 sd/source/ui/inc/filedlg.hxx:55 _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const sd/source/ui/inc/GraphicViewShell.hxx:43 + class SfxViewFactory * sd::GraphicViewShell::Factory() +sd/source/ui/inc/GraphicViewShell.hxx:43 class SfxViewShell * sd::GraphicViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *) sd/source/ui/inc/GraphicViewShell.hxx:43 void sd::GraphicViewShell::InitFactory() sd/source/ui/inc/GraphicViewShell.hxx:43 - class SfxViewFactory * sd::GraphicViewShell::Factory() -sd/source/ui/inc/GraphicViewShell.hxx:43 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 sd/source/ui/inc/OutlineViewShell.hxx:41 - void sd::OutlineViewShell::InitFactory() + class SfxViewFactory * sd::OutlineViewShell::Factory() sd/source/ui/inc/OutlineViewShell.hxx:41 class SfxViewShell * sd::OutlineViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *) sd/source/ui/inc/OutlineViewShell.hxx:41 - class SfxViewFactory * sd::OutlineViewShell::Factory() + 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 @@ -1220,6 +1228,10 @@ 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/source/appl/shutdownicon.hxx:79 class rtl::OUString ShutdownIcon::getShortcutName() sfx2/source/appl/shutdownicon.hxx:95 @@ -1281,48 +1293,64 @@ slideshow/source/inc/box2dtools.hxx:262 slideshow/source/inc/box2dtools.hxx:300 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::UserPaintEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::EventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ShapeListenerEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::IntrinsicAnimationEventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewUpdate> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::PauseEventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ShapeListenerEventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::PauseEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::UserPaintEventHandler> &) slideshow/source/inc/listenercontainer.hxx:44 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::IntrinsicAnimationEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewUpdate> &) slideshow/source/inc/listenercontainer.hxx:54 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewEventHandler> &) 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 + 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 + SmColorTokenTableEntry::SmColorTokenTableEntry() +starmath/inc/token.hxx:174 + SmColorTokenTableEntry::SmColorTokenTableEntry(const class std::unique_ptr<struct SmColorTokenTableEntry, struct std::default_delete<struct SmColorTokenTableEntry> >) +starmath/inc/token.hxx:195 + _Bool SmColorTokenTableEntry::operator==(const class rtl::OUString &) const +starmath/inc/token.hxx:200 + _Bool SmColorTokenTableEntry::operator==(unsigned int) const +starmath/inc/token.hxx:205 + _Bool SmColorTokenTableEntry::operator==(class Color) const +starmath/inc/token.hxx:220 + _Bool SmColorTokenTableEntry::equals(class Color) const svgio/inc/svgstyleattributes.hxx:346 class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const svgio/inc/svgstyleattributes.hxx:370 enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class rtl::OUString &) + struct mdds::mtv::base_element_block * rtl::mdds_mtv_create_new_block(const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) + void rtl::mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 - struct mdds::mtv::base_element_block * rtl::mdds_mtv_create_new_block(const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) + void rtl::mdds_mtv_get_empty_value(class rtl::OUString &) svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) + void rtl::mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class rtl::OUString &) svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) + void rtl::mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_get_empty_value(class rtl::OUString &) + void rtl::mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svx/inc/sdr/contact/viewcontactofgraphic.hxx:52 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() -sw/inc/calbck.hxx:304 +sw/inc/calbck.hxx:310 class sw::WriterListener * sw::ClientIteratorBase::GetLeftOfPos() sw/inc/dbgoutsw.hxx:53 const char * dbg_out(const void *) @@ -1373,17 +1401,17 @@ sw/inc/dbgoutsw.hxx:106 sw/inc/dbgoutsw.hxx:107 const char * dbg_out(const class std::__debug::vector<struct SwFormToken, class std::allocator<struct SwFormToken> > &) sw/inc/docary.hxx:94 + void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwCharFormat **, class std::__cxx1998::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> > >, class std::__debug::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) +sw/inc/docary.hxx:94 void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwFrameFormat **, class std::__cxx1998::vector<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > >, class std::__debug::vector<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) sw/inc/docary.hxx:94 void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwGrfFormatColl **, class std::__cxx1998::vector<class SwGrfFormatColl *, class std::allocator<class SwGrfFormatColl *> > >, class std::__debug::vector<class SwGrfFormatColl *, class std::allocator<class SwGrfFormatColl *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) sw/inc/docary.hxx:94 + void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwNumRule **, class std::__cxx1998::vector<class SwNumRule *, class std::allocator<class SwNumRule *> > >, class std::__debug::vector<class SwNumRule *, class std::allocator<class SwNumRule *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) +sw/inc/docary.hxx:94 void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwSectionFormat **, class std::__cxx1998::vector<class SwSectionFormat *, class std::allocator<class SwSectionFormat *> > >, class std::__debug::vector<class SwSectionFormat *, class std::allocator<class SwSectionFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) sw/inc/docary.hxx:94 void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwTextFormatColl **, class std::__cxx1998::vector<class SwTextFormatColl *, class std::allocator<class SwTextFormatColl *> > >, class std::__debug::vector<class SwTextFormatColl *, class std::allocator<class SwTextFormatColl *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) -sw/inc/docary.hxx:94 - void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwCharFormat **, class std::__cxx1998::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> > >, class std::__debug::vector<class SwCharFormat *, class std::allocator<class SwCharFormat *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) -sw/inc/docary.hxx:94 - void SwVectorModifyBase::insert(class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwNumRule **, class std::__cxx1998::vector<class SwNumRule *, class std::allocator<class SwNumRule *> > >, class std::__debug::vector<class SwNumRule *, class std::allocator<class SwNumRule *> >, struct std::random_access_iterator_tag>,type-parameter-?-?,type-parameter-?-?) sw/inc/docary.hxx:140 void SwVectorModifyBase::dumpAsXml(struct _xmlTextWriter *) sw/inc/docufld.hxx:494 @@ -1672,6 +1700,18 @@ writerfilter/source/ooxml/OOXMLPropertySet.hxx:176 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::end() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:179 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString() +xmloff/source/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) xmlsecurity/source/gpg/XMLEncryption.hxx:25 XMLEncryptionGpg::XMLEncryptionGpg() xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:46 diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index 3aa0949b90e6..6a8c179d2e01 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -67,7 +67,6 @@ public: Wallpaper( Wallpaper&& rWallpaper ); Wallpaper( const Color& rColor ); explicit Wallpaper( const BitmapEx& rBmpEx ); - Wallpaper( const Gradient& rGradient ); ~Wallpaper(); void SetColor( const Color& rColor ); diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index d9797f0757ec..8d10604f4ff5 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -69,8 +69,6 @@ namespace xmloff SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName); - static SvXMLImportContext* createOfficeFormsContext( - SvXMLImport& _rImport); /** create an SvXMLImportContext instance which is able to import the <form:form> element. diff --git a/include/xmloff/namespacemap.hxx b/include/xmloff/namespacemap.hxx index 668bfd22745c..c9f4e71fd876 100644 --- a/include/xmloff/namespacemap.hxx +++ b/include/xmloff/namespacemap.hxx @@ -135,8 +135,6 @@ public: /* deprecated */ const OUString& GetPrefixByIndex( sal_uInt16 nIdx ) const; /* deprecated */ const OUString& GetNameByIndex( sal_uInt16 nIdx ) const; /* deprecated */ OUString GetAttrNameByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ OUString GetQNameByIndex( sal_uInt16 nIdx, - const OUString& rLocalName ) const; sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, OUString *pPrefix, OUString *pLocalName, diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 4076d2db2da6..94d1d6580ab2 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -411,7 +411,6 @@ public: const SvXMLTokenMap& GetTextNumberedParagraphAttrTokenMap(); const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); const SvXMLTokenMap& GetTextListBlockElemTokenMap(); - const SvXMLTokenMap& GetTextFieldAttrTokenMap(); // impl: txtfldi.cxx css::uno::Reference< css::text::XText > & GetText(); css::uno::Reference< css::text::XTextCursor > & GetCursor(); diff --git a/sfx2/inc/sidebar/Tools.hxx b/sfx2/inc/sidebar/Tools.hxx index b5c0c693713c..8c795dfed1c4 100644 --- a/sfx2/inc/sidebar/Tools.hxx +++ b/sfx2/inc/sidebar/Tools.hxx @@ -45,9 +45,6 @@ public: const OUString& rsURL, const css::uno::Reference<css::frame::XFrame>& rxFrame); - static css::awt::Gradient VclToAwtGradient (const Gradient& rGradient); - static Gradient AwtToVclGradient (const css::awt::Gradient& rGradient); - static css::util::URL GetURL (const OUString& rsCommand); static css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::uno::Reference<css::frame::XFrame>& rxFrame, diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index ef9dce06cab6..de2ebdd0ae1b 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -69,39 +69,6 @@ css::uno::Reference<css::graphic::XGraphic> Tools::GetImage( return nullptr; } -css::awt::Gradient Tools::VclToAwtGradient (const Gradient& rVclGradient) -{ - css::awt::Gradient aAwtGradient ( - awt::GradientStyle(rVclGradient.GetStyle()), - sal_Int32(rVclGradient.GetStartColor().GetRGBColor()), - sal_Int32(rVclGradient.GetEndColor().GetRGBColor()), - rVclGradient.GetAngle().get(), - rVclGradient.GetBorder(), - rVclGradient.GetOfsX(), - rVclGradient.GetOfsY(), - rVclGradient.GetStartIntensity(), - rVclGradient.GetEndIntensity(), - rVclGradient.GetSteps()); - return aAwtGradient; -} - -Gradient Tools::AwtToVclGradient (const css::awt::Gradient& rAwtGradient) -{ - Gradient aVclGradient ( - GradientStyle(rAwtGradient.Style), - Color(rAwtGradient.StartColor), - Color(rAwtGradient.EndColor)); - aVclGradient.SetAngle(Degree10(rAwtGradient.Angle)); - aVclGradient.SetBorder(rAwtGradient.Border); - aVclGradient.SetOfsX(rAwtGradient.XOffset); - aVclGradient.SetOfsY(rAwtGradient.YOffset); - aVclGradient.SetStartIntensity(rAwtGradient.StartIntensity); - aVclGradient.SetEndIntensity(rAwtGradient.EndIntensity); - aVclGradient.SetSteps(rAwtGradient.StepCount); - - return aVclGradient; -} - util::URL Tools::GetURL (const OUString& rsCommand) { util::URL aURL; diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 2300a8f8ad23..6b332e5c74fe 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -166,12 +166,6 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) : mpImplWallpaper() mpImplWallpaper->meStyle = WallpaperStyle::Tile; } -Wallpaper::Wallpaper( const Gradient& rGradient ) : mpImplWallpaper() -{ - mpImplWallpaper->mpGradient = std::make_unique<Gradient>( rGradient ); - mpImplWallpaper->meStyle = WallpaperStyle::Tile; -} - Wallpaper::~Wallpaper() = default; void Wallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) const diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 7f5fad5f39b6..175bb834e37d 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -154,7 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/draw/ximpshap \ xmloff/source/draw/ximpshow \ xmloff/source/draw/ximpstyl \ - xmloff/source/forms/attriblistmerge \ xmloff/source/forms/controlelement \ xmloff/source/forms/controlpropertyhdl \ xmloff/source/forms/controlpropertymap \ diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index f19a34480c04..216c32ea677d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -46,66 +46,6 @@ class SvXMLImport; class XMLTextImportHelper; class SvXMLTokenMap; -enum XMLTextFieldAttrTokens -{ - XML_TOK_TEXTFIELD_FIXED = 0, - XML_TOK_TEXTFIELD_DESCRIPTION, - XML_TOK_TEXTFIELD_HELP, - XML_TOK_TEXTFIELD_HINT, - XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE, - XML_TOK_TEXTFIELD_TIME_ADJUST, - XML_TOK_TEXTFIELD_DATE_ADJUST, - XML_TOK_TEXTFIELD_PAGE_ADJUST, - XML_TOK_TEXTFIELD_SELECT_PAGE, - XML_TOK_TEXTFIELD_ACTIVE, - - XML_TOK_TEXTFIELD_NAME, - XML_TOK_TEXTFIELD_FORMULA, - XML_TOK_TEXTFIELD_NUM_FORMAT, - XML_TOK_TEXTFIELD_NUM_LETTER_SYNC, - XML_TOK_TEXTFIELD_DISPLAY_FORMULA, - XML_TOK_TEXTFIELD_NUMBERING_LEVEL, - XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR, - XML_TOK_TEXTFIELD_DISPLAY, - XML_TOK_TEXTFIELD_OUTLINE_LEVEL, - - XML_TOK_TEXTFIELD_VALUE_TYPE, - XML_TOK_TEXTFIELD_VALUE, - XML_TOK_TEXTFIELD_STRING_VALUE, - XML_TOK_TEXTFIELD_DATE_VALUE, - XML_TOK_TEXTFIELD_TIME_VALUE, - XML_TOK_TEXTFIELD_BOOL_VALUE, - XML_TOK_TEXTFIELD_CURRENCY, - XML_TOK_TEXTFIELD_DATA_STYLE_NAME, - - XML_TOK_TEXTFIELD_DATABASE_NAME, - XML_TOK_TEXTFIELD_TABLE_NAME, - XML_TOK_TEXTFIELD_COLUMN_NAME, - XML_TOK_TEXTFIELD_ROW_NUMBER, - XML_TOK_TEXTFIELD_CONDITION, - XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE, - XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE, - XML_TOK_TEXTFIELD_REVISION, - XML_TOK_TEXTFIELD_IS_HIDDEN, - XML_TOK_TEXTFIELD_CURRENT_VALUE, - - XML_TOK_TEXTFIELD_REFERENCE_FORMAT, - XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE, - XML_TOK_TEXTFIELD_REF_NAME, - XML_TOK_TEXTFIELD_CONNECTION_NAME, - - XML_TOK_TEXTFIELD_HREF, - XML_TOK_TEXTFIELD_TARGET_FRAME, - - XML_TOK_TEXTFIELD_ANNOTATION, - XML_TOK_TEXTFIELD_LANGUAGE, - - XML_TOK_TEXTFIELD_MEASURE_KIND, - XML_TOK_TEXTFIELD_TABLE_TYPE, - - XML_TOK_TEXTFIELD_NOTE_CLASS, -}; - /// abstract class for text field import class XMLTextFieldImportContext : public SvXMLImportContext { diff --git a/xmloff/source/core/namespacemap.cxx b/xmloff/source/core/namespacemap.cxx index 6cd01efcd532..1fd9f9d70cbb 100644 --- a/xmloff/source/core/namespacemap.cxx +++ b/xmloff/source/core/namespacemap.cxx @@ -405,12 +405,6 @@ OUString SvXMLNamespaceMap::GetAttrNameByIndex( sal_uInt16 nIdx ) const return GetAttrNameByKey( nIdx ); } -OUString SvXMLNamespaceMap::GetQNameByIndex( sal_uInt16 nIdx, - const OUString& rLocalName ) const -{ - return GetQNameByKey( nIdx, rLocalName ); -} - const OUString& SvXMLNamespaceMap::GetPrefixByIndex( sal_uInt16 nIdx ) const { NameSpaceMap::const_iterator aIter = aNameMap.find (nIdx); diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx deleted file mode 100644 index 6990841c54e2..000000000000 --- a/xmloff/source/forms/attriblistmerge.cxx +++ /dev/null @@ -1,142 +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 "attriblistmerge.hxx" - -#include <osl/diagnose.h> - -#include <numeric> - -namespace xmloff -{ - - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star; - - //= OAttribListMerger - void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList) - { - OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!"); - if (_rxList.is()) - m_aLists.push_back(_rxList); - } - - bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) - { - sal_Int16 nLeftOver = _nGlobalIndex; - AttributeListArray::const_iterator aLookupSublist = m_aLists.begin(); - - for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength()); - ++aLookupSublist - ) - nLeftOver = nLeftOver - (*aLookupSublist)->getLength(); - - if (aLookupSublist == m_aLists.end()) - { - OSL_FAIL("OAttribListMerger::seekToIndex: invalid index!"); - return false; - } - _rSubList = *aLookupSublist; - _rLocalIndex = nLeftOver; - return true; - } - - bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) - { - for ( const auto& rLookupSublist : m_aLists ) - for (sal_Int16 i=0; i<rLookupSublist->getLength(); ++i) - if (rLookupSublist->getNameByIndex(i) == _rName) - { - _rSubList = rLookupSublist; - _rLocalIndex = i; - return true; - } - - OSL_FAIL("OAttribListMerger::seekToName: did not find the name!"); - return false; - } - - sal_Int16 SAL_CALL OAttribListMerger::getLength( ) - { - return std::accumulate(m_aLists.begin(), m_aLists.end(), static_cast<sal_Int16>(0), - [](sal_Int16 sum, AttributeListArray::value_type& rAccumulate) { return sum + rAccumulate->getLength(); }); - } - - OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) - { - Reference< xml::sax::XAttributeList > xSubList; - sal_Int16 nLocalIndex; - - if (!seekToIndex(i, xSubList, nLocalIndex)) - return OUString(); - - return xSubList->getNameByIndex(nLocalIndex); - } - - OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) - { - Reference< xml::sax::XAttributeList > xSubList; - sal_Int16 nLocalIndex; - - if (!seekToIndex(i, xSubList, nLocalIndex)) - return OUString(); - - return xSubList->getTypeByIndex(nLocalIndex); - } - - OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) - { - Reference< xml::sax::XAttributeList > xSubList; - sal_Int16 nLocalIndex; - - if (!seekToName(_rName, xSubList, nLocalIndex)) - return OUString(); - - // though we're in getTypeByName here, we reroute this to the getTypeByIndex of the sub list, - // assuming that this is faster - return xSubList->getTypeByIndex(nLocalIndex); - } - - OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) - { - Reference< xml::sax::XAttributeList > xSubList; - sal_Int16 nLocalIndex; - - if (!seekToIndex(i, xSubList, nLocalIndex)) - return OUString(); - - return xSubList->getValueByIndex(nLocalIndex); - } - - OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) - { - Reference< xml::sax::XAttributeList > xSubList; - sal_Int16 nLocalIndex; - - if (!seekToName(_rName, xSubList, nLocalIndex)) - return OUString(); - - // though we're in getValueByName here, we reroute this to the getValueByIndex of the sub list, - // assuming that this is faster - return xSubList->getValueByIndex(nLocalIndex); - } - -} // namespace xmloff - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx deleted file mode 100644 index e3d352a9d1f8..000000000000 --- a/xmloff/source/forms/attriblistmerge.hxx +++ /dev/null @@ -1,69 +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 . - */ - -#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX -#define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX - -#include <sal/config.h> - -#include <vector> - -#include <cppuhelper/implbase.hxx> -#include <com/sun/star/xml/sax/XAttributeList.hpp> - -namespace xmloff -{ - - //= OAttribListMerger - typedef ::cppu::WeakImplHelper < css::xml::sax::XAttributeList - > OAttribListMerger_Base; - /** implements the XAttributeList list by merging different source attribute lists - - <p>Currently, the time behaviour is O(n), though it would be possible to change it to O(log n).</p> - */ - class OAttribListMerger : public OAttribListMerger_Base - { - typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; - AttributeListArray m_aLists; - - public: - OAttribListMerger() { } - - // attribute list handling - // (very thin at the moment... only adding lists is allowed... add more if you need it :) - void addList(const css::uno::Reference< css::xml::sax::XAttributeList >& _rList); - - // XAttributeList - virtual sal_Int16 SAL_CALL getLength( ) override; - virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) override; - virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) override; - virtual OUString SAL_CALL getTypeByName( const OUString& aName ) override; - virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override; - virtual OUString SAL_CALL getValueByName( const OUString& aName ) override; - - private: - bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - }; - -} // namespace xmloff - -#endif // INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 4c6640747ac0..3ebd9b765a95 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -22,7 +22,6 @@ #include <xmloff/namespacemap.hxx> #include "strings.hxx" #include "callbacks.hxx" -#include "attriblistmerge.hxx" #include <xmloff/xmlnamespace.hxx> #include "eventimport.hxx" #include <xmloff/txtstyli.hxx> @@ -101,20 +100,6 @@ namespace xmloff return _e; } - OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName) - { - if ( s_sElementTranslations.empty() ) - { // initialize - for (ElementType eType=ElementType(0); eType<UNKNOWN; ++eType) - s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType; - } - MapString2Element::const_iterator aPos = s_sElementTranslations.find(_rName); - if (s_sElementTranslations.end() != aPos) - return aPos->second; - - return UNKNOWN; - } - OControlElement::ElementType OElementNameMap::getElementType(sal_Int32 nElement) { if ( s_sElementTranslations2.empty() ) @@ -482,56 +467,6 @@ namespace xmloff }); } - bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) - { - // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers - const AttributeDescription attribute( metadata::getAttributeDescription( _nNamespaceKey, _rLocalName ) ); - if ( attribute.attributeToken != XML_TOKEN_INVALID ) - { - PropertyGroups propertyGroups; - metadata::getPropertyGroupList( attribute, propertyGroups ); - const PropertyGroups::const_iterator pos = impl_matchPropertyGroup( propertyGroups ); - if ( pos == propertyGroups.end() ) - return false; - - do - { - const PropertyDescriptionList& rProperties( *pos ); - const PropertyDescription* first = *rProperties.begin(); - if ( !first ) - { - SAL_WARN( "xmloff.forms", "OElementImport::handleAttribute: invalid property description!" ); - break; - } - - const PPropertyHandler handler = (*first->factory)( first->propertyId ); - if ( !handler ) - { - SAL_WARN( "xmloff.forms", "OElementImport::handleAttribute: invalid property handler!" ); - break; - } - - PropertyValues aValues; - for ( const auto& propDesc : rProperties ) - { - aValues[ propDesc->propertyId ] = Any(); - } - if ( handler->getPropertyValues( _rValue, aValues ) ) - { - for ( const auto& propDesc : rProperties ) - { - implPushBackPropertyValue( propDesc->propertyName, aValues[ propDesc->propertyId ] ); - } - } - } - while ( false ); - - // handled - return true; - } - return false; - } - bool OElementImport::tryGenericAttribute( sal_Int32 nElement, const OUString& _rValue ) { // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 50fcd185c7da..67eebc2f2a7a 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -58,7 +58,6 @@ namespace xmloff OElementNameMap() = delete; public: - static ElementType getElementType(const OUString& _rName); static ElementType getElementType(sal_Int32 nToken); }; @@ -144,11 +143,6 @@ namespace xmloff /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic attribute handler mechanisms */ - bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ); - - /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic - attribute handler mechanisms - */ bool tryGenericAttribute( sal_Int32 nElement, const OUString& _rValue ); /** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class @@ -547,9 +541,6 @@ namespace xmloff m_xColumnFactory; public: - OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_Int32 nElement, - const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, - OControlElement::ElementType _eType); OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); @@ -638,10 +629,6 @@ namespace xmloff virtual css::uno::Reference< css::beans::XPropertySet > createElement() override; - OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const OUString& _rLocalName, - OControlElement::ElementType _eType ); - virtual OUString determineDefaultServiceName() const override; void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); @@ -661,17 +648,6 @@ namespace xmloff template <class BASE> OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_Int32 _nElement, - const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, - OControlElement::ElementType _eType) - :BASE(_rImport, _rEventManager, _nElement, _rxParentContainer, _eType) - ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY) - { - OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!"); - } - template <class BASE> - OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, - IEventAttacherManager& _rEventManager, const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _rxParentContainer, _eType) diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index 43cdf63f4c40..8fa8de921467 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -71,12 +71,6 @@ namespace xmloff return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport); } - SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext( - SvXMLImport& _rImport) - { - return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport); - } - SvXMLImportContext* OFormLayerXMLImport::createContext(sal_Int32 nElement, const Reference< xml::sax::XFastAttributeList >& _rxAttribs) { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 75e73c899171..0705ee7cc0fb 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -410,82 +410,6 @@ const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = XML_TOKEN_MAP_END }; -const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = -{ - { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED }, - { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION }, - { XML_NAMESPACE_TEXT, XML_HELP, XML_TOK_TEXTFIELD_HELP }, - { XML_NAMESPACE_TEXT, XML_HINT, XML_TOK_TEXTFIELD_HINT }, - { XML_NAMESPACE_TEXT, XML_PLACEHOLDER_TYPE, - XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE }, - { XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_TEXTFIELD_NAME }, - { XML_NAMESPACE_TEXT, XML_FORMULA, XML_TOK_TEXTFIELD_FORMULA }, - { XML_NAMESPACE_STYLE, XML_NUM_FORMAT, XML_TOK_TEXTFIELD_NUM_FORMAT }, - { XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC, - XML_TOK_TEXTFIELD_NUM_LETTER_SYNC }, - { XML_NAMESPACE_TEXT, XML_DISPLAY_FORMULA, - XML_TOK_TEXTFIELD_DISPLAY_FORMULA }, - { XML_NAMESPACE_TEXT, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE }, // #i32362#: src680m48++ saves text:value-type - { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE }, - { XML_NAMESPACE_TEXT, XML_VALUE, XML_TOK_TEXTFIELD_VALUE }, - { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TEXTFIELD_VALUE }, - { XML_NAMESPACE_TEXT, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE }, - { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE }, - { XML_NAMESPACE_TEXT, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE }, - { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE }, - { XML_NAMESPACE_TEXT, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE }, - { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE }, - { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TEXTFIELD_BOOL_VALUE}, - { XML_NAMESPACE_OFFICE, XML_CURRENCY, XML_TOK_TEXTFIELD_CURRENCY}, - { XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, - XML_TOK_TEXTFIELD_DATA_STYLE_NAME }, - { XML_NAMESPACE_TEXT, XML_DISPLAY_OUTLINE_LEVEL, - XML_TOK_TEXTFIELD_NUMBERING_LEVEL }, - { XML_NAMESPACE_TEXT, XML_SEPARATION_CHARACTER, - XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR }, - { XML_NAMESPACE_TEXT, XML_DISPLAY, XML_TOK_TEXTFIELD_DISPLAY }, - { XML_NAMESPACE_TEXT, XML_TIME_ADJUST, XML_TOK_TEXTFIELD_TIME_ADJUST }, - { XML_NAMESPACE_TEXT, XML_DATE_ADJUST, XML_TOK_TEXTFIELD_DATE_ADJUST }, - { XML_NAMESPACE_TEXT, XML_PAGE_ADJUST, XML_TOK_TEXTFIELD_PAGE_ADJUST }, - { XML_NAMESPACE_TEXT, XML_SELECT_PAGE, XML_TOK_TEXTFIELD_SELECT_PAGE }, - { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXTFIELD_DATABASE_NAME}, - { XML_NAMESPACE_TEXT, XML_TABLE_NAME, XML_TOK_TEXTFIELD_TABLE_NAME }, - { XML_NAMESPACE_TEXT, XML_COLUMN_NAME, XML_TOK_TEXTFIELD_COLUMN_NAME }, - { XML_NAMESPACE_TEXT, XML_ROW_NUMBER, XML_TOK_TEXTFIELD_ROW_NUMBER }, - { XML_NAMESPACE_TEXT, XML_CONDITION, XML_TOK_TEXTFIELD_CONDITION }, - { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_TRUE, - XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE }, - { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_FALSE, - XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE }, - { XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION }, - { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL}, - { XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE }, - { XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_TOK_TEXTFIELD_NOTE_CLASS }, - { XML_NAMESPACE_TEXT, XML_REFERENCE_FORMAT, - XML_TOK_TEXTFIELD_REFERENCE_FORMAT }, - { XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME }, - { XML_NAMESPACE_TEXT, XML_CONNECTION_NAME, - XML_TOK_TEXTFIELD_CONNECTION_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXTFIELD_HREF }, - { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, - XML_TOK_TEXTFIELD_TARGET_FRAME }, - { XML_NAMESPACE_TEXT, XML_ANNOTATION, XML_TOK_TEXTFIELD_ANNOTATION }, - { XML_NAMESPACE_SCRIPT, XML_LANGUAGE, XML_TOK_TEXTFIELD_LANGUAGE }, - { XML_NAMESPACE_TEXT, XML_KIND, XML_TOK_TEXTFIELD_MEASURE_KIND }, - { XML_NAMESPACE_TEXT, XML_IS_HIDDEN, XML_TOK_TEXTFIELD_IS_HIDDEN }, - { XML_NAMESPACE_TEXT, XML_CURRENT_VALUE, - XML_TOK_TEXTFIELD_CURRENT_VALUE }, - { XML_NAMESPACE_TEXT, XML_TABLE_TYPE, XML_TOK_TEXTFIELD_TABLE_TYPE }, - { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_NAME }, - { XML_NAMESPACE_LO_EXT, XML_REFERENCE_LANGUAGE, - XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE }, - { XML_NAMESPACE_TEXT, XML_REFERENCE_LANGUAGE, - XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE }, - { XML_NAMESPACE_LO_EXT, XML_RESOLVED, XML_TOK_TEXT_RESOLVED }, - - XML_TOKEN_MAP_END -}; - // maximum allowed length of combined characters field #define MAX_COMBINED_CHARACTERS 6 @@ -495,7 +419,6 @@ 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_xTextFieldAttrTokenMap; std::unique_ptr<SvXMLTokenMap> m_xTextNumberedParagraphAttrTokenMap; std::unique_ptr<SvXMLTokenMap> m_xTextListBlockAttrTokenMap; std::unique_ptr<SvXMLTokenMap> m_xTextListBlockElemTokenMap; @@ -803,17 +726,6 @@ const SvXMLTokenMap& XMLTextImportHelper::GetTextHyperlinkAttrTokenMap() return *m_xImpl->m_xTextHyperlinkAttrTokenMap; } -const SvXMLTokenMap& XMLTextImportHelper::GetTextFieldAttrTokenMap() -{ - if (!m_xImpl->m_xTextFieldAttrTokenMap) - { - m_xImpl->m_xTextFieldAttrTokenMap.reset( - new SvXMLTokenMap( aTextFieldAttrTokenMap )); - } - return *m_xImpl->m_xTextFieldAttrTokenMap; -} - - namespace { class FieldParamImporter |