[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source framework/source include/editeng include/sfx2 include/svtools include/svx include/vcl sfx2/source svtools/source svx/source vcl/inc vcl/Library_vclplug_gtk3.mk vcl/opengl vcl/source vcl/unx writerfilter/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 3 14:35:58 UTC 2019
compilerplugins/clang/unusedmethods.results | 294 +++++++----
compilerplugins/clang/unusedmethods.unused-returns.results | 44 +
dbaccess/source/ui/control/FieldDescControl.cxx | 12
dbaccess/source/ui/inc/FieldDescControl.hxx | 3
framework/source/uiconfiguration/ImageList.hxx | 1
include/editeng/splwrap.hxx | 1
include/sfx2/viewsh.hxx | 1
include/svtools/simptabl.hxx | 6
include/svx/colorbox.hxx | 1
include/vcl/builderpage.hxx | 2
include/vcl/edit.hxx | 1
include/vcl/settings.hxx | 1
include/vcl/treelistbox.hxx | 2
include/vcl/vclmedit.hxx | 2
sfx2/source/view/viewsh.cxx | 31 -
svtools/source/contnr/simptabl.cxx | 22
svx/source/table/tablerow.cxx | 5
svx/source/table/tablerow.hxx | 2
vcl/Library_vclplug_gtk3.mk | 1
vcl/inc/opengl/x11/gdiimpl.hxx | 7
vcl/inc/unx/gtk/gtkdata.hxx | 5
vcl/inc/unx/gtk/gtkframe.hxx | 9
vcl/inc/unx/gtk/gtkgdi.hxx | 3
vcl/inc/unx/pixmap.hxx | 43 -
vcl/inc/unx/saldisp.hxx | 1
vcl/inc/unx/salgdi.h | 15
vcl/inc/unx/x11/x11gdiimpl.h | 6
vcl/inc/wizdlg.hxx | 81 ---
vcl/opengl/x11/gdiimpl.cxx | 190 -------
vcl/source/app/settings.cxx | 7
vcl/source/control/roadmapwizard.cxx | 73 --
vcl/source/control/wizardmachine.cxx | 77 ---
vcl/source/treelist/treelistbox.cxx | 6
vcl/unx/generic/gdi/gdiimpl.cxx | 58 --
vcl/unx/generic/gdi/gdiimpl.hxx | 4
vcl/unx/generic/gdi/salgdi2.cxx | 29 -
vcl/unx/gtk3/a11y/atkutil.hxx | 1
vcl/unx/gtk3/a11y/atkwindow.hxx | 30 -
vcl/unx/gtk3/a11y/gtk3atkbridge.cxx | 1
vcl/unx/gtk3/a11y/gtk3atkutil.cxx | 77 ---
vcl/unx/gtk3/a11y/gtk3atkwindow.cxx | 330 -------------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 1
42 files changed, 222 insertions(+), 1264 deletions(-)
New commits:
commit 09f77e8ed51fc64fccc6a14e87eed48b2f15a28d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 3 12:57:10 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Oct 3 16:34:31 2019 +0200
loplugin:unusedmethods
Change-Id: I9790d053248ae6bd58ecc026c774014c4e5e04aa
Reviewed-on: https://gerrit.libreoffice.org/80115
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index f78a7ce43258..8e985abaf45a 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -52,7 +52,7 @@ connectivity/source/inc/OColumn.hxx:104
_Bool connectivity::OColumn::isWritable() const
connectivity/source/inc/OColumn.hxx:105
_Bool connectivity::OColumn::isDefinitelyWritable() const
-connectivity/source/inc/odbc/OConnection.hxx:121
+connectivity/source/inc/odbc/OConnection.hxx:119
class connectivity::odbc::ODBCDriver * connectivity::odbc::OConnection::getDriver() const
connectivity/source/inc/odbc/ODriver.hxx:79
const class com::sun::star::uno::Reference<class com::sun::star::lang::XMultiServiceFactory> & connectivity::odbc::ODBCDriver::getORB() const
@@ -86,12 +86,18 @@ dbaccess/source/filter/hsqldb/fbalterparser.hxx:20
void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
dbaccess/source/filter/hsqldb/parseschema.hxx:82
const class std::__debug::map<class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> >, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > > > > & dbahsql::SchemaParser::getPrimaryKeys() const
-dbaccess/source/ui/app/AppController.hxx:352
- void dbaui::OApplicationController::impl_migrateScripts_nothrow()
dbaccess/source/ui/inc/dsmeta.hxx:88
class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::begin() const
dbaccess/source/ui/inc/dsmeta.hxx:89
class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::end() const
+dbaccess/source/ui/inc/FieldControls.hxx:71
+ class rtl::OUString dbaui::OPropNumericEditCtrl::get_text() const
+dbaccess/source/ui/inc/FieldControls.hxx:76
+ void dbaui::OPropNumericEditCtrl::set_min(int)
+dbaccess/source/ui/inc/FieldDescControl.hxx:134
+ _Bool dbaui::OFieldDescControl::isRightAligned() const
+dbaccess/source/ui/inc/FieldDescControl.hxx:140
+ unsigned short dbaui::OFieldDescControl::CountActiveAggregates() const
dbaccess/source/ui/inc/indexcollection.hxx:54
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::begin() const
dbaccess/source/ui/inc/indexcollection.hxx:58
@@ -102,6 +108,14 @@ dbaccess/source/ui/inc/indexcollection.hxx:65
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/opendoccontrols.hxx:47
_Bool dbaui::OpenDocumentButton::get_sensitive() const
+dbaccess/source/ui/inc/opendoccontrols.hxx:70
+ _Bool dbaui::OpenDocumentListBox::get_sensitive() const
+dbaccess/source/ui/inc/opendoccontrols.hxx:71
+ void dbaui::OpenDocumentListBox::grab_focus()
+dbaccess/source/ui/inc/SqlNameEdit.hxx:106
+ void dbaui::OSQLNameEntry::set_sensitive(_Bool)
+dbaccess/source/ui/inc/WTypeSelect.hxx:84
+ void dbaui::OWizTypeSelectList::show()
desktop/inc/lib/init.hxx:83
void desktop::CallbackFlushHandler::setEventLatch(const _Bool)
desktop/inc/lib/init.hxx:88
@@ -128,12 +142,14 @@ drawinglayer/source/tools/emfpstringformat.hxx:57
_Bool emfplushelper::EMFPStringFormat::NoClip() const
drawinglayer/source/tools/emfpstringformat.hxx:58
_Bool emfplushelper::EMFPStringFormat::BypassGDI() const
-editeng/inc/edtspell.hxx:112
+editeng/inc/edtspell.hxx:111
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::begin() const
-editeng/inc/edtspell.hxx:113
+editeng/inc/edtspell.hxx:112
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::end() const
extensions/source/scanner/scanner.hxx:86
void ScannerManager::SetData(void *)
+framework/source/uiconfiguration/ImageList.hxx:73
+ void ImageList::ImplLoad(struct ImageAryData &) const
hwpfilter/source/mzstring.h:99
class MzString & MzString::operator<<(unsigned char)
hwpfilter/source/mzstring.h:101
@@ -355,7 +371,7 @@ include/codemaker/global.hxx:60
include/codemaker/global.hxx:61
class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer &)
include/comphelper/asyncquithandler.hxx:45
- _Bool AsyncQuitHandler::IsForceQuit()
+ _Bool AsyncQuitHandler::IsForceQuit() const
include/comphelper/automationinvokedzone.hxx:28
comphelper::Automation::AutomationInvokedZone::AutomationInvokedZone()
include/comphelper/basicio.hxx:52
@@ -368,8 +384,6 @@ include/comphelper/configuration.hxx:264
void comphelper::ConfigurationLocalizedProperty::set(const type-parameter-?-? &,const class std::shared_ptr<class comphelper::ConfigurationChanges> &)
include/comphelper/configuration.hxx:300
class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameReplace> comphelper::ConfigurationGroup::get(const class std::shared_ptr<class comphelper::ConfigurationChanges> &)
-include/comphelper/interaction.hxx:92
- comphelper::OInteractionPassword::OInteractionPassword(const class rtl::OUString &)
include/comphelper/interfacecontainer3.hxx:60
OInterfaceIteratorHelper3<ListenerT> comphelper::<deduction guide for OInterfaceIteratorHelper3>(OInterfaceIteratorHelper3<ListenerT>)
include/comphelper/interfacecontainer3.hxx:94
@@ -436,8 +450,6 @@ include/comphelper/scopeguard.hxx:52
ScopeGuard<Func> comphelper::<deduction guide for ScopeGuard>(ScopeGuard<Func>)
include/comphelper/scopeguard.hxx:84
ScopeGuard<Func> comphelper::<deduction guide for ScopeGuard>(const ScopeGuard<Func> &)
-include/comphelper/types.hxx:55
- type-parameter-?-? * comphelper::getImplementation(const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
include/comphelper/unique_disposing_ptr.hxx:46
type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const
include/comphelper/unwrapargs.hxx:50
@@ -454,14 +466,6 @@ include/connectivity/sdbcx/VGroup.hxx:65
connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool)
include/connectivity/sqlparse.hxx:191
class rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int)
-include/desktop/crashreport.hxx:46
- class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CrashReporter::getIniFileName()
-include/desktop/crashreport.hxx:48
- void CrashReporter::writeCommonInfo()
-include/desktop/crashreport.hxx:50
- void CrashReporter::storeExceptionHandler(class google_breakpad::ExceptionHandler *)
-include/desktop/crashreport.hxx:54
- void CrashReporter::updateMinidumpLocation()
include/drawinglayer/geometry/viewinformation2d.hxx:129
_Bool drawinglayer::geometry::ViewInformation2D::operator!=(const class drawinglayer::geometry::ViewInformation2D &) const
include/drawinglayer/primitive2d/baseprimitive2d.hxx:195
@@ -474,6 +478,8 @@ include/drawinglayer/tools/primitive2dxmldump.hxx:44
void drawinglayer::tools::Primitive2dXmlDump::dump(const class drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
include/editeng/hyphenzoneitem.hxx:63
_Bool SvxHyphenZoneItem::IsPageEnd() const
+include/editeng/splwrap.hxx:95
+ _Bool SvxSpellWrapper::IsHyphen() const
include/filter/msfilter/mstoolbar.hxx:102
Indent::Indent(_Bool)
include/formula/opcode.hxx:520
@@ -536,7 +542,7 @@ include/oox/helper/propertymap.hxx:115
void oox::PropertyMap::dumpData(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
include/opencl/openclconfig.hxx:57
_Bool OpenCLConfig::ImplMatcher::operator!=(const struct OpenCLConfig::ImplMatcher &) const
-include/opencl/OpenCLZone.hxx:42
+include/opencl/OpenCLZone.hxx:47
_Bool OpenCLZone::isInInitialTest()
include/sfx2/charwin.hxx:64
void SvxCharView::connect_focus_in(const class Link<class weld::Widget &, void> &)
@@ -548,10 +554,12 @@ include/sfx2/docfilt.hxx:80
_Bool SfxFilter::GetGpgEncryption() const
include/sfx2/evntconf.hxx:60
struct SfxEventName & SfxEventNamesList::at(unsigned long)
-include/sfx2/lokcharthelper.hxx:41
+include/sfx2/lokcharthelper.hxx:42
void LokChartHelper::Invalidate()
include/sfx2/msg.hxx:120
const class std::type_info * SfxType0::Type() const
+include/sfx2/viewsh.hxx:169
+ unsigned long SfxViewShell::GetActiveShells(_Bool)
include/svl/itempool.hxx:171
const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const
include/svl/itempool.hxx:207
@@ -560,8 +568,10 @@ include/svl/lockfilecommon.hxx:58
void svt::LockFileCommon::SetURL(const class rtl::OUString &)
include/svtools/DocumentToGraphicRenderer.hxx:106
_Bool DocumentToGraphicRenderer::isImpress() const
-include/svtools/inettbc.hxx:82
- void SvtURLBox::SetFilter(const class rtl::OUString &)
+include/svtools/simptabl.hxx:92
+ void SvSimpleTable::InsertHeaderEntry(const class rtl::OUString &,unsigned short,enum HeaderBarItemBits)
+include/svtools/simptabl.hxx:99
+ unsigned short SvSimpleTable::GetSortedCol() const
include/svx/autoformathelper.hxx:145
_Bool AutoFormatBase::operator==(const class AutoFormatBase &)
include/svx/ClassificationEditView.hxx:38
@@ -572,8 +582,8 @@ include/svx/ClassificationField.hxx:47
const class rtl::OUString & svx::ClassificationResult::getDisplayText() const
include/svx/ClassificationField.hxx:52
_Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const
-include/svx/DescriptionGenerator.hxx:156
- void accessibility::DescriptionGenerator::AddString(const class rtl::OUString &,const class rtl::OUString &,unsigned short)
+include/svx/colorbox.hxx:70
+ void SvxColorListBox::SetAutoDisplayColor(const class Color &)
include/svx/DiagramDataInterface.hxx:33
class rtl::OUString DiagramDataInterface::getString() const
include/svx/dlgctrl.hxx:256
@@ -584,8 +594,6 @@ include/svx/dlgctrl.hxx:279
void SvxLineEndLB::set_active_text(const class rtl::OUString &)
include/svx/framelink.hxx:194
_Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &)
-include/svx/ImageMapInfo.hxx:53
- class ImageMap * SvxIMapInfo::GetImageMapForObject(class SdrObject *)
include/svx/langbox.hxx:157
void LanguageBox::show()
include/svx/svdlayer.hxx:74
@@ -642,11 +650,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:97
+include/tools/gen.hxx:95
class Point operator/(const class Point &,const long)
-include/tools/gen.hxx:257
+include/tools/gen.hxx:255
class Pair & Range::toPair()
-include/tools/gen.hxx:324
+include/tools/gen.hxx:322
class Pair & Selection::toPair()
include/tools/link.hxx:135
const char * Link::getSourceFilename() const
@@ -686,6 +694,14 @@ 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/builderpage.hxx:38
+ class weld::DialogController * BuilderPage::GetController() const
+include/vcl/ColorMask.hxx:113
+ void ColorMask::GetColorFor16BitMSB(class BitmapColor &,const unsigned char *) const
+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/commandevent.hxx:249
CommandMediaData::CommandMediaData(enum MediaCommand)
include/vcl/commandevent.hxx:256
@@ -698,14 +714,16 @@ include/vcl/cursor.hxx:96
_Bool vcl::Cursor::operator!=(const class vcl::Cursor &) const
include/vcl/customweld.hxx:41
class rtl::OUString weld::CustomWidgetController::GetHelpText() const
-include/vcl/customweld.hxx:73
+include/vcl/customweld.hxx:74
void weld::CustomWidgetController::SetAccessibleName(const class rtl::OUString &)
-include/vcl/customweld.hxx:114
+include/vcl/customweld.hxx:115
void weld::CustomWeld::queue_draw_area(int,int,int,int)
include/vcl/edit.hxx:193
_Bool Edit::IsSelectAllSingleClick() const
include/vcl/edit.hxx:225
class rtl::OUString Edit::GetPlaceholderText() const
+include/vcl/edit.hxx:233
+ void Edit::SetUpdateDataHdl(const class Link<class Edit &, void> &)
include/vcl/errcode.hxx:86
_Bool ErrCode::operator<(const class ErrCode &) const
include/vcl/errcode.hxx:87
@@ -730,18 +748,16 @@ include/vcl/ITiledRenderable.hxx:193
enum PointerStyle vcl::ITiledRenderable::getPointer()
include/vcl/lok.hxx:24
void vcl::lok::unregisterPollCallbacks()
-include/vcl/NotebookBarAddonsMerger.hxx:66
+include/vcl/NotebookBarAddonsMerger.hxx:64
NotebookBarAddonsMerger::NotebookBarAddonsMerger()
include/vcl/opengl/OpenGLHelper.hxx:67
void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &)
include/vcl/opengl/OpenGLHelper.hxx:97
void OpenGLHelper::debugMsgStreamWarn(const class std::__cxx11::basic_ostringstream<char> &)
include/vcl/pdfread.hxx:48
- unsigned long vcl::ImportPDF(const class rtl::OUString &,class std::__debug::vector<class Bitmap, class std::allocator<class Bitmap> > &,class std::__debug::vector<signed char, class std::allocator<signed char> > &,const double)
+ unsigned long vcl::ImportPDF(const class rtl::OUString &,class std::__debug::vector<class Bitmap, class std::allocator<class Bitmap> > &,class std::__debug::vector<signed char, class std::allocator<signed char> > &,double)
include/vcl/pngread.hxx:56
void vcl::PNGReader::SetIgnoreGammaChunk(_Bool)
-include/vcl/roadmapwizard.hxx:116
- void vcl::RoadmapWizard::describeState(short,const class rtl::OUString &,class VclPtr<class TabPage> (*)(class vcl::RoadmapWizard &))
include/vcl/salnativewidgets.hxx:410
_Bool TabitemValue::isBothAligned() const
include/vcl/salnativewidgets.hxx:411
@@ -754,6 +770,10 @@ include/vcl/settings.hxx:428
void StyleSettings::SetHideDisabledMenuItems(_Bool)
include/vcl/settings.hxx:493
void StyleSettings::SetSpinSize(long)
+include/vcl/settings.hxx:558
+ void StyleSettings::SetDialogStyle(const struct DialogStyle &)
+include/vcl/settings.hxx:561
+ void StyleSettings::SetFrameStyle(const struct FrameStyle &)
include/vcl/settings.hxx:652
_Bool HelpSettings::operator!=(const class HelpSettings &) const
include/vcl/settings.hxx:707
@@ -780,6 +800,10 @@ include/vcl/treelistbox.hxx:354
void SvTreeListBox::RemoveSelection()
include/vcl/treelistbox.hxx:371
const class SvTreeListEntry * SvTreeListBox::GetParent(const class SvTreeListEntry *) const
+include/vcl/treelistbox.hxx:658
+ short SvTreeListBox::GetSpaceBetweenEntries() const
+include/vcl/treelistbox.hxx:720
+ void SvTreeListBox::InitStartEntry()
include/vcl/txtattr.hxx:56
_Bool TextAttrib::operator!=(const class TextAttrib &) const
include/vcl/uitest/uiobject.hxx:274
@@ -790,95 +814,101 @@ include/vcl/uitest/uiobject.hxx:345
SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &)
include/vcl/uitest/uiobject.hxx:353
class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *)
-include/vcl/weld.hxx:117
+include/vcl/weld.hxx:118
class rtl::OString weld::Widget::get_buildable_name() const
-include/vcl/weld.hxx:128
+include/vcl/weld.hxx:129
_Bool weld::Widget::get_hexpand() const
-include/vcl/weld.hxx:130
+include/vcl/weld.hxx:131
_Bool weld::Widget::get_vexpand() const
-include/vcl/weld.hxx:269
+include/vcl/weld.hxx:138
+ void weld::Widget::set_margin_right(int)
+include/vcl/weld.hxx:140
+ int weld::Widget::get_margin_top() const
+include/vcl/weld.hxx:141
+ int weld::Widget::get_margin_bottom() const
+include/vcl/weld.hxx:143
+ int weld::Widget::get_margin_right() const
+include/vcl/weld.hxx:280
void weld::ScrolledWindow::hadjustment_configure(int,int,int,int,int,int)
-include/vcl/weld.hxx:275
+include/vcl/weld.hxx:286
void weld::ScrolledWindow::hadjustment_set_upper(int)
-include/vcl/weld.hxx:277
+include/vcl/weld.hxx:288
void weld::ScrolledWindow::hadjustment_set_page_size(int)
-include/vcl/weld.hxx:278
+include/vcl/weld.hxx:289
void weld::ScrolledWindow::hadjustment_set_page_increment(int)
-include/vcl/weld.hxx:279
+include/vcl/weld.hxx:290
void weld::ScrolledWindow::set_hpolicy(enum VclPolicyType)
-include/vcl/weld.hxx:280
+include/vcl/weld.hxx:291
enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const
-include/vcl/weld.hxx:285
+include/vcl/weld.hxx:296
int weld::ScrolledWindow::get_hscroll_height() const
-include/vcl/weld.hxx:331
+include/vcl/weld.hxx:342
class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const
-include/vcl/weld.hxx:383
+include/vcl/weld.hxx:394
struct SystemEnvData weld::Window::get_system_data() const
-include/vcl/weld.hxx:473
+include/vcl/weld.hxx:484
class rtl::OString weld::Assistant::get_current_page_ident() const
-include/vcl/weld.hxx:479
+include/vcl/weld.hxx:490
class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const
-include/vcl/weld.hxx:700
+include/vcl/weld.hxx:711
void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:709
+include/vcl/weld.hxx:720
void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
-include/vcl/weld.hxx:748
+include/vcl/weld.hxx:759
void weld::TreeView::set_top_entry(int)
-include/vcl/weld.hxx:883
+include/vcl/weld.hxx:898
void weld::TreeView::select_all()
-include/vcl/weld.hxx:927
+include/vcl/weld.hxx:942
const class rtl::OUString & weld::TreeView::get_saved_value() const
-include/vcl/weld.hxx:1032
+include/vcl/weld.hxx:1047
void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:1044
+include/vcl/weld.hxx:1059
void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
-include/vcl/weld.hxx:1049
+include/vcl/weld.hxx:1064
void weld::MenuButton::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:1080
+include/vcl/weld.hxx:1095
class rtl::OUString weld::LinkButton::get_label() const
-include/vcl/weld.hxx:1084
+include/vcl/weld.hxx:1099
void weld::LinkButton::clicked()
-include/vcl/weld.hxx:1115
+include/vcl/weld.hxx:1130
class rtl::OUString weld::ProgressBar::get_text() const
-include/vcl/weld.hxx:1132
- void weld::Entry::signal_insert_text(class rtl::OUString &)
include/vcl/weld.hxx:1147
+ void weld::Entry::signal_insert_text(class rtl::OUString &)
+include/vcl/weld.hxx:1162
int weld::Entry::get_position() const
-include/vcl/weld.hxx:1252
+include/vcl/weld.hxx:1271
void weld::FormattedSpinButton::set_max(double)
-include/vcl/weld.hxx:1301
+include/vcl/weld.hxx:1320
void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &)
-include/vcl/weld.hxx:1538
+include/vcl/weld.hxx:1557
class Size weld::MetricSpinButton::get_size_request() const
-include/vcl/weld.hxx:1549
+include/vcl/weld.hxx:1568
void weld::MetricSpinButton::set_position(int)
-include/vcl/weld.hxx:1596
+include/vcl/weld.hxx:1615
_Bool weld::TimeSpinButton::get_sensitive() const
-include/vcl/weld.hxx:1598
+include/vcl/weld.hxx:1617
_Bool weld::TimeSpinButton::get_visible() const
-include/vcl/weld.hxx:1599
+include/vcl/weld.hxx:1618
void weld::TimeSpinButton::grab_focus()
-include/vcl/weld.hxx:1600
+include/vcl/weld.hxx:1619
_Bool weld::TimeSpinButton::has_focus() const
-include/vcl/weld.hxx:1603
+include/vcl/weld.hxx:1622
void weld::TimeSpinButton::save_value()
-include/vcl/weld.hxx:1604
+include/vcl/weld.hxx:1623
_Bool weld::TimeSpinButton::get_value_changed_from_saved() const
-include/vcl/weld.hxx:1664
+include/vcl/weld.hxx:1683
int weld::TextView::vadjustment_get_lower() const
-include/vcl/weld.hxx:1753
+include/vcl/weld.hxx:1769
void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &)
-include/vcl/weld.hxx:1783
+include/vcl/weld.hxx:1799
void weld::Toolbar::append_separator(const class rtl::OUString &)
-include/vcl/weld.hxx:1792
+include/vcl/weld.hxx:1808
void weld::SizeGroup::set_mode(enum VclSizeGroupMode)
-include/vcl/weld.hxx:1819
+include/vcl/weld.hxx:1835
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/weld.hxx:1938
- class rtl::OUString weld::MessageDialogController::get_primary_text() const
-include/vcl/window.hxx:408
+include/vcl/window.hxx:410
const char * ImplDbgCheckWindow(const void *)
-include/vcl/window.hxx:1217
+include/vcl/window.hxx:1222
class Size vcl::Window::PaintActiveFloatingWindow(class VirtualDevice &) const
libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35
void openLokDialog(struct _GtkWidget *,void *)
@@ -898,7 +928,11 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:257
const class std::__debug::vector<class std::shared_ptr<class oox::drawingml::Shape>, class std::allocator<class std::shared_ptr<class oox::drawingml::Shape> > > & oox::drawingml::LayoutNode::getNodeShapes() const
oox/source/drawingml/diagram/diagramlayoutatoms.hxx:265
const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const
-sc/inc/address.hxx:661
+sal/osl/unx/uunxapi.hxx:35
+ int mkdir_c(const class rtl::OString &,unsigned int)
+sal/osl/unx/uunxapi.hxx:70
+ int osl::lstat(const class rtl::OUString &,struct stat &)
+sc/inc/address.hxx:655
_Bool ScRange::operator<=(const class ScRange &) const
sc/inc/bigrange.hxx:73
_Bool ScBigAddress::operator!=(const class ScBigAddress &) const
@@ -1039,7 +1073,7 @@ sd/inc/sddll.hxx:48
sd/source/filter/ppt/pptinanimations.hxx:108
void ppt::AnimationImporter::dump(const char *,long)
sd/source/ui/inc/filedlg.hxx:55
- _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected()
+ _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const
sd/source/ui/inc/optsitem.hxx:178
_Bool SdOptionsContents::operator==(const class SdOptionsContents &) const
sd/source/ui/inc/unomodel.hxx:137
@@ -1110,16 +1144,14 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:180
void OGLTransitionImpl::finish(double,double,double,double,double)
starmath/inc/format.hxx:138
_Bool SmFormat::operator!=(const class SmFormat &) const
-svgio/inc/svgstyleattributes.hxx:347
+svgio/inc/svgstyleattributes.hxx:352
class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const
-svgio/inc/svgstyleattributes.hxx:371
+svgio/inc/svgstyleattributes.hxx:376
enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const
svx/inc/sdr/contact/viewcontactofgraphic.hxx:56
class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject()
svx/source/fmcomp/fmgridcl.cxx:1265
_Bool ::__invoke(const int)
-svx/source/inc/tablemodel.hxx:89
- class std::__debug::vector<int, class std::allocator<int> > sdr::table::TableModel::getRowHeights()
svx/source/svdraw/svdpdf.hxx:92
double ImpSdrPdfImport::Matrix::b() const
svx/source/svdraw/svdpdf.hxx:94
@@ -1130,6 +1162,8 @@ svx/source/svdraw/svdpdf.hxx:96
double ImpSdrPdfImport::Matrix::f() const
svx/source/svdraw/svdpdf.hxx:149
class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > ImpSdrPdfImport::Matrix::toString() const
+svx/source/table/tablerow.hxx:54
+ int sdr::table::TableRow::getHeight() const
sw/inc/dbgoutsw.hxx:53
const char * dbg_out(const void *)
sw/inc/dbgoutsw.hxx:55
@@ -1264,13 +1298,13 @@ sw/inc/swrect.hxx:106
class SvStream & WriteSwRect(class SvStream &,const class SwRect &)
sw/inc/swrect.hxx:148
_Bool SwRect::OverStepTop(long) const
-sw/inc/viscrs.hxx:202
+sw/inc/viscrs.hxx:204
class SwShellTableCursor * SwShellTableCursor::GetNext()
-sw/inc/viscrs.hxx:203
+sw/inc/viscrs.hxx:205
const class SwShellTableCursor * SwShellTableCursor::GetNext() const
-sw/inc/viscrs.hxx:204
+sw/inc/viscrs.hxx:206
class SwShellTableCursor * SwShellTableCursor::GetPrev()
-sw/inc/viscrs.hxx:205
+sw/inc/viscrs.hxx:207
const class SwShellTableCursor * SwShellTableCursor::GetPrev() const
sw/qa/extras/inc/swmodeltestbase.hxx:624
class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const
@@ -1340,7 +1374,7 @@ ucb/source/inc/regexpmap.hxx:286
RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::begin() const
ucb/source/inc/regexpmap.hxx:290
RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::end() const
-ucb/source/ucp/ftp/ftpurl.hxx:112
+ucb/source/ucp/ftp/ftpurl.hxx:109
class rtl::OUString ftp::FTPURL::child() const
ucb/source/ucp/webdav-neon/NeonUri.hxx:64
_Bool webdav_ucp::NeonUri::operator!=(const class webdav_ucp::NeonUri &) const
@@ -1348,6 +1382,8 @@ vcl/inc/bitmap/ScanlineTools.hxx:23
void vcl::bitmap::ScanlineTransformer::skipPixel(unsigned int)
vcl/inc/bitmapwriteaccess.hxx:75
void BitmapWriteAccess::SetFillColor()
+vcl/inc/ControlCacheKey.hxx:34
+ ControlCacheKey::ControlCacheKey(enum ControlType,enum ControlPart,enum ControlState,const class Size &)
vcl/inc/fontinstance.hxx:67
void LogicalFontInstance::SetAverageWidthFactor(double)
vcl/inc/fontinstance.hxx:68
@@ -1372,7 +1408,7 @@ vcl/inc/opengl/texture.hxx:114
void OpenGLTexture::SaveToFile(const class rtl::OUString &)
vcl/inc/opengl/texture.hxx:123
_Bool OpenGLTexture::operator!=(const class OpenGLTexture &) const
-vcl/inc/opengl/zone.hxx:41
+vcl/inc/opengl/zone.hxx:53
void OpenGLZone::relaxWatchdogTimings()
vcl/inc/openglgdiimpl.hxx:108
void OpenGLSalGraphicsImpl::ImplDrawLineAA(double,double,double,double,_Bool)
@@ -1440,16 +1476,72 @@ vcl/inc/schedulerimpl.hxx:38
const char * ImplSchedulerData::GetDebugName() const
vcl/inc/unx/glyphcache.hxx:68
void GlyphCache::ClearFontOptions()
-vcl/inc/unx/gtk/gtkdata.hxx:192
+vcl/inc/unx/gtk/gtkdata.hxx:121
+ struct _GdkCursor * GtkSalDisplay::getFromXBM(const unsigned char *,const unsigned char *,int,int,int,int)
+vcl/inc/unx/gtk/gtkdata.hxx:142
+ int GtkSalDisplay::GetXScreenCount()
+vcl/inc/unx/gtk/gtkdata.hxx:153
void GtkSalDisplay::RefreshMenusUnity()
-vcl/inc/unx/saldata.hxx:54
- void X11SalData::initNWF()
+vcl/inc/unx/gtk/gtkframe.hxx:217
+ void ensure_dbus_setup(struct _GdkWindow *,class GtkSalFrame *)
+vcl/inc/unx/gtk/gtkframe.hxx:311
+ void GtkSalFrame::createNewWindow(unsigned long,_Bool,class SalX11Screen)
+vcl/inc/unx/gtk/gtkframe.hxx:341
+ _Bool GtkSalFrame::Dispatch(const union _XEvent *)
+vcl/inc/unx/gtk/gtkframe.hxx:351
+ struct _GdkWindow * GtkSalFrame::getForeignParent() const
+vcl/inc/unx/gtk/gtkframe.hxx:352
+ unsigned long GtkSalFrame::getForeignParentWindow() const
+vcl/inc/unx/gtk/gtkframe.hxx:353
+ struct _GdkWindow * GtkSalFrame::getForeignTopLevel() const
+vcl/inc/unx/gtk/gtkframe.hxx:354
+ unsigned long GtkSalFrame::getForeignTopLevelWindow() const
+vcl/inc/unx/gtk/gtkgdi.hxx:132
+ void GtkSalGraphics::refreshFontconfig(struct _GtkSettings *)
+vcl/inc/unx/gtk/gtkgdi.hxx:133
+ void GtkSalGraphics::signalSettingsNotify(struct _GObject *,struct _GParamSpec *,void *)
+vcl/inc/unx/pixmap.hxx:21
+ X11Pixmap::X11Pixmap(int,int)
vcl/inc/unx/saldisp.hxx:380
class SalXLib * SalDisplay::GetXLib() const
+vcl/inc/unx/saldisp.hxx:394
+ _Bool SalDisplay::IsNumLockFromXS() const
vcl/inc/unx/salframe.h:185
enum SalFrameStyleFlags X11SalFrame::GetStyle() const
-vcl/inc/unx/salgdi.h:306
+vcl/inc/unx/salgdi.h:266
+ _Bool X11SalGraphics::TryRenderCachedNativeControl(class ControlCacheKey &,int,int)
+vcl/inc/unx/salgdi.h:269
+ _Bool X11SalGraphics::RenderAndCacheNativeControl(class X11Pixmap *,class X11Pixmap *,int,int,class ControlCacheKey &)
+vcl/inc/unx/salgdi.h:273
+ void X11SalGraphics::FillPixmapFromScreen(class X11Pixmap *,int,int)
+vcl/inc/unx/salgdi.h:276
+ _Bool X11SalGraphics::RenderPixmapToScreen(class X11Pixmap *,class X11Pixmap *,int,int)
+vcl/inc/unx/salgdi.h:303
void X11SalGraphics::releaseGlyphPeer()
+vcl/inc/wizdlg.hxx:130
+ _Bool vcl::RoadmapWizard::ShowPrevPage()
+vcl/inc/wizdlg.hxx:131
+ _Bool vcl::RoadmapWizard::ShowNextPage()
+vcl/inc/wizdlg.hxx:153
+ void vcl::RoadmapWizard::SetActivatePageHdl(const class Link<class vcl::RoadmapWizard *, void> &)
+vcl/inc/wizdlg.hxx:158
+ void vcl::RoadmapWizard::defaultButton(enum WizardButtonFlags)
+vcl/inc/wizdlg.hxx:163
+ void vcl::RoadmapWizard::setTitleBase(const class rtl::OUString &)
+vcl/inc/wizdlg.hxx:174
+ void vcl::RoadmapWizard::updateTravelUI()
+vcl/inc/wizdlg.hxx:178
+ void vcl::RoadmapWizard::SetRoadmapInteractive(_Bool)
+vcl/inc/wizdlg.hxx:236
+ void vcl::RoadmapWizard::enableAutomaticNextButtonState()
+vcl/inc/wizdlg.hxx:257
+ void vcl::RoadmapWizard::skip()
+vcl/inc/wizdlg.hxx:322
+ void vcl::RoadmapWizard::declarePath(short,const class std::__debug::vector<short, class std::allocator<short> > &)
+vcl/inc/wizdlg.hxx:377
+ void vcl::RoadmapWizard::enableState(short,_Bool)
+vcl/inc/wizdlg.hxx:381
+ _Bool vcl::RoadmapWizard::knowsState(short) const
vcl/source/app/scheduler.cxx:83
basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &)
vcl/source/edit/textdat2.hxx:85
@@ -1468,7 +1560,13 @@ vcl/source/fontsubset/xlat.hxx:34
unsigned short vcl::TranslateChar15(unsigned short)
vcl/source/fontsubset/xlat.hxx:35
unsigned short vcl::TranslateChar16(unsigned short)
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:736
+vcl/unx/gtk3/a11y/atkutil.hxx:25
+ unsigned long ooo_atk_util_get_type()
+vcl/unx/gtk3/a11y/atkwindow.hxx:25
+ unsigned long ooo_window_wrapper_get_type()
+vcl/unx/gtk3/a11y/atkwindow.hxx:26
+ void restore_gail_window_vtable()
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:737
_Bool writerfilter::dmapper::DomainMapper_Impl::IsInFooter() 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
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results
index bab75bdc1baa..f97ac259ac69 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -1,6 +1,6 @@
connectivity/source/inc/java/lang/Object.hxx:117
int connectivity::java_lang_Object::callIntMethodWithIntArg_ThrowRuntime(const char *,struct _jmethodID *&,int) const
-connectivity/source/inc/odbc/OConnection.hxx:78
+connectivity/source/inc/odbc/OConnection.hxx:76
short connectivity::odbc::OConnection::Construct(const class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &)
connectivity/source/inc/odbc/OStatement.hxx:115
_Bool connectivity::odbc::OStatement_Base::lockIfNecessary(const class rtl::OUString &)
@@ -20,7 +20,7 @@ extensions/source/scanner/sanedlg.hxx:101
_Bool SaneDlg::SetAdjustedNumericalValue(const char *,double,int)
filter/source/flash/swfexporter.hxx:85
_Bool swf::FlashExporter::exportAll(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XOutputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::task::XStatusIndicator> &)
-i18nlangtag/source/languagetag/languagetag.cxx:276
+i18nlangtag/source/languagetag/languagetag.cxx:277
const class rtl::OUString & LanguageTagImpl::getBcp47() const
idlc/inc/aststack.hxx:38
class AstStack * AstStack::push(class AstScope *)
@@ -76,13 +76,13 @@ include/LibreOfficeKit/LibreOfficeKit.hxx:671
int lok::Document::getSignatureState()
include/LibreOfficeKit/LibreOfficeKit.hxx:681
unsigned long lok::Document::renderShapeSelection(char **)
-include/LibreOfficeKit/LibreOfficeKit.hxx:821
+include/LibreOfficeKit/LibreOfficeKit.hxx:834
char * lok::Office::getFilterTypes()
-include/LibreOfficeKit/LibreOfficeKit.hxx:875
+include/LibreOfficeKit/LibreOfficeKit.hxx:888
char * lok::Office::getVersionInfo()
-include/LibreOfficeKit/LibreOfficeKit.hxx:889
+include/LibreOfficeKit/LibreOfficeKit.hxx:902
_Bool lok::Office::runMacro(const char *)
-include/LibreOfficeKit/LibreOfficeKit.hxx:897
+include/LibreOfficeKit/LibreOfficeKit.hxx:910
_Bool lok::Office::signDocument(const char *,const unsigned char *,const int,const unsigned char *,const int)
include/oox/crypto/AgileEngine.hxx:121
_Bool oox::core::AgileEngine::decryptHmacKey()
@@ -232,16 +232,14 @@ include/vcl/texteng.hxx:276
_Bool TextEngine::Read(class SvStream &,const class TextSelection *)
include/vcl/toolbox.hxx:515
_Bool ToolBox::ChangeHighlightUpDn(_Bool)
-include/vcl/weld.hxx:795
+include/vcl/weld.hxx:807
_Bool weld::TreeView::iter_nth_child(class weld::TreeIter &,int) const
-include/vcl/weld.hxx:1643
+include/vcl/weld.hxx:1662
_Bool weld::TextView::get_selection_bounds(int &,int &)
-include/vcl/wizardmachine.hxx:447
- _Bool vcl::WizardMachine::travelNext()
-include/vcl/wizardmachine.hxx:450
- _Bool vcl::WizardMachine::travelPrevious()
-include/vcl/wizardmachine.hxx:524
- class TabPage * vcl::WizardMachine::GetOrCreatePage(const short)
+include/vcl/window.hxx:1515
+ _Bool vcl::Window::set_font_attribute(const class rtl::OString &,const class rtl::OUString &)
+include/vcl/wizardmachine.hxx:319
+ class BuilderPage * vcl::WizardMachine::GetOrCreatePage(const short)
lotuswordpro/inc/lwpsvstream.hxx:76
class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &)
lotuswordpro/inc/lwpsvstream.hxx:77
@@ -249,7 +247,7 @@ lotuswordpro/inc/lwpsvstream.hxx:77
lotuswordpro/inc/lwpsvstream.hxx:78
class LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &)
sc/inc/document.hxx:2151
- const struct ScDocumentThreadSpecific & ScDocument::CalculateInColumnInThread(struct ScInterpreterContext &,const class ScAddress &,unsigned long,unsigned int,unsigned int)
+ const struct ScDocumentThreadSpecific & ScDocument::CalculateInColumnInThread(struct ScInterpreterContext &,const class ScRange &,unsigned int,unsigned int)
sc/inc/orcusfilters.hxx:45
_Bool ScOrcusFilters::importODS_Styles(class ScDocument &,class rtl::OUString &) const
sc/source/core/opencl/formulagroupcl.cxx:1084
@@ -348,9 +346,9 @@ sw/source/uibase/inc/drawbase.hxx:54
_Bool SwDrawBase::MouseMove(const class MouseEvent &)
sw/source/uibase/inc/fldmgr.hxx:117
const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const
-sw/source/uibase/inc/mailmergewizard.hxx:77
+sw/source/uibase/inc/mailmergewizard.hxx:80
_Bool SwMailMergeWizard::skipUntil(unsigned short)
-ucb/source/ucp/webdav-neon/ContentProperties.hxx:169
+ucb/source/ucp/webdav-neon/ContentProperties.hxx:170
_Bool webdav_ucp::CachableContentProperties::containsAllNames(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) const
ucb/source/ucp/webdav-neon/NeonSession.hxx:240
_Bool webdav_ucp::NeonSession::UNLOCK(struct ne_lock *)
@@ -372,10 +370,20 @@ vcl/inc/salgdi.hxx:385
_Bool SalGraphics::UpdateSettings(class AllSettings &)
vcl/inc/salgdi.hxx:387
_Bool SalGraphics::BlendBitmap(const struct SalTwoRect &,const class SalBitmap &,const class OutputDevice *)
-vcl/inc/unx/gtk/gtkdata.hxx:165
+vcl/inc/salinst.hxx:177
+ _Bool SalInstance::CallEventCallback(const void *,int)
+vcl/inc/unx/gtk/gtkdata.hxx:138
int GtkSalDisplay::CaptureMouse(class SalFrame *)
vcl/inc/unx/saldisp.hxx:310
_Bool SalDisplay::Dispatch(union _XEvent *)
+vcl/inc/wizdlg.hxx:223
+ _Bool vcl::RoadmapWizard::onFinish()
+vcl/inc/wizdlg.hxx:226
+ _Bool vcl::RoadmapWizard::travelNext()
+vcl/inc/wizdlg.hxx:229
+ _Bool vcl::RoadmapWizard::travelPrevious()
+vcl/inc/wizdlg.hxx:415
+ class TabPage * vcl::RoadmapWizard::GetOrCreatePage(const short)
vcl/source/gdi/pdfwriter_impl.hxx:1233
_Bool vcl::PDFWriterImpl::setCurrentStructureElement(int)
vcl/source/gdi/pdfwriter_impl.hxx:1234
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 59b3c6cf7c82..643c327b753d 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -178,18 +178,6 @@ void OFieldDescControl::Init()
::dbaui::setEvalDateFormatForFormatter(xFormatter);
}
-sal_uInt16 OFieldDescControl::CountActiveAggregates() const
-{
- OWidgetBase* ppAggregates[] = { m_xRequired.get(), m_xNumType.get(), m_xAutoIncrement.get(), m_xDefault.get(), m_xTextLen.get(), m_xLength.get(), m_xScale.get(), m_xColumnName.get(), m_xType.get(),m_xAutoIncrementValue.get()};
- sal_uInt16 nVisibleAggregates = 0;
- for (OWidgetBase* pAggregate : ppAggregates)
- if (pAggregate)
- ++nVisibleAggregates;
- if (m_xFormat)
- ++nVisibleAggregates;
- return nVisibleAggregates;
-}
-
void OFieldDescControl::SetReadOnly( bool bReadOnly )
{
// Enable/disable Controls
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index cd247af88380..522debaad3a3 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -131,14 +131,11 @@ namespace dbaui
protected:
void setRightAligned() { m_bRightAligned = true; }
- bool isRightAligned() const { return m_bRightAligned; }
void saveCurrentFieldDescData() { SaveData( pActFieldDescr ); }
OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; }
void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; }
- sal_uInt16 CountActiveAggregates() const;
-
virtual void ActivateAggregate( EControlType eType );
virtual void DeactivateAggregate( EControlType eType );
virtual bool IsReadOnly() { return false; };
diff --git a/framework/source/uiconfiguration/ImageList.hxx b/framework/source/uiconfiguration/ImageList.hxx
index fae044564be5..7a7af3d1bb63 100644
--- a/framework/source/uiconfiguration/ImageList.hxx
+++ b/framework/source/uiconfiguration/ImageList.hxx
@@ -70,7 +70,6 @@ private:
sal_uInt16 ImplGetImageId( const OUString& rImageName ) const;
void ImplAddImage( const OUString &aPrefix, const OUString &aName, sal_uInt16 nId, const Image &aImage );
void ImplRemoveImage( sal_uInt16 nPos );
- void ImplLoad(ImageAryData&) const;
};
#endif // INCLUDED_VCL_IMAGE_HXX
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index c73a778983c0..cb868401cdf2 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -92,7 +92,6 @@ public:
void SpellDocument(); // Perform Spell Checking
bool IsStartDone() const { return bStartDone; }
bool IsEndDone() const { return bEndDone; }
- bool IsHyphen() const { return bHyphen; } // Split instead of Spell check
void SetHyphen() { bHyphen = true; }
bool IsAllRight() const { return bAllRight; }
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 4fb019a43132..d3856243e9f5 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -166,7 +166,6 @@ protected:
public:
// Iteration
- static size_t GetActiveShells( bool bOnlyVisible = true );
static SfxViewShell* GetFirst( bool bOnlyVisible = true, const std::function<bool ( const SfxViewShell* )>& isViewShell = nullptr );
static SfxViewShell* GetNext( const SfxViewShell& rPrev,
bool bOnlyVisible = true,
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 88986ffc83a8..23a52dd92ef0 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -56,7 +56,6 @@ private:
VclPtr<HeaderBar> aHeaderBar;
long nOldPos;
- sal_uInt16 nHeaderItemId;
bool bPaintFlag;
bool bSortDirection;
sal_uInt16 nSortCol;
@@ -89,14 +88,9 @@ public:
void UpdateViewSize();
- void InsertHeaderEntry(const OUString& rText,
- sal_uInt16 nCol=HEADERBAR_APPEND,
- HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE);
-
using SvHeaderTabListBox::SetTabs;
void SortByCol(sal_uInt16, bool bDir=true);
- sal_uInt16 GetSortedCol() const { return nSortCol;}
SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const;
bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index bb6af59ae15b..adac3700cbc1 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -67,7 +67,6 @@ public:
void SetNoSelection() { getColorWindow()->SetNoSelection(); }
bool IsNoSelection() const { return getColorWindow()->IsNoSelection(); }
- void SetAutoDisplayColor(const Color &rColor) { m_aAutoDisplayColor = rColor; }
void ShowPreview(const NamedColor &rColor);
void EnsurePaletteManager();
diff --git a/include/vcl/builderpage.hxx b/include/vcl/builderpage.hxx
index c29cc1a7b079..dc846ad1a53c 100644
--- a/include/vcl/builderpage.hxx
+++ b/include/vcl/builderpage.hxx
@@ -35,8 +35,6 @@ public:
OString GetHelpId() const { return m_xContainer->get_help_id(); }
- weld::DialogController* GetController() const { return m_pDialogController; }
-
protected:
weld::DialogController* m_pDialogController;
std::unique_ptr<weld::Builder> m_xBuilder;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index f5b1bd6e7ff1..8c259750684e 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -230,7 +230,6 @@ public:
virtual void SetModifyHdl( const Link<Edit&,void>& rLink ) { maModifyHdl = rLink; }
virtual const Link<Edit&,void>& GetModifyHdl() const { return maModifyHdl; }
- virtual void SetUpdateDataHdl( const Link<Edit&,void>& rLink ) { maUpdateDataHdl = rLink; }
void SetActivateHdl(const Link<Edit&,bool>& rLink) { maActivateHdl = rLink; }
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index d2a2812ce8f8..2f0334a5bed8 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -538,7 +538,6 @@ public:
void SetPreferredIconTheme(const OUString&, bool bDarkIconTheme = false);
const DialogStyle& GetDialogStyle() const;
- void SetDialogStyle( const DialogStyle& rStyle );
BitmapEx const & GetPersonaHeader() const;
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 454e507460e9..d9c8e8b0fab3 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -655,7 +655,6 @@ public:
// Place the expander checkitem at the optimal indent for hierarchical lists
void SetOptimalImageIndent() { SetIndent(12); }
void SetSpaceBetweenEntries( short nSpace );
- short GetSpaceBetweenEntries() const {return nEntryHeightOffs;}
Point GetEntryPosition( SvTreeListEntry* ) const;
void MakeVisible( SvTreeListEntry* pEntry );
void MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop );
@@ -717,7 +716,6 @@ public:
void ScrollToAbsPos( long nPos );
void ShowFocusRect( const SvTreeListEntry* pEntry );
- void InitStartEntry();
virtual VclPtr<PopupMenu> CreateContextMenu();
virtual void ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry );
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 23381f5f8443..b95cf77a399b 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -154,8 +154,6 @@ public:
void SetModifyHdl( const Link<Edit&,void>& rLink ) override { aModifyHdlLink = rLink; }
const Link<Edit&,void>& GetModifyHdl() const override { return aModifyHdlLink; }
- void SetUpdateDataHdl( const Link<Edit&,void>& rLink ) override { aUpdateDataHdlLink = rLink; }
-
virtual void Resize() override;
virtual void GetFocus() override;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 748d8eefe05b..a6f8567f8aac 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1305,37 +1305,6 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue
}
-// returns the number of current available shells of spec. type viewing the specified doc.
-size_t SfxViewShell::GetActiveShells ( bool bOnlyVisible )
-{
- size_t nShells = 0;
-
- // search for a SfxViewShell of the specified type
- SfxViewShellArr_Impl &rShells = SfxGetpApp()->GetViewShells_Impl();
- SfxViewFrameArr_Impl &rFrames = SfxGetpApp()->GetViewFrames_Impl();
- for (SfxViewShell* pShell : rShells)
- {
- if ( pShell )
- {
- // sometimes dangling SfxViewShells exist that point to a dead SfxViewFrame
- // these ViewShells shouldn't be accessible anymore
- // a destroyed ViewFrame is not in the ViewFrame array anymore, so checking this array helps
- for (SfxViewFrame* pFrame : rFrames)
- {
- if ( pFrame == pShell->GetViewFrame() )
- {
- // only ViewShells with a valid ViewFrame will be returned
- if ( !bOnlyVisible || pFrame->IsVisible() )
- ++nShells;
- }
- }
- }
- }
-
- return nShells;
-}
-
-
// returns the first shell of spec. type viewing the specified doc.
SfxViewShell* SfxViewShell::GetFirst
(
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index c429cda97cba..a74cde258b51 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -100,7 +100,6 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits):
SvHeaderTabListBox(&rParent, nBits | WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP),
m_rParentTableContainer(rParent),
aHeaderBar(VclPtr<HeaderBar>::Create(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP)),
- nHeaderItemId(1),
bPaintFlag(true),
aCollator(*(IntlWrapper(SvtSysLocale().GetUILanguageTag()).getCaseCollator()))
{
@@ -219,27 +218,6 @@ void SvSimpleTable::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
bPaintFlag = true;
}
-void SvSimpleTable::InsertHeaderEntry(const OUString& rText,
- sal_uInt16 nCol, HeaderBarItemBits nBits)
-{
- sal_Int32 nEnd = rText.indexOf( '\t' );
- if( nEnd == -1 )
- {
- aHeaderBar->InsertItem(nHeaderItemId++, rText, 0, nBits, nCol);
- }
- else
- {
- sal_Int32 nIndex = 0;
- do
- {
- OUString aString = rText.getToken(0, '\t', nIndex);
- aHeaderBar->InsertItem(nHeaderItemId++, aString, 0, nBits, nCol);
- }
- while ( nIndex >= 0 );
- }
- SetTabs();
-}
-
void SvSimpleTable::SortByCol(sal_uInt16 nCol, bool bDir)
{
if(nSortCol!=0xFFFF)
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 5623007e69a8..f7ca4d8d40d0 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -153,11 +153,6 @@ const TableModelRef& TableRow::getModel() const
return mxTableModel;
}
-sal_Int32 TableRow::getHeight() const
-{
- return mnHeight;
-}
-
// XCellRange
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index c45957962208..5c14452831b1 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -50,8 +50,6 @@ public:
void removeColumns( sal_Int32 nIndex, sal_Int32 nCount );
/// Reference to the table model containing this row.
const TableModelRef& getModel() const;
- /// Get the height of this row.
- sal_Int32 getHeight() const;
// XCellRange
virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 9f6504c38f56..9e67d5efc265 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/a11y/gtk3atktext \
vcl/unx/gtk3/a11y/gtk3atkutil \
vcl/unx/gtk3/a11y/gtk3atkvalue \
- vcl/unx/gtk3/a11y/gtk3atkwindow \
vcl/unx/gtk3/a11y/gtk3atkwrapper \
vcl/unx/gtk3/fpicker/resourceprovider \
vcl/unx/gtk3/fpicker/SalGtkFilePicker \
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index bff6f4881629..5d57605bf64d 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,6 @@ public:
protected:
virtual rtl::Reference<OpenGLContext> CreateWinContext() override;
- void RenderPixmap(X11Pixmap const * pPixmap, X11Pixmap const * pMask, int nX, int nY, TextureCombo& rCombo);
-
public:
// implementation of X11GraphicsImpl
@@ -40,11 +38,6 @@ public:
virtual void Init() override;
- void FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) override;
- bool RenderPixmapToScreen(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY) override;
-
- bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& aControlCacheKey) override;
bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
int nX, int nY) override;
};
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 84e2d19f6c94..f3b106070dbd 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -118,8 +118,6 @@ class GtkSalDisplay : public SalGenericDisplay
bool m_bStartupCompleted;
bool m_bX11Display;
- GdkCursor* getFromXBM( const unsigned char *pBitmap, const unsigned char *pMask,
- int nWidth, int nHeight, int nXHot, int nYHot );
GdkCursor* getFromSvg( OUString const & name, int nXHot, int nYHot );
public:
@@ -139,7 +137,6 @@ public:
SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); }
Size GetScreenSize( int nDisplayScreen );
- int GetXScreenCount() { return m_pSys->GetDisplayXScreenCount(); }
GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event );
void startupNotificationCompleted() { m_bStartupCompleted = true; }
@@ -149,8 +146,6 @@ public:
virtual void TriggerUserEventProcessing() override;
virtual void TriggerAllUserEventsProcessed() override;
-
- void RefreshMenusUnity();
};
inline GtkSalData* GetGtkSalData()
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index a8aa8a443e2a..ccf9064966bd 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -305,7 +305,6 @@ class GtkSalFrame : public SalFrame
Size calcDefaultSize();
void setMinMaxSize();
- void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen );
void AllocateFrame();
void TriggerPaintEvent();
@@ -332,10 +331,6 @@ public:
guint m_nHudAwarenessId;
std::vector<gulong> m_aMouseSignalIds;
- // dispatches an event, returns true if dispatched
- // and false else; if true was returned the event should
- // be swallowed
- bool Dispatch( const XEvent* pEvent );
void grabPointer(bool bGrab, bool bOwnerEvents = false);
static GtkSalDisplay* getDisplay();
@@ -345,10 +340,6 @@ public:
GtkEventBox* getEventBox() const { return m_pEventBox; }
GtkWidget* getMouseEventWidget() const;
GtkGrid* getTopLevelGridWidget() const { return m_pTopLevelGrid; }
- GdkWindow* getForeignParent() const { return m_pForeignParent; }
- GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; }
- GdkWindow* getForeignTopLevel() const { return m_pForeignTopLevel; }
- GdkNativeWindow getForeignTopLevelWindow() const { return m_aForeignTopLevelWindow; }
const SalX11Screen& getXScreenNumber() const { return m_nXScreen; }
int GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; }
void updateScreenNumber();
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index e19d01205e49..cd9cf4c5b562 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -129,9 +129,6 @@ public:
void WidgetQueueDraw() const;
- static void refreshFontconfig( GtkSettings *pSettings );
- static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
-
virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
GtkStyleContext* createStyleContext(gtk_widget_path_iter_set_object_nameFunc set_object_name, GtkControlPart ePart);
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
deleted file mode 100644
index bc7f34612e4d..000000000000
--- a/vcl/inc/unx/pixmap.hxx
+++ /dev/null
@@ -1,43 +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/.
- */
-
-#ifndef INCLUDED_VCL_INC_UNX_PIXMAP_HXX
-#define INCLUDED_VCL_INC_UNX_PIXMAP_HXX
-
-#include <X11/X.h>
-
-#include <unx/saltype.h>
-#include <vclpluginapi.h>
-
-class VCLPLUG_GEN_PUBLIC X11Pixmap
-{
-public:
- X11Pixmap( int nWidth, int nHeight )
- {
- mnWidth = nWidth;
- mnHeight = nHeight;
- }
-
- virtual ~X11Pixmap() {};
-
- virtual int GetDepth() const = 0;
- virtual SalX11Screen GetScreen() const = 0;
- virtual Pixmap GetPixmap() const = 0;
- Drawable GetDrawable() const { return GetPixmap(); };
- int GetWidth() const { return mnWidth; };
- int GetHeight() const { return mnHeight; };
-
-private:
- int mnWidth;
- int mnHeight;
-};
-
-#endif // INCLUDED_VCL_INC_UNX_PIXMAP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 7d721253e4d0..bc98120d474c 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -391,7 +391,6 @@ public:
unsigned int GetXScreenCount() const { return m_aScreens.size(); }
const SalFrameSet& getFrames() const { return m_aFrames; }
- bool IsNumLockFromXS() const { return bNumLockFromXS_; }
std::list< SalObject* >& getSalObjects() { return m_aSalObjects; }
};
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index b93d263f33e7..dd75c47dee9f 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -263,19 +263,6 @@ public:
void clipRegion(cairo_t* cr);
#endif // ENABLE_CAIRO_CANVAS
- bool TryRenderCachedNativeControl(ControlCacheKey& aControlCacheKey,
- int nX, int nY);
-
- bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& aControlCacheKey);
-
- // fill a pixmap from a screen region
- void FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY );
-
- // render a pixmap to the screen
- bool RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY );
-
-
/* use to handle GraphicsExpose/NoExpose after XCopyArea & friends
* if pFrame is not NULL, corresponding Paint events are generated
* and dispatched to pFrame
@@ -300,8 +287,6 @@ public:
unsigned int w, unsigned int h,
int dest_x, int dest_y );
- static void releaseGlyphPeer();
-
protected:
using SalGraphics::SetClipRegion;
void SetClipRegion( GC pGC, Region pXReg = nullptr ) const;
diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h
index 3c33c5415eef..6c2e8be7fb86 100644
--- a/vcl/inc/unx/x11/x11gdiimpl.h
+++ b/vcl/inc/unx/x11/x11gdiimpl.h
@@ -10,7 +10,6 @@
#ifndef INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
#define INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
-#include <unx/pixmap.hxx>
#include <ControlCacheKey.hxx>
class ControlCacheKey;
@@ -20,12 +19,7 @@ class X11GraphicsImpl
public:
virtual ~X11GraphicsImpl() {};
- virtual void FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) = 0;
- virtual bool RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY ) = 0;
-
virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY) = 0;
- virtual bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& aControlCacheKey) = 0;
};
#endif // INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index fc979912b866..b98d11db3d7f 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -127,8 +127,6 @@ namespace vcl
virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
- bool ShowPrevPage();
- bool ShowNextPage();
bool ShowPage( sal_uInt16 nLevel );
bool Finish( long nResult = 0 );
sal_uInt16 GetCurLevel() const { return mnCurLevel; }
@@ -150,33 +148,16 @@ namespace vcl
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
const Size& GetPageSizePixel() const { return maPageSize; }
- void SetActivatePageHdl( const Link<RoadmapWizard*,void>& rLink ) { maActivateHdl = rLink; }
-
/// enable (or disable) buttons
void enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable);
/// set the default style for a button
- void defaultButton(WizardButtonFlags _nWizardButtonFlags);
- /// set the default style for a button
void defaultButton(PushButton* _pNewDefButton);
- /// set the base of the title to use - the title of the current page is appended
- void setTitleBase(const OUString& _rTitleBase);
-
/// determines whether there is a next state to which we can advance
bool canAdvance() const;
- /** updates the user interface which deals with traveling in the wizard
-
- The default implementation simply checks whether both the current page and the wizard
- itself allow to advance to the next state (<code>canAdvance</code>), and enables the "Next"
- button if and only if this is the case.
- */
- void updateTravelUI();
-
void SetRoadmapHelpId( const OString& _rId );
- void SetRoadmapInteractive( bool _bInteractive );
-
void InsertRoadmapItem(int nIndex, const OUString& rLabel, int nId, bool bEnabled);
void DeleteRoadmapItems();
int GetCurrentRoadmapItemID() const;
@@ -233,29 +214,12 @@ namespace vcl
If this is <TRUE/>, then upon entering a new state, the "Next" button will automatically be
enabled if and only if determineNextState does not return WZS_INVALID_STATE.
*/
- void enableAutomaticNextButtonState();
bool isAutomaticNextButtonStateEnabled() const;
/** removes a page from the history. Should be called when the page is being disabled
*/
void removePageFromHistory(WizardTypes::WizardState nToRemove);
- /** skip a state
-
- The method behaves as if from the current state, <arg>_nSteps</arg> <method>travelNext</method>s were
- called, but without actually creating or displaying the \EDntermediate pages. Only the
- (<arg>_nSteps</arg> + 1)th page is created.
-
- The skipped states appear in the state history, so <method>travelPrevious</method> will make use of them.
-
- A very essential precondition for using this method is that your <method>determineNextState</method>
- method is able to determine the next state without actually having the page of the current state.
-
- @see skipUntil
- @see skipBackwardUntil
- */
- void skip();
-
/** skips one or more states, until a given state is reached
The method behaves as if from the current state, <method>travelNext</method>s were called
@@ -302,25 +266,6 @@ namespace vcl
*/
void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory);
- /** declares a valid path in the wizard
-
- The very first path which is declared is automatically activated.
-
- Note that all paths which are declared must have the very first state in
- common. Also note that due to a restriction of the very base class (WizardDialog),
- this common first state must be 0.
-
- You cannot declare new paths once the wizard started, so it's recommended that
- you do all declarations within your derivee's constructor.
-
- @see activatePath
-
- @param _nId
- the unique id you wish to give this path. This id can later on be used
- to refer to the path which you just declared
- */
- void declarePath( RoadmapWizardTypes::PathId _nPathId, const RoadmapWizardTypes::WizardPath& _lWizardStates);
-
/** activates a path which has previously been declared with <member>declarePath</member>
You can only activate paths which share the first <code>k</code> states with the path
@@ -354,32 +299,6 @@ namespace vcl
*/
void activatePath( RoadmapWizardTypes::PathId _nPathId, bool _bDecideForIt = false );
- /** en- or disables a state
-
- In the wizard's roadmap, states to travel to can be freely chosen. To prevent
- users from selecting a state which is currently not available, you can declare this
- state as being disabled.
-
- A situation where you need this may be when you have a checkbox which, when checked
- by the user, enables a page with additional settings. As long as this checkbox is
- not checked, the respective state would be disabled.
-
- Note that in theory, you can declare multiple paths, instead of disabling states.
- For instance, if you have a path where one state can be potentially disabled, then
- you could declare a second path, which does not contain this state. However, the
- disadvantage is that then, not the complete path would be visible in the roadmap,
- but only all steps up to the point where the both paths diverge.<br/>
- Another disadvantage is that the number of needed paths grows exponentially with
- the number of states which can be potentially disabled.
-
- @see declarePath
- */
- void enableState(WizardTypes::WizardState nState, bool _bEnable = true);
-
- /** returns true if and only if the given state is known in at least one declared path
- */
- bool knowsState(WizardTypes::WizardState nState) const;
-
/** returns a human readable name for a given state
There is a default implementation for this method, which returns the display name
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index db4940c41abd..c9ae89b04d1f 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -12,7 +12,6 @@
#include <svdata.hxx>
-#include <unx/pixmap.hxx>
#include <unx/saldisp.hxx>
#include <unx/salframe.h>
#include <unx/salgdi.h>
@@ -596,184 +595,11 @@ void X11OpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics*
OpenGLSalGraphicsImpl::DoCopyBits( rPosAry, *pImpl );
}
-void X11OpenGLSalGraphicsImpl::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
-{
- Display* pDisplay = mrX11Parent.GetXDisplay();
- SalX11Screen nScreen = mrX11Parent.GetScreenNumber();
- XVisualInfo aVisualInfo;
- XImage* pImage;
- char* pData;
-
- SAL_INFO( "vcl.opengl", "FillPixmapFromScreen" );
-
- if (!SalDisplay::BestOpenGLVisual(pDisplay, nScreen.getXScreen(), aVisualInfo))
- return;
-
- // make sure everything is synced up before reading back
- mpContext->makeCurrent();
- glXWaitX();
-
- // TODO: lfrb: What if offscreen?
- pData = static_cast<char*>(malloc( pPixmap->GetWidth() * pPixmap->GetHeight() * 4 ));
- glPixelStorei( GL_PACK_ALIGNMENT, 1 );
- CHECK_GL_ERROR();
- glReadPixels( nX, GetHeight() - nY, pPixmap->GetWidth(), pPixmap->GetHeight(),
- GL_RGBA, GL_UNSIGNED_BYTE, pData );
- CHECK_GL_ERROR();
-
- pImage = XCreateImage( pDisplay, aVisualInfo.visual, 24, ZPixmap, 0, pData,
- pPixmap->GetWidth(), pPixmap->GetHeight(), 8, 0 );
- XInitImage( pImage );
- GC aGC = XCreateGC( pDisplay, pPixmap->GetPixmap(), 0, nullptr );
- XPutImage( pDisplay, pPixmap->GetDrawable(), aGC, pImage,
- 0, 0, 0, 0, pPixmap->GetWidth(), pPixmap->GetHeight() );
- XFreeGC( pDisplay, aGC );
- XDestroyImage( pImage );
-}
-
typedef typename std::pair<ControlCacheKey, std::unique_ptr<TextureCombo>> ControlCachePair;
typedef o3tl::lru_map<ControlCacheKey, std::unique_ptr<TextureCombo>, ControlCacheHashFunction> ControlCacheType;
static vcl::DeleteOnDeinit<ControlCacheType> gTextureCache(new ControlCacheType(200));
-namespace
-{
- GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool& bInverted )
- {
- OpenGLZone aZone;
-
- int nScreen = DefaultScreen( pDisplay );
- GLXFBConfig *aFbConfigs;
- int i, nFbConfigs, nValue;
-
- aFbConfigs = glXGetFBConfigs( pDisplay, nScreen, &nFbConfigs );
- for( i = 0; i < nFbConfigs; i++ )
- {
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_DRAWABLE_TYPE, &nValue );
- if( !(nValue & GLX_PIXMAP_BIT) )
- continue;
-
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_BIND_TO_TEXTURE_TARGETS_EXT, &nValue );
- if( !(nValue & GLX_TEXTURE_2D_BIT_EXT) )
- continue;
-
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_DEPTH_SIZE, &nValue );
- if( nValue != 24 )
- continue;
-
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_RED_SIZE, &nValue );
- if( nValue != 8 )
- continue;
- SAL_INFO( "vcl.opengl", "Red is " << nValue );
-
- // TODO: lfrb: Make it configurable wrt RGB/RGBA
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_BIND_TO_TEXTURE_RGB_EXT, &nValue );
- if( nValue == False )
- {
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_BIND_TO_TEXTURE_RGBA_EXT, &nValue );
- if( nValue == False )
- continue;
- }
-
- glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_Y_INVERTED_EXT, &nValue );
-
- // Looks like that X sends GLX_DONT_CARE but this usually means "true" for most
- // of the X implementations. Investigation on internet pointed that this could be
- // safely "true" all the time (for example gnome-shell always assumes "true").
- bInverted = nValue == True || nValue == int(GLX_DONT_CARE);
-
- break;
- }
-
- if( i == nFbConfigs )
- {
- SAL_WARN( "vcl.opengl", "Unable to find FBconfig for pixmap texturing" );
- return nullptr;
- }
-
- CHECK_GL_ERROR();
- return aFbConfigs[i];
- }
-}
-
-void X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap const * pPixmap, X11Pixmap const * pMask, int nX, int nY, TextureCombo& rCombo)
-{
- const int aAttribs[] =
- {
- GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
- GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGBA_EXT,
- None
- };
-
- Display* pDisplay = mrX11Parent.GetXDisplay();
- bool bInverted = false;
-
- const long nWidth = pPixmap->GetWidth();
- const long nHeight = pPixmap->GetHeight();
- SalTwoRect aPosAry(0, 0, nWidth, nHeight, nX, nY, nWidth, nHeight);
-
- PreDraw();
- //glClear( GL_COLOR_BUFFER_BIT );
-
- XSync( pDisplay, 0 );
- GLXFBConfig pFbConfig = GetPixmapFBConfig( pDisplay, bInverted );
- GLXPixmap pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, pPixmap->GetPixmap(), aAttribs);
- GLXPixmap pGlxMask;
- if( pMask != nullptr )
- pGlxMask = glXCreatePixmap( pDisplay, pFbConfig, pMask->GetPixmap(), aAttribs);
- else
- pGlxMask = 0;
- XSync( pDisplay, 0 );
-
- if( !pGlxPixmap )
- SAL_WARN( "vcl.opengl", "Couldn't create GLXPixmap" );
-
- //TODO: lfrb: glXGetProc to get the functions
-
- rCombo.mpTexture.reset(new OpenGLTexture(pPixmap->GetWidth(), pPixmap->GetHeight(), false));
-
- mpContext->state().texture().active(0);
-
- rCombo.mpTexture->Bind();
- glXBindTexImageEXT( pDisplay, pGlxPixmap, GLX_FRONT_LEFT_EXT, nullptr );
- rCombo.mpTexture->Unbind();
-
- if( pMask != nullptr && pGlxMask )
- {
- rCombo.mpMask.reset(new OpenGLTexture(pPixmap->GetWidth(), pPixmap->GetHeight(), false));
- rCombo.mpMask->Bind();
- glXBindTexImageEXT( pDisplay, pGlxMask, GLX_FRONT_LEFT_EXT, nullptr );
- rCombo.mpMask->Unbind();
-
- DrawTextureDiff(*rCombo.mpTexture, *rCombo.mpMask, aPosAry, bInverted);
-
- glXReleaseTexImageEXT( pDisplay, pGlxMask, GLX_FRONT_LEFT_EXT );
- glXDestroyPixmap( pDisplay, pGlxMask );
- }
- else
- {
- DrawTexture(*rCombo.mpTexture, aPosAry, bInverted);
- }
-
- CHECK_GL_ERROR();
-
- glXReleaseTexImageEXT( pDisplay, pGlxPixmap, GLX_FRONT_LEFT_EXT );
- glXDestroyPixmap( pDisplay, pGlxPixmap );
-
- PostDraw();
-
- CHECK_GL_ERROR();
-}
-
-bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY )
-{
- SAL_INFO( "vcl.opengl", "RenderPixmapToScreen (" << nX << " " << nY << ")" );
-
- TextureCombo aCombo;
- RenderPixmap(pPixmap, pMask, nX, nY, aCombo);
- return true;
-}
-
bool X11OpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY)
{
static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE");
@@ -805,20 +631,4 @@ bool X11OpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& rCo
return true;
}
-bool X11OpenGLSalGraphicsImpl::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& aControlCacheKey)
-{
- std::unique_ptr<TextureCombo> pCombo(new TextureCombo);
- RenderPixmap(pPixmap, pMask, nX, nY, *pCombo);
-
- if (!aControlCacheKey.canCacheControl())
- return true;
-
- ControlCachePair pair(aControlCacheKey, std::move(pCombo));
- if (gTextureCache.get())
- gTextureCache.get()->insert(std::move(pair));
-
- return true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index fdd524e06f20..837a42499c7e 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1875,13 +1875,6 @@ StyleSettings::GetDialogStyle() const
}
void
-StyleSettings::SetDialogStyle( const DialogStyle& rStyle )
-{
- CopyData();
- mxData->maDialogStyle = rStyle;
-}
-
-void
StyleSettings::SetEdgeBlending(sal_uInt16 nCount)
{
CopyData();
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index a046db704de0..513f319cbf45 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -226,23 +226,6 @@ namespace vcl
m_xAssistant->set_page_side_help_id(rId);
}
- void RoadmapWizard::SetRoadmapInteractive( bool _bInteractive )
- {
- m_xRoadmapImpl->pRoadmap->SetRoadmapInteractive( _bInteractive );
- }
-
- void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates)
- {
-
- m_xRoadmapImpl->aPaths.emplace( _nPathId, _lWizardStates );
-
- if ( m_xRoadmapImpl->aPaths.size() == 1 )
- // the very first path -> activate it
- activatePath( _nPathId );
- else
- implUpdateRoadmap( );
- }
-
void RoadmapWizardMachine::declarePath( PathId _nPathId, const WizardPath& _lWizardStates)
{
m_pImpl->aPaths.emplace( _nPathId, _lWizardStates );
@@ -664,34 +647,6 @@ namespace vcl
return *rPath.rbegin() != getCurrentState();
}
- void RoadmapWizard::updateTravelUI()
- {
- const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
- OSL_ENSURE( pController != nullptr, "RoadmapWizard::updateTravelUI: no controller for the current page!" );
-
- bool bCanAdvance =
- ( !pController || pController->canAdvance() ) // the current page allows to advance
- && canAdvance(); // the dialog as a whole allows to advance
- enableButtons( WizardButtonFlags::NEXT, bCanAdvance );
-
- // disable the "Previous" button if all states in our history are disabled
- std::vector< WizardTypes::WizardState > aHistory;
- getStateHistory( aHistory );
- bool bHaveEnabledState = false;
- for (auto const& state : aHistory)
- {
- if ( isStateEnabled(state) )
- {
- bHaveEnabledState = true;
- break;
- }
- }
-
- enableButtons( WizardButtonFlags::PREVIOUS, bHaveEnabledState );
-
- implUpdateRoadmap();
- }
-
void RoadmapWizardMachine::updateTravelUI()
{
WizardMachine::updateTravelUI();
@@ -866,21 +821,6 @@ namespace vcl
return pPage;
}
- void RoadmapWizard::enableState( WizardTypes::WizardState _nState, bool _bEnable )
- {
- // remember this (in case the state appears in the roadmap later on)
- if ( _bEnable )
- m_xRoadmapImpl->aDisabledStates.erase( _nState );
- else
- {
- m_xRoadmapImpl->aDisabledStates.insert( _nState );
- removePageFromHistory( _nState );
- }
-
- // if the state is currently in the roadmap, reflect it's new status
- m_xRoadmapImpl->pRoadmap->EnableRoadmapItem( static_cast<RoadmapTypes::ItemId>(_nState), _bEnable );
- }
-
void RoadmapWizardMachine::enableState( WizardTypes::WizardState _nState, bool _bEnable )
{
// remember this (in case the state appears in the roadmap later on)
@@ -896,19 +836,6 @@ namespace vcl
m_xAssistant->set_page_sensitive(OString::number(_nState), _bEnable);
}
- bool RoadmapWizard::knowsState( WizardTypes::WizardState i_nState ) const
- {
- for (auto const& path : m_xRoadmapImpl->aPaths)
- {
- for (auto const& state : path.second)
- {
- if ( state == i_nState )
- return true;
- }
- }
- return false;
- }
-
bool RoadmapWizardMachine::knowsState( WizardTypes::WizardState i_nState ) const
{
for (auto const& path : m_pImpl->aPaths)
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 8944725b996b..c049f9a3e987 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -535,12 +535,6 @@ namespace vcl
return Dialog::EventNotify( rNEvt );
}
- void RoadmapWizard::setTitleBase(const OUString& _rTitleBase)
- {
- m_xWizardImpl->sTitleBase = _rTitleBase;
- implUpdateTitle();
- }
-
TabPage* RoadmapWizard::GetOrCreatePage( const WizardTypes::WizardState i_nState )
{
if ( nullptr == GetPage( i_nState ) )
@@ -578,39 +572,6 @@ namespace vcl
enterState( nCurrentLevel );
}
- void RoadmapWizard::defaultButton(WizardButtonFlags _nWizardButtonFlags)
- {
- // the new default button
- PushButton* pNewDefButton = nullptr;
- if (m_pFinish && (_nWizardButtonFlags & WizardButtonFlags::FINISH))
- pNewDefButton = m_pFinish;
- if (m_pNextPage && (_nWizardButtonFlags & WizardButtonFlags::NEXT))
- pNewDefButton = m_pNextPage;
- if (m_pPrevPage && (_nWizardButtonFlags & WizardButtonFlags::PREVIOUS))
- pNewDefButton = m_pPrevPage;
- if (m_pHelp && (_nWizardButtonFlags & WizardButtonFlags::HELP))
- pNewDefButton = m_pHelp;
- if (m_pCancel && (_nWizardButtonFlags & WizardButtonFlags::CANCEL))
- pNewDefButton = m_pCancel;
-
- if ( pNewDefButton )
- defaultButton( pNewDefButton );
- else
- implResetDefault( this );
- }
-
- bool RoadmapWizard::ShowNextPage()
- {
- return ShowPage( mnCurLevel+1 );
- }
-
- bool RoadmapWizard::ShowPrevPage()
- {
- if ( !mnCurLevel )
- return false;
- return ShowPage( mnCurLevel-1 );
- }
-
bool RoadmapWizard::ShowPage( sal_uInt16 nLevel )
{
mnCurLevel = nLevel;
@@ -892,39 +853,6 @@ namespace vcl
return true;
}
- void RoadmapWizard::skip()
- {
- // allowed to leave the current page?
- if ( !prepareLeaveCurrentState( WizardTypes::eTravelForward ) )
- return;
-
- WizardTypes::WizardState nCurrentState = getCurrentState();
- WizardTypes::WizardState nNextState = determineNextState(nCurrentState);
-
- if (WZS_INVALID_STATE == nNextState)
- return;
-
- // remember the skipped state in the history
- m_xWizardImpl->aStateHistory.push(nCurrentState);
-
- // get the next state
- nCurrentState = nNextState;
-
- // show the (n+1)th page
- if (!ShowPage(nCurrentState))
- {
- // TODO: this leaves us in a state where we have no current page and an inconsistent state history.
- // Perhaps we should rollback the skipping here...
- OSL_FAIL("RoadmapWizard::skip: very unpolite...");
- // if somebody does a skip and then does not allow to leave...
- // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here,
- // somebody behaves really strange...)
- return;
- }
-
- // all fine
- }
-
bool RoadmapWizard::travelNext()
{
// allowed to leave the current page?
@@ -993,11 +921,6 @@ namespace vcl
}
}
- void RoadmapWizard::enableAutomaticNextButtonState()
- {
- m_xWizardImpl->m_bAutoNextButtonState = true;
- }
-
bool RoadmapWizard::isAutomaticNextButtonStateEnabled() const
{
return m_xWizardImpl->m_bAutoNextButtonState;
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index ee2574c5e328..b455b2f8a56e 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3547,12 +3547,6 @@ sal_uInt16 SvTreeListBox::GetCurrentTabPos() const
return pImpl->GetCurrentTabPos();
}
-void SvTreeListBox::InitStartEntry()
-{
- if( !pImpl->m_pStartEntry )
- pImpl->m_pStartEntry = GetModel()->First();
-}
-
VclPtr<PopupMenu> SvTreeListBox::CreateContextMenu()
{
return nullptr;
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index a511488e53a1..de51359b6e6e 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -154,69 +154,11 @@ void X11SalGraphicsImpl::Init()
mnBrushPixel = mrParent.GetPixel( mnBrushColor );
}
-void X11SalGraphicsImpl::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
-{
- //TODO lfrb: don't hardcode the depth
- Display* pDpy = mrParent.GetXDisplay();
- GC aTmpGC = XCreateGC( pDpy, pPixmap->GetPixmap(), 0, nullptr );
-
- if( !aTmpGC )
- {
- SAL_WARN( "vcl", "Could not create GC from screen" );
- return;
- }
-
- // Copy the background of the screen into a composite pixmap
- X11SalGraphics::CopyScreenArea( mrParent.GetXDisplay(),
- mrParent.GetDrawable(), mrParent.GetScreenNumber(),
- mrParent.GetVisual().GetDepth(),
- pPixmap->GetDrawable(), pPixmap->GetScreen(),
- pPixmap->GetDepth(),
- aTmpGC,
- nX, nY, pPixmap->GetWidth(), pPixmap->GetHeight(),
- 0, 0 );
-
- XFreeGC( pDpy, aTmpGC );
-}
-
-bool X11SalGraphicsImpl::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* /*Mask*/, int nX, int nY )
-{
- // TODO: lfrb: Use the mask
- GC aFontGC = mrParent.GetFontGC();
-
- // The GC can't be null, otherwise we'd have no clip region
- if( aFontGC == nullptr )
- {
- SAL_WARN( "vcl", "no valid GC to render pixmap" );
- return false;
- }
-
- if( !pPixmap )
- return false;
-
- X11SalGraphics::CopyScreenArea( mrParent.GetXDisplay(),
- pPixmap->GetDrawable(), pPixmap->GetScreen(),
- pPixmap->GetDepth(),
- mrParent.GetDrawable(), mrParent.m_nXScreen,
- mrParent.GetVisual().GetDepth(),
- aFontGC,
- 0, 0,
- pPixmap->GetWidth(), pPixmap->GetHeight(),
- nX, nY );
- return true;
-}
-
bool X11SalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& /*rControlCacheKey*/, int /*nX*/, int /*nY*/)
{
return false;
}
-bool X11SalGraphicsImpl::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& /*rControlCacheKey*/)
-{
- return RenderPixmapToScreen(pPixmap, pMask, nX, nY);
-}
-
XID X11SalGraphicsImpl::GetXRenderPicture()
{
XRenderPeer& rRenderPeer = XRenderPeer::GetInstance();
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 40f52f337170..0b4861896b5e 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -286,13 +286,9 @@ public:
// implementation of X11GraphicsImpl
void Init() override;
- void FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) override;
- bool RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY ) override;
virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
int nX, int nY) override;
- virtual bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& aControlCacheKey) override;
};
#endif
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 75b742eb4285..7f470488bdd0 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -22,7 +22,6 @@
#include <vcl/sysdata.hxx>
#include <sal/log.hxx>
-#include <unx/pixmap.hxx>
#include <unx/saldisp.hxx>
#include <unx/salbmp.h>
#include <unx/salgdi.h>
@@ -69,34 +68,6 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
}
}
-void X11SalGraphics::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY )
-{
- X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl);
- rImpl.FillPixmapFromScreen( pPixmap, nX, nY );
-}
-
-bool X11SalGraphics::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY )
-{
- SAL_INFO( "vcl", "RenderPixmapToScreen" );
- X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl);
- return rImpl.RenderPixmapToScreen( pPixmap, pMask, nX, nY );
-}
-
-bool X11SalGraphics::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY)
-{
- SAL_INFO( "vcl", "TryRenderCachedNativeControl" );
- X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl);
- return rImpl.TryRenderCachedNativeControl(rControlCacheKey, nX, nY);
-}
-
-bool X11SalGraphics::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
- ControlCacheKey& rControlCacheKey)
-{
- SAL_INFO( "vcl", "RenderAndCachePixmap" );
- X11GraphicsImpl& rImpl = dynamic_cast<X11GraphicsImpl&>(*mxImpl);
- return rImpl.RenderAndCacheNativeControl(pPixmap, pMask, nX, nY, rControlCacheKey);
-}
-
extern "C"
{
static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const XPointer pFrameWindow )
diff --git a/vcl/unx/gtk3/a11y/atkutil.hxx b/vcl/unx/gtk3/a11y/atkutil.hxx
index cb4a005157a0..3df45c1cadfb 100644
--- a/vcl/unx/gtk3/a11y/atkutil.hxx
+++ b/vcl/unx/gtk3/a11y/atkutil.hxx
@@ -22,7 +22,6 @@
#include <atk/atk.h>
-GType ooo_atk_util_get_type();
void ooo_atk_util_ensure_event_listener();
#endif
diff --git a/vcl/unx/gtk3/a11y/atkwindow.hxx b/vcl/unx/gtk3/a11y/atkwindow.hxx
deleted file mode 100644
index 35a4bcedf486..000000000000
--- a/vcl/unx/gtk3/a11y/atkwindow.hxx
+++ /dev/null
@@ -1,30 +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_VCL_UNX_GTK_A11Y_ATKWINDOW_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKWINDOW_HXX
-
-#include <atk/atk.h>
-
-GType ooo_window_wrapper_get_type();
-void restore_gail_window_vtable();
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
index 0e2781cf8fd5..90cb06ef0647 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
@@ -22,7 +22,6 @@
#include "atkfactory.hxx"
#include "atkutil.hxx"
-#include "atkwindow.hxx"
bool InitAtkBridge()
{
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index 50ed2793bbf0..1b920fe42c9c 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -699,45 +699,6 @@ static Link<VclSimpleEvent&,void> g_aEventListenerLink( nullptr, WindowEventHand
/*****************************************************************************/
-extern "C" {
-
-static const gchar *
-ooo_atk_util_get_toolkit_name()
-{
- return "VCL";
-}
-
-/*****************************************************************************/
-
-static const gchar *
-ooo_atk_util_get_toolkit_version()
-{
- return LIBO_VERSION_DOTTED;
-}
-
-/*****************************************************************************/
-
-/*
- * GObject inheritance
- */
-
-static void
-ooo_atk_util_class_init (AtkUtilClass *)
-{
- AtkUtilClass *atk_class;
- gpointer data;
-
- data = g_type_class_peek (ATK_TYPE_UTIL);
- atk_class = ATK_UTIL_CLASS (data);
-
- atk_class->get_toolkit_name = ooo_atk_util_get_toolkit_name;
- atk_class->get_toolkit_version = ooo_atk_util_get_toolkit_version;
-
- ooo_atk_util_ensure_event_listener();
-}
-
-} // extern "C"
-
void ooo_atk_util_ensure_event_listener()
{
static bool bInited;
@@ -748,42 +709,4 @@ void ooo_atk_util_ensure_event_listener()
}
}
-GType
-ooo_atk_util_get_type()
-{
- static GType type = 0;
-
- if (!type)
- {
- GType parent_type = g_type_from_name( "GailUtil" );
-
- if( ! parent_type )
- {
- g_warning( "Unknown type: GailUtil" );
- parent_type = ATK_TYPE_UTIL;
- }
-
- GTypeQuery type_query;
- g_type_query( parent_type, &type_query );
-
- static const GTypeInfo typeInfo =
- {
- static_cast<guint16>(type_query.class_size),
- nullptr,
- nullptr,
- reinterpret_cast<GClassInitFunc>(ooo_atk_util_class_init),
- nullptr,
- nullptr,
- static_cast<guint16>(type_query.instance_size),
- 0,
- nullptr,
- nullptr
- } ;
-
- type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, GTypeFlags(0)) ;
- }
-
- return type;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx b/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
deleted file mode 100644
index eb72edf4908c..000000000000
--- a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
+++ /dev/null
@@ -1,330 +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 <unx/gtk/gtkframe.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-#include <vcl/popupmenuwindow.hxx>
-#include <sal/log.hxx>
-
-#include "atkwindow.hxx"
-#include "atkwrapper.hxx"
-#include "atkregistry.hxx"
-
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-
-using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::uno;
-
-extern "C" {
-
-static void (* window_real_initialize) (AtkObject *obj, gpointer data) = nullptr;
-static void (* window_real_finalize) (GObject *obj) = nullptr;
-
-static void
-init_from_window( AtkObject *accessible, vcl::Window const *pWindow )
-{
- static AtkRole aDefaultRole = ATK_ROLE_INVALID;
-
- // Special role for sub-menu and combo-box popups that are exposed directly
- // by their parents already.
- if( aDefaultRole == ATK_ROLE_INVALID )
- {
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- aDefaultRole = atk_role_register( "redundant object" );
- SAL_WNODEPRECATED_DECLARATIONS_POP
- }
-
- AtkRole role = aDefaultRole;
-
- // Determine the appropriate role for the GtkWindow
- switch( pWindow->GetAccessibleRole() )
- {
- case AccessibleRole::ALERT:
- role = ATK_ROLE_ALERT;
- break;
-
- case AccessibleRole::DIALOG:
- role = ATK_ROLE_DIALOG;
- break;
-
- case AccessibleRole::FRAME:
- role = ATK_ROLE_FRAME;
- break;
-
- /* Ignore window objects for sub-menus, combo- and list boxes,
- * which are exposed as children of their parents.
- */
- case AccessibleRole::WINDOW:
- {
- WindowType type = WindowType::WINDOW;
- bool parentIsMenuFloatingWindow = false;
-
- vcl::Window *pParent = pWindow->GetParent();
- if( pParent ) {
- type = pParent->GetType();
- parentIsMenuFloatingWindow = pParent->IsMenuFloatingWindow();
- }
-
- if( (WindowType::LISTBOX != type) && (WindowType::COMBOBOX != type) &&
- (WindowType::MENUBARWINDOW != type) && ! parentIsMenuFloatingWindow )
- {
- role = ATK_ROLE_WINDOW;
- }
- }
- break;
-
- default:
- {
- vcl::Window *pChild = pWindow->GetWindow(GetWindowType::FirstChild);
- if( pChild )
- {
- if( WindowType::HELPTEXTWINDOW == pChild->GetType() )
- {
- role = ATK_ROLE_TOOL_TIP;
- pChild->SetAccessibleRole( AccessibleRole::LABEL );
- accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- else if ( pWindow->GetType() == WindowType::BORDERWINDOW && pChild->GetType() == WindowType::FLOATINGWINDOW )
- {
- PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
- if (p && p->IsPopupMenu() && p->GetMenuStackLevel() == 0)
- {
- // This is a top-level menu popup. Register it.
- role = ATK_ROLE_POPUP_MENU;
- pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU );
- accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
- }
- break;
- }
- }
-
- accessible->role = role;
-}
-
-/*****************************************************************************/
-
-static gboolean
-ooo_window_wrapper_clear_focus(gpointer)
-{
- SolarMutexGuard aGuard;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- atk_focus_tracker_notify( nullptr );
- SAL_WNODEPRECATED_DECLARATIONS_POP
- return false;
-}
-
-/*****************************************************************************/
-
-static gboolean
-ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
-{
- g_idle_add( ooo_window_wrapper_clear_focus, nullptr );
- return false;
-}
-
-static gboolean ooo_tooltip_map( GtkWidget* pToolTip, gpointer )
-{
- AtkObject* pAccessible = gtk_widget_get_accessible( pToolTip );
- if( pAccessible )
- atk_object_notify_state_change( pAccessible, ATK_STATE_SHOWING, TRUE );
- return FALSE;
-}
-
-static gboolean ooo_tooltip_unmap( GtkWidget* pToolTip, gpointer )
-{
- AtkObject* pAccessible = gtk_widget_get_accessible( pToolTip );
- if( pAccessible )
- atk_object_notify_state_change( pAccessible, ATK_STATE_SHOWING, FALSE );
- return FALSE;
-}
-
-/*****************************************************************************/
-
-static bool
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list