diff options
| -rw-r--r-- | compilerplugins/clang/unnecessaryvirtual-dead.results | 8 | ||||
| -rw-r--r-- | compilerplugins/clang/unnecessaryvirtual.results | 142 | ||||
| -rw-r--r-- | include/svx/svdundo.hxx | 2 | ||||
| -rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.hxx | 2 |
6 files changed, 69 insertions, 89 deletions
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index 9e99db597dee..5d14653d6cdb 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -2,17 +2,17 @@ basic/source/comp/codegen.cxx:478 void (anonymous namespace)::OffSetAccumulator::start(const unsigned char *,) canvas/inc/base/bufferedgraphicdevicebase.hxx:105 void canvas::BufferedGraphicDeviceBase::destroyBuffers() -canvas/inc/base/graphicdevicebase.hxx:304 +canvas/inc/base/graphicdevicebase.hxx:305 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,) -canvas/inc/base/graphicdevicebase.hxx:317 +canvas/inc/base/graphicdevicebase.hxx:318 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,) include/basegfx/utils/unopolypolygon.hxx:94 void basegfx::unotools::UnoPolyPolygon::modifying()const sc/source/core/opencl/formulagroupcl.cxx:1070 - void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) + void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::basic_stringstream<char> &,) slideshow/source/engine/animationfactory.cxx:616 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() -vcl/inc/salframe.hxx:145 +vcl/inc/salframe.hxx:147 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) vcl/inc/salinst.hxx:201 void SalInstance::releaseMainThread() diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index a88701c51faf..8287b882fbf5 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -128,55 +128,55 @@ canvas/inc/base/disambiguationhelper.hxx:70 void canvas::DisambiguationHelper::disposing() canvas/inc/base/disambiguationhelper.hxx:73 void canvas::DisambiguationHelper::disposing(const struct com::sun::star::lang::EventObject &,) -canvas/inc/base/graphicdevicebase.hxx:133 +canvas/inc/base/graphicdevicebase.hxx:134 void canvas::GraphicDeviceBase::disposeThis() -canvas/inc/base/graphicdevicebase.hxx:144 +canvas/inc/base/graphicdevicebase.hxx:145 class com::sun::star::uno::Reference<class com::sun::star::rendering::XBufferController> canvas::GraphicDeviceBase::getBufferController() -canvas/inc/base/graphicdevicebase.hxx:149 +canvas/inc/base/graphicdevicebase.hxx:150 class com::sun::star::uno::Reference<class com::sun::star::rendering::XColorSpace> canvas::GraphicDeviceBase::getDeviceColorSpace() -canvas/inc/base/graphicdevicebase.hxx:156 +canvas/inc/base/graphicdevicebase.hxx:157 struct com::sun::star::geometry::RealSize2D canvas::GraphicDeviceBase::getPhysicalResolution() -canvas/inc/base/graphicdevicebase.hxx:163 +canvas/inc/base/graphicdevicebase.hxx:164 struct com::sun::star::geometry::RealSize2D canvas::GraphicDeviceBase::getPhysicalSize() -canvas/inc/base/graphicdevicebase.hxx:170 +canvas/inc/base/graphicdevicebase.hxx:171 class com::sun::star::uno::Reference<class com::sun::star::rendering::XLinePolyPolygon2D> canvas::GraphicDeviceBase::createCompatibleLinePolyPolygon(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<struct com::sun::star::geometry::RealPoint2D> > &,) -canvas/inc/base/graphicdevicebase.hxx:177 +canvas/inc/base/graphicdevicebase.hxx:178 class com::sun::star::uno::Reference<class com::sun::star::rendering::XBezierPolyPolygon2D> canvas::GraphicDeviceBase::createCompatibleBezierPolyPolygon(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<struct com::sun::star::geometry::RealBezierSegment2D> > &,) -canvas/inc/base/graphicdevicebase.hxx:184 +canvas/inc/base/graphicdevicebase.hxx:185 class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmap> canvas::GraphicDeviceBase::createCompatibleBitmap(const struct com::sun::star::geometry::IntegerSize2D &,) -canvas/inc/base/graphicdevicebase.hxx:195 +canvas/inc/base/graphicdevicebase.hxx:196 class com::sun::star::uno::Reference<class com::sun::star::rendering::XVolatileBitmap> canvas::GraphicDeviceBase::createVolatileBitmap(const struct com::sun::star::geometry::IntegerSize2D &,) -canvas/inc/base/graphicdevicebase.hxx:206 +canvas/inc/base/graphicdevicebase.hxx:207 class com::sun::star::uno::Reference<class com::sun::star::rendering::XBitmap> canvas::GraphicDeviceBase::createCompatibleAlphaBitmap(const struct com::sun::star::geometry::IntegerSize2D &,) -canvas/inc/base/graphicdevicebase.hxx:217 +canvas/inc/base/graphicdevicebase.hxx:218 class com::sun::star::uno::Reference<class com::sun::star::rendering::XVolatileBitmap> canvas::GraphicDeviceBase::createVolatileAlphaBitmap(const struct com::sun::star::geometry::IntegerSize2D &,) -canvas/inc/base/graphicdevicebase.hxx:228 +canvas/inc/base/graphicdevicebase.hxx:229 class com::sun::star::uno::Reference<class com::sun::star::lang::XMultiServiceFactory> canvas::GraphicDeviceBase::getParametricPolyPolygonFactory() -canvas/inc/base/graphicdevicebase.hxx:233 +canvas/inc/base/graphicdevicebase.hxx:234 unsigned char canvas::GraphicDeviceBase::hasFullScreenMode() -canvas/inc/base/graphicdevicebase.hxx:238 +canvas/inc/base/graphicdevicebase.hxx:239 unsigned char canvas::GraphicDeviceBase::enterFullScreenMode(unsigned char,) -canvas/inc/base/graphicdevicebase.hxx:244 +canvas/inc/base/graphicdevicebase.hxx:245 class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> canvas::GraphicDeviceBase::createInstance(const class rtl::OUString &,) -canvas/inc/base/graphicdevicebase.hxx:252 +canvas/inc/base/graphicdevicebase.hxx:253 class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> canvas::GraphicDeviceBase::createInstanceWithArguments(const class rtl::OUString &,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,) -canvas/inc/base/graphicdevicebase.hxx:260 +canvas/inc/base/graphicdevicebase.hxx:261 class com::sun::star::uno::Sequence<class rtl::OUString> canvas::GraphicDeviceBase::getAvailableServiceNames() -canvas/inc/base/graphicdevicebase.hxx:267 +canvas/inc/base/graphicdevicebase.hxx:268 void canvas::GraphicDeviceBase::update() -canvas/inc/base/graphicdevicebase.hxx:277 +canvas/inc/base/graphicdevicebase.hxx:278 class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySetInfo> canvas::GraphicDeviceBase::getPropertySetInfo() -canvas/inc/base/graphicdevicebase.hxx:283 +canvas/inc/base/graphicdevicebase.hxx:284 void canvas::GraphicDeviceBase::setPropertyValue(const class rtl::OUString &,const class com::sun::star::uno::Any &,) -canvas/inc/base/graphicdevicebase.hxx:290 +canvas/inc/base/graphicdevicebase.hxx:291 class com::sun::star::uno::Any canvas::GraphicDeviceBase::getPropertyValue(const class rtl::OUString &,) -canvas/inc/base/graphicdevicebase.hxx:296 +canvas/inc/base/graphicdevicebase.hxx:297 void canvas::GraphicDeviceBase::addPropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,) -canvas/inc/base/graphicdevicebase.hxx:304 +canvas/inc/base/graphicdevicebase.hxx:305 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,) -canvas/inc/base/graphicdevicebase.hxx:309 +canvas/inc/base/graphicdevicebase.hxx:310 void canvas::GraphicDeviceBase::addVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,) -canvas/inc/base/graphicdevicebase.hxx:317 +canvas/inc/base/graphicdevicebase.hxx:318 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,) canvas/inc/base/integerbitmapbase.hxx:43 class com::sun::star::uno::Sequence<signed char> canvas::IntegerBitmapBase::getData(struct com::sun::star::rendering::IntegerBitmapLayout &,const struct com::sun::star::geometry::IntegerRectangle2D &,) @@ -232,11 +232,11 @@ extensions/source/propctrlr/commoncontrol.hxx:139 void pcr::CommonBehaviourControl::notifyModifiedValue() extensions/source/propctrlr/commoncontrol.hxx:154 void pcr::CommonBehaviourControl::disposing() -forms/source/xforms/datatypes.hxx:234 +forms/source/xforms/datatypes.hxx:215 class cppu::IPropertyArrayHelper * xforms::ODerivedDataType::createArrayHelper()const -forms/source/xforms/datatypes.hxx:237 +forms/source/xforms/datatypes.hxx:218 class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySetInfo> xforms::ODerivedDataType::getPropertySetInfo() -forms/source/xforms/datatypes.hxx:238 +forms/source/xforms/datatypes.hxx:219 class cppu::IPropertyArrayHelper & xforms::ODerivedDataType::getInfoHelper() forms/source/xforms/namedcollection.hxx:81 class com::sun::star::uno::Type NamedCollection::getElementType() @@ -260,14 +260,6 @@ include/comphelper/unique_disposing_ptr.hxx:169 void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,) include/comphelper/weakeventlistener.hxx:120 void comphelper::OWeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,) -include/sfx2/thumbnailview.hxx:196 - _Bool ThumbnailView::isDrawMnemonic()const -include/sfx2/thumbnailview.hxx:259 - class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> ThumbnailView::getAccessible() -include/sfx2/thumbnailview.hxx:285 - unsigned short ThumbnailView::ImplGetVisibleItemCount()const -include/sfx2/thumbnailview.hxx:286 - class ThumbnailViewItem * ThumbnailView::ImplGetVisibleItem(unsigned short,) include/svl/svdde.hxx:236 class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) include/svl/svdde.hxx:237 @@ -280,8 +272,8 @@ include/svl/svdde.hxx:243 _Bool DdeTopic::StartAdviseLoop() include/svl/svdde.hxx:300 void DdeService::~DdeService() -include/svx/svdpage.hxx:122 - void SdrObjList::SetExistingObjectOrdNum(class SdrObject *,unsigned long,) +include/svx/svdundo.hxx:753 + class std::unique_ptr<class SdrUndoAction> SdrUndoFactory::CreateUndoSort(class SdrPage &,const class std::vector<int> &,) include/vbahelper/vbacollectionimpl.hxx:289 int ScVbaCollectionBase::getCount() include/vbahelper/vbacollectionimpl.hxx:294 @@ -308,14 +300,16 @@ include/vcl/customweld.hxx:45 class rtl::OUString weld::CustomWidgetController::GetHelpText()const include/vcl/weld.hxx:104 void weld::Widget::set_visible(_Bool,) +jvmfwk/inc/vendorbase.hxx:157 + _Bool jfw_plugin::VendorBase::initialize(const class std::vector<struct std::pair<class rtl::OUString, class rtl::OUString> > &,) sc/source/core/opencl/formulagroupcl.cxx:1062 _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction()const sc/source/core/opencl/formulagroupcl.cxx:1070 - void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) + void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::basic_stringstream<char> &,) sc/source/core/opencl/formulagroupcl.cxx:1353 - void sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) + void sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowFunction(class std::basic_stringstream<char> &,) sc/source/core/opencl/formulagroupcl.cxx:1355 - class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const + class std::basic_string<char> sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const sc/source/core/opencl/formulagroupcl.cxx:1369 unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *,) sc/source/ui/vba/vbacondition.hxx:40 @@ -408,29 +402,31 @@ sw/inc/flypos.hxx:37 void SwPosFlyFrame::~SwPosFlyFrame() toolkit/inc/controls/geometrycontrolmodel.hxx:185 void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const +ucb/source/ucp/webdav-curl/DAVTypes.hxx:96 + void http_dav_ucp::DAVOptions::~DAVOptions() vcl/inc/jsdialog/jsdialogbuilder.hxx:151 void JSDialogSender::sendFullUpdate(_Bool,) vcl/inc/jsdialog/jsdialogbuilder.hxx:154 - void JSDialogSender::sendAction(class VclPtr<class vcl::Window>,class std::unique_ptr<class std::__debug::unordered_map<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, class rtl::OUString, struct std::hash<std::string>, struct std::equal_to<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > >, class std::allocator<struct std::pair<const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, class rtl::OUString> > >, struct std::default_delete<class std::__debug::unordered_map<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, class rtl::OUString, struct std::hash<std::string>, struct std::equal_to<class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > >, class std::allocator<struct std::pair<const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >, class rtl::OUString> > > > >,) + void JSDialogSender::sendAction(class VclPtr<class vcl::Window>,class std::unique_ptr<class std::unordered_map<class std::basic_string<char>, class rtl::OUString> >,) vcl/inc/jsdialog/jsdialogbuilder.hxx:155 void JSDialogSender::sendPopup(class VclPtr<class vcl::Window>,class rtl::OUString,class rtl::OUString,) vcl/inc/jsdialog/jsdialogbuilder.hxx:156 void JSDialogSender::sendClosePopup(unsigned int,) -vcl/inc/jsdialog/jsdialogbuilder.hxx:339 +vcl/inc/jsdialog/jsdialogbuilder.hxx:341 void JSWidget::show() -vcl/inc/jsdialog/jsdialogbuilder.hxx:351 +vcl/inc/jsdialog/jsdialogbuilder.hxx:353 void JSWidget::hide() -vcl/inc/jsdialog/jsdialogbuilder.hxx:364 +vcl/inc/jsdialog/jsdialogbuilder.hxx:366 void JSWidget::set_sensitive(_Bool,) -vcl/inc/jsdialog/jsdialogbuilder.hxx:372 +vcl/inc/jsdialog/jsdialogbuilder.hxx:374 class com::sun::star::uno::Reference<class com::sun::star::datatransfer::dnd::XDropTarget> JSWidget::get_drop_target() -vcl/inc/jsdialog/jsdialogbuilder.hxx:380 +vcl/inc/jsdialog/jsdialogbuilder.hxx:382 void JSWidget::freeze() -vcl/inc/jsdialog/jsdialogbuilder.hxx:386 +vcl/inc/jsdialog/jsdialogbuilder.hxx:388 void JSWidget::thaw() -vcl/inc/salframe.hxx:145 +vcl/inc/salframe.hxx:147 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) -vcl/inc/salframe.hxx:194 +vcl/inc/salframe.hxx:196 void SalFrame::Flush(const class tools::Rectangle &,) vcl/inc/salinst.hxx:94 _Bool SalInstance::SVMainHook(int *,) @@ -442,48 +438,32 @@ vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) vcl/inc/salprn.hxx:116 enum SalPrinterError SalPrinter::GetErrorCode() -vcl/inc/salvtables.hxx:1596 +vcl/inc/salvtables.hxx:1603 _Bool SalInstanceTreeView::get_iter_abs_pos(class weld::TreeIter &,int,)const -vcl/inc/skia/gdiimpl.hxx:228 +vcl/inc/skia/gdiimpl.hxx:229 void SkiaSalGraphicsImpl::createSurface() -vcl/inc/skia/gdiimpl.hxx:238 +vcl/inc/skia/gdiimpl.hxx:239 void SkiaSalGraphicsImpl::flushSurfaceToWindowContext() -vcl/inc/unx/gtk/gtkdata.hxx:328 +vcl/inc/skia/gdiimpl.hxx:262 + int SkiaSalGraphicsImpl::getWindowScaling()const +vcl/inc/unx/gtk/gtkdata.hxx:335 int GtkSalDisplay::CaptureMouse(class SalFrame *,) vcl/inc/unx/saldata.hxx:50 void X11SalData::Init() -vcl/inc/unx/saldisp.hxx:181 - void SalXLib::~SalXLib() -vcl/inc/unx/saldisp.hxx:182 - void SalXLib::Init() -vcl/inc/unx/saldisp.hxx:184 - _Bool SalXLib::Yield(_Bool,_Bool,) -vcl/inc/unx/saldisp.hxx:185 - void SalXLib::Wakeup() -vcl/inc/unx/saldisp.hxx:188 - void SalXLib::Insert(int,void *,int (*)(int, void *),int (*)(int, void *),int (*)(int, void *),) -vcl/inc/unx/saldisp.hxx:192 - void SalXLib::Remove(int,) -vcl/inc/unx/saldisp.hxx:194 - void SalXLib::StartTimer(unsigned long,) -vcl/inc/unx/saldisp.hxx:195 - void SalXLib::StopTimer() -vcl/inc/unx/saldisp.hxx:197 - _Bool SalXLib::CheckTimeout(_Bool,) -vcl/inc/unx/saldisp.hxx:404 +vcl/inc/unx/saldisp.hxx:405 void SalX11Display::Yield() vcl/inc/unx/salframe.h:208 void X11SalFrame::updateGraphics(_Bool,) vcl/inc/unx/salinst.h:41 class SalX11Display * X11SalInstance::CreateDisplay()const -workdir/../vcl/inc/qt5/Qt5Frame.hxx:155 - void Qt5Frame::registerDragSource(class Qt5DragSource *,) -workdir/../vcl/inc/qt5/Qt5Frame.hxx:156 - void Qt5Frame::deregisterDragSource(const class Qt5DragSource *,) -workdir/../vcl/inc/qt5/Qt5Frame.hxx:157 - void Qt5Frame::registerDropTarget(class Qt5DropTarget *,) -workdir/../vcl/inc/qt5/Qt5Frame.hxx:158 - void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *,) +workdir/../vcl/inc/qt5/QtFrame.hxx:158 + void QtFrame::registerDragSource(class QtDragSource *,) +workdir/../vcl/inc/qt5/QtFrame.hxx:159 + void QtFrame::deregisterDragSource(const class QtDragSource *,) +workdir/../vcl/inc/qt5/QtFrame.hxx:160 + void QtFrame::registerDropTarget(class QtDropTarget *,) +workdir/../vcl/inc/qt5/QtFrame.hxx:161 + void QtFrame::deregisterDropTarget(const class QtDropTarget *,) writerfilter/source/dmapper/TableManager.hxx:492 void writerfilter::dmapper::TableManager::tableExceptionProps(const class tools::SvRef<class writerfilter::dmapper::TablePropertyMap> &,) writerfilter/source/ooxml/OOXMLFactory.hxx:66 diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 5bb4e26c1a43..a6cf4b497212 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -750,7 +750,7 @@ public: virtual std::unique_ptr<SdrUndoAction> CreateUndoNewPage(SdrPage& rPage); virtual std::unique_ptr<SdrUndoAction> CreateUndoCopyPage(SdrPage& rPage); virtual std::unique_ptr<SdrUndoAction> CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); - virtual std::unique_ptr<SdrUndoAction> CreateUndoSort(SdrPage& rPage, ::std::vector<sal_Int32> const& rSortOrder); + static std::unique_ptr<SdrUndoAction> CreateUndoSort(SdrPage& rPage, ::std::vector<sal_Int32> const& rSortOrder); // Master page virtual std::unique_ptr<SdrUndoAction> CreateUndoPageRemoveMasterPage(SdrPage& rChangedPage); diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index 4a0190eb0bb8..779fc8f7a46f 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -154,7 +154,7 @@ protected: false - the object could not completely initialize. In this case it will be discarded by the caller. */ - virtual bool initialize(const std::vector<std::pair<OUString, OUString>>& props); + bool initialize(const std::vector<std::pair<OUString, OUString>>& props); /* returns relative file URLs to the runtime library. For example "/bin/client/jvm.dll" diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 334bde8e5450..99c6ab9d3185 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -718,7 +718,7 @@ void SdrObjList::sort( std::vector<sal_Int32>& sortOrder) bool const isUndo(rModel.IsUndoEnabled()); if (isUndo) { - rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoSort(*getSdrPageFromSdrObjList(), sortOrder)); + rModel.AddUndo(SdrUndoFactory::CreateUndoSort(*getSdrPageFromSdrObjList(), sortOrder)); } for (size_t i = 0; i < aNewSortOrder.size(); ++i) diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx b/ucb/source/ucp/webdav-curl/DAVTypes.hxx index ae3e5a076f60..e57e1f480fd7 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx @@ -93,7 +93,7 @@ namespace http_dav_ucp DAVOptions( const DAVOptions & rOther ); - virtual ~DAVOptions(); + ~DAVOptions(); bool isClass1() const { return m_isClass1; }; void setClass1( bool Class1 = true ) { m_isClass1 = Class1; }; |