[Libreoffice-commits] core.git: compilerplugins/clang include/sfx2 include/tools include/vcl rsc/inc rsc/source sfx2/source tools/source vcl/inc vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Apr 26 11:25:52 UTC 2017
compilerplugins/clang/unusedmethods.results | 48 +++++++------
compilerplugins/clang/unusedmethods.unused-returns.results | 48 +++++++++++--
include/sfx2/sidebar/ControllerItem.hxx | 9 --
include/tools/resmgr.hxx | 5 -
include/vcl/field.hxx | 2
rsc/inc/rscdb.hxx | 1
rsc/source/parser/rscibas.cxx | 10 --
sfx2/source/sidebar/ControllerItem.cxx | 10 --
tools/source/rc/resmgr.cxx | 20 -----
vcl/inc/implimagetree.hxx | 5 -
vcl/source/control/field.cxx | 8 --
vcl/source/image/ImplImageTree.cxx | 6 -
12 files changed, 71 insertions(+), 101 deletions(-)
New commits:
commit dbd20b5c793cab388f01b7172df91429b6324418
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Apr 26 12:36:19 2017 +0200
loplugin:unusedmethods
Change-Id: If2e1241bbe8a3d17859e3ca076b0f55f25c48ea5
Reviewed-on: https://gerrit.libreoffice.org/36983
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 18f28ab3d8ce..23bea866aeea 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -4,6 +4,8 @@ connectivity/source/drivers/mork/mork_helper.cxx:36
int main(int,char **)
connectivity/source/inc/odbc/OPreparedStatement.hxx:74
void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,const type-parameter-?-?)
+connectivity/source/inc/odbc/OPreparedStatement.hxx:75
+ void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,int,const type-parameter-?-?)
connectivity/source/inc/OTypeInfo.hxx:52
connectivity::OTypeInfo::OTypeInfo()
dbaccess/source/ui/inc/indexcollection.hxx:54
@@ -62,6 +64,8 @@ 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/hash.hxx:40
+ class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > comphelper::Hash::calculateHash(const unsigned char *,unsigned long,enum comphelper::HashType)
include/comphelper/logging.hxx:57
class rtl::OUString convertLogArgToString(char16_t)
include/comphelper/logging.hxx:129
@@ -130,9 +134,9 @@ include/comphelper/unwrapargs.hxx:49
void unwrapArgs(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
include/connectivity/FValue.hxx:396
unsigned char connectivity::ORowSetValue::getUInt8() const
-include/connectivity/sdbcx/VGroup.hxx:67
- connectivity::sdbcx::OGroup::OGroup(_Bool)
include/connectivity/sdbcx/VGroup.hxx:68
+ connectivity::sdbcx::OGroup::OGroup(_Bool)
+include/connectivity/sdbcx/VGroup.hxx:69
connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool)
include/desktop/crashreport.hxx:46
class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CrashReporter::getIniFileName()
@@ -148,7 +152,7 @@ include/i18nlangtag/languagetag.hxx:257
enum LanguageTag::ScriptType LanguageTag::getScriptType() const
include/o3tl/any.hxx:155
class boost::optional<const struct o3tl::detail::Void> tryAccess(const class com::sun::star::uno::Any &)
-include/o3tl/cow_wrapper.hxx:309
+include/o3tl/cow_wrapper.hxx:310
type-parameter-?-? * o3tl::cow_wrapper::get()
include/o3tl/string_view.hxx:178
o3tl::basic_string_view::basic_string_view<charT, traits>()
@@ -232,8 +236,6 @@ include/svl/macitem.hxx:96
class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const unsigned short, class SvxMacro> >, class std::__debug::map<unsigned short, class SvxMacro, struct std::less<unsigned short>, class std::allocator<struct std::pair<const unsigned short, class SvxMacro> > > > SvxMacroTableDtor::begin() const
include/svl/macitem.hxx:98
class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const unsigned short, class SvxMacro> >, class std::__debug::map<unsigned short, class SvxMacro, struct std::less<unsigned short>, class std::allocator<struct std::pair<const unsigned short, class SvxMacro> > > > SvxMacroTableDtor::end() const
-include/svl/style.hxx:275
- SfxStyleSheet::SfxStyleSheet()
include/tools/bigint.hxx:94
BigInt::BigInt(unsigned short)
include/tools/bigint.hxx:103
@@ -264,7 +266,7 @@ include/unotest/assertion_traits.hxx:25
_Bool CppUnit::assertion_traits::equal(signed char,signed char)
include/unotest/assertion_traits.hxx:27
class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CppUnit::assertion_traits::toString(signed char)
-include/vcl/commandevent.hxx:248
+include/vcl/commandevent.hxx:249
CommandMediaData::CommandMediaData(enum MediaCommand)
include/vcl/menu.hxx:472
class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short)
@@ -298,6 +300,8 @@ sc/inc/formulacell.hxx:433
void ScFormulaCell::Dump() const
sc/inc/formulagroup.hxx:140
void sc::FormulaGroupInterpreter::enableOpenCL_UnitTestsOnly()
+sc/inc/PivotTableDataProvider.hxx:150
+ void sc::PivotTableDataProvider::setLabeledDataSequence(class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XLabeledDataSequence> &,const class rtl::OUString &,const class rtl::OUString &,const class std::__debug::vector<struct sc::ValueAndFormat, class std::allocator<struct sc::ValueAndFormat> > &,const class rtl::OUString &,const class rtl::OUString &,const class std::__debug::vector<struct sc::ValueAndFormat, class std::allocator<struct sc::ValueAndFormat> > &)
sc/inc/postit.hxx:47
ScCaptionPtr::ScCaptionPtr(class SdrCaptionObj *)
sc/inc/scdll.hxx:42
@@ -352,22 +356,24 @@ sc/source/core/opencl/opbase.hxx:119
void sc::opencl::DynamicKernelArgument::GenNumDeclRef(class std::basic_stringstream<char> &) const
sc/source/core/opencl/opbase.hxx:121
void sc::opencl::DynamicKernelArgument::GenStringDeclRef(class std::basic_stringstream<char> &) const
-sc/source/ui/inc/dataprovider.hxx:53
+sc/source/ui/inc/dataprovider.hxx:54
sc::ExternalDataMapper::ExternalDataMapper(class ScDocShell *,const class rtl::OUString &,const class rtl::OUString &,short,short,int,short,int,_Bool &)
-sc/source/ui/inc/dataprovider.hxx:58
+sc/source/ui/inc/dataprovider.hxx:59
void sc::ExternalDataMapper::StartImport()
-sc/source/ui/inc/dataprovider.hxx:106
- _Bool sc::CSVFetchThread::IsRequestedTerminate()
sc/source/ui/inc/dataprovider.hxx:107
+ _Bool sc::CSVFetchThread::IsRequestedTerminate()
+sc/source/ui/inc/dataprovider.hxx:108
void sc::CSVFetchThread::Terminate()
-sc/source/ui/inc/dataprovider.hxx:109
+sc/source/ui/inc/dataprovider.hxx:110
void sc::CSVFetchThread::EmptyLineQueue(class std::queue<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *, class std::__debug::deque<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *, class std::allocator<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *> > > &)
-sc/source/ui/inc/dataprovider.hxx:121
- class ScRange sc::DataProvider::GetRange() const
sc/source/ui/inc/dataprovider.hxx:122
+ class ScRange sc::DataProvider::GetRange() const
+sc/source/ui/inc/dataprovider.hxx:123
const class rtl::OUString & sc::DataProvider::GetURL() const
sc/source/ui/inc/impex.hxx:92
ScImportExport::ScImportExport(class ScDocument *,const class rtl::OUString &)
+sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:69
+ void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const short,const class boost::optional<signed char>)
sd/inc/sddll.hxx:50
SdDLL::SdDLL()
sd/source/filter/ppt/pptinanimations.hxx:110
@@ -488,9 +494,9 @@ sw/inc/ring.hxx:204
sw::RingIterator::RingIterator<value_type>()
sw/inc/swrect.hxx:105
class SvStream & WriteSwRect(class SvStream &,const class SwRect &)
-sw/qa/extras/inc/swmodeltestbase.hxx:522
+sw/qa/extras/inc/swmodeltestbase.hxx:523
class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const
-sw/qa/extras/uiwriter/uiwriter.cxx:4559
+sw/qa/extras/uiwriter/uiwriter.cxx:4592
int main()
sw/source/core/inc/flowfrm.hxx:171
class SwFlowFrame * SwFlowFrame::GetPrecede()
@@ -516,11 +522,11 @@ ucb/source/ucp/ftp/ftpurl.hxx:113
class rtl::OUString ftp::FTPURL::child() const
vcl/inc/opengl/BufferObject.hxx:50
void vcl::BufferObject::unbind()
-vcl/inc/opengl/PackedTextureAtlas.hxx:43
+vcl/inc/opengl/PackedTextureAtlas.hxx:44
PackedTextureAtlasManager::PackedTextureAtlasManager(int,int)
-vcl/inc/opengl/PackedTextureAtlas.hxx:45
+vcl/inc/opengl/PackedTextureAtlas.hxx:46
class OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int,int,int,int,unsigned char *)
-vcl/inc/opengl/PackedTextureAtlas.hxx:47
+vcl/inc/opengl/PackedTextureAtlas.hxx:48
class std::__debug::vector<unsigned int, class std::allocator<unsigned int> > PackedTextureAtlasManager::ReduceTextureNumber(int)
vcl/inc/opengl/salbmp.hxx:86
const class BitmapPalette & OpenGLSalBitmap::GetBitmapPalette() const
@@ -542,7 +548,7 @@ vcl/inc/salmenu.hxx:46
SalMenuButtonItem::SalMenuButtonItem()
vcl/inc/salwtype.hxx:117
SalMenuEvent::SalMenuEvent()
-vcl/inc/unx/glyphcache.hxx:70
+vcl/inc/unx/glyphcache.hxx:71
void GlyphCache::ClearFontOptions()
vcl/inc/unx/gtk/gtkdata.hxx:182
void GtkSalDisplay::RefreshMenusUnity()
@@ -568,9 +574,9 @@ vcl/source/fontsubset/xlat.hxx:34
unsigned short TranslateChar15(unsigned short)
vcl/source/fontsubset/xlat.hxx:35
unsigned short TranslateChar16(unsigned short)
-vcl/source/gdi/pdfwriter_impl.hxx:1283
+vcl/source/gdi/pdfwriter_impl.hxx:1282
void vcl::PDFWriterImpl::setAutoAdvanceTime(unsigned int,int)
-workdir/LexTarget/l10ntools/source/srclex.cxx:1380
+workdir/LexTarget/l10ntools/source/xrmlex.cxx:730
void YYWarning()
writerfilter/source/ooxml/OOXMLPropertySet.hxx:160
class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > > writerfilter::ooxml::OOXMLPropertySet::begin() const
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results
index e80c3755b318..39144956f645 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -28,10 +28,20 @@ chart2/source/view/main/OpenGLRender.hxx:105
int OpenGLRender::RenderSymbol2DShape(float,float,float,float,int)
chart2/source/view/main/OpenGLRender.hxx:122
int OpenGLRender::Create2DCircle(int)
+compilerplugins/clang/test/externvar.hxx:23
+ int f(int)
compilerplugins/clang/test/redundantinline.hxx:35
int S3::operator int()
compilerplugins/clang/test/redundantinline.hxx:64
int S4::operator int()
+compilerplugins/clang/test/redundantinline.hxx:68
+ int S4::f5()
+compilerplugins/clang/test/redundantinline.hxx:70
+ int S4::f6()
+compilerplugins/clang/test/redundantinline.hxx:73
+ int f5()
+compilerplugins/clang/test/redundantinline.hxx:75
+ int f6()
connectivity/source/inc/java/lang/Object.hxx:118
int connectivity::java_lang_Object::callIntMethodWithIntArg_ThrowRuntime(const char *,struct _jmethodID *&,int) const
connectivity/source/inc/OColumn.hxx:131
@@ -66,6 +76,8 @@ include/basegfx/point/b3dpoint.hxx:85
class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(const class basegfx::B3DPoint &)
include/basegfx/point/b3dpoint.hxx:95
class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(double)
+include/basegfx/tools/unopolypolygon.hxx:91
+ const class basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
include/basegfx/tuple/b2i64tuple.hxx:92
const long & basegfx::B2I64Tuple::operator[](int) const
include/basegfx/tuple/b2i64tuple.hxx:101
@@ -136,10 +148,38 @@ include/canvas/vclwrapper.hxx:135
type-parameter-?-? & canvas::vcltools::VCLObject::get()
include/canvas/vclwrapper.hxx:136
const type-parameter-?-? & canvas::vcltools::VCLObject::get() const
-include/comphelper/unique_disposing_ptr.hxx:45
+include/comphelper/unique_disposing_ptr.hxx:46
type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const
include/connectivity/FValue.hxx:327
unsigned short connectivity::ORowSetValue::operator unsigned short() const
+include/LibreOfficeKit/LibreOfficeKit.hxx:63
+ struct _LibreOfficeKitDocument * lok::Document::get()
+include/LibreOfficeKit/LibreOfficeKit.hxx:71
+ int lok::Document::getDocumentType()
+include/LibreOfficeKit/LibreOfficeKit.hxx:96
+ char * lok::Document::getPartPageRectangles()
+include/LibreOfficeKit/LibreOfficeKit.hxx:102
+ int lok::Document::getPart()
+include/LibreOfficeKit/LibreOfficeKit.hxx:120
+ char * lok::Document::getPartHash(int)
+include/LibreOfficeKit/LibreOfficeKit.hxx:162
+ int lok::Document::getTileMode()
+include/LibreOfficeKit/LibreOfficeKit.hxx:281
+ char * lok::Document::getTextSelection(const char *,char **)
+include/LibreOfficeKit/LibreOfficeKit.hxx:324
+ char * lok::Document::getCommandValues(const char *)
+include/LibreOfficeKit/LibreOfficeKit.hxx:366
+ int lok::Document::createView()
+include/LibreOfficeKit/LibreOfficeKit.hxx:393
+ int lok::Document::getView()
+include/LibreOfficeKit/LibreOfficeKit.hxx:401
+ int lok::Document::getViewsCount()
+include/LibreOfficeKit/LibreOfficeKit.hxx:410
+ unsigned char * lok::Document::renderFont(const char *,const char *,int *,int *)
+include/LibreOfficeKit/LibreOfficeKit.hxx:543
+ char * lok::Office::getFilterTypes()
+include/LibreOfficeKit/LibreOfficeKit.hxx:593
+ char * lok::Office::getVersionInfo()
include/o3tl/enumarray.hxx:100
typename type-parameter-?-?::value_type * o3tl::enumarray_iterator::operator->()
include/o3tl/string_view.hxx:844
@@ -246,9 +286,9 @@ sc/source/core/opencl/formulagroupcl.cxx:968
unsigned long sc::opencl::DynamicKernelSlidingArgument::GenReductionLoopHeader(class std::basic_stringstream<char> &,_Bool &)
sc/source/core/opencl/formulagroupcl.cxx:1413
unsigned long sc::opencl::ParallelReductionVectorRef::GenReductionLoopHeader(class std::basic_stringstream<char> &,int,_Bool &)
-sc/source/core/tool/scmatrix.cxx:2208
+sc/source/core/tool/scmatrix.cxx:2209
type-parameter-?-? * wrapped_iterator::operator->() const
-sc/source/core/tool/scmatrix.cxx:3174
+sc/source/core/tool/scmatrix.cxx:3175
const class svl::SharedString & matop::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
sc/source/ui/vba/vbaformat.hxx:69
class com::sun::star::uno::Any ScVbaFormat::getAddIndent()
@@ -286,7 +326,7 @@ sd/source/filter/eppt/pptx-epptooxml.cxx:118
class oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePageShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,enum PageType,_Bool)
sd/source/ui/remotecontrol/IBluetoothSocket.hxx:37
int sd::IBluetoothSocket::write(const void *,unsigned int)
-sw/inc/calc.hxx:110
+sw/inc/calc.hxx:111
class SwSbxValue & SwSbxValue::MakeDouble()
sw/source/uibase/inc/fldmgr.hxx:114
const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index cbade65eddfd..c02509934e23 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -82,15 +82,6 @@ public:
*/
void RequestUpdate();
- /** Do not call. Used by local class only. Should be a member of
- a local and hidden interface.
- */
- void NotifyFrameContextChange();
- /** Do not call. Used by local class only. Should be a member of
- a local and hidden interface.
- */
- void ResetFrame();
-
protected:
virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override;
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 5a6cd3272aae..2dd642422953 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -137,11 +137,6 @@ public:
static ResMgr* CreateResMgr( const sal_Char* pPrefixName,
const LanguageTag& aLocale = LanguageTag( LANGUAGE_SYSTEM) );
- #ifdef DBG_UTIL
- /// Test whether resource still exists
- void TestStack();
- #endif
-
/// Check whether resource is available
bool IsAvailable( const ResId& rId,
const Resource* = nullptr) const;
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index e1e9900a2514..149043562f80 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -79,8 +79,6 @@ public:
const css::lang::Locale& GetLocale() const;
const LanguageTag& GetLanguageTag() const;
- const AllSettings& GetFieldSettings() const;
-
void SetEmptyFieldValue();
bool IsEmptyFieldValue() const;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 0fbe8064fc9d..9381d16b2ee8 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -78,7 +78,6 @@ class RscTypCont
void Init(); // initializes classes and tables
void SETCONST( RscEnum *, const char *, sal_uInt32 );
- void SETCONST( RscEnum *, Atom, sal_uInt32 );
RscEnum * InitFieldUnitsType();
RscTupel * InitStringLongTupel();
static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel );
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 6fd5070eae33..4ad3c6b522b0 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -53,16 +53,6 @@ void RscTypCont::SETCONST( RscEnum * pClass, const char * szString, sal_uInt32 n
CONSTNAME, nVal ), nVal );
}
-void RscTypCont::SETCONST( RscEnum * pClass, Atom nName, sal_uInt32 nVal )
-{
-#if OSL_DEBUG_LEVEL > 2
- fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName );
-#endif
- pClass->SetConstant( aNmTb.Put( nName,
- CONSTNAME, nVal ), nVal );
-}
-
-
typedef std::unordered_map< OString, sal_uInt32, OStringHash > langmap;
static langmap ULong_Iso_map;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index b21ffdd7a1f2..a468c2129bb5 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -102,16 +102,6 @@ void ControllerItem::RequestUpdate()
mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState.get(), IsEnabled(eState));
}
-void ControllerItem::NotifyFrameContextChange()
-{
- RequestUpdate();
-}
-
-void ControllerItem::ResetFrame()
-{
- mxFrame = nullptr;
-}
-
ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
{
}
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8ef96d78d56d..86b5be7b5146 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -874,26 +874,6 @@ void ResMgr::decStack()
}
}
-#ifdef DBG_UTIL
-
-void ResMgr::TestStack()
-{
- osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
- int upperLimit = nCurStack;
-
- if ( upperLimit < 0 )
- {
- OSL_FAIL( "resource stack underrun!" );
- }
- else if ( upperLimit >= static_cast<int>(aStack.size()) )
- {
- OSL_FAIL( "stack occupation index > allocated stack size" );
- }
-}
-
-#endif
-
bool ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const
{
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 1a4d4c624918..796bb22d0d30 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -72,11 +72,6 @@ public:
BitmapEx & bitmap, bool localized,
const ImageLoadFlags eFlags = ImageLoadFlags::NONE);
- bool loadDefaultImage(
- OUString const & style,
- BitmapEx& bitmap,
- const ImageLoadFlags eFlags = ImageLoadFlags::NONE);
-
/** a crude form of life cycle control (called from DeInitVCL; otherwise,
* if the ImplImageTree singleton were destroyed during exit that would
* be too late for the destructors of the bitmaps in maIconCache)*/
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index b1543c557615..4b1a66a5cf3b 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -443,14 +443,6 @@ const LanguageTag& FormatterBase::GetLanguageTag() const
return mpLocaleDataWrapper->getLanguageTag();
}
-const AllSettings& FormatterBase::GetFieldSettings() const
-{
- if ( mpField )
- return mpField->GetSettings();
- else
- return Application::GetSettings();
-}
-
void FormatterBase::ImplSetText( const OUString& rText, Selection* pNewSelection )
{
if ( mpField )
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index b13fa620b528..508be2cb53f6 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -289,12 +289,6 @@ bool ImplImageTree::loadImage(OUString const & name, OUString const & style, Bit
return false;
}
-bool ImplImageTree::loadDefaultImage(OUString const & style, BitmapEx& bitmap, const ImageLoadFlags eFlags)
-{
- ImageRequestParameters aParameters("res/grafikde.png", style, bitmap, false, eFlags);
- return doLoadImage(aParameters);
-}
-
OUString createVariant(ImageRequestParameters& rParameters)
{
bool bConvertToDarkTheme = rParameters.convertToDarkTheme();
More information about the Libreoffice-commits
mailing list