diff options
35 files changed, 156 insertions, 630 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index b1318fc0f7ed..4ac309ca9d48 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -14,7 +14,7 @@ basctl/source/inc/bastype2.hxx:276 void basctl::SbTreeListBox::set_sort_column(int) basctl/source/inc/bastype2.hxx:278 void basctl::SbTreeListBox::set_sort_func(const class std::function<int (const class weld::TreeIter &, const class weld::TreeIter &)> &) -basegfx/source/range/b2drangeclipper.cxx:687 +basegfx/source/range/b2drangeclipper.cxx:688 type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &) basic/source/inc/buffer.hxx:41 void SbiBuffer::operator+=(signed char) @@ -74,6 +74,8 @@ connectivity/source/drivers/firebird/Util.hxx:74 short connectivity::firebird::ColumnTypeInfo::getSubType() const connectivity/source/drivers/firebird/Util.hxx:76 const class rtl::OUString & connectivity::firebird::ColumnTypeInfo::getCharacterSet() const +connectivity/source/drivers/mork/mork_helper.cxx:37 + int main(int,char **) connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:96 type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::safelyRetrieveValue(const int) connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:97 @@ -102,6 +104,8 @@ 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/about.hxx:43 + _Bool AboutDialog::IsStringValidGitHash(const class rtl::OUString &) cui/source/inc/cfg.hxx:336 class rtl::OUString SvxMenuEntriesListBox::get_text(int) cui/source/inc/cfg.hxx:337 @@ -130,6 +134,8 @@ cui/source/inc/hangulhanjadlg.hxx:244 class rtl::OUString svx::SuggestionEdit::get_text() const cui/source/inc/SvxNotebookbarConfigPage.hxx:40 void SvxNotebookbarConfigPage::SetElement() +dbaccess/source/core/api/KeySet.hxx:117 + class com::sun::star::uno::Reference<class com::sun::star::container::XNameAccess> dbaccess::OKeySet::getKeyColumns() const dbaccess/source/filter/hsqldb/fbalterparser.hxx:20 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const dbaccess/source/filter/hsqldb/parseschema.hxx:81 @@ -164,7 +170,7 @@ dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() desktop/source/lib/lokclipboard.hxx:96 LOKClipboardFactory::LOKClipboardFactory() -drawinglayer/inc/texture/texture.hxx:43 +drawinglayer/inc/texture/texture.hxx:44 _Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const drawinglayer/source/tools/emfpcustomlinecap.hxx:38 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) @@ -236,9 +242,9 @@ include/basegfx/matrix/b3dhommatrix.hxx:106 class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator*=(double) include/basegfx/matrix/b3dhommatrix.hxx:107 class basegfx::B3DHomMatrix & basegfx::B3DHomMatrix::operator/=(double) -include/basegfx/numeric/ftools.hxx:143 +include/basegfx/numeric/ftools.hxx:145 double basegfx::snapToRange(double,double,double) -include/basegfx/numeric/ftools.hxx:147 +include/basegfx/numeric/ftools.hxx:149 double basegfx::copySign(double,double) include/basegfx/pixel/bpixel.hxx:54 basegfx::BPixel::BPixel(unsigned char,unsigned char,unsigned char,unsigned char) @@ -644,15 +650,23 @@ include/svl/lockfilecommon.hxx:58 void svt::LockFileCommon::SetURL(const class rtl::OUString &) include/svtools/asynclink.hxx:44 void svtools::AsynchronLink::LinkStubHandleCall_Idle(void *,class Timer *) +include/svtools/ctrlbox.hxx:339 + void FontNameBox::ImplCalcUserItemSize() +include/svtools/ctrlbox.hxx:384 + class vcl::Font FontNameBox::get_font() include/svtools/DocumentToGraphicRenderer.hxx:106 _Bool DocumentToGraphicRenderer::isImpress() const +include/svtools/toolbarmenu.hxx:66 + _Bool svtools::ToolbarPopup::IsInPopupMode() const include/svtools/toolbarmenu.hxx:113 class weld::Container * ToolbarPopupContainer::getContainer() include/svtools/toolbarmenu.hxx:130 class weld::Container * InterimToolbarPopup::getContainer() +include/svtools/valueset.hxx:324 + _Bool ValueSet::IsNoSelection() const include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) const -include/svx/ClassificationDialog.hxx:77 +include/svx/ClassificationDialog.hxx:78 void svx::ClassificationDialog::(anonymous)::__invoke() include/svx/ClassificationField.hxx:47 const class rtl::OUString & svx::ClassificationResult::getDisplayText() const @@ -676,6 +690,10 @@ include/svx/pagenumberlistbox.hxx:36 int SvxPageNumberListBox::get_active() const include/svx/pagenumberlistbox.hxx:37 void SvxPageNumberListBox::set_active(int) +include/svx/PaletteManager.hxx:57 + void PaletteManager::ReloadColorSet(class SvxColorValueSet &) +include/svx/PaletteManager.hxx:59 + void PaletteManager::ReloadRecentColorSet(class SvxColorValueSet &) include/svx/relfld.hxx:61 void SvxRelativeField::set_size_request(int,int) include/svx/relfld.hxx:63 @@ -684,6 +702,8 @@ include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:455 _Bool SdrPaintView::IsSwapAsynchron() const +include/svx/SvxColorValueSet.hxx:41 + class Size SvxColorValueSet::layoutAllVisible(unsigned int) include/svx/txencbox.hxx:92 void SvxTextEncodingBox::grab_focus() include/svx/txencbox.hxx:146 @@ -732,11 +752,11 @@ include/tools/fract.hxx:106 class Fraction operator-(const class Fraction &,double) include/tools/fract.hxx:108 class Fraction operator/(const class Fraction &,double) -include/tools/gen.hxx:96 +include/tools/gen.hxx:97 class Point operator/(const class Point &,const long) -include/tools/gen.hxx:256 +include/tools/gen.hxx:259 class Pair & Range::toPair() -include/tools/gen.hxx:323 +include/tools/gen.hxx:326 class Pair & Selection::toPair() include/tools/link.hxx:134 const char * Link::getSourceFilename() const @@ -782,6 +802,8 @@ include/vcl/animate/AnimationBitmap.hxx:69 _Bool AnimationBitmap::operator!=(const struct AnimationBitmap &) const include/vcl/BitmapColor.hxx:39 void BitmapColor::SetAlpha(unsigned char) +include/vcl/bitmapex.hxx:101 + void BitmapEx::GetSplitData(class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &) const include/vcl/builderpage.hxx:36 void BuilderPage::SetHelpId(const class rtl::OString &) include/vcl/ColorMask.hxx:113 @@ -790,6 +812,8 @@ include/vcl/ColorMask.hxx:114 void ColorMask::SetColorFor16BitMSB(const class BitmapColor &,unsigned char *) const include/vcl/ColorMask.hxx:116 void ColorMask::SetColorFor16BitLSB(const class BitmapColor &,unsigned char *) const +include/vcl/combobox.hxx:88 + void ComboBox::RemoveEntry(const class rtl::OUString &) include/vcl/commandevent.hxx:249 CommandMediaData::CommandMediaData(enum MediaCommand) include/vcl/commandevent.hxx:256 @@ -820,6 +844,8 @@ include/vcl/gdimtf.hxx:202 void GDIMetaFile::dumpAsXml(const char *) const include/vcl/gradient.hxx:82 _Bool Gradient::operator!=(const class Gradient &) const +include/vcl/graphictools.hxx:325 + _Bool SvtGraphicFill::IsTiling() const include/vcl/hatch.hxx:55 _Bool Hatch::operator!=(const class Hatch &) const include/vcl/inputctx.hxx:62 @@ -828,6 +854,14 @@ include/vcl/ITiledRenderable.hxx:187 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/lok.hxx:24 void vcl::lok::unregisterPollCallbacks() +include/vcl/lstbox.hxx:155 + void ListBox::RemoveEntry(const class rtl::OUString &) +include/vcl/lstbox.hxx:195 + enum ListBoxEntryFlags ListBox::GetEntryFlags(int) const +include/vcl/lstbox.hxx:232 + void ListBox::EnableUserDraw(_Bool) +include/vcl/lstbox.hxx:234 + void ListBox::DrawEntry(const class UserDrawEvent &) include/vcl/menu.hxx:459 unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &) include/vcl/menu.hxx:463 @@ -838,6 +872,8 @@ include/vcl/menu.hxx:468 void MenuBar::RemoveMenuBarButton(unsigned short) include/vcl/menu.hxx:520 void PopupMenu::SetSelectedEntry(unsigned short) +include/vcl/menubtn.hxx:83 + unsigned short MenuButton::GetCurItemId() const include/vcl/NotebookBarAddonsMerger.hxx:64 NotebookBarAddonsMerger::NotebookBarAddonsMerger() include/vcl/opengl/OpenGLHelper.hxx:67 @@ -886,30 +922,34 @@ include/vcl/TaskStopwatch.hxx:118 void TaskStopwatch::setTimeSlice(unsigned int) include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/treelist.hxx:92 - class SvTreeListEntry * SvTreeList::PrevSelected(const class SvListView *,class SvTreeListEntry *) const -include/vcl/treelist.hxx:280 - unsigned long SvListView::GetChildSelectionCount(class SvTreeListEntry *) const -include/vcl/treelistbox.hxx:359 +include/vcl/toolkit/field.hxx:121 + void MetricBox::InsertValue(long,enum FieldUnit,int) +include/vcl/treelist.hxx:171 + const class SvTreeListEntry * SvTreeList::GetParent(const class SvTreeListEntry *) const +include/vcl/treelistbox.hxx:370 void SvTreeListBox::RemoveSelection() -include/vcl/treelistbox.hxx:376 - const class SvTreeListEntry * SvTreeListBox::GetParent(const class SvTreeListEntry *) const -include/vcl/treelistbox.hxx:706 - class SvTreeListEntry * SvTreeListBox::GetPrevEntryInView(class SvTreeListEntry *) const +include/vcl/treelistbox.hxx:711 + class ScrollBar * SvTreeListBox::GetVScroll() +include/vcl/treelistbox.hxx:715 + class SvTreeListEntry * SvTreeListBox::GetLastEntryInView() const include/vcl/txtattr.hxx:56 _Bool TextAttrib::operator!=(const class TextAttrib &) const -include/vcl/uitest/uiobject.hxx:274 +include/vcl/uitest/uiobject.hxx:279 TabPageUIObject::TabPageUIObject(const class VclPtr<class TabPage> &) -include/vcl/uitest/uiobject.hxx:282 +include/vcl/uitest/uiobject.hxx:287 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > TabPageUIObject::create(class vcl::Window *) -include/vcl/uitest/uiobject.hxx:345 +include/vcl/uitest/uiobject.hxx:350 SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &) -include/vcl/uitest/uiobject.hxx:353 +include/vcl/uitest/uiobject.hxx:358 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *) +include/vcl/viewdataentry.hxx:75 + void SvViewDataEntry::SetSelectable(_Bool) include/vcl/weld.hxx:135 _Bool weld::Widget::get_hexpand() const include/vcl/weld.hxx:137 _Bool weld::Widget::get_vexpand() const +include/vcl/weld.hxx:139 + void weld::Widget::set_secondary(_Bool) include/vcl/weld.hxx:144 void weld::Widget::set_margin_right(int) include/vcl/weld.hxx:146 @@ -926,83 +966,95 @@ include/vcl/weld.hxx:324 int weld::ScrolledWindow::get_hscroll_height() const include/vcl/weld.hxx:449 struct SystemEnvData weld::Window::get_system_data() const +include/vcl/weld.hxx:524 + void weld::AboutDialog::set_version(const class rtl::OUString &) +include/vcl/weld.hxx:525 + void weld::AboutDialog::set_copyright(const class rtl::OUString &) +include/vcl/weld.hxx:526 + void weld::AboutDialog::set_website(const class rtl::OUString &) +include/vcl/weld.hxx:527 + void weld::AboutDialog::set_website_label(const class rtl::OUString &) +include/vcl/weld.hxx:528 + class rtl::OUString weld::AboutDialog::get_website_label() const +include/vcl/weld.hxx:529 + void weld::AboutDialog::set_logo(const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &) +include/vcl/weld.hxx:530 + void weld::AboutDialog::set_background(const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &) include/vcl/weld.hxx:544 class rtl::OString weld::Assistant::get_current_page_ident() const include/vcl/weld.hxx:550 class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const -include/vcl/weld.hxx:801 +include/vcl/weld.hxx:862 void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:810 +include/vcl/weld.hxx:871 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:857 - void weld::TreeView::set_text_align(int,double,int) -include/vcl/weld.hxx:904 +include/vcl/weld.hxx:965 _Bool weld::TreeView::iter_next_visible(class weld::TreeIter &) const -include/vcl/weld.hxx:945 +include/vcl/weld.hxx:1006 void weld::TreeView::set_text_align(const class weld::TreeIter &,double,int) -include/vcl/weld.hxx:1019 +include/vcl/weld.hxx:1080 void weld::TreeView::select_all() -include/vcl/weld.hxx:1068 +include/vcl/weld.hxx:1129 const class rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1115 +include/vcl/weld.hxx:1183 class rtl::OUString weld::IconView::get_selected_id() const -include/vcl/weld.hxx:1130 +include/vcl/weld.hxx:1198 _Bool weld::IconView::get_cursor(class weld::TreeIter *) const -include/vcl/weld.hxx:1140 +include/vcl/weld.hxx:1208 void weld::IconView::select_all() -include/vcl/weld.hxx:1146 +include/vcl/weld.hxx:1214 void weld::IconView::save_value() -include/vcl/weld.hxx:1147 +include/vcl/weld.hxx:1215 const class rtl::OUString & weld::IconView::get_saved_value() const -include/vcl/weld.hxx:1148 +include/vcl/weld.hxx:1216 _Bool weld::IconView::get_value_changed_from_saved() const -include/vcl/weld.hxx:1246 +include/vcl/weld.hxx:1314 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1254 +include/vcl/weld.hxx:1322 void weld::MenuButton::append_item_radio(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1262 +include/vcl/weld.hxx:1330 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1267 +include/vcl/weld.hxx:1335 void weld::MenuButton::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1318 +include/vcl/weld.hxx:1386 void weld::Scale::get_increments(int &,int &) const -include/vcl/weld.hxx:1335 +include/vcl/weld.hxx:1403 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1352 +include/vcl/weld.hxx:1420 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:1368 +include/vcl/weld.hxx:1436 int weld::Entry::get_position() const -include/vcl/weld.hxx:1478 +include/vcl/weld.hxx:1546 void weld::FormattedSpinButton::set_max(double) -include/vcl/weld.hxx:1533 +include/vcl/weld.hxx:1601 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1769 +include/vcl/weld.hxx:1837 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1780 +include/vcl/weld.hxx:1849 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1830 +include/vcl/weld.hxx:1899 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:1832 +include/vcl/weld.hxx:1901 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:1833 +include/vcl/weld.hxx:1902 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:1834 +include/vcl/weld.hxx:1903 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1837 +include/vcl/weld.hxx:1906 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:1838 +include/vcl/weld.hxx:1907 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1906 +include/vcl/weld.hxx:1975 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:2011 +include/vcl/weld.hxx:2080 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:2054 +include/vcl/weld.hxx:2123 _Bool weld::Toolbar::get_item_visible(const class rtl::OString &) const -include/vcl/weld.hxx:2056 +include/vcl/weld.hxx:2125 class rtl::OUString weld::Toolbar::get_item_label(const class rtl::OString &) const -include/vcl/weld.hxx:2066 +include/vcl/weld.hxx:2135 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:2108 +include/vcl/weld.hxx:2174 class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool) include/vcl/window.hxx:410 const char * ImplDbgCheckWindow(const void *) @@ -1026,10 +1078,10 @@ 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-signal-handlers.cxx:183 + void ::operator()(struct _GList *) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) lotuswordpro/source/filter/clone.hxx:28 @@ -1196,7 +1248,7 @@ 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:6508 +sc/source/core/tool/interpr1.cxx:6455 double ::operator()(const struct sc::ParamIfsResult &) const sc/source/core/tool/interpr3.cxx:4442 double ::operator()(double,unsigned long) const @@ -1271,13 +1323,13 @@ sd/source/ui/inc/GraphicViewShell.hxx:43 sd/source/ui/inc/optsitem.hxx:178 _Bool SdOptionsContents::operator==(const class SdOptionsContents &) const 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() 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/OutlineViewShell.hxx:41 + class SfxViewShell * sd::OutlineViewShell::CreateInstance(class SfxViewFrame *,class SfxViewShell *) sd/source/ui/inc/PaneShells.hxx:35 void sd::LeftImpressPaneShell::RegisterInterface(class SfxModule *) sd/source/ui/inc/PaneShells.hxx:53 @@ -1368,8 +1420,6 @@ slideshow/source/inc/listenercontainer.hxx:55 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewRepaintHandler> &) slideshow/source/inc/listenercontainer.hxx:55 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewEventHandler> &) -smoketest/libtest.cxx:70 - int main(int,char **) starmath/inc/format.hxx:138 _Bool SmFormat::operator!=(const class SmFormat &) const svgio/inc/svgstyleattributes.hxx:348 @@ -1381,12 +1431,12 @@ svl/source/misc/gridprinter.cxx:47 svl/source/misc/gridprinter.cxx:47 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-?-? &) +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-?-? &) 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-?-? &) 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-?-? &) -svl/source/misc/gridprinter.cxx:47 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_set_values(struct mdds::mtv::base_element_block &,unsigned long,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) @@ -1394,8 +1444,8 @@ svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_append_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svx/inc/sdr/contact/viewcontactofgraphic.hxx:54 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() -sw/inc/calbck.hxx:375 - type-parameter-?-? * SwIterator::Previous() +sw/inc/calbck.hxx:307 + class sw::WriterListener * sw::ClientIteratorBase::GetLeftOfPos() sw/inc/dbgoutsw.hxx:53 const char * dbg_out(const void *) sw/inc/dbgoutsw.hxx:55 @@ -1447,10 +1497,10 @@ sw/inc/dbgoutsw.hxx:107 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 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 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 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 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-?-?) @@ -1534,11 +1584,11 @@ sw/inc/swcrsr.hxx:307 class SwTableCursor * SwTableCursor::GetPrev() sw/inc/swcrsr.hxx:308 const class SwTableCursor * SwTableCursor::GetPrev() const -sw/inc/swrect.hxx:101 +sw/inc/swrect.hxx:100 class SwRect & SwRect::operator-=(const class Point &) -sw/inc/swrect.hxx:107 +sw/inc/swrect.hxx:106 class SvStream & WriteSwRect(class SvStream &,const class SwRect &) -sw/inc/swrect.hxx:149 +sw/inc/swrect.hxx:150 _Bool SwRect::OverStepTop(long) const sw/inc/viscrs.hxx:204 class SwShellTableCursor * SwShellTableCursor::GetNext() @@ -1574,13 +1624,15 @@ sw/source/core/text/txtpaint.hxx:71 DbgBackColor::DbgBackColor(class OutputDevice *,const _Bool) sw/source/core/text/txtpaint.hxx:78 DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color) +sw/source/filter/inc/fltini.hxx:75 + SwRelNumRuleSpaces::SwRelNumRuleSpaces(const class SwDoc &,_Bool) sw/source/ui/dbui/createaddresslistdialog.hxx:98 void SwFindEntryDialog::hide() sw/source/uibase/inc/bookmark.hxx:45 void BookmarkTable::remove(const class weld::TreeIter &) sw/source/uibase/inc/condedit.hxx:53 _Bool ConditionEdit::get_sensitive() const -sw/source/uibase/inc/conttree.hxx:341 +sw/source/uibase/inc/conttree.hxx:340 int SwGlobalTree::count_selected_rows() const sw/source/uibase/inc/numfmtlb.hxx:130 _Bool SwNumFormatTreeView::get_value_changed_from_saved() const @@ -1610,6 +1662,22 @@ ucb/source/ucp/gio/gio_mount.cxx:37 void * ooo_mount_operation_get_instance_private(struct OOoMountOperation *) ucb/source/ucp/webdav-neon/NeonUri.hxx:64 _Bool webdav_ucp::NeonUri::operator!=(const class webdav_ucp::NeonUri &) const +vcl/inc/aboutdialog.hxx:43 + vcl::AboutDialog::AboutDialog(class vcl::Window *,long,enum Dialog::InitFlag) +vcl/inc/aboutdialog.hxx:48 + void vcl::AboutDialog::SetLogo(const class Image &) +vcl/inc/aboutdialog.hxx:49 + void vcl::AboutDialog::SetBackground(const class Image &) +vcl/inc/aboutdialog.hxx:50 + void vcl::AboutDialog::SetVersion(const class rtl::OUString &) +vcl/inc/aboutdialog.hxx:51 + void vcl::AboutDialog::SetCopyright(const class rtl::OUString &) +vcl/inc/aboutdialog.hxx:52 + void vcl::AboutDialog::SetWebsiteLink(const class rtl::OUString &) +vcl/inc/aboutdialog.hxx:53 + void vcl::AboutDialog::SetWebsiteLabel(const class rtl::OUString &) +vcl/inc/aboutdialog.hxx:55 + class rtl::OUString vcl::AboutDialog::GetWebsiteLabel() const vcl/inc/bitmap/ScanlineTools.hxx:23 void vcl::bitmap::ScanlineTransformer::skipPixel(unsigned int) vcl/inc/bitmapwriteaccess.hxx:75 @@ -1622,7 +1690,7 @@ vcl/inc/ControlCacheKey.hxx:51 _Bool ControlCacheKey::canCacheControl() const vcl/inc/ControlCacheKey.hxx:82 unsigned long ControlCacheHashFunction::operator()(const class ControlCacheKey &) const -vcl/inc/driverblocklist.hxx:77 +vcl/inc/driverblocklist.hxx:79 DriverBlocklist::DriverInfo::DriverInfo(enum DriverBlocklist::OperatingSystem,const class rtl::OUString &,enum DriverBlocklist::VersionComparisonOp,unsigned long,_Bool,const char *) vcl/inc/fontinstance.hxx:69 void LogicalFontInstance::SetAverageWidthFactor(double) @@ -1650,7 +1718,7 @@ vcl/inc/opengl/PackedTextureAtlas.hxx:50 class OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int,int,int,int,const unsigned char *) vcl/inc/opengl/PackedTextureAtlas.hxx:52 class std::__debug::vector<unsigned int, class std::allocator<unsigned int> > PackedTextureAtlasManager::ReduceTextureNumber(int) -vcl/inc/opengl/salbmp.hxx:88 +vcl/inc/opengl/salbmp.hxx:89 const class BitmapPalette & OpenGLSalBitmap::GetBitmapPalette() const vcl/inc/opengl/texture.hxx:114 void OpenGLTexture::SaveToFile(const class rtl::OUString &) @@ -1710,7 +1778,7 @@ vcl/inc/salwtype.hxx:118 SalMenuEvent::SalMenuEvent() vcl/inc/schedulerimpl.hxx:38 const char * ImplSchedulerData::GetDebugName() const -vcl/inc/skia/gdiimpl.hxx:197 +vcl/inc/skia/gdiimpl.hxx:199 void SkiaSalGraphicsImpl::dump(const char *) const vcl/inc/skia/packedsurfaceatlas.hxx:74 SkiaPackedSurfaceAtlasManager::SkiaPackedSurfaceAtlasManager(int,int) @@ -1718,9 +1786,9 @@ vcl/inc/skia/packedsurfaceatlas.hxx:77 class SkiaPackedSurface SkiaPackedSurfaceAtlasManager::Reserve(int,int) vcl/inc/skia/packedsurfaceatlas.hxx:78 class std::__debug::vector<class sk_sp<class SkSurface>, class std::allocator<class sk_sp<class SkSurface> > > SkiaPackedSurfaceAtlasManager::ReduceSurfaceNumber(int) -vcl/inc/skia/salbmp.hxx:69 +vcl/inc/skia/salbmp.hxx:70 void SkiaSalBitmap::dump(const char *) const -vcl/inc/skia/utils.hxx:53 +vcl/inc/skia/utils.hxx:57 void SkiaHelper::dump(const class SkBitmap &,const char *) vcl/inc/skia/x11/cairotextrender.hxx:18 SkiaX11CairoTextRender::SkiaX11CairoTextRender(class X11SalGraphics &) @@ -1728,7 +1796,7 @@ vcl/inc/skia/zone.hxx:22 void SkiaZone::relaxWatchdogTimings() vcl/inc/unx/glyphcache.hxx:108 void FreetypeManager::ClearFontOptions() -vcl/inc/unx/gtk/gtkframe.hxx:216 +vcl/inc/unx/gtk/gtkframe.hxx:217 void ensure_dbus_setup(struct _GdkWindow *,class GtkSalFrame *) vcl/inc/unx/saldisp.hxx:377 class SalXLib * SalDisplay::GetXLib() const @@ -1736,8 +1804,10 @@ vcl/inc/unx/salframe.h:184 enum SalFrameStyleFlags X11SalFrame::GetStyle() const vcl/qa/cppunit/lifecycle.cxx:234 (anonymous namespace)::LeakTestClass::LeakTestClass(_Bool &,type-parameter-?-? &&...) -vcl/skia/salbmp.cxx:376 +vcl/skia/salbmp.cxx:436 void ::operator()(void *,void *) const +vcl/source/app/salvtables.cxx:5835 + class Size (anonymous namespace)::SalInstanceComboBox::call_signal_custom_get_size(class VirtualDevice &,const class rtl::OUString &) vcl/source/app/scheduler.cxx:83 basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &) vcl/source/bitmap/BitmapColorQuantizationFilter.cxx:113 @@ -1762,6 +1832,8 @@ 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/NumberingManager.hxx:85 + int writerfilter::dmapper::ListLevel::GetStartAt() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:176 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::begin() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:177 diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index d04d15a3b49b..ed58d06acc1c 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -146,16 +146,6 @@ OUString AboutDialog::GetLocaleString() { return aLocaleStr; } -bool AboutDialog::IsStringValidGitHash(const OUString &hash) { - for (int i = 0; i < hash.getLength(); i++) { - if (!rtl::isAsciiHexDigit(hash[i])) { - return false; - } - } - - return true; -} - OUString AboutDialog::GetVersionString() { OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index bd90143a83e6..0872a7c3da44 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -40,7 +40,6 @@ private: static OUString GetVersionString(); static OUString GetCopyrightString(); static OUString GetLocaleString(); - static bool IsStringValidGitHash(const OUString& hash); DECL_LINK(HandleClick, weld::Button&, void); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 1e12ba40f7ec..d9342b15b18b 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -919,46 +919,6 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTa } } -Reference<XNameAccess> OKeySet::getKeyColumns() const -{ - // use keys and indexes for exact positioning - // first the keys - - Reference<XIndexAccess> xKeys = m_xTableKeys; - if ( !xKeys.is() ) - { - Reference<XPropertySet> xSet(m_xTable,UNO_QUERY); - const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet); - return xPrimaryKeyColumns; - } - - Reference<XColumnsSupplier> xKeyColsSup; - Reference<XNameAccess> xKeyColumns; - if(xKeys.is()) - { - Reference<XPropertySet> xProp; - sal_Int32 nCount = xKeys->getCount(); - for(sal_Int32 i = 0;i< nCount;++i) - { - xProp.set(xKeys->getByIndex(i),UNO_QUERY); - if ( xProp.is() ) - { - sal_Int32 nKeyType = 0; - xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; - if(KeyType::PRIMARY == nKeyType) - { - xKeyColsSup.set(xProp,UNO_QUERY); - OSL_ENSURE(xKeyColsSup.is(),"Columnsupplier is null!"); - xKeyColumns = xKeyColsSup->getColumns(); - break; - } - } - } - } - - return xKeyColumns; -} - bool OKeySet::next() { m_bInserted = m_bUpdated = m_bDeleted = false; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index c0f034081a62..92ed794429ab 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -114,7 +114,6 @@ namespace dbaccess */ void copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rKeyRow, sal_Int32 i_nBookmark); - css::uno::Reference< css::container::XNameAccess > getKeyColumns() const; // returns true if it did any work bool fillAllRows(); bool fetchRow(); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 3dd48f9dd985..4ecff16ec1ef 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -336,7 +336,6 @@ private: OUString maFontMRUEntriesFile; Idle maUpdateIdle; - SVT_DLLPRIVATE void ImplCalcUserItemSize(); SVT_DLLPRIVATE void ImplDestroyFontList(); DECL_LINK(CustomRenderHdl, weld::ComboBox::render_args, void); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index c73882f6b71f..c08da7e9c899 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -63,7 +63,6 @@ public: virtual void dispose() override; protected: - bool IsInPopupMode() const; void EndPopupMode(); private: diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 748802a34c8e..fe516494fff6 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -321,10 +321,6 @@ public: return !mbNoSelection && (nItemId == mnSelItemId); } void SetNoSelection(); - bool IsNoSelection() const - { - return mbNoSelection; - } Color GetItemColor( sal_uInt16 nItemId ) const; OUString GetItemText( sal_uInt16 nItemId ) const; diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 40a4af22f7f8..514211960961 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -54,9 +54,7 @@ public: PaletteManager(const PaletteManager&) = delete; PaletteManager& operator=(const PaletteManager&) = delete; void LoadPalettes(); - void ReloadColorSet(SvxColorValueSet& rColorSet); void ReloadColorSet(ColorValueSet& rColorSet); - void ReloadRecentColorSet(SvxColorValueSet& rColorSet); void ReloadRecentColorSet(ColorValueSet& rColorSet); std::vector<OUString> GetPaletteList(); void SetPalette( sal_Int32 nPos ); diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 8c1b50138c8b..d9dc1a9879b3 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -38,7 +38,6 @@ public: void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1); void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix); - Size layoutAllVisible(sal_uInt32 nEntryCount); Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index c2916bf6356d..f8dc7de56520 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -95,11 +95,6 @@ public: sal_uLong GetSizeBytes() const; BitmapChecksum GetChecksum() const; - /** - * @brief extract the bitmap and alpha data separately. Used by the SWF filter. - */ - void GetSplitData( std::vector<sal_uInt8>& rvColorData, std::vector<sal_uInt8>& rvAlphaData ) const; - /** Convert bitmap format @param eConversion diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index ef04fff46330..ef52747844cf 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -85,7 +85,6 @@ public: sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 nPos = COMBOBOX_APPEND); sal_Int32 InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32 nPos = COMBOBOX_APPEND ); - void RemoveEntry( const OUString& rStr ); void RemoveEntryAt(sal_Int32 nPos); void Clear(); diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index 1c4df9900d2b..90dcbc360d1d 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -321,8 +321,7 @@ public: */ void getTransform ( Transform& ) const; - /// deprecated - bool IsTiling () const { return mbTiling;} + /** Query state of texture tiling @return true, if texture is tiled, false, if output only once. diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index cc6576c32487..3ad859a927db 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -152,7 +152,6 @@ public: sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); sal_Int32 InsertEntry( const OUString& rStr, const Image& rImage, sal_Int32 nPos = LISTBOX_APPEND ); - void RemoveEntry( const OUString& rStr ); void RemoveEntry( sal_Int32 nPos ); void Clear(); @@ -187,13 +186,6 @@ public: */ void SetEntryFlags( sal_Int32 nPos, ListBoxEntryFlags nFlags ); - /** this methods gets the current combination of flags from the - ListBoxEntryFlags::* defines from the given entry. - See description of the possible ListBoxEntryFlags::* flags - for details. - */ - ListBoxEntryFlags GetEntryFlags( sal_Int32 nPos ) const; - void SetTopEntry( sal_Int32 nPos ); sal_Int32 GetTopEntry() const; @@ -229,10 +221,6 @@ public: tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; - void EnableUserDraw( bool bUserDraw ); - - void DrawEntry( const UserDrawEvent& rEvt ); - void SetSelectHdl( const Link<ListBox&,void>& rLink ) { maSelectHdl = rLink; } void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) { maDoubleClickHdl = rLink; } const Link<ListBox&,void>& GetDoubleClickHdl() const { return maDoubleClickHdl; } diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 01e5a50500f4..609d3d031aab 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -80,7 +80,6 @@ public: void SetPopover(Window* pWindow); - sal_uInt16 GetCurItemId() const { return mnCurItemId; } OString const & GetCurItemIdent() const { return msCurItemIdent; } void SetActivateHdl( const Link<MenuButton *, void>& rLink ) { maActivateHdl = rLink; } diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index f0b0a8b3521a..bd3e92e13dcc 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -118,9 +118,6 @@ public: virtual void ReformatAll() override; - void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FieldUnit::NONE, - sal_Int32 nPos = COMBOBOX_APPEND ); - // Needed, because GetValue() with nPos hide these functions using MetricFormatter::GetValue; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index cce02a9286b6..96f019094e02 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -708,11 +708,9 @@ public: SvTreeListEntry* pEntry2, sal_uLong nPos ) override; void EndSelection(); - ScrollBar* GetVScroll(); SvTreeListEntry* GetFirstEntryInView() const; SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const; - SvTreeListEntry* GetLastEntryInView() const; void ScrollToAbsPos( long nPos ); void ShowFocusRect( const SvTreeListEntry* pEntry ); diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx index 74d7d22b98de..85f4d32ed118 100644 --- a/include/vcl/viewdataentry.hxx +++ b/include/vcl/viewdataentry.hxx @@ -72,7 +72,6 @@ public: void SetFocus( bool bFocus ); void SetSelected( bool bSelected ); void SetExpanded( bool bExpanded ); - void SetSelectable( bool bSelectable ); void SetDragTarget( bool bDragTarget ) { mbDragTarget = bDragTarget; diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b72546e39a08..da45acfbddf6 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -158,11 +158,6 @@ void ToolbarPopupBase::statusChanged( const css::frame::FeatureStateEvent& /*Eve { } -bool ToolbarPopup::IsInPopupMode() const -{ - return GetDockingManager()->IsInPopupMode(this); -} - void ToolbarPopup::EndPopupMode() { GetDockingManager()->EndPopupMode(this); diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 322c1e3b1647..8a4f4e5b8efd 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -125,39 +125,6 @@ void PaletteManager::LoadPalettes() } } -void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet) -{ - if( mnCurrentPalette == 0) - { - rColorSet.Clear(); - css::uno::Sequence< sal_Int32 > CustomColorList( officecfg::Office::Common::UserColors::CustomColor::get() ); - css::uno::Sequence< OUString > CustomColorNameList( officecfg::Office::Common::UserColors::CustomColorName::get() ); - int nIx = 1; - for (int i = 0; i < CustomColorList.getLength(); ++i) - { - Color aColor(CustomColorList[i]); - rColorSet.InsertItem(nIx, aColor, CustomColorNameList[i]); - ++nIx; - } - } - else if( mnCurrentPalette == mnNumOfPalettes - 1 ) - { - rColorSet.Clear(); - // Add doc colors to palette - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - if (pDocSh) - { - std::set<Color> aColors = pDocSh->GetDocColors(); - mnColorCount = aColors.size(); - rColorSet.addEntriesForColorSet(aColors, SvxResId( RID_SVXSTR_DOC_COLOR_PREFIX ) + " " ); - } - } - else - { - m_Palettes[mnCurrentPalette - 1]->LoadColorSet( rColorSet ); - mnColorCount = rColorSet.GetItemCount(); - } -} void PaletteManager::ReloadColorSet(ColorValueSet &rColorSet) { @@ -193,24 +160,6 @@ void PaletteManager::ReloadColorSet(ColorValueSet &rColorSet) } } -void PaletteManager::ReloadRecentColorSet(SvxColorValueSet& rColorSet) -{ - maRecentColors.clear(); - rColorSet.Clear(); - css::uno::Sequence< sal_Int32 > Colorlist(officecfg::Office::Common::UserColors::RecentColor::get()); - css::uno::Sequence< OUString > ColorNamelist(officecfg::Office::Common::UserColors::RecentColorName::get()); - int nIx = 1; - const bool bHasColorNames = Colorlist.getLength() == ColorNamelist.getLength(); - for (int i = 0; i < Colorlist.getLength(); ++i) - { - Color aColor(Colorlist[i]); - OUString sColorName = bHasColorNames ? ColorNamelist[i] : ("#" + aColor.AsRGBHexString().toAsciiUpperCase()); - maRecentColors.emplace_back(aColor, sColorName); - rColorSet.InsertItem(nIx, aColor, sColorName); - ++nIx; - } -} - void PaletteManager::ReloadRecentColorSet(ColorValueSet& rColorSet) { maRecentColors.clear(); diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 2c0ba7c73966..ffdbdab668eb 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -162,34 +162,6 @@ Size ColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount) return CalcWindowSizePixel(aItemSize); } -Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount) -{ - if(!nEntryCount) - { - nEntryCount++; - } - - const sal_uInt32 nRowCount(ceil(double(nEntryCount)/getColumnCount())); - const Size aItemSize(getEntryEdgeLength() - 2, getEntryEdgeLength() - 2); - const WinBits aWinBits(GetStyle() & ~WB_VSCROLL); - - if(nRowCount > getMaxRowCount()) - { - SetStyle(aWinBits|WB_VSCROLL); - } - else - { - SetStyle(aWinBits); - } - - SetColCount(getColumnCount()); - SetLineCount(std::min(nRowCount, getMaxRowCount())); - SetItemWidth(aItemSize.Width()); - SetItemHeight(aItemSize.Height()); - - return CalcWindowSizePixel(aItemSize); -} - void SvxColorValueSet::Resize() { layoutToGivenHeight(GetSizePixel().Height(), GetItemCount()); diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 5e9af3abd6ff..f76ae2684a61 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -269,21 +269,6 @@ void StgReader::SetFltName( const OUString& rFltNm ) m_aFltName = rFltNm; } -SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc const & rDoc, bool bNDoc ) -{ - pNumRuleTable.reset(new SwNumRuleTable); - pNumRuleTable->reserve(8); - if( !bNDoc ) - pNumRuleTable->insert( pNumRuleTable->begin(), - rDoc.GetNumRuleTable().begin(), rDoc.GetNumRuleTable().end() ); -} - -SwRelNumRuleSpaces::~SwRelNumRuleSpaces() -{ - if( pNumRuleTable ) - pNumRuleTable->clear(); -} - void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, SwTwips nPageWidth) { diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 81b0809c2040..54ff7cf07679 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -62,21 +62,6 @@ public: void GetWW8Writer( const OUString&, const OUString&, WriterRef& ); -// Mapping of the LRSpaces in the currently imported document. -// The foreign filters always provide absolute values for the levels of -// a NumRule. We are now processing relative values related to the LR-Space-Item -// though. The consequence of this is that, for all paragraphs, the indentations -// of the NumRule must be subtracted from the paragraph indentation. -class SW_DLLPUBLIC SwRelNumRuleSpaces -{ - std::unique_ptr<SwNumRuleTable> pNumRuleTable; // list of all named NumRules - -public: - SwRelNumRuleSpaces( SwDoc const & rDoc, bool bNewDoc ); - ~SwRelNumRuleSpaces(); -}; - - // Get size of fly (if 'automatic' in WW) and check if not too small SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, SwTwips nPageWidth); diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 64812f920d47..fe3afd7de9a4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -117,7 +117,6 @@ endif $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/animate/Animation \ vcl/source/animate/AnimationBitmap \ - vcl/source/window/aboutdialog \ vcl/source/window/errinf \ vcl/source/window/settings \ vcl/source/window/paint \ diff --git a/vcl/inc/aboutdialog.hxx b/vcl/inc/aboutdialog.hxx deleted file mode 100644 index 85da1cf27076..000000000000 --- a/vcl/inc/aboutdialog.hxx +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * 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/. - */ - -#ifndef INCLUDED_VCL_ABOUT_DIALOG_HXX -#define INCLUDED_VCL_ABOUT_DIALOG_HXX - -#include <vcl/fixed.hxx> -#include <vcl/toolkit/fixedhyper.hxx> -#include <vcl/toolkit/dialog.hxx> -#include <vcl/layout.hxx> -#include <vcl/vclmedit.hxx> - -namespace vcl -{ -class AboutDialog final : public Dialog -{ -private: - BitmapEx m_aBackgroundBitmap; - - std::unique_ptr<VclBuilder> m_xBuilder; - VclPtr<VclContainer> m_xContents; - VclPtr<VclMultiLineEdit> m_xVersion; - VclPtr<FixedHyperlink> m_xBuildIdLink; - VclPtr<FixedText> m_xDescriptionText; - VclPtr<FixedText> m_xCopyrightText; - VclPtr<FixedImage> m_xLogoImage; - VclPtr<FixedText> m_xLogoReplacement; - - void StyleControls(); - - virtual void Paint(vcl::RenderContext& rRenderContext, - const ::tools::Rectangle& rRect) override; - virtual bool set_property(const OString& rKey, const OUString& rValue) override; - virtual void set_content_area(VclBox* pBox) override; - -public: - explicit AboutDialog(vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, - InitFlag eFlag = InitFlag::Default); - virtual ~AboutDialog() override; - virtual void dispose() override; - - void SetLogo(const Image& rLogoBitmap); - void SetBackground(const Image& rBackgroundBitmap); - void SetVersion(const OUString& rVersion) { m_xVersion->SetText(rVersion); } - void SetCopyright(const OUString& rCopyright) { m_xCopyrightText->SetText(rCopyright); } - void SetWebsiteLink(const OUString& rURL) { m_xBuildIdLink->SetURL(rURL); } - void SetWebsiteLabel(const OUString& rLabel) { m_xBuildIdLink->SetText(rLabel); } - - OUString GetWebsiteLabel() const { return m_xBuildIdLink->GetText(); } -}; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7cc4d9ebbc50..35c604955179 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -69,7 +69,6 @@ #include <vcl/vclmedit.hxx> #include <vcl/viewdataentry.hxx> #include <vcl/virdev.hxx> -#include <aboutdialog.hxx> #include <bitmaps.hlst> #include <wizdlg.hxx> #include <salvtables.hxx> @@ -5832,11 +5831,6 @@ public: m_xComboBox->DrawEntry(*pEvent, false, false); // draw separator } - Size call_signal_custom_get_size(VirtualDevice& rOutput, const OUString& rId) - { - return signal_custom_get_size(rOutput, rId); - } - VclPtr<VirtualDevice> create_render_virtual_device() const override { return VclPtr<VirtualDevice>::Create(); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index ef1e3c1cebf5..d25a9be9790a 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -920,11 +920,6 @@ sal_Int32 ComboBox::InsertEntryWithImage( return nRealPos; } -void ComboBox::RemoveEntry( const OUString& rStr ) -{ - RemoveEntryAt(GetEntryPos(rStr)); -} - void ComboBox::RemoveEntryAt(sal_Int32 const nPos) { const sal_Int32 nMRUCount = m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 3d23ee89deda..dc4e98c440f0 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1786,13 +1786,6 @@ void MetricBox::ReformatAll() SetUpdateMode( true ); } -void MetricBox::InsertValue( sal_Int64 nValue, FieldUnit eInUnit, sal_Int32 nPos ) -{ - // convert to previously configured units - nValue = vcl::ConvertValue(nValue, 0, GetDecimalDigits(), eInUnit, meUnit); - ComboBox::InsertEntry( CreateFieldText( nValue ), nPos ); -} - static bool ImplCurrencyProcessKeyInput( const KeyEvent& rKEvt, bool bUseThousandSep, const LocaleDataWrapper& rWrapper ) { diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 9fa46963b9ff..07bdb413ac02 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -952,11 +952,6 @@ sal_Int32 ListBox::InsertEntry( const OUString& rStr, const Image& rImage, sal_I return nRealPos; } -void ListBox::RemoveEntry( const OUString& rStr ) -{ - RemoveEntry( GetEntryPos( rStr ) ); -} - void ListBox::RemoveEntry( sal_Int32 nPos ) { mpImplLB->RemoveEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); @@ -1095,11 +1090,6 @@ void ListBox::SetEntryFlags( sal_Int32 nPos, ListBoxEntryFlags nFlags ) mpImplLB->SetEntryFlags( nPos + mpImplLB->GetEntryList()->GetMRUCount(), nFlags ); } -ListBoxEntryFlags ListBox::GetEntryFlags( sal_Int32 nPos ) const -{ - return mpImplLB->GetEntryList()->GetEntryFlags( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); -} - void ListBox::SetTopEntry( sal_Int32 nPos ) { mpImplLB->SetTopEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); @@ -1338,21 +1328,6 @@ void ListBox::UserDraw( const UserDrawEvent& ) { } -void ListBox::DrawEntry(const UserDrawEvent& rEvt) -{ - if (rEvt.GetWindow() == mpImplLB->GetMainWindow()) - mpImplLB->GetMainWindow()->DrawEntry(*rEvt.GetRenderContext(), rEvt.GetItemId(), true/*bDrawImage*/, true/*bDrawText*/, false/*bDrawTextAtImagePos*/ ); - else if (rEvt.GetWindow() == mpImplWin) - mpImplWin->DrawEntry(*rEvt.GetRenderContext(), false/*layout*/); -} - -void ListBox::EnableUserDraw( bool bUserDraw ) -{ - mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw ); - if ( mpImplWin ) - mpImplWin->EnableUserDraw( bUserDraw ); -} - void ListBox::SetReadOnly( bool bReadOnly ) { if ( mpImplLB->IsReadOnly() != bReadOnly ) diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 88ff6b5c2fb8..f4add8ef1bb2 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -1620,71 +1620,6 @@ void BitmapEx::AdjustTransparency(sal_uInt8 cTrans) *this = BitmapEx( GetBitmap(), aAlpha ); } -// AS: Because JPEGs require the alpha channel provided separately (JPEG does not -// natively support alpha channel, but SWF lets you provide it separately), we -// extract the alpha channel into a separate array here. -void BitmapEx::GetSplitData( std::vector<sal_uInt8>& rvColorData, std::vector<sal_uInt8>& rvAlphaData ) const -{ - if( IsEmpty() ) - return; - - Bitmap::ScopedReadAccess pRAcc(const_cast<Bitmap&>(maBitmap)); - - assert( pRAcc ); - - AlphaMask aAlpha; - sal_uInt32 nWidth = pRAcc->Width(); - sal_uInt32 nHeight = pRAcc->Height(); - rvColorData.resize(nWidth*nHeight*4); - rvAlphaData.resize(nWidth*nHeight); - sal_uInt8* p = rvColorData.data(), *pAlpha = rvAlphaData.data(); - - - if (IsAlpha()) - { - aAlpha = GetAlpha(); - } - else if (IsTransparent()) - { - aAlpha = GetMask(); - } - else - { - sal_uInt8 cAlphaVal = 0; - aAlpha = AlphaMask(maBitmap.GetSizePixel(), &cAlphaVal); - } - - AlphaMask::ScopedReadAccess pAAcc(aAlpha); - - assert( pAAcc ); - - for( sal_uInt32 nY = 0; nY < nHeight; nY++ ) - { - Scanline pScanlineAA = pAAcc->GetScanline( nY ); - for( sal_uInt32 nX = 0; nX < nWidth; nX++ ) - { - const sal_uInt8 nAlpha = pAAcc->GetIndexFromData( pScanlineAA, nX ); - const BitmapColor aPixelColor( pRAcc->GetColor( nY, nX ) ); - - if( nAlpha == 0xff ) - { - *p++ = 0; - *p++ = 0; - *p++ = 0; - *p++ = 0; - } - else - { - *p++ = 0xff-nAlpha; - *p++ = aPixelColor.GetRed(); - *p++ = aPixelColor.GetGreen(); - *p++ = aPixelColor.GetBlue(); - } - *pAlpha++ = 0xff - nAlpha; - } - } -} - void BitmapEx::CombineMaskOr(Color maskColor, sal_uInt8 nTol) { Bitmap aNewMask = maBitmap.CreateMask( maskColor, nTol ); diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 9f66861b92ae..e295308dbd5b 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -3397,11 +3397,6 @@ void SvTreeListBox::EndSelection() pImpl->EndSelection(); } -ScrollBar *SvTreeListBox::GetVScroll() -{ - return pImpl->m_aVerSBar.get(); -} - SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const { return GetEntry( Point() ); @@ -3420,27 +3415,6 @@ SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) con return pNext; } -SvTreeListEntry* SvTreeListBox::GetLastEntryInView() const -{ - SvTreeListEntry* pEntry = GetFirstEntryInView(); - SvTreeListEntry* pNext = nullptr; - while( pEntry ) - { - pNext = NextVisible( pEntry ); - if( pNext ) - { - Point aPos( GetEntryPosition(pNext) ); - const Size& rSize = pImpl->GetOutputSize(); - if( aPos.Y() < 0 || aPos.Y() + GetEntryHeight() >= rSize.Height() ) - break; - else - pEntry = pNext; - } - else - break; - } - return pEntry; -} void SvTreeListBox::ShowFocusRect( const SvTreeListEntry* pEntry ) { diff --git a/vcl/source/treelist/viewdataentry.cxx b/vcl/source/treelist/viewdataentry.cxx index 76a3fc7e3c7e..bde20c337c60 100644 --- a/vcl/source/treelist/viewdataentry.cxx +++ b/vcl/source/treelist/viewdataentry.cxx @@ -66,11 +66,6 @@ void SvViewDataEntry::SetExpanded( bool bExpanded ) mbExpanded = bExpanded; } -void SvViewDataEntry::SetSelectable( bool bSelectable ) -{ - mbSelectable = bSelectable; -} - void SvViewDataEntry::Init(size_t nSize) { maItems.resize(nSize); diff --git a/vcl/source/window/aboutdialog.cxx b/vcl/source/window/aboutdialog.cxx deleted file mode 100644 index 882b47b09790..000000000000 --- a/vcl/source/window/aboutdialog.cxx +++ /dev/null @@ -1,142 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * 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/. - */ - -#include <vcl/layout.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <aboutdialog.hxx> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star; -using namespace vcl; - -AboutDialog::AboutDialog(vcl::Window* pParent, WinBits nStyle, Dialog::InitFlag eFlag) - : Dialog(pParent, nStyle, eFlag) - , m_xBuilder(new VclBuilder(this, getUIRootDir(), "vcl/ui/aboutbox.ui")) -{ - m_xBuilder->get(m_xContents, "about"); - m_xBuilder->get(m_xLogoReplacement, "logoreplacement"); - m_xBuilder->get(m_xLogoImage, "logo"); - m_xBuilder->get(m_xVersion, "version"); - m_xBuilder->get(m_xDescriptionText, "description"); - m_xBuilder->get(m_xCopyrightText, "copyright"); - m_xBuilder->get(m_xBuildIdLink, "buildIdLink"); - - // tdf#127148 so tabbing into the widget will auto select-all - AllSettings aSettings = m_xVersion->GetSettings(); - StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - aStyleSettings.SetSelectionOptions(aStyleSettings.GetSelectionOptions() - | SelectionOptions::Focus); - aSettings.SetStyleSettings(aStyleSettings); - m_xVersion->SetSettings(aSettings, true); - -#ifndef MACOSX - m_xVersion->RequestDoubleBuffering(true); -#endif -} - -void AboutDialog::set_content_area(VclBox* pBox) -{ - Dialog::set_content_area(pBox); - - // move it now that the content area exists - m_xContents->SetParent(pBox); - - StyleControls(); -} - -AboutDialog::~AboutDialog() { disposeOnce(); } - -void AboutDialog::dispose() -{ - m_xVersion.clear(); - m_xDescriptionText.clear(); - m_xCopyrightText.clear(); - m_xLogoImage.clear(); - m_xLogoReplacement.clear(); - m_xBuildIdLink.clear(); - m_xContents.clear(); - m_xBuilder.reset(); - Dialog::dispose(); -} - -void AboutDialog::StyleControls() -{ - // Make all the controls have a transparent background - m_xLogoImage->SetBackground(); - m_xLogoReplacement->SetPaintTransparent(true); - m_xVersion->SetPaintTransparent(true); - m_xDescriptionText->SetPaintTransparent(true); - m_xCopyrightText->SetPaintTransparent(true); - - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - - const vcl::Font& aLabelFont = rStyleSettings.GetLabelFont(); - vcl::Font aLargeFont = aLabelFont; - aLargeFont.SetFontSize(Size(0, aLabelFont.GetFontSize().Height() * 3)); - - // Logo Replacement Text - m_xLogoReplacement->SetControlFont(aLargeFont); - - // Description Text - aLargeFont.SetFontSize(Size(0, aLabelFont.GetFontSize().Height() * 1.3)); - m_xDescriptionText->SetControlFont(aLargeFont); -} - -void AboutDialog::SetLogo(const Image& rLogoBitmap) -{ - if (!rLogoBitmap) - { - m_xLogoImage->Hide(); - m_xLogoReplacement->Show(); - } - else - { - m_xLogoReplacement->Hide(); - m_xLogoImage->SetImage(rLogoBitmap); - m_xLogoImage->Show(); - } -} - -void AboutDialog::SetBackground(const Image& rBackgroundBitmap) -{ - m_aBackgroundBitmap = rBackgroundBitmap.GetBitmapEx(); - Invalidate(); -} - -void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/) -{ - Size aSize(GetOutputSizePixel()); - Point aPos(aSize.Width() - m_aBackgroundBitmap.GetSizePixel().Width(), - aSize.Height() - m_aBackgroundBitmap.GetSizePixel().Height()); - - rRenderContext.DrawBitmapEx(aPos, m_aBackgroundBitmap); -} - -bool AboutDialog::set_property(const OString& rKey, const OUString& rValue) -{ - if (rKey == "version") - m_xVersion->SetText(rValue); - else if (rKey == "copyright") - m_xCopyrightText->SetText(rValue); - else if (rKey == "comments") - m_xDescriptionText->SetText(rValue); - else if (rKey == "website") - m_xBuildIdLink->SetURL(rValue); - else if (rKey == "website_label") - m_xBuildIdLink->SetText(rValue); - else if (rKey == "program_name") - m_xLogoReplacement->SetText(rValue); - else - return Dialog::set_property(rKey, rValue); - return true; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 020182cbe055..8cb3ca6b2fbe 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -64,7 +64,6 @@ #include <desktop/crashreport.hxx> #include <salinst.hxx> #include <strings.hrc> -#include <aboutdialog.hxx> #include <treeglue.hxx> #include <tools/diagnose_ex.h> #include <wizdlg.hxx> diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index c337b88e9872..6fed0a0be801 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -82,7 +82,6 @@ public: // Getters const OUString& GetBulletChar( ) const { return m_sBulletChar; }; const tools::SvRef< StyleSheetEntry >& GetParaStyle( ) const { return m_pParaStyle; }; - sal_Int32 GetStartAt() const { return m_nIStartAt; }; bool isOutlineNumbering() const { return m_outline; } sal_Int32 GetStartOverride() const { return m_nStartOverride; }; /// Determines if SetValue() was called at least once. |