diff options
| -rw-r--r-- | comphelper/inc/comphelper/embeddedobjectcontainer.hxx | 3 | ||||
| -rw-r--r-- | comphelper/inc/comphelper/mimeconfighelper.hxx | 3 | ||||
| -rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 24 | ||||
| -rw-r--r-- | comphelper/source/misc/mimeconfighelper.cxx | 15 | ||||
| -rw-r--r-- | unusedcode.easy | 3 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/txtparae.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 16 |
7 files changed, 0 insertions, 66 deletions
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx index 7983dec4b662..8d1aab98ed24 100644 --- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx +++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx @@ -124,9 +124,6 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, ::rtl::OUString& ); - // copy an embedded object into the storage - sal_Bool CopyEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& ); - // copy an embedded object into the storage, open the new copy and return it ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const ::rtl::OUString& aOrigName,*/ ::rtl::OUString& rName ); diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx index 992f367d67df..c8eeed153015 100644 --- a/comphelper/inc/comphelper/mimeconfighelper.hxx +++ b/comphelper/inc/comphelper/mimeconfighelper.hxx @@ -138,9 +138,6 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ); - - ::com::sun::star::uno::Sequence<sal_Int8> GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) ; - }; } diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 9f84b7afa053..8842205a42dd 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -711,30 +711,6 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta return bResult; } -sal_Bool EmbeddedObjectContainer::CopyEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) -{ - RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyEmbeddedObject" ); - - OSL_FAIL( "This method is depricated! Use EmbeddedObjectContainer::CopyAndGetEmbeddedObject() to copy object!\n" ); - - // get the object name before(!) it is assigned to a new storage - ::rtl::OUString aOrigName; - uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); - if ( xPersist.is() ) - aOrigName = xPersist->getEntryName(); - - if ( !rName.getLength() ) - rName = CreateUniqueObjectName(); - - if ( StoreEmbeddedObject( xObj, rName, sal_True ) ) - { - TryToCopyGraphReplacement( rSrc, aOrigName, rName ); - return sal_True; - } - - return sal_False; -} - uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" ); diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index c81e761392b9..dfa66e839bd9 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -925,19 +925,4 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3 return aResult; } -//------------------------------------------------------------------------- -uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) -{ - uno::Sequence<sal_Int8> aClassId; - uno::Reference< container::XNameAccess > xObjectNames = GetConfigurationByPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Embedding/ObjectNames"))); - uno::Reference< container::XNameAccess > xProps; - if ( xObjectNames.is() && (xObjectNames->getByName(_sObjectName) >>= xProps) && xProps.is() ) - { - ::rtl::OUString sValue; - xProps->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassID"))) >>= sValue; - aClassId = GetSequenceClassIDRepresentation(sValue); - } - return aClassId; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index fddda51431c2..59369992ea56 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1354,7 +1354,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*) XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*) XMLTextParagraphExport::FindTextStyle(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char&) const -XMLTextParagraphExport::GetHeadingLevel(rtl::OUString const&) XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, short) XPropertyList::Clear() XSecController::collectToSign(int, rtl::OUString const&) @@ -1982,7 +1981,6 @@ codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&) comphelper::AccessibleEventNotifier::getEventListeners(unsigned int) comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&) comphelper::AttributeList::Clear() -comphelper::EmbeddedObjectContainer::CopyEmbeddedObject(comphelper::EmbeddedObjectContainer&, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString&) comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&) comphelper::EventLogger::getLogLevel() const comphelper::EventLogger::getName() const @@ -1991,7 +1989,6 @@ comphelper::EventLogger::setLogLevel(int) const comphelper::FastPropertySetInfo::FastPropertySetInfo() comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&) comphelper::MimeConfigurationHelper::AddFilterNameCheckOwnFile(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&) -comphelper::MimeConfigurationHelper::GetSequenceClassIDFromObjectName(rtl::OUString const&) comphelper::OAccessibleImplementationAccess::setForeignControlledState(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const&, short, unsigned char) comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper() comphelper::OAccessibleTextHelper::OAccessibleTextHelper() diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index 17b0b3d65dae..cb095ebcfc75 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -673,8 +673,6 @@ public: SinglePropertySetInfoCache& GetCharStyleNamesPropInfoCache() { return aCharStyleNamesPropInfoCache; } - sal_Int32 GetHeadingLevel( const ::rtl::OUString& rStyleName ); - void PushNewTextListsHelper(); void PopTextListsHelper(); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 14501ae9f498..dac0b8e5afc5 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3695,22 +3695,6 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( // else: no control shape -> nothing to do } } -sal_Int32 XMLTextParagraphExport::GetHeadingLevel( const OUString& rStyleName ) -{ - if( !pHeadingStyles ) - { - pHeadingStyles = new XMLStringVector; - SvxXMLNumRuleExport::GetOutlineStyles( *pHeadingStyles, - GetExport().GetModel() ); - } - for( XMLStringVector::size_type i=0; i < pHeadingStyles->size(); ++i ) - { - if( (*pHeadingStyles)[i] == rStyleName ) - return static_cast < sal_Int32 >( i ); - } - - return -1; -} void XMLTextParagraphExport::PushNewTextListsHelper() { |