diff options
45 files changed, 76 insertions, 1258 deletions
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 6af3710f63bf..caca2e63d579 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -22,14 +22,32 @@ desktop/inc/lib/init.hxx:45 _Bool desktop::CallbackFlushHandler::isEventLatchOn() const desktop/inc/lib/init.hxx:47 _Bool desktop::CallbackFlushHandler::isPartTilePainting() const -drawinglayer/source/tools/emfpbrush.hxx:123 - unsigned int emfplushelper::EMFPBrush::GetType() const drawinglayer/source/tools/emfpcustomlinecap.hxx:37 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) -drawinglayer/source/tools/emfppen.hxx:62 - void emfplushelper::EMFPPen::SetStrokeWidth(struct com::sun::star::rendering::StrokeAttributes &,struct emfplushelper::EmfPlusHelperData &,const class basegfx::B2DHomMatrix &) +drawinglayer/source/tools/emfpfont.hxx:38 + _Bool emfplushelper::EMFPFont::Underline() +drawinglayer/source/tools/emfpfont.hxx:39 + _Bool emfplushelper::EMFPFont::Strikeout() drawinglayer/source/tools/emfppen.hxx:64 + void emfplushelper::EMFPPen::SetStrokeWidth(struct com::sun::star::rendering::StrokeAttributes &,struct emfplushelper::EmfPlusHelperData &,const class basegfx::B2DHomMatrix &) +drawinglayer/source/tools/emfppen.hxx:66 void emfplushelper::EMFPPen::SetStrokeAttributes(struct com::sun::star::rendering::StrokeAttributes &) +drawinglayer/source/tools/emfpstringformat.hxx:51 + _Bool emfplushelper::EMFPStringFormat::NoFitBlackBox() +drawinglayer/source/tools/emfpstringformat.hxx:52 + _Bool emfplushelper::EMFPStringFormat::DisplayFormatControl() +drawinglayer/source/tools/emfpstringformat.hxx:53 + _Bool emfplushelper::EMFPStringFormat::NoFontFallback() +drawinglayer/source/tools/emfpstringformat.hxx:54 + _Bool emfplushelper::EMFPStringFormat::MeasureTrailingSpaces() +drawinglayer/source/tools/emfpstringformat.hxx:55 + _Bool emfplushelper::EMFPStringFormat::NoWrap() +drawinglayer/source/tools/emfpstringformat.hxx:56 + _Bool emfplushelper::EMFPStringFormat::LineLimit() +drawinglayer/source/tools/emfpstringformat.hxx:57 + _Bool emfplushelper::EMFPStringFormat::NoClip() +drawinglayer/source/tools/emfpstringformat.hxx:58 + _Bool emfplushelper::EMFPStringFormat::BypassGDI() include/basegfx/pixel/bpixel.hxx:57 basegfx::BPixel::BPixel(unsigned char,unsigned char,unsigned char,unsigned char) include/basegfx/polygon/b3dpolypolygon.hxx:109 @@ -128,10 +146,6 @@ include/desktop/crashreport.hxx:50 void CrashReporter::storeExceptionHandler(class google_breakpad::ExceptionHandler *) include/desktop/crashreport.hxx:54 void CrashReporter::updateMinidumpLocation() -include/editeng/svxrtf.hxx:255 - struct com::sun::star::util::DateTime SvxRTFParser::GetDateTimeStamp() -include/editeng/svxrtf.hxx:256 - class rtl::OUString & SvxRTFParser::GetTextToEndGroup(class rtl::OUString &) include/filter/msfilter/mstoolbar.hxx:98 Indent::Indent(_Bool) include/i18nlangtag/languagetag.hxx:257 @@ -192,10 +206,6 @@ include/o3tl/typed_flags_set.hxx:348 typename typed_flags<type-parameter-?-?>::Self operator^=(type-parameter-?-? &,typename typed_flags<type-parameter-?-?>::Wrap) include/o3tl/vector_pool.hxx:83 o3tl::detail::struct_from_value::type::type() -include/oox/core/binarycodec.hxx:119 - _Bool oox::core::BinaryCodec_XOR::skip(int) -include/oox/core/binarycodec.hxx:230 - _Bool oox::core::BinaryCodec_RCF::decode(unsigned char *,const unsigned char *,int) include/oox/helper/containerhelper.hxx:99 oox::Matrix::Matrix<Type>(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::const_reference) include/oox/helper/containerhelper.hxx:117 @@ -214,14 +224,12 @@ include/oox/helper/propertymap.hxx:114 void oox::PropertyMap::dumpData(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &) include/opencl/OpenCLZone.hxx:42 _Bool OpenCLZone::isInInitialTest() +include/sfx2/lokcharthelper.hxx:41 + void LokChartHelper::Invalidate() include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const -include/svl/itempool.hxx:210 +include/svl/itempool.hxx:181 void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const -include/svl/macitem.hxx:97 - class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const enum SvMacroItemId, class SvxMacro> >, class std::__debug::map<enum SvMacroItemId, class SvxMacro, struct std::less<enum SvMacroItemId>, class std::allocator<struct std::pair<const enum SvMacroItemId, class SvxMacro> > > > SvxMacroTableDtor::begin() const -include/svl/macitem.hxx:99 - class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const enum SvMacroItemId, class SvxMacro> >, class std::__debug::map<enum SvMacroItemId, class SvxMacro, struct std::less<enum SvMacroItemId>, class std::allocator<struct std::pair<const enum SvMacroItemId, class SvxMacro> > > > SvxMacroTableDtor::end() const include/tools/bigint.hxx:94 BigInt::BigInt(unsigned short) include/tools/bigint.hxx:103 @@ -250,10 +258,6 @@ include/tools/datetime.hxx:93 class DateTime operator-(const class DateTime &,const class tools::Time &) include/tools/fract.hxx:74 _Bool operator>=(const class Fraction &,const class Fraction &) -include/tools/unqidx.hxx:44 - void * UniqueIndexImpl::Remove(struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType>) -include/tools/unqidx.hxx:47 - struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType> UniqueIndexImpl::GetIndexOf(const void *) const include/unotest/assertion_traits.hxx:25 _Bool CppUnit::assertion_traits::equal(signed char,signed char) include/unotest/assertion_traits.hxx:27 @@ -266,10 +270,8 @@ include/vcl/opengl/OpenGLContext.hxx:99 void OpenGLContext::UseNoProgram() include/vcl/opengl/OpenGLHelper.hxx:93 void OpenGLHelper::debugMsgStreamWarn(const class std::basic_ostringstream<char> &) -include/vcl/pdfwriter.hxx:566 +include/vcl/pdfwriter.hxx:565 vcl::PDFWriter::PDFSignContext::PDFSignContext(class rtl::OStringBuffer &) -include/vcl/pdfwriter.hxx:1235 - _Bool vcl::PDFWriter::Sign(struct vcl::PDFWriter::PDFSignContext &) include/vcl/svapp.hxx:168 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) include/vcl/syswin.hxx:193 @@ -292,20 +294,22 @@ sc/inc/columniterator.hxx:74 int sc::ColumnIterator::getType() const sc/inc/compressedarray.hxx:158 ScBitMaskCompressedArray::ScBitMaskCompressedArray<A, D>(type-parameter-?-?,const type-parameter-?-? *,unsigned long) +sc/inc/datamapper.hxx:79 + void sc::ExternalDataSource::setUpdateFrequency(double) sc/inc/dpfilteredcache.hxx:144 void ScDPFilteredCache::dump() const sc/inc/formulacell.hxx:443 void ScFormulaCell::Dump() const sc/inc/formulagroup.hxx:140 void sc::FormulaGroupInterpreter::enableOpenCL_UnitTestsOnly() +sc/inc/formulagroup.hxx:141 + void sc::FormulaGroupInterpreter::disableOpenCL_UnitTestsOnly() sc/inc/postit.hxx:47 ScCaptionPtr::ScCaptionPtr(class SdrCaptionObj *) sc/inc/scdll.hxx:42 ScDLL::ScDLL() sc/inc/table.hxx:293 _Bool ScTable::IsColRowTabValid(short,int,short) const -sc/inc/userdat.hxx:57 - ScIMapInfo::ScIMapInfo() sc/inc/userlist.hxx:86 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > > ScUserList::begin() const sc/qa/unit/helper/qahelper.hxx:201 @@ -356,28 +360,24 @@ sc/source/core/opencl/opbase.hxx:121 void sc::opencl::DynamicKernelArgument::GenStringDeclRef(class std::basic_stringstream<char> &) const sc/source/filter/inc/tokstack.hxx:216 _Bool TokenPool::GrowTripel(unsigned short) -sc/source/ui/inc/dataprovider.hxx:115 +sc/source/ui/inc/dataprovider.hxx:72 + _Bool sc::CSVFetchThread::IsRequestedTerminate() +sc/source/ui/inc/dataprovider.hxx:73 void sc::CSVFetchThread::Terminate() -sc/source/ui/inc/dataprovider.hxx:117 - 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:134 - class ScRange sc::DataProvider::GetRange() const -sc/source/ui/inc/dataprovider.hxx:135 +sc/source/ui/inc/dataprovider.hxx:74 + void sc::CSVFetchThread::EndThread() +sc/source/ui/inc/dataprovider.hxx:98 const class rtl::OUString & sc::DataProvider::GetURL() const -sc/source/ui/inc/dataprovider.hxx:159 - struct sc::Line sc::CSVDataProvider::GetLine() -sc/source/ui/inc/dataprovider.hxx:183 - void sc::ScDBDataManager::SetDatabase(class ScDBData *) -sc/source/ui/inc/dataprovider.hxx:188 - class ScRange & sc::ScDBDataManager::GetSourceRange() +sc/source/ui/inc/dataprovider.hxx:100 + class std::__debug::map<class rtl::OUString, class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class rtl::OUString> > > sc::DataProvider::getDataSourcesForURL(const class rtl::OUString &) +sc/source/ui/inc/dataprovider.hxx:151 + void sc::ScDBDataManager::AddDataTransformation(class std::shared_ptr<class sc::DataTransformation>) +sc/source/ui/inc/datatransformation.hxx:75 + sc::SortTransformation::SortTransformation(const struct ScSortParam &) 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 char *,const class boost::optional<signed char>) -sc/source/ui/inc/undobase.hxx:118 - void ScMultiBlockUndo::AdjustHeight() -sd/inc/imapinfo.hxx:34 - SdIMapInfo::SdIMapInfo() sd/inc/sddll.hxx:50 SdDLL::SdDLL() sd/source/filter/ppt/pptinanimations.hxx:109 @@ -422,8 +422,6 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:180 void OGLTransitionImpl::finish(double,double,double,double,double) slideshow/source/inc/shapeattributelayer.hxx:391 void slideshow::internal::ShapeAttributeLayer::setCharRotationAngle(const double &) -starmath/inc/smmod.hxx:56 - SmLocalizedSymbolData::SmLocalizedSymbolData() sw/inc/dbgoutsw.hxx:53 const char * dbg_out(const void *) sw/inc/dbgoutsw.hxx:55 @@ -455,7 +453,7 @@ sw/inc/dbgoutsw.hxx:69 sw/inc/dbgoutsw.hxx:70 const char * dbg_out(const class SwUndo &) sw/inc/dbgoutsw.hxx:71 - const char * dbg_out(class SwOutlineNodes &) + const char * dbg_out(const class SwOutlineNodes &) sw/inc/dbgoutsw.hxx:72 const char * dbg_out(const class SwNumRule &) sw/inc/dbgoutsw.hxx:73 @@ -496,13 +494,13 @@ sw/inc/pagedesc.hxx:427 class SwPageDesc *const & SwPageDescs::back() const sw/inc/ring.hxx:204 sw::RingIterator::RingIterator<value_type>() -sw/inc/swatrset.hxx:236 +sw/inc/swatrset.hxx:227 const class SvxNoHyphenItem & SwAttrSet::GetNoHyphenHere(_Bool) const sw/inc/swrect.hxx:105 class SvStream & WriteSwRect(class SvStream &,const class SwRect &) 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:5067 +sw/qa/extras/uiwriter/uiwriter.cxx:5181 int main() sw/source/core/inc/frame.hxx:1184 class Size SwRectFnSet::GetSize(const class SwRect &) const @@ -552,7 +550,7 @@ vcl/inc/salmenu.hxx:46 SalMenuButtonItem::SalMenuButtonItem() vcl/inc/salwtype.hxx:114 SalMenuEvent::SalMenuEvent() -vcl/inc/schedulerimpl.hxx:35 +vcl/inc/schedulerimpl.hxx:37 const char * ImplSchedulerData::GetDebugName() const vcl/inc/unx/glyphcache.hxx:71 void GlyphCache::ClearFontOptions() @@ -586,9 +584,9 @@ workdir/LexTarget/l10ntools/source/cfglex.cxx:3736 void YYWarning(const char *) 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 writerfilter/source/ooxml/OOXMLPropertySet.hxx:161 + 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 +writerfilter/source/ooxml/OOXMLPropertySet.hxx:162 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::end() const xmlsecurity/source/gpg/XMLEncryption.hxx:27 XMLEncryptionGpg::XMLEncryptionGpg() diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 754ce021d86c..8af384f43f06 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -28,7 +28,7 @@ chart2/source/view/main/OpenGLRender.hxx:104 int OpenGLRender::RenderSymbol2DShape(float,float,int) chart2/source/view/main/OpenGLRender.hxx:121 int OpenGLRender::Create2DCircle(int) -connectivity/source/drivers/evoab2/NResultSet.hxx:125 +connectivity/source/drivers/evoab2/NResultSet.hxx:123 class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> connectivity::evoab::OEvoabResultSet::operator*() connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51 class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSetMetaData> connectivity::evoab::OEvoabResultSetMetaData::operator Reference() @@ -40,7 +40,9 @@ connectivity/source/inc/OColumn.hxx:133 const class rtl::OUString & connectivity::OColumn::getCatalogName() const connectivity/source/inc/odbc/OConnection.hxx:82 short connectivity::odbc::OConnection::Construct(const class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &) -dbaccess/source/ui/browser/genericcontroller.cxx:1266 +cppcanvas/source/inc/canvasgraphichelper.hxx:59 + const class com::sun::star::uno::Reference<class com::sun::star::rendering::XGraphicDevice> & cppcanvas::internal::CanvasGraphicHelper::getGraphicDevice() const +dbaccess/source/ui/browser/genericcontroller.cxx:1258 const type-parameter-?-? & dbaui::(anonymous namespace)::SGI_identity::operator()(const type-parameter-?-? &) const i18nlangtag/source/languagetag/languagetag.cxx:275 const class rtl::OUString & LanguageTagImpl::getBcp47() const @@ -140,7 +142,7 @@ include/comphelper/unique_disposing_ptr.hxx:45 type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const include/connectivity/FValue.hxx:327 unsigned short connectivity::ORowSetValue::operator unsigned short() const -include/editeng/editview.hxx:191 +include/editeng/editview.hxx:219 class ErrCode EditView::Read(class SvStream &,enum EETextFormat,class SvKeyValueIterator *) include/LibreOfficeKit/LibreOfficeKit.hxx:63 struct _LibreOfficeKitDocument * lok::Document::get() @@ -246,6 +248,12 @@ include/sax/fshelper.hxx:206 class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(long) include/sax/fshelper.hxx:209 class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::writeEscaped(const char *) +include/svl/macitem.hxx:92 + class SvStream & SvxMacroTableDtor::Write(class SvStream &) const +include/svl/poolitem.hxx:171 + class SvStream & SfxPoolItem::Store(class SvStream &,unsigned short) const +include/svx/framelink.hxx:157 + class svx::frame::Style & svx::frame::Style::MirrorSelf() include/test/sheet/xnamedrange.hxx:22 class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XNamedRange::init() include/test/sheet/xsheetannotation.hxx:36 @@ -254,6 +262,8 @@ include/test/sheet/xspreadsheets2.hxx:40 class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> apitest::XSpreadsheets2::getComponent() include/test/sheet/xstyleloader.hxx:27 class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> apitest::XStyleLoader::getTargetComponent() +include/test/sheet/xusedareacursor.hxx:25 + class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XUsedAreaCursor::init() include/tools/bigint.hxx:114 unsigned short BigInt::operator unsigned short() const include/tools/bigint.hxx:115 @@ -266,7 +276,7 @@ include/vcl/fontcharmap.hxx:48 class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool) include/vcl/gdimtf.hxx:185 class SvStream & GDIMetaFile::Read(class SvStream &) -include/vcl/graphicfilter.hxx:259 +include/vcl/graphicfilter.hxx:258 class ErrCode GraphicFilter::ExportGraphic(const class Graphic &,const class INetURLObject &,unsigned short,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *) include/vcl/menu.hxx:460 unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &) @@ -280,9 +290,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:2213 +sc/source/core/tool/scmatrix.cxx:2217 type-parameter-?-? * wrapped_iterator::operator->() const -sc/source/core/tool/scmatrix.cxx:3179 +sc/source/core/tool/scmatrix.cxx:3183 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() @@ -316,7 +326,7 @@ sc/source/ui/vba/vbaformat.hxx:145 class com::sun::star::uno::Any ScVbaFormat::getMergeCells() sc/source/ui/vba/vbaformat.hxx:151 class com::sun::star::uno::Any ScVbaFormat::getReadingOrder() -sd/source/filter/eppt/pptx-epptooxml.cxx:126 +sd/source/filter/eppt/pptx-epptooxml.cxx:131 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/inc/OutlineViewShell.hxx:114 class ErrCode sd::OutlineViewShell::ReadRtf(class SvStream &) @@ -328,7 +338,7 @@ sw/inc/calc.hxx:112 class SwSbxValue & SwSbxValue::MakeDouble() sw/inc/editsh.hxx:617 const class GraphicAttr * SwEditShell::GetGraphicAttr(class GraphicAttr &) const -sw/source/uibase/inc/fldmgr.hxx:114 +sw/source/uibase/inc/fldmgr.hxx:113 const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const vcl/inc/PhysicalFontFace.hxx:79 int PhysicalFontFace::GetWidth() const diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index cbcb9ce9215c..138a10e557a0 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -821,13 +821,6 @@ OUString SvxExtFileField::GetFormatted() const SV_IMPL_PERSIST1( SvxAuthorField ); -SvxAuthorField::SvxAuthorField() -{ - eType = SVXAUTHORTYPE_VAR; - eFormat = SVXAUTHORFORMAT_FULLNAME; -} - - SvxAuthorField::SvxAuthorField( const OUString& rFirstName, const OUString& rLastName, const OUString& rShortName, diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index afafedb69b40..d4962fb2ff9c 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -345,7 +345,6 @@ private: public: SV_DECL_PERSIST1( SvxAuthorField, css::text::textfield::Type::AUTHOR ) - SvxAuthorField(); SvxAuthorField( const OUString& rFirstName, const OUString& rLastName, diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index 844a1c90b1c1..f29ae7e9f314 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -41,7 +41,6 @@ class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData { SdrMeasureFieldKind eMeasureFieldKind; public: SV_DECL_PERSIST1(SdrMeasureField, css::text::textfield::Type::MEASURE) - SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {} SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {} virtual ~SdrMeasureField() override; virtual SvxFieldData* Clone() const override; diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index bc6c12bf36f6..0d3a253ad9bf 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -43,203 +43,6 @@ namespace CodecHelper } -/** Encodes and decodes data from/to protected MS Office documents. - - Implements a simple XOR encoding/decoding algorithm used in MS Excel Office - versions up to MSO 95. - */ -class OOX_DLLPUBLIC BinaryCodec_XOR -{ -public: - /** Default constructor. - - Two-step construction in conjunction with the initKey() and verifyKey() - functions allows to try to initialize with different passwords (e.g. - built-in default password used for Excel workbook protection). - */ - explicit BinaryCodec_XOR(); - - ~BinaryCodec_XOR(); - - /** Initializes the algorithm with the specified password. - - @param pnPassData - Character array containing the password. Must be zero terminated, - which results in a maximum length of 15 characters. - */ - void initKey( const sal_uInt8 pnPassData[ 16 ] ); - - /** Initializes the algorithm with the encryption data. - - @param aData - The sequence contains the necessary data to initialize - the codec. - */ - bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData ); - - /** Retrieves the encryption data - - @return - The sequence contains the necessary data to initialize - the codec. - */ - css::uno::Sequence< css::beans::NamedValue > getEncryptionData(); - - /** Verifies the validity of the password using the passed key and hash. - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param nKey - Password key value read from the file. - @param nHash - Password hash value read from the file. - - @return - True = test was successful. - */ - bool verifyKey( sal_uInt16 nKey, sal_uInt16 nHash ) const; - - /** Lets the cipher skip a specific amount of bytes. - - This function sets the cipher to the same state as if the specified - amount of data has been decoded with one or more calls of decode(). - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param nBytes - Number of bytes to be skipped (cipher "seeks" forward). - - @return - True = skip was successful (no error occurred). - */ - bool skip( sal_Int32 nBytes ); - -private: - sal_uInt8 mpnKey[ 16 ]; ///< Encryption key. - sal_Int32 mnOffset; ///< Key offset. - sal_uInt16 mnBaseKey; ///< Base key from password. - sal_uInt16 mnHash; ///< Hash value from password. -}; - - -/** Encodes and decodes data from protected MSO 97+ documents. - - This is a wrapper class around low level cryptographic functions from RTL. - Implementation is based on the wvDecrypt package by Caolan McNamara: - http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html - */ -class OOX_DLLPUBLIC BinaryCodec_RCF -{ -public: - /** Default constructor. - - Two-step construction in conjunction with the initKey() and verifyKey() - functions allows to try to initialize with different passwords (e.g. - built-in default password used for Excel workbook protection). - */ - explicit BinaryCodec_RCF(); - - ~BinaryCodec_RCF(); - - /** Initializes the algorithm with the encryption data. - - @param aData - The sequence contains the necessary data to initialize - the codec. - */ - bool initCodec( const css::uno::Sequence< css::beans::NamedValue >& aData ); - - /** Retrieves the encryption data - - @return - The sequence contains the necessary data to initialize - the codec. - */ - css::uno::Sequence< css::beans::NamedValue > getEncryptionData(); - - /** Initializes the algorithm with the specified password and document ID. - - @param pnPassData - Unicode character array containing the password. Must be zero - terminated, which results in a maximum length of 15 characters. - @param pnSalt - Random salt data block read from or written to the file. - */ - void initKey( - const sal_uInt16 pnPassData[ 16 ], - const sal_uInt8 pnSalt[ 16 ] ); - - /** Verifies the validity of the password using the passed salt data. - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param pnVerifier - Verifier block read from the file. - @param pnVerifierHash - Verifier hash read from the file. - - @return - True = test was successful. - */ - bool verifyKey( - const sal_uInt8 pnVerifier[ 16 ], - const sal_uInt8 pnVerifierHash[ 16 ] ); - - /** Rekeys the codec using the specified counter. - - After reading a specific amount of data the cipher algorithm needs to - be rekeyed using a counter that counts the data blocks. - - The block size is for example 512 bytes for MS Word files and 1024 - bytes for MS Excel files. - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param nCounter - Block counter used to rekey the cipher. - */ - bool startBlock( sal_Int32 nCounter ); - - /** Decodes a block of memory. - - @see rtl_cipher_decode() - - @precond - The codec must be initialized with the initKey() function before - this function can be used. - - @param pnDestData - Destination buffer. Will contain the decrypted data afterwards. - @param pnSrcData - Encrypted data block. - @param nBytes - Size of the passed data blocks. pnDestData and pnSrcData must be of - this size. - - @return - True = decoding was successful (no error occurred). - */ - bool decode( - sal_uInt8* pnDestData, - const sal_uInt8* pnSrcData, - sal_Int32 nBytes ); - -private: - rtlCipher mhCipher; - rtlDigest mhDigest; - sal_uInt8 mpnDigestValue[ RTL_DIGEST_LENGTH_MD5 ]; - sal_uInt8 mpnUnique[16]; -}; - - } // namespace core } // namespace oox diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 1fbb036b4878..41b7b9aae5e7 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -217,16 +217,10 @@ enum INetContentType class SVL_DLLPUBLIC INetContentTypes { public: - static INetContentType RegisterContentType(OUString const & rTypeName, - OUString const & rPresentation, - OUString const * pExtension = nullptr); - static INetContentType GetContentType(OUString const & rTypeName); static OUString GetContentType(INetContentType eTypeID); - static OUString GetPresentation(INetContentType eTypeID); - static INetContentType GetContentType4Extension(OUString const & rExtension); static INetContentType GetContentTypeFromURL(OUString const & rURL); diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index f8d5ca32f0af..90138c93889a 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -83,7 +83,6 @@ protected: static inline void ClearRefCount(SfxPoolItem& rItem); static inline void AddRef(const SfxPoolItem& rItem, sal_uInt32 n = 1); static inline sal_uInt32 ReleaseRef(const SfxPoolItem& rItem, sal_uInt32 n = 1); - static inline void SetKind( SfxPoolItem& rItem, SfxItemKind nRef ); public: SfxItemPool( const SfxItemPool &rPool, @@ -206,11 +205,6 @@ inline sal_uInt32 SfxItemPool::ReleaseRef(const SfxPoolItem& rItem, sal_uInt32 n return rItem.ReleaseRef(n); } -inline void SfxItemPool::SetKind( SfxPoolItem& rItem, SfxItemKind nRef ) -{ - rItem.SetKind( nRef ); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 504a8dcaab54..9c7a71e551ac 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -93,11 +93,6 @@ public: static sal_uInt16 GetVersion() { return SVX_MACROTBL_AKTVERSION; } - SvxMacroTable::iterator begin() { return aSvxMacroTable.begin(); } - SvxMacroTable::const_iterator begin() const { return aSvxMacroTable.begin(); } - SvxMacroTable::iterator end() { return aSvxMacroTable.end(); } - SvxMacroTable::const_iterator end () const { return aSvxMacroTable.end(); } - SvxMacroTable::size_type size() const { return aSvxMacroTable.size(); } bool empty() const { return aSvxMacroTable.empty(); } // returns NULL if no entry exists, or a pointer to the internal value diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index c4a5217e050a..bcace549a956 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -26,7 +26,6 @@ class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { public: explicit SfxMetricItem( sal_uInt16 nWhich, sal_uInt32 nValue ); - SfxMetricItem( sal_uInt16 nWhich, SvStream & ); SfxMetricItem( const SfxMetricItem& ); virtual void ScaleMetrics( long lMult, long lDiv ) override; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 8992d3ef4cb4..0b9d6919cf75 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -186,7 +186,6 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - SVT_DLLPRIVATE static void ImplGetWeekFont( vcl::Font& rFont ); SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; @@ -234,9 +233,6 @@ public: void Select(); - void SelectDate( const Date& rDate, bool bSelect = true ); - void SetNoSelection(); - bool IsDateSelected( const Date& rDate ) const; Date GetFirstSelectedDate() const; void EnableCallEverySelect() { mbAllSel = true; } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index affdebf10099..e95febf8fabd 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -773,7 +773,6 @@ public: void SetMargin2() { SetMargin2( 0, RulerMarginStyle::Invisible ); } void SetMargin2( long nPos, RulerMarginStyle nMarginStyle = RulerMarginStyle::Sizeable ); long GetMargin2() const; - long GetPageWidth() const; void SetLeftFrameMargin( long nPos ); void SetRightFrameMargin( long nPos ); diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 83e369901bab..86ec0f082628 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -172,13 +172,12 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE bool IsFlipVert() { return bFlipV; }; SAL_DLLPRIVATE bool IsFlipHorz() { return bFlipH; }; SAL_DLLPRIVATE sal_Int32 GetRotateAngle() { return nRotateAngle; }; - bool IsPostRotate() const; SdrObject* CreateLineGeometry(); SdrObject* CreateObject( bool bLineGeometryNeededOnly ); void ApplyGluePoints( SdrObject* pObj ); - tools::Rectangle GetTextRect() const; - const tools::Rectangle& GetLogicRect() const { return aLogicRect; } + tools::Rectangle GetTextRect() const; + const tools::Rectangle& GetLogicRect() const { return aLogicRect; } sal_uInt32 GetHdlCount() const; bool GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const; diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index f79b5ed84301..c53f429c3b59 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -155,8 +155,6 @@ public: /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); - /** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */ - Style Mirror() const; /** return the Cell using this style (if set) */ const Cell* GetUsingCell() const { return mpUsingCell; } @@ -185,7 +183,6 @@ bool operator==( const Style& rL, const Style& rR ); SVX_DLLPUBLIC bool operator<( const Style& rL, const Style& rR ); inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } -inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } /** Extends the Style struct with an angle for diagonal frame borders. @@ -198,18 +195,10 @@ class SAL_WARN_UNUSED DiagStyle : public Style { public: /** Constructs an invisible diagonal frame style. */ - explicit DiagStyle() : mfAngle( 0.0 ) {} + explicit DiagStyle() {} /** Constructs a diagonal frame style passed style and angle. */ - explicit DiagStyle( const Style& rStyle, double fAngle ) : - Style( rStyle ), mfAngle( fAngle ) {} - - double GetAngle() const { return mfAngle; } - - /** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */ - DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); } - -private: - double mfAngle; /// Angle between this and hor. or vert. border. + explicit DiagStyle( const Style& rStyle, double /*fAngle*/ ) : + Style( rStyle ) {} }; @@ -224,33 +213,6 @@ private: */ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight ); -/** Returns the angle between horizontal border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and - horizontal borders, and is therefore in the range [0,PI/2] (inclusive). - */ -inline double GetHorDiagAngle( const tools::Rectangle& rRect ) -{ return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - - -/** Returns the angle between vertical border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and - vertical borders, and is therefore in the range [0,PI/2] (inclusive). The - passed sizes may be negative, calculation is done with absolute values. - */ -inline double GetVerDiagAngle( long nWidth, long nHeight ) -{ return GetHorDiagAngle( nHeight, nWidth ); } - -/** Returns the angle between vertical border of a rectangle and its diagonal. - - The returned values represents the inner angle between the diagonals and - vertical borders, and is therefore in the range [0,PI/2] (inclusive). - */ -inline double GetVerDiagAngle( const tools::Rectangle& rRect ) -{ return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - - /** Returns an X coordinate for a diagonal frame border in the specified height. This function is for usage with the top-left end of a top-left to diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 15d8dcf1d9cf..d272170b8bca 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -227,12 +227,6 @@ public: /** Returns true, if the cell (nCol,nRow) is part of a merged range. */ bool IsMerged( size_t nCol, size_t nRow ) const; - /** Returns true, if the left border of the cell (nCol,nRow) is overlapped by a merged range. */ - bool IsMergedOverlappedLeft( size_t nCol, size_t nRow ) const; - - /** Returns true, if the right border of the cell (nCol,nRow) is overlapped by a merged range. */ - bool IsMergedOverlappedRight( size_t nCol, size_t nRow ) const; - /** Returns the address of the top-left cell of the merged range that contains (nCol,nRow). */ void GetMergedOrigin( size_t& rnFirstCol, size_t& rnFirstRow, size_t nCol, size_t nRow ) const; diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx index bf66a1cf55fa..cfb46036b5f4 100644 --- a/include/svx/searchcharmap.hxx +++ b/include/svx/searchcharmap.hxx @@ -72,7 +72,6 @@ public: virtual int LastInView() const override; virtual void SelectIndex( int index, bool bFocus = false ) override; void AppendCharToList(sal_UCS4 cChar); - void AppendCharList(std::vector<sal_UCS4> cCharList); void ClearPreviousData(); virtual sal_Int32 getMaxCharCount() const override; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 48e14836cd0d..7f34b0c1be71 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -41,8 +41,6 @@ class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex private: GraphicObject maGraphicObject; - GraphicObject makeGraphicObject(SvStream& rIn, sal_uInt16 nVer) const; - public: static SfxPoolItem* CreateDefault(); XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {} diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 1f55c7c0fa0f..062025891826 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_PSTM_HXX #include <tools/toolsdllapi.h> -#include <tools/unqidx.hxx> #include <tools/ref.hxx> #include <tools/stream.hxx> #include <map> diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 3a0b44594618..cd7f20e57e91 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -196,9 +196,6 @@ protected: std::size_t CryptAndWriteBuffer( const void* pStart, std::size_t nLen ); bool EncryptBuffer( void* pStart, std::size_t nLen ); - void SyncSvStream( std::size_t nNewStreamPos ); ///< SvStream <- Medium - void SyncSysStream(); ///< SvStream -> Medium - public: SvStream(); SvStream( SvLockBytes *pLockBytes); diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx deleted file mode 100644 index 59ca4d067325..000000000000 --- a/include/tools/unqidx.hxx +++ /dev/null @@ -1,62 +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_TOOLS_UNQIDX_HXX -#define INCLUDED_TOOLS_UNQIDX_HXX - -#include <sal/types.h> -#include <tools/toolsdllapi.h> -#include <o3tl/strong_int.hxx> -#include <map> - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC UniqueIndexImpl -{ -public: - struct IndexTagType {}; - typedef o3tl::strong_int<sal_uInt32, IndexTagType> Index; - static Index const IndexNotFound;// = Index(SAL_MAX_UINT32); - -private: - std::map<Index, void*> maMap; - Index nUniqIndex; - -public: - UniqueIndexImpl( Index nStartIndex = Index(0) ) - : maMap(), nUniqIndex(nStartIndex) {} - - Index Insert( void* p ); - // insert value with key, replacing existing entry if necessary - void* Get( Index aIndex ) const; -}; - -template<typename T> -class SAL_WARN_UNUSED UniqueIndex : private UniqueIndexImpl -{ -public: - using UniqueIndexImpl::Index; - using UniqueIndexImpl::IndexNotFound; - - UniqueIndex<T>( Index _nStartIndex = Index(0) ) : UniqueIndexImpl(_nStartIndex) {} - - Index Insert(T* p) { return UniqueIndexImpl::Insert(p); } - T* Get(Index idx) const { return static_cast<T*>( UniqueIndexImpl::Get(idx) ); } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index 96e0b7c8343f..edd52d8be96a 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -70,7 +70,6 @@ public: void setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ); bool isValid() const; sal_Int16 getValue( sal_Int16 nFieldIndex ) const; - void addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ); sal_Int16 getFirstDayOfWeek() const; sal_Int16 getNumberOfMonthsInYear() const; sal_Int16 getNumberOfDaysInWeek() const; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index a0bfccec2919..8504c6c25ad9 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -88,9 +88,6 @@ public: bool GetCheckBoxState() const; virtual Size GetOptimalSize() const override; - - void SetMessBoxStyle(MessBoxStyle n) { mnMessBoxStyle = n; } - MessBoxStyle GetMessBoxStyle() { return mnMessBoxStyle; } }; class VCL_DLLPUBLIC InfoBox : public MessBox diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 3980f0a98452..0811882090af 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -293,7 +293,6 @@ public: tools::Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = nullptr ); - bool HasAttrib( sal_uInt16 nWhich ) const; const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 84660d6abb54..3437de9abb40 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -32,79 +32,6 @@ using namespace ::com::sun::star; namespace oox { namespace core { -namespace { - -/** Rotates rnValue left by nBits bits. */ -template< typename Type > -inline void lclRotateLeft( Type& rnValue, size_t nBits ) -{ - OSL_ENSURE( nBits < sizeof( Type ) * 8, "lclRotateLeft - rotation count overflow" ); - rnValue = static_cast< Type >( (rnValue << nBits) | (rnValue >> (sizeof( Type ) * 8 - nBits)) ); -} - -/** Rotates the lower nWidth bits of rnValue left by nBits bits. */ -template< typename Type > -inline void lclRotateLeft( Type& rnValue, size_t nBits, size_t nWidth ) -{ - OSL_ENSURE( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8), "lclRotateLeft - rotation count overflow" ); - Type nMask = static_cast< Type >( (1UL << nWidth) - 1 ); - rnValue = static_cast< Type >( - ((rnValue << nBits) | ((rnValue & nMask) >> (nWidth - nBits))) & nMask ); -} - -sal_Int32 lclGetLen( const sal_uInt8* pnPassData, sal_Int32 nBufferSize ) -{ - sal_Int32 nLen = 0; - while( (nLen < nBufferSize) && pnPassData[ nLen ] ) ++nLen; - return nLen; -} - -sal_uInt16 lclGetKey( const sal_uInt8* pnPassData, sal_Int32 nBufferSize ) -{ - sal_Int32 nLen = lclGetLen( pnPassData, nBufferSize ); - if( nLen <= 0 ) return 0; - - sal_uInt16 nKey = 0; - sal_uInt16 nKeyBase = 0x8000; - sal_uInt16 nKeyEnd = 0xFFFF; - const sal_uInt8* pnChar = pnPassData + nLen - 1; - for( sal_Int32 nIndex = 0; nIndex < nLen; ++nIndex, --pnChar ) - { - sal_uInt8 cChar = *pnChar & 0x7F; - for( size_t nBit = 0; nBit < 8; ++nBit ) - { - lclRotateLeft( nKeyBase, 1 ); - if( nKeyBase & 1 ) nKeyBase ^= 0x1020; - if( cChar & 1 ) nKey ^= nKeyBase; - cChar >>= 1; - lclRotateLeft( nKeyEnd, 1 ); - if( nKeyEnd & 1 ) nKeyEnd ^= 0x1020; - } - } - return nKey ^ nKeyEnd; -} - -sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Int32 nBufferSize ) -{ - sal_Int32 nLen = lclGetLen( pnPassData, nBufferSize ); - - sal_uInt16 nHash = static_cast< sal_uInt16 >( nLen ); - if( nLen > 0 ) - nHash ^= 0xCE4B; - - const sal_uInt8* pnChar = pnPassData; - for( sal_Int32 nIndex = 0; nIndex < nLen; ++nIndex, ++pnChar ) - { - sal_uInt16 cChar = *pnChar; - size_t nRot = static_cast< size_t >( (nIndex + 1) % 15 ); - lclRotateLeft( cChar, nRot, 15 ); - nHash ^= cChar; - } - return nHash; -} - -} // namespace - sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement ) { sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 ); @@ -112,230 +39,7 @@ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int3 return static_cast< sal_uInt16 >( ((0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16)) ? nPasswordHash : 0 ); } -BinaryCodec_XOR::BinaryCodec_XOR() : - mnOffset( 0 ), - mnBaseKey( 0 ), - mnHash( 0 ) -{ - (void)memset( mpnKey, 0, sizeof( mpnKey ) ); -} - -BinaryCodec_XOR::~BinaryCodec_XOR() -{ - (void)memset( mpnKey, 0, sizeof( mpnKey ) ); - mnBaseKey = mnHash = 0; -} - -void BinaryCodec_XOR::initKey( const sal_uInt8 pnPassData[ 16 ] ) -{ - // calculate base key and hash from passed password - mnBaseKey = lclGetKey( pnPassData, 16 ); - mnHash = lclGetHash( pnPassData, 16 ); - - static const sal_uInt8 spnFillChars[] = - { - 0xBB, 0xFF, 0xFF, 0xBA, - 0xFF, 0xFF, 0xB9, 0x80, - 0x00, 0xBE, 0x0F, 0x00, - 0xBF, 0x0F, 0x00, 0x00 - }; - - (void)memcpy( mpnKey, pnPassData, 16 ); - sal_Int32 nLen = lclGetLen( pnPassData, 16 ); - const sal_uInt8* pnFillChar = spnFillChars; - for (sal_Int32 nIndex = nLen; nIndex < static_cast<sal_Int32>(sizeof(mpnKey)); ++nIndex, ++pnFillChar ) - mpnKey[ nIndex ] = *pnFillChar; - - // use little-endian base key to create key array - sal_uInt8 pnBaseKeyLE[ 2 ]; - pnBaseKeyLE[ 0 ] = static_cast< sal_uInt8 >( mnBaseKey ); - pnBaseKeyLE[ 1 ] = static_cast< sal_uInt8 >( mnBaseKey >> 8 ); - sal_uInt8* pnKeyChar = mpnKey; - for (sal_Int32 nIndex = 0; nIndex < static_cast<sal_Int32>(sizeof(mpnKey)); ++nIndex, ++pnKeyChar ) - { - *pnKeyChar ^= pnBaseKeyLE[ nIndex & 1 ]; - lclRotateLeft( *pnKeyChar, 2/*nRotateSize*/ ); - } -} - -bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData ) -{ - bool bResult = false; - - ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault("XOR95EncryptionKey", uno::Sequence< sal_Int8 >() ); - - if ( aKey.getLength() == 16 ) - { - (void)memcpy( mpnKey, aKey.getConstArray(), 16 ); - bResult = true; - - mnBaseKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95BaseKey", (sal_Int16)0 ); - mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95PasswordHash", (sal_Int16)0 ); - } - else - OSL_FAIL( "Unexpected key size!" ); - - return bResult; -} - -uno::Sequence< beans::NamedValue > BinaryCodec_XOR::getEncryptionData() -{ - ::comphelper::SequenceAsHashMap aHashData; - aHashData[ OUString("XOR95EncryptionKey") ] <<= uno::Sequence<sal_Int8>( reinterpret_cast<sal_Int8*>(mpnKey), 16 ); - aHashData[ OUString("XOR95BaseKey") ] <<= (sal_Int16)mnBaseKey; - aHashData[ OUString("XOR95PasswordHash") ] <<= (sal_Int16)mnHash; - - return aHashData.getAsConstNamedValueList(); -} - -bool BinaryCodec_XOR::verifyKey( sal_uInt16 nKey, sal_uInt16 nHash ) const -{ - return (nKey == mnBaseKey) && (nHash == mnHash); -} - -bool BinaryCodec_XOR::skip( sal_Int32 nBytes ) -{ - mnOffset = static_cast< sal_Int32 >( (mnOffset + nBytes) & 0x0F ); - return true; -} - -BinaryCodec_RCF::BinaryCodec_RCF() -{ - mhCipher = rtl_cipher_create( rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream ); - OSL_ENSURE( mhCipher != nullptr, "BinaryCodec_RCF::BinaryCodec_RCF - cannot create cipher" ); - - mhDigest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); - OSL_ENSURE( mhDigest != nullptr, "BinaryCodec_RCF::BinaryCodec_RCF - cannot create digest" ); - - (void)memset( mpnDigestValue, 0, sizeof( mpnDigestValue ) ); - (void)memset (mpnUnique, 0, sizeof(mpnUnique)); -} - -BinaryCodec_RCF::~BinaryCodec_RCF() -{ - (void)memset( mpnDigestValue, 0, sizeof( mpnDigestValue ) ); - (void)memset (mpnUnique, 0, sizeof(mpnUnique)); - rtl_digest_destroy( mhDigest ); - rtl_cipher_destroy( mhCipher ); -} - -bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData ) -{ - bool bResult = false; - - ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault("STD97EncryptionKey", uno::Sequence< sal_Int8 >() ); - - if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 ) - { - (void)memcpy( mpnDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 ); - uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault("STD97UniqueID", uno::Sequence< sal_Int8 >() ); - if ( aUniqueID.getLength() == 16 ) - { - (void)memcpy( mpnUnique, aUniqueID.getConstArray(), 16 ); - bResult = false; - } - else - OSL_FAIL( "Unexpected document ID!" ); - } - else - OSL_FAIL( "Unexpected key size!" ); - - return bResult; -} - -uno::Sequence< beans::NamedValue > BinaryCodec_RCF::getEncryptionData() -{ - ::comphelper::SequenceAsHashMap aHashData; - aHashData[ OUString("STD97EncryptionKey") ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(mpnDigestValue), RTL_DIGEST_LENGTH_MD5 ); - aHashData[ OUString("STD97UniqueID") ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(mpnUnique), 16 ); - - return aHashData.getAsConstNamedValueList(); -} - -void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt8 pnSalt[ 16 ] ) -{ - uno::Sequence< sal_Int8 > aKey = ::comphelper::DocPasswordHelper::GenerateStd97Key( pnPassData, uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(pnSalt), 16 ) ); - // Fill raw digest of above updates into DigestValue. - - if ( aKey.getLength() == sizeof(mpnDigestValue) ) - (void)memcpy ( mpnDigestValue, aKey.getConstArray(), sizeof(mpnDigestValue) ); - else - memset( mpnDigestValue, 0, sizeof(mpnDigestValue) ); - (void)memcpy( mpnUnique, pnSalt, 16 ); -} - -bool BinaryCodec_RCF::verifyKey( const sal_uInt8 pnVerifier[ 16 ], const sal_uInt8 pnVerifierHash[ 16 ] ) -{ - if( !startBlock( 0 ) ) - return false; - - sal_uInt8 pnDigest[ RTL_DIGEST_LENGTH_MD5 ]; - sal_uInt8 pnBuffer[ 64 ]; - - // decode salt data into buffer - rtl_cipher_decode( mhCipher, pnVerifier, 16, pnBuffer, sizeof( pnBuffer ) ); - - pnBuffer[ 16 ] = 0x80; - (void)memset( pnBuffer + 17, 0, sizeof( pnBuffer ) - 17 ); - pnBuffer[ 56 ] = 0x80; - - // fill raw digest of buffer into digest - rtl_digest_updateMD5( mhDigest, pnBuffer, sizeof( pnBuffer ) ); - rtl_digest_rawMD5( mhDigest, pnDigest, sizeof( pnDigest ) ); - - // decode original salt digest into buffer - rtl_cipher_decode( mhCipher, pnVerifierHash, 16, pnBuffer, sizeof( pnBuffer ) ); - - // compare buffer with computed digest - bool bResult = memcmp( pnBuffer, pnDigest, sizeof( pnDigest ) ) == 0; - - // erase buffer and digest arrays and leave - rtl_secureZeroMemory (pnBuffer, sizeof(pnBuffer)); - rtl_secureZeroMemory (pnDigest, sizeof(pnDigest)); - return bResult; -} - -bool BinaryCodec_RCF::startBlock( sal_Int32 nCounter ) -{ - // initialize key data array - sal_uInt8 pnKeyData[ 64 ]; - (void)memset( pnKeyData, 0, sizeof( pnKeyData ) ); - - // fill 40 bit of digest value into [0..4] - (void)memcpy( pnKeyData, mpnDigestValue, 5 ); - - // fill little-endian counter into [5..8], static_cast masks out unneeded bits - pnKeyData[ 5 ] = static_cast< sal_uInt8 >( nCounter ); - pnKeyData[ 6 ] = static_cast< sal_uInt8 >( nCounter >> 8 ); - pnKeyData[ 7 ] = static_cast< sal_uInt8 >( nCounter >> 16 ); - pnKeyData[ 8 ] = static_cast< sal_uInt8 >( nCounter >> 24 ); - - pnKeyData[ 9 ] = 0x80; - pnKeyData[ 56 ] = 0x48; - - // fill raw digest of key data into key data - (void)rtl_digest_updateMD5( mhDigest, pnKeyData, sizeof( pnKeyData ) ); - (void)rtl_digest_rawMD5( mhDigest, pnKeyData, RTL_DIGEST_LENGTH_MD5 ); - - // initialize cipher with key data (for decoding) - rtlCipherError eResult = - rtl_cipher_init( mhCipher, rtl_Cipher_DirectionDecode, pnKeyData, RTL_DIGEST_LENGTH_MD5, nullptr, 0 ); - - // erase key data array and leave - rtl_secureZeroMemory (pnKeyData, sizeof(pnKeyData)); - return eResult == rtl_Cipher_E_None; -} - -bool BinaryCodec_RCF::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int32 nBytes ) -{ - rtlCipherError eResult = rtl_cipher_decode( mhCipher, - pnSrcData, static_cast< sal_Size >( nBytes ), - pnDestData, static_cast< sal_Size >( nBytes ) ); - return eResult == rtl_Cipher_E_None; -} } // namespace core } // namespace oox diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 3efe0ff75f55..5cc9198f88e1 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -245,9 +245,6 @@ public: void SetLeftArea( const EditTextObject& rNew ); void SetCenterArea( const EditTextObject& rNew ); void SetRightArea( const EditTextObject& rNew ); - - // Set method with pointer assignment, nArea see defines above - void SetArea( EditTextObject *pNew, int nArea ); }; // page format item: contents of header and footer diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index c2199ed0d486..a9d8c5a35a35 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -648,18 +648,6 @@ void ScPageHFItem::SetRightArea( const EditTextObject& rNew ) pRightArea = rNew.Clone(); } -void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) -{ - switch ( nArea ) - { - case SC_HF_LEFTAREA: delete pLeftArea; pLeftArea = pNew; break; - case SC_HF_CENTERAREA: delete pCenterArea; pCenterArea = pNew; break; - case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break; - default: - OSL_FAIL( "New Area?" ); - } -} - /** * ScViewObjectModeItem - Display Mode of View Objects */ diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 9d1eee2db3c8..c5b16df371ed 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -153,11 +153,6 @@ SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue): { } -SfxMetricItem::SfxMetricItem(sal_uInt16 which, SvStream & rStream): - SfxInt32Item(which, rStream) -{ -} - SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem): SfxInt32Item(rItem) { diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index a4cfc252589e..7ca340963859 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -45,55 +45,22 @@ struct TypeIDMapEntry OUString m_aPresentation; }; -struct TypeNameMapEntry -{ - OUString m_aExtension; - INetContentType m_eTypeID; - - TypeNameMapEntry(INetContentType const eTypeID, OUString const*const pExtension) - : m_aExtension((pExtension) ? *pExtension : OUString()) - , m_eTypeID(eTypeID) - {} -}; - -struct ExtensionMapEntry -{ - INetContentType m_eTypeID; - - explicit ExtensionMapEntry(INetContentType const eTypeID) - : m_eTypeID(eTypeID) {} -}; - class Registration { - typedef std::map<OUString, TypeNameMapEntry> TypeNameMap; - typedef std::map<OUString, ExtensionMapEntry> ExtensionMap; typedef std::map<INetContentType, TypeIDMapEntry*> TypeIDMap; TypeIDMap m_aTypeIDMap; // map ContentType to TypeID - TypeNameMap m_aTypeNameMap; // map TypeName to TypeID, Extension - ExtensionMap m_aExtensionMap; // map Extension to TypeID - sal_uInt32 m_nNextDynamicID; public: - Registration(): m_nNextDynamicID(CONTENT_TYPE_LAST + 1) {} + Registration() {} ~Registration(); public: - static inline TypeIDMapEntry * getEntry(INetContentType eTypeID); - - static TypeNameMapEntry * getExtensionEntry(OUString const & rTypeName); - - static INetContentType RegisterContentType(OUString const & rTypeName, - OUString const & rPresentation, - OUString const * pExtension); static INetContentType GetContentType(OUString const & rTypeName); static OUString GetContentType(INetContentType eTypeID); - static OUString GetPresentation(INetContentType eTypeID); - static INetContentType GetContentType4Extension(OUString const & rExtension); }; @@ -104,18 +71,6 @@ namespace : public rtl::Static< Registration, theRegistration > {}; } -// static -inline TypeIDMapEntry * Registration::getEntry(INetContentType eTypeID) -{ - Registration &rRegistration = theRegistration::get(); - - TypeIDMap::const_iterator it = rRegistration.m_aTypeIDMap.find( eTypeID ); - if( it != rRegistration.m_aTypeIDMap.end() ) - return it->second; - else - return nullptr; -} - MediaTypeEntry const * seekEntry(OUString const & rTypeName, MediaTypeEntry const * pMap, std::size_t nSize); @@ -210,103 +165,6 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1] { CONTENT_TYPE_STR_X_VRML, CONTENT_TYPE_X_VRML } }; -/** A mapping from type IDs to presentation resource IDs. Sorted by type ID. - */ -const char* aStaticResourceIDMap[CONTENT_TYPE_LAST + 1] - = { STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN - STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_APP_OCTSTREAM - STR_SVT_MIMETYPE_APP_PDF, // CONTENT_TYPE_APP_PDF - STR_SVT_MIMETYPE_APP_RTF, // CONTENT_TYPE_APP_RTF - STR_SVT_MIMETYPE_APP_MSWORD, // CONTENT_TYPE_APP_MSWORD - STR_SVT_MIMETYPE_APP_MSWORD, // CONTENT_TYPE_APP_MSWORD_TEMPL //TODO: new presentation string? - STR_SVT_MIMETYPE_APP_STARCALC, // CONTENT_TYPE_APP_STARCALC - STR_SVT_MIMETYPE_APP_STARCHART, // CONTENT_TYPE_APP_STARCHART - STR_SVT_MIMETYPE_APP_STARDRAW, // CONTENT_TYPE_APP_STARDRAW - STR_SVT_MIMETYPE_APP_STARHELP, // CONTENT_TYPE_APP_STARHELP - STR_SVT_MIMETYPE_APP_STARIMAGE, // CONTENT_TYPE_APP_STARIMAGE - STR_SVT_MIMETYPE_APP_STARIMPRESS, // CONTENT_TYPE_APP_STARIMPRESS - STR_SVT_MIMETYPE_APP_STARMATH, // CONTENT_TYPE_APP_STARMATH - STR_SVT_MIMETYPE_APP_STARWRITER, // CONTENT_TYPE_APP_STARWRITER - STR_SVT_MIMETYPE_APP_ZIP, // CONTENT_TYPE_APP_ZIP - STR_SVT_MIMETYPE_AUDIO_AIFF, // CONTENT_TYPE_AUDIO_AIFF - STR_SVT_MIMETYPE_AUDIO_BASIC, // CONTENT_TYPE_AUDIO_BASIC - STR_SVT_MIMETYPE_AUDIO_MIDI, // CONTENT_TYPE_AUDIO_MIDI - STR_SVT_MIMETYPE_AUDIO_VORBIS, // CONTENT_TYPE_AUDIO_VORBIS - STR_SVT_MIMETYPE_AUDIO_WAV, // CONTENT_TYPE_AUDIO_WAV - STR_SVT_MIMETYPE_AUDIO_WEBM, // CONTENT_TYPE_AUDIO_WEBM - STR_SVT_MIMETYPE_IMAGE_GIF, // CONTENT_TYPE_IMAGE_GIF - STR_SVT_MIMETYPE_IMAGE_JPEG, // CONTENT_TYPE_IMAGE_JPEG - STR_SVT_MIMETYPE_IMAGE_PCX, // CONTENT_TYPE_IMAGE_PCX - STR_SVT_MIMETYPE_IMAGE_PNG, // CONTENT_TYPE_IMAGE_PNG - STR_SVT_MIMETYPE_IMAGE_TIFF, // CONTENT_TYPE_IMAGE_TIFF - STR_SVT_MIMETYPE_IMAGE_BMP, // CONTENT_TYPE_IMAGE_BMP - STR_SVT_MIMETYPE_TEXT_HTML, // CONTENT_TYPE_TEXT_HTML - STR_SVT_MIMETYPE_TEXT_PLAIN, // CONTENT_TYPE_TEXT_PLAIN - STR_SVT_MIMETYPE_TEXT_URL, // CONTENT_TYPE_TEXT_URL - STR_SVT_MIMETYPE_TEXT_VCARD, // CONTENT_TYPE_TEXT_VCARD - STR_SVT_MIMETYPE_VIDEO_MSVIDEO, // CONTENT_TYPE_VIDEO_MSVIDEO - STR_SVT_MIMETYPE_VIDEO_THEORA, // CONTENT_TYPE_VIDEO_THEORA - STR_SVT_MIMETYPE_VIDEO_VDO, // CONTENT_TYPE_VIDEO_VDO - STR_SVT_MIMETYPE_VIDEO_WEBM, // CONTENT_TYPE_VIDEO_WEBM - STR_SVT_MIMETYPE_CNT_FSYSBOX, // CONTENT_TYPE_X_CNT_FSYSBOX - STR_SVT_MIMETYPE_CNT_FSYSFLD, // CONTENT_TYPE_X_CNT_FSYSFOLDER - STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_X_STARMAIL - STR_SVT_MIMETYPE_X_VRML, // CONTENT_TYPE_X_VRML - STR_SVT_MIMETYPE_APP_GAL, // CONTENT_TYPE_APP_GALLERY - STR_SVT_MIMETYPE_APP_GAL_THEME, // CONTENT_TYPE_APP_GALLERY_THEME - STR_SVT_MIMETYPE_APP_STARW_GLOB, // CONTENT_TYPE_APP_STARWRITER_GLOB - STR_SVT_MIMETYPE_APP_SDM, // CONTENT_TYPE_APP_STARMAIL_SDM - STR_SVT_MIMETYPE_APP_SMD, // CONTENT_TYPE_APP_STARMAIL_SMD - STR_SVT_MIMETYPE_APP_STARCALC, // CONTENT_TYPE_APP_VND_CALC - STR_SVT_MIMETYPE_APP_STARCHART, // CONTENT_TYPE_APP_VND_CHART - STR_SVT_MIMETYPE_APP_STARDRAW, // CONTENT_TYPE_APP_VND_DRAW - STR_SVT_MIMETYPE_APP_STARIMAGE, // CONTENT_TYPE_APP_VND_IMAGE - STR_SVT_MIMETYPE_APP_STARIMPRESS, // CONTENT_TYPE_APP_VND_IMPRESS - STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_APP_VND_MAIL - STR_SVT_MIMETYPE_APP_STARMATH, // CONTENT_TYPE_APP_VND_MATH - STR_SVT_MIMETYPE_APP_STARWRITER, // CONTENT_TYPE_APP_VND_WRITER - STR_SVT_MIMETYPE_APP_STARW_GLOB, // CONTENT_TYPE_APP_VND_WRITER_GLOBAL - STR_SVT_MIMETYPE_APP_STARW_WEB, // CONTENT_TYPE_APP_VND_WRITER_WEB - STR_SVT_MIMETYPE_FRAMESET, // CONTENT_TYPE_APP_FRAMESET - STR_SVT_MIMETYPE_MACRO, // CONTENT_TYPE_APP_MACRO - STR_SVT_MIMETYPE_CNT_SFSYSFOLDER, - // CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER - STR_SVT_MIMETYPE_APP_TEMPLATE, // CONTENT_TYPE_APP_VND_TEMPLATE - STR_SVT_MIMETYPE_IMAGE_GENERIC, // CONTENT_TYPE_IMAGE_GENERIC - STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_APP_VND_NEWS - STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_APP_VND_OUTTRAY - STR_SVT_MIMETYPE_APP_MSEXCEL, // CONTENT_TYPE_APP_MSEXCEL - STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL, // CONTENT_TYPE_APP_MSEXCEL_TEMPL - STR_SVT_MIMETYPE_APP_MSPPOINT, // CONTENT_TYPE_APP_MSPPOINT - STR_SVT_MIMETYPE_APP_MSPPOINT, // CONTENT_TYPE_APP_MSPPOINT_TEMPL //@todo new presentation string? - STR_SVT_MIMETYPE_TEXT_VCALENDAR, // CONTENT_TYPE_TEXT_VCALENDAR - STR_SVT_MIMETYPE_TEXT_ICALENDAR, // CONTENT_TYPE_TEXT_ICALENDAR - STR_SVT_MIMETYPE_TEXT_XMLICALENDAR, // CONTENT_TYPE_TEXT_XMLICALENDAR - STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP, - // CONTENT_TYPE_APP_CDE_CALENDAR_APP - STR_SVT_MIMETYPE_INET_MSG_RFC822, // CONTENT_TYPE_INET_MESSAGE_RFC822 - STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE, - // CONTENT_TYPE_INET_MULTIPART_ALTERNATIVE - STR_SVT_MIMETYPE_INET_MULTI_DIGEST, - // CONTENT_TYPE_INET_MULTIPART_DIGEST - STR_SVT_MIMETYPE_INET_MULTI_PARALLEL, - // CONTENT_TYPE_INET_MULTIPART_PARALLEL - STR_SVT_MIMETYPE_INET_MULTI_RELATED, - // CONTENT_TYPE_INET_MULTIPART_RELATED - STR_SVT_MIMETYPE_INET_MULTI_MIXED, - // CONTENT_TYPE_INET_MULTIPART_MIXED - STR_SVT_MIMETYPE_APP_IMPRESSPACKED, - // CONTENT_TYPE_APP_VND_IMPRESSPACKED - STR_SVT_MIMETYPE_APP_JAR, // CONTENT_TYPE_APP_JAR - STR_SVT_MIMETYPE_APP_SXWRITER, // CONTENT_TYPE_APP_VND_SUN_XML_WRITER - STR_SVT_MIMETYPE_APP_SXCALC, // CONTENT_TYPE_APP_VND_SUN_XML_CALC - STR_SVT_MIMETYPE_APP_SXIMPRESS, // CONTENT_TYPE_APP_VND_SUN_XML_IMPRESS - STR_SVT_MIMETYPE_APP_SXDRAW, // CONTENT_TYPE_APP_VND_SUN_XML_DRAW - STR_SVT_MIMETYPE_APP_SXCHART, // CONTENT_TYPE_APP_VND_SUN_XML_CHART - STR_SVT_MIMETYPE_APP_SXMATH, // CONTENT_TYPE_APP_VND_SUN_XML_MATH - STR_SVT_MIMETYPE_APP_SXGLOBAL, // CONTENT_TYPE_APP_VND_SUN_XML_WRITER_GLOBAL - STR_SVT_MIMETYPE_APP_SXIPACKED, // CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED - }; /** A mapping from extensions to type IDs. Sorted by extension. */ @@ -405,55 +263,9 @@ Registration::~Registration() } // static -TypeNameMapEntry * Registration::getExtensionEntry(OUString const & rTypeName) -{ - OUString aTheTypeName = rTypeName.toAsciiLowerCase(); - Registration &rRegistration = theRegistration::get(); - TypeNameMap::iterator it = rRegistration.m_aTypeNameMap.find(aTheTypeName); - if (it != rRegistration.m_aTypeNameMap.end()) - return & it->second; - return nullptr; -} - -// static -INetContentType Registration::RegisterContentType(OUString const & rTypeName, - OUString const & rPresentation, - OUString const * pExtension) -{ - Registration &rRegistration = theRegistration::get(); - - DBG_ASSERT(GetContentType(rTypeName) == CONTENT_TYPE_UNKNOWN, - "Registration::RegisterContentType(): Already registered"); - - INetContentType eTypeID = INetContentType(rRegistration.m_nNextDynamicID++); - OUString aTheTypeName = rTypeName.toAsciiLowerCase(); - - TypeIDMapEntry * pTypeIDMapEntry = new TypeIDMapEntry; - pTypeIDMapEntry->m_aTypeName = aTheTypeName; - pTypeIDMapEntry->m_aPresentation = rPresentation; - rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID, pTypeIDMapEntry ) ); - - rRegistration.m_aTypeNameMap.insert(std::make_pair(aTheTypeName, - TypeNameMapEntry(eTypeID, pExtension))); - - if (pExtension) - { - rRegistration.m_aExtensionMap.insert(std::make_pair(*pExtension, ExtensionMapEntry(eTypeID))); - } - - return eTypeID; -} - -// static -INetContentType Registration::GetContentType(OUString const & rTypeName) +INetContentType Registration::GetContentType(OUString const &) { - Registration &rRegistration = theRegistration::get(); - - OUString aTheTypeName = rTypeName.toAsciiLowerCase(); - TypeNameMap::const_iterator it = rRegistration.m_aTypeNameMap.find(aTheTypeName); - return it != rRegistration.m_aTypeNameMap.end() - ? it->second.m_eTypeID - : CONTENT_TYPE_UNKNOWN; + return CONTENT_TYPE_UNKNOWN; } // static @@ -468,26 +280,9 @@ OUString Registration::GetContentType(INetContentType eTypeID) } // static -OUString Registration::GetPresentation(INetContentType eTypeID) +INetContentType Registration::GetContentType4Extension(OUString const & ) { - Registration &rRegistration = theRegistration::get(); - - TypeIDMap::const_iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID ); - if( pEntry != rRegistration.m_aTypeIDMap.end() ) - return pEntry->second->m_aPresentation; - else - return OUString(); -} - -// static -INetContentType Registration::GetContentType4Extension(OUString const & rExtension) -{ - Registration &rRegistration = theRegistration::get(); - - ExtensionMap::const_iterator it = rRegistration.m_aExtensionMap.find(rExtension); - return it != rRegistration.m_aExtensionMap.end() - ? it->second.m_eTypeID - : CONTENT_TYPE_UNKNOWN; + return CONTENT_TYPE_UNKNOWN; } @@ -528,33 +323,6 @@ MediaTypeEntry const * seekEntry(OUString const & rTypeName, } -//static -INetContentType INetContentTypes::RegisterContentType(OUString const & rTypeName, - OUString const & rPresentation, - OUString const * pExtension) -{ - INetContentType eTypeID = GetContentType(rTypeName); - if (eTypeID == CONTENT_TYPE_UNKNOWN) - eTypeID = Registration::RegisterContentType(rTypeName, rPresentation, - pExtension); - else if (eTypeID > CONTENT_TYPE_LAST) - { - TypeIDMapEntry * pTypeEntry = Registration::getEntry(eTypeID); - if (pTypeEntry) - { - if (!rPresentation.isEmpty()) - pTypeEntry->m_aPresentation = rPresentation; - } - if (pExtension) - { - TypeNameMapEntry * pEntry = Registration::getExtensionEntry(rTypeName); - if (pEntry) - pEntry->m_aExtension = *pExtension; - } - } - return eTypeID; -} - // static INetContentType INetContentTypes::GetContentType(OUString const & rTypeName) { @@ -600,23 +368,6 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID) } //static -OUString INetContentTypes::GetPresentation(INetContentType eTypeID) -{ - const char* pResID = nullptr; - if (eTypeID <= CONTENT_TYPE_LAST) - pResID = aStaticResourceIDMap[eTypeID]; - else - { - OUString aPresentation = Registration::GetPresentation(eTypeID); - if (aPresentation.isEmpty()) - pResID = STR_SVT_MIMETYPE_APP_OCTSTREAM; - else - return aPresentation; - } - return SvlResId(pResID); -} - -//static INetContentType INetContentTypes::GetContentType4Extension(OUString const & rExtension) { MediaTypeEntry const * pEntry = seekEntry(rExtension, aStaticExtensionMap, diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 828e3af37c0d..911f464eac3d 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -48,8 +48,6 @@ #define SPIN_OFFX 4 #define SPIN_OFFY TITLE_BORDERY -#define WEEKNUMBER_HEIGHT 85 - #define CALENDAR_HITTEST_DAY ((sal_uInt16)0x0001) #define CALENDAR_HITTEST_MONTHTITLE ((sal_uInt16)0x0004) #define CALENDAR_HITTEST_PREV ((sal_uInt16)0x0008) @@ -69,11 +67,6 @@ static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, bool -inline void ImplCalendarClearSelectDate( IntDateSet* pTable ) -{ - pTable->clear(); -} - void Calendar::ImplInit( WinBits nWinStyle ) { mpSelectTable = new IntDateSet; @@ -219,16 +212,6 @@ DayOfWeek Calendar::ImplGetWeekStart() const return eDay; } -void Calendar::ImplGetWeekFont( vcl::Font& rFont ) -{ - // weeknumber is displayed in WEEKNUMBER_HEIGHT%-Fontheight - Size aFontSize = rFont.GetFontSize(); - aFontSize.Height() *= WEEKNUMBER_HEIGHT; - aFontSize.Height() /= 100; - rFont.SetFontSize( aFontSize ); - rFont.SetWeight( WEIGHT_NORMAL ); -} - void Calendar::ImplFormat() { if ( !mbFormat ) @@ -1365,38 +1348,6 @@ void Calendar::Select() maSelectHdl.Call( this ); } -void Calendar::SelectDate( const Date& rDate, bool bSelect ) -{ - if ( !rDate.IsValidAndGregorian() ) - return; - - std::unique_ptr<IntDateSet> pOldSel; - - pOldSel.reset(new IntDateSet( *mpSelectTable )); - - ImplCalendarSelectDate( mpSelectTable, rDate, bSelect ); - - if ( pOldSel ) - ImplUpdateSelection( pOldSel.get() ); -} - -void Calendar::SetNoSelection() -{ - std::unique_ptr<IntDateSet> pOldSel; - - pOldSel.reset(new IntDateSet( *mpSelectTable )); - - ImplCalendarClearSelectDate( mpSelectTable ); - - if ( pOldSel ) - ImplUpdateSelection( pOldSel.get() ); -} - -bool Calendar::IsDateSelected( const Date& rDate ) const -{ - return mpSelectTable->find( rDate.GetDate() ) != mpSelectTable->end(); -} - Date Calendar::GetFirstSelectedDate() const { if ( !mpSelectTable->empty() ) diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index f4deadc572e1..8392ba2fd678 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2678,11 +2678,6 @@ void Ruler::SetTextRTL(bool bRTL) } -long Ruler::GetPageWidth() const -{ - return mpData->nPageWidth; -} - long Ruler::GetPageOffset() const { return mpData->nPageOff; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 14abb1d6e428..c5995a141b22 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1017,30 +1017,6 @@ void GraphicCache::SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ) ImplFreeDisplayCacheSpace( GetUsedDisplayCacheSize() - GetMaxDisplayCacheSize() ); } -void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize ) -{ - const bool bDestroy = nNewMaxObjSize < mnMaxObjDisplaySize; - - mnMaxObjDisplaySize = std::min( nNewMaxObjSize, mnMaxDisplaySize ); - - if( bDestroy ) - { - GraphicDisplayCacheEntryList::iterator it = maDisplayCache.begin(); - while( it != maDisplayCache.end() ) - { - GraphicDisplayCacheEntry* pCacheObj = *it; - if( pCacheObj->GetCacheSize() > mnMaxObjDisplaySize ) - { - mnUsedDisplaySize -= pCacheObj->GetCacheSize(); - it = maDisplayCache.erase( it ); - delete pCacheObj; - } - else - ++it; - } - } -} - void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { if( mnReleaseTimeoutSeconds != nTimeoutSeconds ) diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index ac6c1a8dbe49..48c2624521bd 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -80,8 +80,6 @@ public: void SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ); sal_uLong GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; }; - void SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize ); - sal_uLong GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; } sal_uLong GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; } diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index fff63888d760..402a7c42ce27 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -206,11 +206,6 @@ Style& Style::MirrorSelf() return *this; } -Style Style::Mirror() const -{ - return Style( *this ).MirrorSelf(); -} - bool operator==( const Style& rL, const Style& rR ) { return (rL.Prim() == rR.Prim()) && (rL.Dist() == rR.Dist()) && (rL.Secn() == rR.Secn()) && diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 5c87cf33943b..c5d0d9fe2676 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -739,18 +739,6 @@ bool Array::IsMerged( size_t nCol, size_t nRow ) const return CELL( nCol, nRow ).IsMerged(); } -bool Array::IsMergedOverlappedLeft( size_t nCol, size_t nRow ) const -{ - DBG_FRAME_CHECK_COLROW( nCol, nRow, "IsMergedOverlappedLeft" ); - return mxImpl->IsMergedOverlappedLeft( nCol, nRow ); -} - -bool Array::IsMergedOverlappedRight( size_t nCol, size_t nRow ) const -{ - DBG_FRAME_CHECK_COLROW( nCol, nRow, "IsMergedOverlappedRight" ); - return mxImpl->IsMergedOverlappedRight( nCol, nRow ); -} - void Array::GetMergedOrigin( size_t& rnFirstCol, size_t& rnFirstRow, size_t nCol, size_t nRow ) const { DBG_FRAME_CHECK_COLROW( nCol, nRow, "GetMergedOrigin" ); diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 10e006333446..0e25f4fceaf3 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -463,10 +463,4 @@ void SvxSearchCharSet::AppendCharToList(sal_UCS4 sChar) m_aItemList.insert(std::make_pair(nCount++, sChar)); } -void SvxSearchCharSet::AppendCharList(std::vector<sal_UCS4> sList) -{ - for (auto& it : sList) - AppendCharToList(it); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index f5a4ef086ccd..0c02ff92896a 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -213,63 +213,6 @@ bool isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColo return bRet; } -GraphicObject XFillBitmapItem::makeGraphicObject(SvStream& rIn, sal_uInt16 nVer) const -{ - if (!IsIndex()) - { - if(0 == nVer) - { - // work with the old bitmap - Bitmap aBmp; - - ReadDIB(aBmp, rIn, true); - return Graphic(aBmp); - } - else if(1 == nVer) - { - sal_Int16 iTmp; - - rIn.ReadInt16( iTmp ); // former XBitmapStyle - rIn.ReadInt16( iTmp ); // XBitmapType - - if(XBitmapType::Import == (XBitmapType)iTmp) - { - Bitmap aBmp; - - ReadDIB(aBmp, rIn, true); - return Graphic(aBmp); - } - else if(XBitmapType::N8x8 == (XBitmapType)iTmp) - { - sal_uInt16 aArray[64]; - - for(sal_uInt16 & i : aArray) - { - rIn.ReadUInt16( i ); - } - - Color aColorPix; - Color aColorBack; - - ReadColor( rIn, aColorPix ); - ReadColor( rIn, aColorBack ); - - const Bitmap aBitmap(createHistorical8x8FromArray(aArray, aColorPix, aColorBack)); - - return Graphic(aBitmap); - } - } - else if(2 == nVer) - { - BitmapEx aBmpEx; - - ReadDIBBitmapEx(aBmpEx, rIn); - return Graphic(aBmpEx); - } - } - return GraphicObject(); -} - XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject) : NameOrIndex(XATTR_FILLBITMAP, -1) , maGraphicObject(rGraphicObject) diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index eaa7afc0f935..7a9d85cff82e 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -73,12 +73,8 @@ public: void setResult(sal_uInt8 nResult) { mnResult = nResult; } - void setCheckboxHeight(sal_uInt16 nCheckboxHeight) { mnCheckboxHeight = nCheckboxHeight; } - void setName(const OUString & rName) { msName = rName; } - void setDefaultResult(sal_uInt16 nDefault) { mnDefault = nDefault; } - void setHelp(const OUString & rHelp); void setStatus(const OUString & rStatus); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 73f690a66198..de017201ed78 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -244,9 +244,6 @@ private: /// Write customXml/item[n].xml and customXml/itemProps[n].xml void WriteCustomXml(); - /// Write word/activeX/activeX[n].xml - void WriteActiveX(); - /// Write word/embeddings/Worksheet[n].xlsx void WriteEmbeddings(); diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 9b3a9d984bd6..040490ed7f05 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/inet/inetstrm \ tools/source/memtools/mempool \ tools/source/memtools/multisel \ - tools/source/memtools/unqidx \ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ tools/source/ref/globname \ diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx deleted file mode 100644 index 0ad58921efb2..000000000000 --- a/tools/source/memtools/unqidx.cxx +++ /dev/null @@ -1,48 +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 <tools/unqidx.hxx> - -UniqueIndexImpl::Index const UniqueIndexImpl::IndexNotFound(SAL_MAX_UINT32); - -UniqueIndexImpl::Index UniqueIndexImpl::Insert( void* p ) -{ - // NULL-Pointer not allowed - if ( !p ) - return IndexNotFound; - - // Insert the pointer, starting from the current nUniqIndex "hint" - // and increasing it until a free one is found (this may happen - // after removals followed by multiple insertions). - while ( !maMap.emplace(nUniqIndex, p).second ) - ++nUniqIndex; - - // Take care of updating hint key for next insertion - return nUniqIndex++; -} - -void* UniqueIndexImpl::Get( Index nIndex ) const -{ - std::map<Index, void*>::const_iterator it = maMap.find( nIndex ); - if ( it != maMap.end() ) - return it->second; - return nullptr; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 7de1f413b88b..590e13655bc8 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1537,18 +1537,6 @@ void SvStream::SetCryptMaskKey(const OString& rCryptMaskKey) m_aCryptMaskKey.getLength(), GetVersion()); } -void SvStream::SyncSvStream( std::size_t nNewStreamPos ) -{ - ClearBuffer(); - SvStream::m_nBufFilePos = nNewStreamPos; -} - -void SvStream::SyncSysStream() -{ - Flush(); - SeekPos( Tell() ); -} - bool SvStream::SetStreamSize(sal_uInt64 const nSize) { #ifdef DBG_UTIL diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index 117eac5b4248..086ae57a661c 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -195,19 +195,6 @@ sal_Int16 CalendarWrapper::getValue( sal_Int16 nFieldIndex ) const return 0; } -void CalendarWrapper::addValue( sal_Int16 nFieldIndex, sal_Int32 nAmount ) -{ - try - { - if ( xC.is() ) - xC->addValue( nFieldIndex, nAmount ); - } - catch (const Exception& e) - { - SAL_WARN( "unotools.i18n", "addValue: Exception caught " << e.Message ); - } -} - sal_Int16 CalendarWrapper::getFirstDayOfWeek() const { try diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 25b19fb521c4..70976cb35530 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -95,29 +95,6 @@ TextCharAttrib* TextCharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 nPo return nullptr; } -const TextCharAttrib* TextCharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos, sal_Int32 nMaxPos ) const -{ - SAL_WARN_IF( !nWhich, "vcl", "FindNextAttrib: Which?" ); - for (std::vector<std::unique_ptr<TextCharAttrib> >::const_iterator it = maAttribs.begin(); it != maAttribs.end(); ++it) - { - if ( ( (*it)->GetStart() >= nFromPos ) && - ( (*it)->GetEnd() <= nMaxPos ) && - ( (*it)->Which() == nWhich ) ) - return it->get(); - } - return nullptr; -} - -bool TextCharAttribList::HasAttrib( sal_uInt16 nWhich ) const -{ - for (std::vector<std::unique_ptr<TextCharAttrib> >::const_reverse_iterator it = maAttribs.rbegin(); it != maAttribs.rend(); ++it) - { - if ( (*it)->Which() == nWhich ) - return true; - } - return false; -} - bool TextCharAttribList::HasBoundingAttrib( sal_Int32 nBound ) { for (std::vector<std::unique_ptr<TextCharAttrib> >::reverse_iterator it = maAttribs.rbegin(); it != maAttribs.rend(); ++it) diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index dce060d713be..1695f9f4c04b 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -54,9 +54,7 @@ public: bool& HasEmptyAttribs() { return mbHasEmptyAttribs; } TextCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); - const TextCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos, sal_Int32 nMaxPos ) const; TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); - bool HasAttrib( sal_uInt16 nWhich ) const; bool HasBoundingAttrib( sal_Int32 nBound ); }; diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 769e2927d2ed..a4e6f1e4fb11 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1017,17 +1017,6 @@ const TextCharAttrib* TextEngine::FindCharAttrib( const TextPaM& rPaM, sal_uInt1 return pAttr; } -bool TextEngine::HasAttrib( sal_uInt16 nWhich ) const -{ - bool bAttr = false; - for ( auto n = mpDoc->GetNodes().size(); --n && !bAttr; ) - { - TextNode* pNode = mpDoc->GetNodes()[ n ]; - bAttr = pNode->GetCharAttribs().HasAttrib( nWhich ); - } - return bAttr; -} - TextPaM TextEngine::GetPaM( const Point& rDocPos ) { SAL_WARN_IF( !GetUpdateMode(), "vcl", "GetPaM: GetUpdateMode()" ); |