diff options
Diffstat (limited to 'filter')
87 files changed, 0 insertions, 570 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index c998ec6c7d13..0049b43636b5 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -44,13 +44,11 @@ BaseContainer::BaseContainer() } - BaseContainer::~BaseContainer() { } - void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const OUString& sImplementationName, const css::uno::Sequence< OUString >& lServiceNames , @@ -67,7 +65,6 @@ void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext } - void BaseContainer::impl_loadOnDemand() { #ifdef LOAD_IMPLICIT @@ -104,7 +101,6 @@ void BaseContainer::impl_loadOnDemand() } - void BaseContainer::impl_initFlushMode() throw (css::uno::RuntimeException) { @@ -119,7 +115,6 @@ void BaseContainer::impl_initFlushMode() } - FilterCache* BaseContainer::impl_getWorkingCache() const { // SAFE -> @@ -132,7 +127,6 @@ FilterCache* BaseContainer::impl_getWorkingCache() const } - OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException, std::exception) { @@ -140,7 +134,6 @@ OUString SAL_CALL BaseContainer::getImplementationName() } - sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) { @@ -154,7 +147,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames( } - void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , @@ -195,7 +187,6 @@ void SAL_CALL BaseContainer::insertByName(const OUString& sItem , } - void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , @@ -217,7 +208,6 @@ void SAL_CALL BaseContainer::removeByName(const OUString& sItem) } - void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , @@ -258,7 +248,6 @@ void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , } - css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , @@ -299,7 +288,6 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) } - css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() throw (css::uno::RuntimeException, std::exception) { @@ -328,7 +316,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() } - sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) throw (css::uno::RuntimeException, std::exception) { @@ -356,7 +343,6 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) } - css::uno::Type SAL_CALL BaseContainer::getElementType() throw (css::uno::RuntimeException, std::exception) { @@ -366,7 +352,6 @@ css::uno::Type SAL_CALL BaseContainer::getElementType() } - sal_Bool SAL_CALL BaseContainer::hasElements() throw (css::uno::RuntimeException, std::exception) { @@ -394,7 +379,6 @@ sal_Bool SAL_CALL BaseContainer::hasElements() } - css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException, std::exception) { @@ -405,7 +389,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea } - css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw (css::uno::RuntimeException, std::exception) { @@ -453,7 +436,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea } - void SAL_CALL BaseContainer::flush() throw (css::uno::RuntimeException, std::exception) { @@ -530,7 +512,6 @@ void SAL_CALL BaseContainer::flush() } - void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -540,7 +521,6 @@ void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::ut } - void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException, std::exception) { diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index df104b1459e6..9c0f9246eba4 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -37,8 +37,6 @@ namespace filter{ namespace config{ - - /** @short implements the interface css::container::XNameContainer on top of a FilterCache reference. @@ -119,13 +117,11 @@ class BaseContainer : public BaseLock BaseContainer(); - /** @short standard dtor. */ virtual ~BaseContainer(); - /** @short initialize this generic intsnace with some specialized values from our derived object. @@ -161,14 +157,12 @@ class BaseContainer : public BaseLock protected: - /** @short check if the underlying configuration data was already loaded and do it if necessary automatically. */ void impl_loadOnDemand(); - /** @short it creates the global instance m_pFilterCache, which is a copy of the global instance m_rCache, and will be used to change the configuration. @@ -180,7 +174,6 @@ class BaseContainer : public BaseLock throw (css::uno::RuntimeException); - /** @short returns a pointer to the current used cache member. @descr Its a point to the FilterCache instance behind m_pFlushCache diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index ed235ca46b91..183b4d945191 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -39,7 +39,6 @@ CacheItem::CacheItem() } - void CacheItem::update(const CacheItem& rUpdateItem) { for(const_iterator pItUpdate = rUpdateItem.begin(); @@ -55,7 +54,6 @@ void CacheItem::update(const CacheItem& rUpdateItem) } - void CacheItem::validateUINames(const OUString& sActLocale) { if (sActLocale.isEmpty()) @@ -89,7 +87,6 @@ void CacheItem::validateUINames(const OUString& sActLocale) } - css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyValueList() { sal_Int32 c = (sal_Int32)size(); @@ -118,7 +115,6 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa } - bool isSubSet(const css::uno::Any& aSubSet, const css::uno::Any& aSet ) { @@ -326,7 +322,6 @@ bool isSubSet(const css::uno::Any& aSubSet, } - bool CacheItem::haveProps(const CacheItem& lProps) const { for (const_iterator pIt = lProps.begin(); @@ -357,7 +352,6 @@ bool CacheItem::haveProps(const CacheItem& lProps) const } - bool CacheItem::dontHaveProps(const CacheItem& lProps) const { for (const_iterator pIt = lProps.begin(); diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 6410be46c095..e890f3aaf92a 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -52,7 +52,6 @@ struct BaseLock typedef ::std::vector< OUString > OUStringList; - /** @short represent an item of a FilterCache instance. @@ -71,7 +70,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap CacheItem(); - /** @short update only properties, which are given by the specified rItem. @@ -86,7 +84,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap void update(const CacheItem& rUpdateItem); - /** @short check, if the given properties exist at this item. @@ -103,7 +100,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap bool haveProps(const CacheItem& lProps) const; - /** @short check, if the given properties don't exist at this item. @@ -120,7 +116,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap bool dontHaveProps(const CacheItem& lProps) const; - /** @short because we know two UIName properties (a list with all locales and the value for the current locale only), we must be sure @@ -134,7 +129,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap void validateUINames(const OUString& sActLocale); - /** @short convert this structure to a seq< PropertyValue > and ignore all empty properties! @@ -151,7 +145,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap }; - /** @short represent an item list of a FilterCache instance. */ @@ -161,7 +154,6 @@ typedef std::unordered_map< OUString , std::equal_to< OUString > > CacheItemList; - /** @short supports registration of multiple key to another string information. @@ -180,7 +172,6 @@ typedef std::unordered_map< OUString , std::equal_to< OUString > > CacheItemRegistration; - /** @short is used to collect all matching types of an URL during type detection. diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 9e222f58413c..4442a995b118 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -63,7 +63,6 @@ void CacheUpdateListener::startListening() } - void CacheUpdateListener::stopListening() { // SAFE -> @@ -80,7 +79,6 @@ void CacheUpdateListener::stopListening() } - void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -180,7 +178,6 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven } - void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 9a9704c52629..babc0aebd4a2 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements a listener, which will update the global filter cache, if the underlying configuration wa changed by other processes. @@ -83,19 +81,16 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante FilterCache::EItemType eConfigType); - /** @short standard dtor. */ virtual ~CacheUpdateListener(); - /** @short starts listening. */ void startListening(); - /** @short stop listening. */ void stopListening(); diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index e5bde60d7580..62ac5ed71732 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -31,8 +31,6 @@ namespace filter{ namespace config{ - - /** @short supports registration of XRefreshListener on the global filter configuration. @@ -66,7 +64,6 @@ class ConfigFlush : public BaseLock ConfigFlush(); - /** @short standard dtor. */ virtual ~ConfigFlush(); diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index d0a5ab83cadc..1afda54d13b1 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -43,13 +43,11 @@ ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference< css::uno } - ContentHandlerFactory::~ContentHandlerFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -58,7 +56,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -135,7 +132,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea } - css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -144,21 +140,18 @@ css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServi } - OUString ContentHandlerFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.ContentHandlerFactory" ); } - css::uno::Sequence< OUString > ContentHandlerFactory::impl_getSupportedServiceNames() { return { "com.sun.star.frame.ContentHandlerFactory" }; } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { ContentHandlerFactory* pNew = new ContentHandlerFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index e9e949d4190d..89e9077062c3 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">ContentHandlerFactory</type>. */ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine explicit ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~ContentHandlerFactory(); @@ -87,7 +84,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -99,7 +95,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -111,7 +106,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index aaa7dfbbaa56..ac3b91fe10d6 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -116,7 +116,6 @@ FilterCache::~FilterCache() } - FilterCache* FilterCache::clone() const { // SAFE -> ---------------------------------- @@ -149,7 +148,6 @@ FilterCache* FilterCache::clone() const } - void FilterCache::takeOver(const FilterCache& rClone) { // SAFE -> ---------------------------------- @@ -199,7 +197,6 @@ void FilterCache::takeOver(const FilterCache& rClone) } - void FilterCache::load(EFillState eRequired) throw(css::uno::Exception) { @@ -242,7 +239,6 @@ void FilterCache::load(EFillState eRequired) } - bool FilterCache::isFillState(FilterCache::EFillState eState) const throw(css::uno::Exception) { @@ -253,7 +249,6 @@ bool FilterCache::isFillState(FilterCache::EFillState eState) const } - OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , const CacheItem& lIProps, const CacheItem& lEProps) const @@ -291,7 +286,6 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , } - bool FilterCache::hasItems(EItemType eType) const throw(css::uno::Exception) { @@ -308,7 +302,6 @@ bool FilterCache::hasItems(EItemType eType) const } - OUStringList FilterCache::getItemNames(EItemType eType) const throw(css::uno::Exception) { @@ -332,7 +325,6 @@ OUStringList FilterCache::getItemNames(EItemType eType) const } - bool FilterCache::hasItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -366,7 +358,6 @@ bool FilterCache::hasItem( EItemType eType, } - CacheItem FilterCache::getItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -418,7 +409,6 @@ CacheItem FilterCache::getItem( EItemType eType, } - void FilterCache::removeItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -440,7 +430,6 @@ void FilterCache::removeItem( EItemType eType, } - void FilterCache::setItem( EItemType eType , const OUString& sItem , const CacheItem& aValue) @@ -480,7 +469,6 @@ void FilterCache::refreshItem( EItemType eType, } - void FilterCache::addStatePropsToItem( EItemType eType, const OUString& sItem, CacheItem& rItem) @@ -577,7 +565,6 @@ void FilterCache::addStatePropsToItem( EItemType eType, } - void FilterCache::removeStatePropsFromItem(CacheItem& rItem) throw(css::uno::Exception) { @@ -591,7 +578,6 @@ void FilterCache::removeStatePropsFromItem(CacheItem& rItem) } - void FilterCache::flush() throw(css::uno::Exception) { @@ -629,7 +615,6 @@ void FilterCache::flush() } - void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , const CacheItemList& rCache, @@ -691,7 +676,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN } - void FilterCache::detectFlatForURL(const css::util::URL& aURL , FlatDetection& rFlatTypes) const throw(css::uno::Exception) @@ -925,7 +909,6 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) } - css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot , bool bReadOnly , bool bLocalesMode) @@ -985,7 +968,6 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess } - void FilterCache::impl_validateAndOptimize() throw(css::uno::Exception) { @@ -1419,7 +1401,6 @@ void FilterCache::impl_load(EFillState eRequiredState) } - void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig, EItemType eType , EReadOption eOption, @@ -1530,7 +1511,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA } - void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) throw(css::uno::Exception) @@ -1592,7 +1572,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe } - void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) throw(css::uno::Exception) @@ -1731,7 +1710,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: } - CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -1806,7 +1784,6 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType } - void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xItem, EItemType eType, const CacheItem& aItem) @@ -2062,7 +2039,6 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ } - void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) @@ -2093,7 +2069,6 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, } - void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) @@ -2242,7 +2217,6 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe } - OUStringList FilterCache::impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator) { @@ -2280,7 +2254,6 @@ OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const } - OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) const { CacheItemList::const_iterator pIt; @@ -2301,7 +2274,6 @@ OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) co #endif - bool FilterCache::impl_isModuleInstalled(const OUString& sModule) { css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index aa8b50b27c6b..93c8d78e07a8 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -42,8 +42,6 @@ namespace filter{ class CacheUpdateListener; - - /** @short implements a cache, which contains all elements of our filter and type detection configuration. @@ -68,7 +66,6 @@ class FilterCache : public BaseLock public: - /** @short identify the type of a container item. @descr Because the cache interface is a generic one @@ -83,7 +80,6 @@ class FilterCache : public BaseLock }; - /** @short indicates, which items already exists inside this cache and which not. @@ -274,13 +270,11 @@ class FilterCache : public BaseLock FilterCache(); - /** @short standard dtor. */ ~FilterCache(); - /** @short creates a copy of this container. @descr Such copy can be used then to modify items (add/change/remove) @@ -305,13 +299,11 @@ class FilterCache : public BaseLock FilterCache* clone() const; - /** @short copy the cache content or rClone back to this instance. */ void takeOver(const FilterCache& rClone); - /** @short force special fill state of this cache. @descr This method checks, if all requested items/properties already @@ -331,7 +323,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return the current fill state of this cache. @descr This information can be used e.g. to start @@ -347,7 +338,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return a list of key names for items, which match the specified criteria. @@ -385,7 +375,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short indicates if the requested sub container contains some items. @@ -411,7 +400,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return a list of all key names, which represent an item inside the specified sub container. @@ -436,7 +424,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short check if the required item exist inside this container. @attention This method exists to supports some UNO container interfaces @@ -461,7 +448,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return an item, which match the specified type and name. @descr Because this cache can be used inside multithreaded environments @@ -491,7 +477,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me ... */ void removeItem( EItemType eType, @@ -499,7 +484,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me ... */ void setItem( EItemType eType , @@ -508,7 +492,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception, std::exception); - /** TODO document me ... */ void refreshItem( EItemType eType, @@ -516,7 +499,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short add some implicit properties to the given cache item reference. @@ -558,14 +540,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me */ static void removeStatePropsFromItem(CacheItem& aValue) throw(css::uno::Exception); - /** @short force writing of all changes (which was made after last flush was called) back to the configuration. @@ -579,7 +559,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short supports a flat type detection for given URL. @descr Because such detection works on our optimized internal @@ -616,7 +595,6 @@ class FilterCache : public BaseLock private: - /** @short return a reference to one of our internal sub container, which contains items of the requested type. @@ -635,7 +613,6 @@ class FilterCache : public BaseLock CacheItemList& impl_getItemList(EItemType eType); - /** @short return a valid configuration update access to the underlying configuration package, which is fix for this cache. @@ -657,7 +634,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short tries to open the requested configuration root using the specified modi. @@ -681,7 +657,6 @@ class FilterCache : public BaseLock bool bLocalesMode); - /** @short reads the specified configuration key and return its value. @@ -704,7 +679,6 @@ class FilterCache : public BaseLock css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); - /** @short load the underlying configuration into this cache. @descr Which items should be readed can be regulate by the @@ -719,7 +693,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short validate the whole cache and create structures for optimized items access. @@ -742,7 +715,6 @@ class FilterCache : public BaseLock private: - /** @short read the specified config set into the cache. @descr This method provides the following mechanism for reading: @@ -775,7 +747,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short read the specified container item from the given configuration set. @descr Its not added to any internal structures here. That must be done @@ -805,7 +776,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short try to load the requested item on demand from the underlying configuration layer. @@ -836,7 +806,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ static void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet , EItemType eType , @@ -844,15 +813,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ void impl_addItem2FlushList( EItemType eType, const OUString& sItem) throw(css::uno::Exception); - - /** TODO */ static void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , @@ -894,14 +860,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ void impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) throw(css::uno::Exception); - /** TODO */ static void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) @@ -917,27 +881,23 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ static void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - /** TODO */ static void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - /** TODO */ static OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator); - #if OSL_DEBUG_LEVEL > 0 /** TODO */ OUString impl_searchFrameLoaderForType(const OUString& sType) const; @@ -955,7 +915,6 @@ class FilterCache : public BaseLock bool impl_isModuleInstalled(const OUString& sModule); - /** @short convert a list of flag names to its int representation. @param lNames @@ -966,7 +925,6 @@ class FilterCache : public BaseLock static SfxFilterFlags impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); - /** @short convert a flag field value to its list representation of flag names. @param nFlags diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 1b08d00b7474..4381264b37bf 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -61,13 +61,11 @@ FilterFactory::FilterFactory(const css::uno::Reference< css::uno::XComponentCont } - FilterFactory::~FilterFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -76,7 +74,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -154,7 +151,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan } - css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -182,7 +178,6 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames( } - css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException, std::exception) { @@ -238,7 +233,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea } - OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenizer& lTokens) const { // analyze query @@ -372,7 +366,6 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize } - class stlcomp_removeIfMatchFlags { private: @@ -414,7 +407,6 @@ class stlcomp_removeIfMatchFlags }; - OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lTokens) const { // analyze the given query parameter @@ -465,7 +457,6 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke } - OUStringList FilterFactory::impl_getListOfInstalledModules() const { // SAFE -> ---------------------- @@ -480,7 +471,6 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const } - OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const @@ -535,7 +525,6 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sM } - OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& sModule) const { // SAFE -> ---------------------- @@ -570,21 +559,18 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& } - OUString FilterFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } - css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { return { "com.sun.star.document.FilterFactory" }; } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FilterFactory* pNew = new FilterFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 8125bda72cac..0e9f7d8ef50f 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -31,8 +31,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">FilterFactory</type>. */ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -57,7 +55,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer explicit FilterFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~FilterFactory(); @@ -94,7 +91,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer private: - /** @short implement the container string query: "matchByDocumentService=:iflags=:eflags=:..." @param lTokens @@ -106,13 +102,11 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer OUStringList impl_queryMatchByDocumentService(const QueryTokenizer& lTokens) const; - /** TODO document me */ OUStringList impl_getListOfInstalledModules() const; - /** @short implement the container string query: "getSortedFilterList()[:module=<xxx>]:[iflags=<xxx>][:eflags=<xxx>]" @@ -125,7 +119,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer OUStringList impl_getSortedFilterList(const QueryTokenizer& lTokens) const; - /** TODO document me */ OUStringList impl_getSortedFilterListForModule(const OUString& sModule, @@ -133,7 +126,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer sal_Int32 nEFlags) const; - /** @short read a specialized and sorted list of filter names from the configuration (matching the specified module) @@ -151,7 +143,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -163,7 +154,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -175,7 +165,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index bf422393f5c8..0baf60160f9d 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -42,13 +42,11 @@ FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::uno::XCom } - FrameLoaderFactory::~FrameLoaderFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -57,7 +55,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -132,7 +129,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI } - css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -141,21 +137,18 @@ css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceN } - OUString FrameLoaderFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.FrameLoaderFactory" ); } - css::uno::Sequence< OUString > FrameLoaderFactory::impl_getSupportedServiceNames() { return { "com.sun.star.frame.FrameLoaderFactory" }; } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FrameLoaderFactory* pNew = new FrameLoaderFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index c9c4cd30b0d5..eb7e506eb7d6 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">FrameLoaderFactory</type>. */ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer explicit FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~FrameLoaderFactory(); @@ -87,7 +84,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -99,7 +95,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -111,7 +106,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index 4dea850765a7..84ec1ba60bff 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -26,8 +26,6 @@ namespace filter{ namespace config{ - - QueryTokenizer::QueryTokenizer(const OUString& sQuery) : m_bValid(true) { @@ -63,14 +61,12 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery) } - QueryTokenizer::~QueryTokenizer() { /*TODO*/ } - bool QueryTokenizer::valid() const { return m_bValid; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 6ddf8dd1b28d..9a25efa53915 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -81,13 +81,11 @@ class QueryTokenizer : public std::unordered_map< OUString , explicit QueryTokenizer(const OUString& sQuery); - /** @short destruct an instance of this class. */ virtual ~QueryTokenizer(); - /** @short can be used to check if analyzing of given query was successfully or not. */ diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 1170b792a967..5c8466f3c0fe 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -58,13 +58,11 @@ TypeDetection::TypeDetection(const css::uno::Reference< css::uno::XComponentCont } - TypeDetection::~TypeDetection() { } - OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException, std::exception) { @@ -468,7 +466,6 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: } - void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDescriptor, OUString& sType ) { @@ -629,7 +626,6 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes } - bool TypeDetection::impl_getPreselectionForType( const OUString& sPreSelType, const util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService) { @@ -875,7 +871,6 @@ void TypeDetection::impl_getAllFormatTypes( } - OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , bool bAllowDeep , @@ -1073,7 +1068,6 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet } - OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor) { css::uno::Reference< css::task::XInteractionHandler > xInteraction = @@ -1134,7 +1128,6 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript } - void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor) throw (css::uno::Exception) { @@ -1165,7 +1158,6 @@ void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor) } - void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor) { utl::MediaDescriptor::iterator pItType = rDescriptor.find(utl::MediaDescriptor::PROP_TYPENAME() ); @@ -1177,7 +1169,6 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rD } - bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sType ) { @@ -1197,7 +1188,6 @@ bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescript } - bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sFilter ) { @@ -1228,21 +1218,18 @@ bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescri } - OUString TypeDetection::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.TypeDetection" ); } - css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames() { return { "com.sun.star.document.TypeDetection" }; } - css::uno::Reference< css::uno::XInterface > SAL_CALL TypeDetection::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { TypeDetection* pNew = new TypeDetection( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index def8863c5e36..af9f692a8ca1 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config { - - /** @short implements the service <type scope="com.sun.star.document">TypeDetection</type>. */ class TypeDetection : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ public: explicit TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~TypeDetection(); @@ -82,7 +79,6 @@ private: FlatDetection& rFlatTypes); - /** @short make a combined flat/deep type detection @descr It steps over all flat detected types (given by the parameter lFlatTypes), @@ -134,7 +130,6 @@ private: OUString& rLastChance ); - /** @short seek a might existing stream to position 0. @descr This is an optinal action to be more robust @@ -148,7 +143,6 @@ private: static void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor); - /** @short make deep type detection for a specified detect service (threadsafe!). @@ -170,7 +164,6 @@ private: utl::MediaDescriptor& rDescriptor ); - /** @short try to find an interaction handler and ask him to select a possible filter for this unknown format. @@ -187,7 +180,6 @@ private: OUString impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor); - /** @short check if an input stream is already part of the given MediaDesciptor and creates a new one if necessary. @@ -225,7 +217,6 @@ private: throw (css::uno::Exception); - /** @short validate the specified type and its relationships and set all needed information related to this type in the specified descriptor. @@ -248,7 +239,6 @@ private: const OUString& sType ); - /** @short validate the specified filter and its relationships and set all needed information related to this filter in the specified descriptor. @@ -270,7 +260,6 @@ private: const OUString& sFilter ); - /** @short remove anything related to a TYPE/FILTER entry from the specified MediaDescriptor. @@ -285,7 +274,6 @@ private: static void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor); - /** @short search the best suitable filter for the given type and add it into the media descriptor. @@ -340,7 +328,6 @@ public: public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -352,7 +339,6 @@ public: static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -364,7 +350,6 @@ public: static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index 2c0f9111283d..d6728330657a 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX - #define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 595bf0df9e71..075bd7fe5618 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -60,7 +60,6 @@ using com::sun::star::frame::XModel; using com::sun::star::lang::XServiceInfo; - PageInfo::PageInfo() : mnBackgroundID( 0 ) , mnObjectsID( 0) @@ -69,7 +68,6 @@ PageInfo::PageInfo() } - PageInfo::~PageInfo() { vector<ShapeInfo*>::iterator aIter( maShapesVector.begin() ); @@ -112,7 +110,6 @@ FlashExporter::FlashExporter( } - FlashExporter::~FlashExporter() { Flush(); @@ -127,7 +124,6 @@ void FlashExporter::Flush() } - const sal_uInt16 cBackgroundDepth = 2; const sal_uInt16 cBackgroundObjectsDepth = 3; const sal_uInt16 cPageObjectsDepth = 4; @@ -398,7 +394,6 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, s } - sal_Int32 nPlaceDepth; // AS: A Slide can have a private background or use its masterpage's background. // We use the checksums on the metafiles to tell if backgrounds are the same and @@ -502,7 +497,6 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X } - /** export's the definition of the shapes inside this drawing page and adds the shape infos to the current PageInfo */ void FlashExporter::exportDrawPageContents( const Reference< XDrawPage >& xPage, bool bStream, bool bMaster ) @@ -512,7 +506,6 @@ void FlashExporter::exportDrawPageContents( const Reference< XDrawPage >& xPage, } - /** export's the definition of the shapes inside this XShapes container and adds the shape infos to the current PageInfo */ void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStream, bool bMaster ) @@ -545,7 +538,6 @@ void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStr } - /** export this shape definition and adds it's info to the current PageInfo */ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster ) { @@ -653,7 +645,6 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster } - bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground /* = false */, bool bExportAsJPEG /* = false */) { if( !mxGraphicExporter.is() ) diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index e4b831e5d58e..b369312759fd 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -112,7 +112,6 @@ struct PageInfo }; - class FlashExporter { public: diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 37b9a30c1a34..0976193e666b 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -136,7 +136,6 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (css::io::NotConnect } - class FlashExportFilter : public cppu::WeakImplHelper < css::document::XFilter, @@ -474,14 +473,12 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes } - void SAL_CALL FlashExportFilter::cancel( ) throw (RuntimeException, std::exception) { } - // XExporter void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) @@ -490,7 +487,6 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< c } - // XInitialization void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index fe1e67f29256..9a627dcf6782 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; - static MapMode aTWIPSMode( MAP_TWIP ); static MapMode a100thmmMode( MAP_100TH_MM ); @@ -40,7 +39,6 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM ) } - Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode ) : mpClipPolyPolygon( nullptr ), mpTag( nullptr ), @@ -96,7 +94,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int } - Writer::~Writer() { mpVDev.disposeAndClear(); @@ -105,7 +102,6 @@ Writer::~Writer() } - void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > &xOut ) { sal_uInt32 nBufferSize = 64*1024; @@ -136,7 +132,6 @@ void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > } - void Writer::storeTo( Reference< XOutputStream > &xOutStream ) { for(FontMap::iterator i = maFonts.begin(); i != maFonts.end(); ++i) @@ -181,7 +176,6 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) } - sal_uInt16 Writer::startSprite() { sal_uInt16 nShapeId = createID(); @@ -191,7 +185,6 @@ sal_uInt16 Writer::startSprite() } - void Writer::endSprite() { if( mpSprite ) @@ -213,7 +206,6 @@ void Writer::endSprite() } - void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClip, const char* pName ) { startTag( TAG_PLACEOBJECT2 ); @@ -249,7 +241,6 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int } - void Writer::removeShape( sal_uInt16 nDepth ) { startTag( TAG_REMOVEOBJECT2 ); @@ -258,7 +249,6 @@ void Writer::removeShape( sal_uInt16 nDepth ) } - void Writer::startTag( sal_uInt8 nTagId ) { DBG_ASSERT( mpTag == nullptr, "Last tag was not ended"); @@ -267,7 +257,6 @@ void Writer::startTag( sal_uInt8 nTagId ) } - void Writer::endTag() { sal_uInt8 nTag = mpTag->getTagId(); @@ -286,7 +275,6 @@ void Writer::endTag() } - void Writer::showFrame() { startTag( TAG_SHOWFRAME ); @@ -297,7 +285,6 @@ void Writer::showFrame() } - sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 y ) { mpVDev->SetMapMode( rMtf.GetPrefMapMode() ); @@ -330,7 +317,6 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 } - sal_uInt16 Writer::defineShape( const tools::Polygon& rPoly, const FillStyle& rFillStyle ) { const tools::PolyPolygon aPolyPoly( rPoly ); @@ -338,7 +324,6 @@ sal_uInt16 Writer::defineShape( const tools::Polygon& rPoly, const FillStyle& rF } - sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ) { sal_uInt16 nShapeId = createID(); @@ -382,7 +367,6 @@ sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, const FillS } - sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ) { sal_uInt16 nShapeId = createID(); @@ -427,8 +411,6 @@ sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 } - - void Writer::stop() { startTag( TAG_DOACTION ); @@ -438,7 +420,6 @@ void Writer::stop() } - void Writer::waitOnClick( sal_uInt16 nDepth ) { placeShape( _uInt16( mnPageButtonId ), nDepth, 0, 0 ); @@ -448,7 +429,6 @@ void Writer::waitOnClick( sal_uInt16 nDepth ) } - /** inserts a doaction tag with an ActionGotoFrame */ void Writer::gotoFrame( sal_uInt16 nFrame ) { diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 333c2af911b6..198c04948e96 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -104,12 +104,10 @@ const sal_uInt8 TAG_FRAMELABEL = 43; const sal_uInt8 TAG_HEADER = 0xff; - /** converts a double to a 16.16 flash fixed value */ sal_uInt32 getFixed( double fValue ); - typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache; /** unsigned int 16 compare operation for stl */ @@ -122,7 +120,6 @@ struct ltuint16 }; - /** container class to create bit structures */ class BitStream { @@ -145,7 +142,6 @@ private: }; - /** this class collects all used glyphs for a given fonts and maps characters to glyph ids. */ @@ -174,7 +170,6 @@ private: typedef std::vector<FlashFont*> FontMap; - /** this class helps creating flash tags */ class Tag : public SvMemoryStream { @@ -205,7 +200,6 @@ private: }; - /** this class helps to define flash sprites */ class Sprite { @@ -223,7 +217,6 @@ private: }; - /** this class stores a flash fill style for shapes */ class FillStyle { @@ -253,7 +246,6 @@ private: }; - /** this class creates a flash movie from vcl geometry */ class Writer { @@ -424,7 +416,6 @@ private: }; - } #endif diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 200d424897f4..cdb956d57a87 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -50,7 +50,6 @@ static MapMode aTWIPSMode( MAP_TWIP ); static MapMode a100thmmMode( MAP_100TH_MM ); - Point Writer::map( const Point& rPoint ) const { const MapMode& aSourceMapMode = mpVDev->GetMapMode(); @@ -66,7 +65,6 @@ Point Writer::map( const Point& rPoint ) const } - Size Writer::map( const Size& rSize ) const { const MapMode& aSourceMapMode = mpVDev->GetMapMode(); @@ -82,7 +80,6 @@ Size Writer::map( const Size& rSize ) const } - void Writer::map( tools::PolyPolygon& rPolyPolygon ) const { const sal_uInt16 nPolyCount = rPolyPolygon.Count(); @@ -103,7 +100,6 @@ void Writer::map( tools::PolyPolygon& rPolyPolygon ) const } - sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const { MapMode aSourceMapMode( mpVDev->GetMapMode() ); @@ -114,7 +110,6 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const } - void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, bool bFilled ) { Point aLastPoint( rPoly[0] ); @@ -169,7 +164,6 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo } - /** Exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1 */ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled ) @@ -192,7 +186,6 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1 } - /** Exports a straight edge record */ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int16 dy ) @@ -226,7 +219,6 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int } - /** Exports a curved edge record */ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy ) @@ -249,7 +241,6 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s } - /** Exports a end shape record */ void Writer::Impl_addEndShapeRecord( BitStream& rBits ) @@ -258,7 +249,6 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits ) } - void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled ) { tools::PolyPolygon aPolyPoly( rPoly ); @@ -266,7 +256,6 @@ void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled ) } - void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { tools::PolyPolygon aPolyPoly( rPoly ); @@ -274,7 +263,6 @@ void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled, const } - void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ ) { Color aLineColor( mpVDev->GetLineColor() ); @@ -287,7 +275,6 @@ void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bF } - void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { tools::PolyPolygon aPolyPoly( rPolyPoly ); @@ -322,7 +309,6 @@ void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bF } - /** A gradient is a transition from one color to another, rendered inside a given polypolygon */ void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { @@ -357,14 +343,12 @@ void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gr } - void Writer::setClipping( const tools::PolyPolygon* pClipPolyPolygon ) { mpClipPolyPolygon = pClipPolyPolygon; } - // AS: Just comparing fonts straight up is too literal. There are some // differences in font that actually require different glyphs to be defined, // and some that don't. This function is meant to capture all the differences @@ -380,7 +364,6 @@ bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2) } - FlashFont& Writer::Impl_getFont( const vcl::Font& rFont ) { FontMap::iterator aIter( maFonts.begin() ); @@ -401,7 +384,6 @@ FlashFont& Writer::Impl_getFont( const vcl::Font& rFont ) } - void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth ) { const FontMetric aMetric( mpVDev->GetFontMetric() ); @@ -876,7 +858,6 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali } - void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& /* rSrcPt */, const Size& /* rSrcSz */, const Rectangle& rClipRect, bool bNeedToMapClipRect ) { if( !!rBmpEx ) @@ -989,7 +970,6 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h } - void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size ) { // AS: Go through the actual JPEG bits, separating out the @@ -1126,7 +1106,6 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal } - void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor ) { Color aOldColor( mpVDev->GetLineColor() ); @@ -1141,7 +1120,6 @@ void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* } - void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ) { if( (rRect.Top() == rRect.Bottom()) || (rRect.Left() == rRect.Right()) ) @@ -1157,7 +1135,6 @@ void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ) } - void Writer::Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY ) { tools::Polygon aPoly( rCenter, nRadX, nRadY ); @@ -1208,7 +1185,6 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) } - /** Writes the filling defined by SvtGraphicFill and returns true or it returns false if it can't handle this filling. */ @@ -1285,7 +1261,6 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling ) } - /* CL: The idea was to export page fields as text fields that get theire string from a variable set with actionscript by each page. This didn't work out since the formatting is always wrong when text follows the @@ -1334,7 +1309,6 @@ bool Writer::Impl_writePageField( Rectangle& rTextBounds ) #endif - void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon) { if(rLinePolygon.count()) @@ -1374,7 +1348,6 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf } - void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) { Rectangle clipRect; @@ -1842,9 +1815,6 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } - - - void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, const double P2x, const double P2y ) { @@ -1856,7 +1826,6 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, } - void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint, const double P2x, const double P2y, const double P3x, const double P3y ) @@ -1872,7 +1841,6 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint, } - /* Approximate given cubic bezier curve by quadratic bezier segments */ void Writer::Impl_quadBezierApprox( BitStream& rBits, Point& rLastPoint, diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 5c0c098b9072..ec523c56fba9 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; - sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue ) { sal_uInt16 nBits = 0; @@ -44,7 +43,6 @@ sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue ) } - sal_uInt16 getMaxBitsSigned( sal_Int32 nValue ) { if( nValue < 0 ) @@ -54,7 +52,6 @@ sal_uInt16 getMaxBitsSigned( sal_Int32 nValue ) } - BitStream::BitStream() { mnBitPos = 8; @@ -62,7 +59,6 @@ BitStream::BitStream() } - void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits ) { while( nBits != 0 ) @@ -86,21 +82,18 @@ void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits ) } - void BitStream::writeSB( sal_Int32 nValue, sal_uInt16 nBits ) { writeUB( static_cast< sal_uInt32 >(nValue), nBits ); } - void BitStream::writeFB( sal_uInt32 nValue, sal_uInt16 nBits ) { writeUB( nValue, nBits ); } - void BitStream::pad() { if( 8 != mnBitPos ) @@ -112,7 +105,6 @@ void BitStream::pad() } - void BitStream::writeTo( SvStream& out ) { pad(); @@ -126,21 +118,18 @@ void BitStream::writeTo( SvStream& out ) } - sal_uInt32 BitStream::getOffset() const { return maData.size(); } - Tag::Tag( sal_uInt8 nTagId ) { mnTagId = nTagId; } - void Tag::write( SvStream &out ) { Seek( STREAM_SEEK_TO_END ); @@ -203,21 +192,18 @@ void Tag::addUI16( sal_uInt16 nValue ) } - void Tag::addUI8( sal_uInt8 nValue ) { WriteUChar( nValue ); } - void Tag::addBits( BitStream& rIn ) { rIn.writeTo( *this ); } - void Tag::addRGBA( const Color& rColor ) { addUI8( rColor.GetRed() ); @@ -227,7 +213,6 @@ void Tag::addRGBA( const Color& rColor ) } - void Tag::addRGB( const Color& rColor ) { addUI8( rColor.GetRed() ); @@ -236,14 +221,12 @@ void Tag::addRGB( const Color& rColor ) } - void Tag::addRect( const Rectangle& rRect ) { writeRect( *this, rRect ); } - void Tag::writeRect( SvStream& rOut, const Rectangle& rRect ) { BitStream aBits; @@ -293,14 +276,12 @@ void Tag::writeRect( SvStream& rOut, const Rectangle& rRect ) } - void Tag::addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264# { writeMatrix( *this, rMatrix ); } - void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264# { @@ -342,7 +323,6 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ) } - void Tag::addString( const char* pString ) { if( pString ) @@ -355,21 +335,18 @@ void Tag::addString( const char* pString ) } - void Tag::addStream( SvStream& rIn ) { (*this).WriteStream( rIn ); } - Sprite::Sprite( sal_uInt16 nId ) : mnId( nId ), mnFrames(0) { } - Sprite::~Sprite() { for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i) @@ -377,7 +354,6 @@ Sprite::~Sprite() } - void Sprite::write( SvStream& out ) { SvMemoryStream aTmp; @@ -397,7 +373,6 @@ void Sprite::write( SvStream& out ) } - void Sprite::addTag( Tag* pNewTag ) { if( pNewTag ) @@ -410,7 +385,6 @@ void Sprite::addTag( Tag* pNewTag ) } - sal_uInt32 swf::getFixed( double fValue ) { sal_Int16 nUpper = (sal_Int16)floor(fValue); @@ -423,7 +397,6 @@ sal_uInt32 swf::getFixed( double fValue ) } - /** constructs a new flash font for the given VCL Font */ FlashFont::FlashFont( const vcl::Font& rFont, sal_uInt16 nId ) : maFont( rFont ), mnNextIndex(0), mnId( nId ) @@ -431,13 +404,11 @@ FlashFont::FlashFont( const vcl::Font& rFont, sal_uInt16 nId ) } - FlashFont::~FlashFont() { } - /** gets the glyph id for the given character. The glyphs are created on demand */ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) { @@ -497,7 +468,6 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) } - void FlashFont::write( SvStream& out ) { Tag aTag( TAG_DEFINEFONT ); @@ -516,7 +486,6 @@ void FlashFont::write( SvStream& out ) } - /** this c'tor creates a solid fill style */ FillStyle::FillStyle( const Color& rSolidColor ) : meType(solid ) @@ -526,7 +495,6 @@ FillStyle::FillStyle( const Color& rSolidColor ) } - /** this c'tor creates a tiled or clipped bitmap fill style */ FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264# : meType( bClipped ? clipped_bitmap : tiled_bitmap ), @@ -536,7 +504,6 @@ FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DH } - FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient ) { switch( rGradient.GetStyle() ) @@ -554,7 +521,6 @@ FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient ) } - /** this c'tor creates a linear or radial gradient fill style */ FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient ) : meType(Impl_getFillStyleType(rGradient)) @@ -565,7 +531,6 @@ FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient ) } - void FillStyle::addTo( Tag* pTag ) const { pTag->addUI8( sal::static_int_cast<sal_uInt8>( meType ) ); @@ -587,7 +552,6 @@ void FillStyle::addTo( Tag* pTag ) const } - struct GradRecord { sal_uInt8 mnRatio; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 33aa48214f5c..4aa347db9ed1 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -234,7 +234,6 @@ public: //========================== methods from PSWriter ========================== - PSWriter::PSWriter() : mbStatus(false) , mnLevelWarning(0) @@ -296,7 +295,6 @@ PSWriter::~PSWriter() } - bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem ) { sal_uInt32 nStreamPosition = 0, nPSPosition = 0; // -Wall warning, unset, check @@ -481,7 +479,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter } - void PSWriter::ImplWriteProlog( const Graphic* pPreview ) { ImplWriteLine( "%!PS-Adobe-3.0 EPSF-3.0 " ); @@ -617,7 +614,6 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) } - void PSWriter::ImplWriteEpilog() { ImplTranslate( 0, nBoundingY2 ); @@ -631,9 +627,6 @@ void PSWriter::ImplWriteEpilog() } - - - void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { tools::PolyPolygon aFillPath; @@ -1442,9 +1435,6 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) } - - - inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) { ImplWriteDouble( rPoint.X() ); @@ -1452,7 +1442,6 @@ inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) { ImplWritePoint( rPoint ); @@ -1461,7 +1450,6 @@ void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) { ImplWritePoint( rPoint ); @@ -1470,7 +1458,6 @@ void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode ) { ImplWritePoint( rP1 ); @@ -1481,7 +1468,6 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3 } - void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode ) { ImplWriteDouble( fX ); @@ -1491,7 +1477,6 @@ void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMo } - void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) { ImplWriteDouble( fX ); @@ -1501,7 +1486,6 @@ void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) } - void PSWriter::ImplRect( const Rectangle & rRect ) { if ( bFillColor ) @@ -1526,7 +1510,6 @@ void PSWriter::ImplRect( const Rectangle & rRect ) } - void PSWriter::ImplRectFill( const Rectangle & rRect ) { double nWidth = rRect.GetWidth(); @@ -1546,7 +1529,6 @@ void PSWriter::ImplRectFill( const Rectangle & rRect ) } - void PSWriter::ImplAddPath( const tools::Polygon & rPolygon ) { sal_uInt16 nPointCount = rPolygon.GetSize(); @@ -1571,7 +1553,6 @@ void PSWriter::ImplAddPath( const tools::Polygon & rPolygon ) } - void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); @@ -1589,7 +1570,6 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) } - void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { ScopedVclPtrInstance< VirtualDevice > l_pVDev; @@ -1600,7 +1580,6 @@ void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gra } - void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOutline ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); @@ -1637,7 +1616,6 @@ void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOut } - void PSWriter::ImplPolyLine( const tools::Polygon & rPoly ) { if ( bLineColor ) @@ -1675,7 +1653,6 @@ void PSWriter::ImplPolyLine( const tools::Polygon & rPoly ) } - void PSWriter::ImplSetClipRegion( vcl::Region& rClipRegion ) { if ( !rClipRegion.IsEmpty() ) @@ -2069,7 +2046,6 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi } - void PSWriter::ImplWriteCharacter( sal_Char nChar ) { switch( nChar ) @@ -2083,7 +2059,6 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar ) } - void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const long* pDXArry, bool bStretch ) { sal_Int32 nLen = rString.getLength(); @@ -2115,7 +2090,6 @@ void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, co } - void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ) { if ( rUniString.isEmpty() ) @@ -2176,7 +2150,6 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo } - void PSWriter::ImplSetAttrForText( const Point& rPoint ) { Point aPoint( rPoint ); @@ -2219,7 +2192,6 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) } - void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) { mpPS->WriteUChar( '/' ); //convert the font pOriginalName using ISOLatin1Encoding @@ -2243,9 +2215,6 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) } - - - void PSWriter::ImplClosePathDraw( sal_uLong nMode ) { mpPS->WriteCharPtr( "pc" ); @@ -2261,7 +2230,6 @@ void PSWriter::ImplPathDraw() } - inline void PSWriter::ImplWriteLineColor( sal_uLong nMode ) { if ( aColor != aLineColor ) @@ -2307,7 +2275,6 @@ void PSWriter::ImplWriteColor( sal_uLong nMode ) } - double PSWriter::ImplGetScaling( const MapMode& rMapMode ) { double nMul; @@ -2355,7 +2322,6 @@ double PSWriter::ImplGetScaling( const MapMode& rMapMode ) } - void PSWriter::ImplGetMapMode( const MapMode& rMapMode ) { ImplWriteLine( "tm setmatrix" ); @@ -2367,7 +2333,6 @@ void PSWriter::ImplGetMapMode( const MapMode& rMapMode ) } - inline void PSWriter::ImplExecMode( sal_uLong nMode ) { if ( nMode & PS_WRAP ) @@ -2392,7 +2357,6 @@ inline void PSWriter::ImplExecMode( sal_uLong nMode ) } - inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) { sal_uLong i = 0; @@ -2405,7 +2369,6 @@ inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) } - void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, SvtGraphicStroke::CapType eLCap, SvtGraphicStroke::JoinType eJoin, @@ -2450,7 +2413,6 @@ void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, } - void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) { SvtGraphicStroke::DashArray l_aDashArray; @@ -2500,7 +2462,6 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) } - void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { const OString aNumber(OString::number(nNumber)); @@ -2510,7 +2471,6 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) } - void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) { sal_Int32 nPTemp = (sal_Int32)fNumber; @@ -2554,7 +2514,6 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) } - // writes the number to stream: nNumber / ( 10^nCount ) void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode ) @@ -2596,7 +2555,6 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode } - void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) { mpPS->WriteUChar( nNumb ); @@ -2605,7 +2563,6 @@ void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) } - void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) { if ( ( nNumb >> 4 ) > 9 ) @@ -2622,7 +2579,6 @@ void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) } - // writes the sal_uInt8 nNumb as a Number from 0.000 up to 1.000 void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode ) @@ -2631,8 +2587,6 @@ void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode ) } - - inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { dwShift |= ( nCode << ( nOffset - nCodeLen ) ); @@ -2648,7 +2602,6 @@ inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) } - void PSWriter::StartCompression() { sal_uInt16 i; @@ -2674,7 +2627,6 @@ void PSWriter::StartCompression() } - void PSWriter::Compress( sal_uInt8 nCompThis ) { PSLZWCTreeNode* p; @@ -2728,7 +2680,6 @@ void PSWriter::Compress( sal_uInt8 nCompThis ) } - void PSWriter::EndCompression() { if( pPrefix ) @@ -2739,7 +2690,6 @@ void PSWriter::EndCompression() } - sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize ) { while ( nComp-- >= nSize ) @@ -2758,7 +2708,6 @@ sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDes } - bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ) { bool bRetValue = false; diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 2e0048dde16d..3a8eba18408b 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; - CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) : CGMOutAct ( rCGM ), nFinalTextCount ( 0 ) @@ -91,7 +90,6 @@ bool CGMImpressOutAct::ImplInitPage() } - bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) { uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) ); @@ -106,7 +104,6 @@ bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) } - void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrientation ) { uno::Any aAny; @@ -119,7 +116,6 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien } - void CGMImpressOutAct::ImplSetLineBundle() { uno::Any aAny; diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 2243ed849f4f..89edee37e1bd 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -21,7 +21,6 @@ #include "main.hxx" - CGMBitmap::CGMBitmap( CGM& rCGM ) : mpCGM ( &rCGM ), pCGMBitmapDescriptor ( new CGMBitmapDescriptor ) @@ -30,14 +29,12 @@ CGMBitmap::CGMBitmap( CGM& rCGM ) : }; - CGMBitmap::~CGMBitmap() { delete pCGMBitmapDescriptor; } - void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) { rDesc.mbStatus = true; @@ -217,7 +214,6 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) } - void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) { sal_uInt16 nColors = sal::static_int_cast< sal_uInt16 >( @@ -230,7 +226,6 @@ void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) } - bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) { mpCGM->ImplGetPoint( rDesc.mnP ); // parallelogram p < - > r @@ -322,7 +317,6 @@ bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) } - void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest ) { if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) ) diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index f59182d7a7f2..df877fed3020 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -31,15 +31,12 @@ Bundle& Bundle::operator=( Bundle& rSource ) }; - void Bundle::SetColor( sal_uInt32 nColor ) { mnColor = nColor; } - - LineBundle& LineBundle::operator=( LineBundle& rSource ) { SetIndex( rSource.GetIndex() ); @@ -111,7 +108,6 @@ CGMFList::~CGMFList() } - CGMFList& CGMFList::operator=( CGMFList& rSource ) { ImplDeleteList(); @@ -142,7 +138,6 @@ CGMFList& CGMFList::operator=( CGMFList& rSource ) } - FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) { sal_uInt32 nInd = nIndex; @@ -152,7 +147,6 @@ FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) } - static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8 const * pDest, sal_uInt32 nComp, sal_uInt32 nSize ) { while ( nComp-- >= nSize ) @@ -231,7 +225,6 @@ void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize ) } - void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_uInt32 nSize ) { FontEntry* pFontEntry; @@ -253,7 +246,6 @@ void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_ } - void CGMFList::ImplDeleteList() { for ( size_t i = 0, n = aFontEntryList.size(); i < n; ++i ) diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index 0ad0202edff1..2e6573f59ee2 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -26,7 +26,6 @@ #include <vector> - class Bundle { @@ -51,7 +50,6 @@ public: }; - class LineBundle : public Bundle { public: @@ -69,7 +67,6 @@ public: }; - class MarkerBundle : public Bundle { public: @@ -88,7 +85,6 @@ public: }; - class EdgeBundle : public Bundle { public: @@ -105,7 +101,6 @@ public: }; - class TextBundle : public Bundle { public: @@ -128,7 +123,6 @@ public: }; - class FillBundle : public Bundle { public: @@ -147,8 +141,6 @@ public: }; - - class FontEntry { public: diff --git a/filter/source/graphicfilter/icgm/cgmtypes.hxx b/filter/source/graphicfilter/icgm/cgmtypes.hxx index 07e121d38b28..b55178812eba 100644 --- a/filter/source/graphicfilter/icgm/cgmtypes.hxx +++ b/filter/source/graphicfilter/icgm/cgmtypes.hxx @@ -132,8 +132,6 @@ enum FillInteriorStyle { FIS_HOLLOW = 0, FIS_SOLID = 1, FIS_PATTERN = 2, FIS_HA FIS_INTERPOLATED = 6, FIS_GRADIENT = 7 }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index 12305f9c8bc6..929fe752a231 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -21,7 +21,6 @@ #include <outact.hxx> - void CGM::ImplDoClass0() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index b43238f5a140..641355924f74 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -21,7 +21,6 @@ #include <main.hxx> - void CGM::ImplDoClass1() { long nInteger, nI0, nI1; diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 6cd12931af49..93b3679381b6 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -21,7 +21,6 @@ #include <main.hxx> - void CGM::ImplDoClass2() { sal_uInt32 nUInteger; diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 3faf2572444d..c18a5866fae1 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -22,7 +22,6 @@ #include <outact.hxx> - void CGM::ImplDoClass3() { sal_uInt32 nUInteger; diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index fbd800c38779..442f10dc087d 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -41,7 +41,6 @@ double CGM::ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint ) } - void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) { double nTemp; @@ -51,7 +50,6 @@ void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) } - void CGM::ImplGetVector( double* pVector ) { if ( pElement->eVDCType == VDC_REAL ) diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index 13ac9e42d619..1ff3cd7f05db 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -23,8 +23,6 @@ #include <outact.hxx> - - void CGM::ImplDoClass5() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index b4f7994f15c2..bdbdb866caaf 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -23,7 +23,6 @@ #include <outact.hxx> - void CGM::ImplDoClass7() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx index 28d565df1615..ce897128a2c2 100644 --- a/filter/source/graphicfilter/icgm/classx.cxx +++ b/filter/source/graphicfilter/icgm/classx.cxx @@ -22,7 +22,6 @@ #include <outact.hxx> - #define ImplSetUnderlineMode() \ \ sal_uInt32 nMode = ImplGetUI16(); \ @@ -37,7 +36,6 @@ pElement->nUnderlineColor = ImplGetBitmapColor(); - void CGM::ImplDoClass6() { switch ( mnElementID ) @@ -198,7 +196,6 @@ void CGM::ImplDoClass6() }; - void CGM::ImplDoClass8() { switch ( mnElementID ) @@ -217,7 +214,6 @@ void CGM::ImplDoClass8() }; - void CGM::ImplDoClass9() { switch ( mnElementID ) @@ -237,7 +233,6 @@ void CGM::ImplDoClass9() }; - void CGM::ImplDoClass15() { switch ( mnElementID ) @@ -250,5 +245,4 @@ void CGM::ImplDoClass15() }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 2172b72bf14d..60e4c0f5f7b2 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -21,15 +21,12 @@ #include "elements.hxx" - - CGMElements::CGMElements() { Init(); }; - CGMElements::~CGMElements() { DeleteAllBundles( aLineList ); @@ -40,7 +37,6 @@ CGMElements::~CGMElements() } - CGMElements& CGMElements::operator=( CGMElements& rSource ) { sal_uInt32 nIndex; @@ -139,7 +135,6 @@ CGMElements& CGMElements::operator=( CGMElements& rSource ) } - void CGMElements::Init() { @@ -286,7 +281,6 @@ void CGMElements::Init() } - void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, long nAngle ) { HatchEntry& rEntry = maHatchMap[nKey]; @@ -296,7 +290,6 @@ void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, l } - void CGMElements::DeleteAllBundles( BundleList& rList ) { for ( size_t i = 0, n = rList.size(); i < n; ++i ) { @@ -306,8 +299,6 @@ void CGMElements::DeleteAllBundles( BundleList& rList ) }; - - void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) { DeleteAllBundles( rDest ); @@ -321,7 +312,6 @@ void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) }; - Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBundle ) { rBundle.SetIndex( nIndex ); @@ -332,7 +322,6 @@ Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBu } - Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) { for ( size_t i = 0, n = rList.size(); i < n; ++i ) { @@ -344,7 +333,6 @@ Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) } - Bundle* CGMElements::InsertBundle( BundleList& rList, Bundle& rBundle ) { Bundle* pBundle = GetBundle( rList, rBundle.GetIndex() ); diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 70f89e8c92b8..fb732c8e3afc 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -888,5 +888,4 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx index d16428f3e850..07f67777ae3b 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx @@ -22,11 +22,9 @@ #include <dxfblkrd.hxx> - //---------------- DXFBlock -------------------------------------------------- - DXFBlock::DXFBlock() : pSucc(nullptr) , nFlags(0) @@ -66,11 +64,9 @@ void DXFBlock::Read(DXFGroupReader & rDGR) } - //---------------- DXFBlocks ------------------------------------------------- - DXFBlocks::DXFBlocks() { pFirst=nullptr; @@ -127,5 +123,4 @@ void DXFBlocks::Clear() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx index 9f17599a5c44..572ce27575ca 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx @@ -49,7 +49,6 @@ public: }; - //---------------- Eine Menge von Bloecken ----------------------------------- diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx index a2e6d7aabb48..93d78a3a161f 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx @@ -24,7 +24,6 @@ #include <dxftblrd.hxx> - //--------------------Other stuff--------------------------------------------- @@ -66,7 +65,6 @@ private: }; - //-----------------read and represent DXF file-------------------------------- diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx index 569dc317300c..588e7c8f059d 100644 --- a/filter/source/graphicfilter/idxf/dxftblrd.hxx +++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx @@ -24,7 +24,6 @@ #include <dxfvec.hxx> - //------------------- Line Type ---------------------------------------------- @@ -48,7 +47,6 @@ public: }; - //------------------ Layer --------------------------------------------------- @@ -68,7 +66,6 @@ public: }; - //------------------ Style --------------------------------------------------- @@ -93,7 +90,6 @@ public: }; - //------------------ VPort --------------------------------------------------- @@ -141,7 +137,6 @@ public: }; - //------------------ Tabellen ------------------------------------------------ diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx index a5ce4e451192..8c8a4f7bba0c 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.hxx +++ b/filter/source/graphicfilter/idxf/dxfvec.hxx @@ -56,7 +56,6 @@ public: }; - //---------------------------- DXFVector --------------------------------------- // common 3D vector with doubles @@ -169,7 +168,6 @@ private: //------------------------------- inlines -------------------------------------- - inline DXFVector::DXFVector(double fX, double fY, double fZ) { fx=fX; fy=fY; fz=fZ; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index b904bc37b2a4..a111a99519e4 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -107,7 +107,6 @@ static long ImplGetNumber( sal_uInt8 **pBuf, sal_uInt32& nSecurityCount ) } - static int ImplGetLen( sal_uInt8* pBuf, int nMax ) { int nLen = 0; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index ec13ccc3c55d..f77499e43f4d 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -452,7 +452,6 @@ bool PBMReader::ImplReadBody() break; - // PPM case 2 : diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 87b3d950731c..d4568d071a8a 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -168,7 +168,6 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem ) } - void PCDReader::CheckPCDImagePacFile() { char Buf[ 8 ]; @@ -181,7 +180,6 @@ void PCDReader::CheckPCDImagePacFile() } - void PCDReader::ReadOrientation() { if ( !bStatus ) @@ -192,7 +190,6 @@ void PCDReader::ReadOrientation() } - void PCDReader::ReadImage() { sal_uLong nx,ny,nW2,nH2,nYPair,ndy,nXPair; diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 22d7e96fbec7..aff44cd5f63c 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -258,7 +258,6 @@ public: }; - #define SETBYTE \ switch ( nPixelSize ) \ { \ @@ -299,7 +298,6 @@ public: } - #define BITMAPERROR \ { \ if ( pAcc ) \ diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 74f3349a5696..3a89900176b4 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -169,7 +169,6 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) } - bool PSDReader::ImplReadHeader() { mpFileHeader = new PSDFileHeader; diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 45d62927a229..a40202c63928 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -87,7 +87,6 @@ RASReader::~RASReader() } - bool RASReader::ReadRAS(Graphic & rGraphic) { sal_uInt32 nMagicNumber; @@ -211,7 +210,6 @@ bool RASReader::ImplReadHeader() } - bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) { sal_Int32 x, y; diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index ad3960e03c56..571421d90851 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -130,7 +130,6 @@ TGAReader::~TGAReader() } - bool TGAReader::ReadTGA(Graphic & rGraphic) { if ( m_rTGA.GetError() ) @@ -170,7 +169,6 @@ bool TGAReader::ReadTGA(Graphic & rGraphic) } - bool TGAReader::ImplReadHeader() { mpFileHeader = new TGAFileHeader; @@ -271,7 +269,6 @@ bool TGAReader::ImplReadHeader() } - bool TGAReader::ImplReadBody() { @@ -706,7 +703,6 @@ bool TGAReader::ImplReadBody() } - bool TGAReader::ImplReadPalette() { if ( mbIndexing ) // read the colormap diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 56a4aea358ce..1cb7d7d53448 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -564,8 +564,6 @@ const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={ }; - - CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) : bTableBad ( false ), bStatus ( false ), @@ -1015,7 +1013,6 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget } - void CCIDecompressor::Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits) { sal_uInt16 n2DMode,nBitPos,nUncomp,nRun,nRun2,nt; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index b8f8368548bd..f4352df88e8f 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -537,7 +537,6 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) } - bool TIFFReader::ReadMap() { if ( nCompression == 1 || nCompression == 32771 ) @@ -787,7 +786,6 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u } - bool TIFFReader::ConvertScanline(sal_Int32 nY) { sal_uInt32 nRed, nGreen, nBlue, ns, nVal, nByteCount; @@ -1092,7 +1090,6 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY) } - void TIFFReader::MakePalCol() { if ( nDstBitsPerPixel <= 8 ) @@ -1143,7 +1140,6 @@ void TIFFReader::MakePalCol() } - void TIFFReader::ReadHeader() { sal_uInt8 nbyte1(0), nbyte2(0); @@ -1173,7 +1169,6 @@ bool TIFFReader::HasAlphaChannel() const } - bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) { sal_uInt16 i, nNumTags(0), nTagType(0); diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index 508fd84e7a54..3cddf0b40976 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -223,5 +223,4 @@ void LZWDecompressor::DecompressSome() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index cd546e2b7226..f2b8b7abe2cc 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -23,7 +23,6 @@ #include <sal/macros.h> - namespace msfilter { // Mapping table ============================================================== @@ -31,7 +30,6 @@ namespace msfilter { namespace { - /** Table entry for Windows country ID <-> language type conversion. The first member is the Windows country ID, as defined in the header. @@ -58,7 +56,6 @@ struct CountryEntry }; - /** Table for Windows country ID <-> language type conversion. To map the same language to different country IDs, some of the entries diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 758558214869..971b65b70c76 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -143,7 +143,6 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty } - #define ADD_SHAPE( nType, nFlags ) \ { \ nShapeType = nType; \ diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index f4b50cae88fc..e7a089b0d4e0 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -89,8 +89,6 @@ public: }; - - // fractions of the Draw PPTWriter class EscherEx; @@ -189,7 +187,6 @@ public: }; - #endif // INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index ff74b81cc74f..b6ac16949c88 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; namespace msfilter { - namespace { /** Rotates rnValue left by nBits bits. */ @@ -116,7 +115,6 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Size nBufferSize ) } // namespace - MSCodec_Xor95::MSCodec_Xor95(int nRotateDistance) : mnOffset( 0 ), mnKey( 0 ), @@ -248,7 +246,6 @@ void MSCodec_Xor95::Skip( sal_Size nBytes ) } - MSCodec_Std97::MSCodec_Std97 () { m_hCipher = rtl_cipher_create ( @@ -540,7 +537,6 @@ void MSCodec_Std97::GetDocId( sal_uInt8 pDocId[16] ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index a6ee333a38af..3600381c09c1 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -380,7 +380,6 @@ DffPropertyReader::~DffPropertyReader() } - SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) { rIn.ReadUInt32( rRule.nRuleId ) @@ -783,7 +782,6 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) } - static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd, const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLength, sal_Int32& rnArrowWidth, bool& rbArrowCenter, @@ -6161,7 +6159,6 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, } - /***************************************************************************** Access to a shape at runtime (via the Shape-Id) @@ -6203,7 +6200,6 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape, } - /* access to a BLIP at runtime (if the Blip-Number is already known) --------------------------- ******************************************************************************/ diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 240849ca63f7..02f2fd07a727 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -338,5 +338,4 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 278112b4ef9e..744fdc2591fa 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -506,7 +506,6 @@ bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequ } - uno::Sequence< OUString > VBAMacroResolver_getSupportedServiceNames() { uno::Sequence<OUString> aServiceNames { "com.sun.star.script.vba.VBAMacroResolver" }; @@ -524,7 +523,6 @@ uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( cons } - VBAMacroResolver::VBAMacroResolver() : mpObjShell( nullptr ) { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 42c47b89a79f..ab232e851482 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3055,7 +3055,6 @@ HeaderFooterEntry::~HeaderFooterEntry() } - sal_uInt32 HeaderFooterEntry::IsToDisplay( sal_uInt32 nInstance ) { sal_uInt32 nMask = 0; @@ -4663,7 +4662,6 @@ PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() } - PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter() { } diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 42b3b926afae..687411198c08 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -439,7 +439,6 @@ sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) } - // read parameters "1-3" or 1-3 with both values between 1 and nMax bool WW8ReadFieldParams::GetTokenSttFromTo(sal_Int32* pFrom, sal_Int32* pTo, sal_Int32 nMax) { diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 76d8952dc161..a7aacde578da 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -55,25 +55,20 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul } - #undef SERVICE_NAME - - PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext ) : PDFDialog_Base( rxContext ) { } - PDFDialog::~PDFDialog() { } - Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() throw(RuntimeException, std::exception) { @@ -81,7 +76,6 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() } - OUString SAL_CALL PDFDialog::getImplementationName() throw (RuntimeException, std::exception) { @@ -89,7 +83,6 @@ OUString SAL_CALL PDFDialog::getImplementationName() } - Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) { @@ -97,7 +90,6 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() } - VclPtr<Dialog> PDFDialog::createDialog( vcl::Window* pParent ) { if( mxSrcDoc.is() ) @@ -106,7 +98,6 @@ VclPtr<Dialog> PDFDialog::createDialog( vcl::Window* pParent ) } - void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) { if( nExecutionResult && m_pDialog ) @@ -115,7 +106,6 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) } - Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() throw(RuntimeException, std::exception) { @@ -138,7 +128,6 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() } - Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() throw ( RuntimeException, std::exception ) { @@ -160,7 +149,6 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() } - void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { @@ -177,7 +165,6 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr } - void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) { diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index df52a406932e..90cb749d371f 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -101,12 +101,4 @@ SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSM #endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX - - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index de4d56244133..6deaec9bfb8f 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -55,14 +55,12 @@ using com::sun::star::presentation::XPresentationPage; using com::sun::star::task::XStatusIndicator; - PlaceWareExporter::PlaceWareExporter(const Reference< XComponentContext > & rxContext) : mxContext( rxContext ) { } - PlaceWareExporter::~PlaceWareExporter() { } @@ -400,7 +398,6 @@ bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOut } - PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) { Reference< XComponent > xComp( xDrawPage, UNO_QUERY ); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 2c257f1b53e3..abcf09bb0e22 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::task::XStatusIndicator; namespace pwp { - class PlaceWareExportFilter : public cppu::WeakImplHelper < css::document::XFilter, @@ -72,14 +71,12 @@ public: }; - PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext > &rxContext) : mxContext( rxContext ) { } - sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { @@ -119,14 +116,12 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css:: } - void SAL_CALL PlaceWareExportFilter::cancel( ) throw (RuntimeException, std::exception) { } - // XExporter void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) @@ -135,7 +130,6 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Referenc } - // XInitialization void SAL_CALL PlaceWareExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) @@ -181,7 +175,6 @@ css::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServi } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 040359ce8b00..01e9d97acc8e 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -377,7 +377,6 @@ bool parseOpacity (const char* sOpacity, ARGBColor& rColor ) } - bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) { using namespace ::boost::spirit::classic; @@ -493,7 +492,6 @@ bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) } - bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) { using namespace ::boost::spirit::classic; @@ -521,7 +519,6 @@ bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) } - bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector ) { using namespace ::boost::spirit::classic; @@ -545,7 +542,6 @@ bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector } - bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, std::pair<ARGBColor,bool>& io_rColor, const char* sPaintUri ) @@ -571,7 +567,6 @@ bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, } - bool parseXlinkHref( const char* sXlinkHref, OUString& data ) { OUString sLink(OUString::createFromAscii(sXlinkHref)); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 7caf71d94b57..1fcd97046f9d 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1694,7 +1694,6 @@ bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, bool bMa } - bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, bool bMaster ) { Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY ); @@ -1937,7 +1936,6 @@ bool SVGFilter::implCreateObjects() } - bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes ) { Reference< XShape > xShape; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index f5a455bb1f21..f3aeb17022c2 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -2276,7 +2276,6 @@ bool SVGReader::parseAndConvert() m_xDocumentHandler->endElement( "office:master-styles" ); - xAttrs->Clear(); m_xDocumentHandler->startElement( "office:body", xUnoAttrs ); m_xDocumentHandler->startElement( "office:drawing", xUnoAttrs ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 441aeedd3d42..9eb27d2b96fd 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -126,7 +126,6 @@ struct SVGShapeDescriptor css::drawing::LineCap maLineCap; - SVGShapeDescriptor() : maShapeFillColor( Color( COL_TRANSPARENT ) ), maShapeLineColor( Color( COL_TRANSPARENT ) ), diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 447939864823..988cc46aa5fc 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -195,7 +195,6 @@ public: }; - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestParser, "test svg parser fragments"); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 798a93de736c..75dac5ea4193 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -65,7 +65,6 @@ css::uno::Reference < css::uno::XInterface > SAL_CALL throw ( css::uno::Exception ); - // class T602ImportFilter diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index 8d5b402e63e7..65f6d654c066 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/implbase.hxx> - enum FilterType { FILTER_IMPORT, @@ -68,7 +67,6 @@ protected: throw (css::uno::RuntimeException, std::exception); - public: explicit XmlFilterAdaptor( const css::uno::Reference< css::uno::XComponentContext > & rxContext) @@ -80,7 +78,6 @@ public: virtual ~XmlFilterAdaptor() {} - // XFilter virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) @@ -90,14 +87,12 @@ public: throw (css::uno::RuntimeException, std::exception) override; - // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) @@ -105,7 +100,6 @@ public: throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) @@ -113,7 +107,6 @@ public: throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) @@ -131,22 +124,18 @@ public: }; - OUString XmlFilterAdaptor_getImplementationName() throw ( css::uno::RuntimeException ); - bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw ( css::uno::RuntimeException ); - css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw ( css::uno::RuntimeException ); - css::uno::Reference< css::uno::XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) @@ -154,7 +143,6 @@ SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang:: throw ( css::uno::Exception ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index e6e01c7bc7d4..7a73ba8fc511 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -29,7 +29,6 @@ #include <vector> - extern OUString string_encode( const OUString & rText ); extern OUString string_decode( const OUString & rText ); @@ -37,7 +36,6 @@ bool copyStreams( css::uno::Reference< css::io::XInputStream > xIS, css::uno::Re bool createDirectory( OUString& rURL ); - class filter_info_impl { public: @@ -71,7 +69,6 @@ public: }; - struct application_info_impl { OUString maDocumentService; @@ -83,7 +80,6 @@ struct application_info_impl }; - extern std::vector< application_info_impl* >& getApplicationInfos(); extern OUString getApplicationUIName( const OUString& rServiceName ); extern const application_info_impl* getApplicationInfo( const OUString& rServiceName ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index d1dab361f242..abf579ef3b2f 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -111,7 +111,6 @@ private: }; - namespace { static ResMgr* pXSLTResMgr = nullptr; @@ -133,13 +132,11 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< X } - XMLFilterDialogComponent::~XMLFilterDialogComponent() { } - // XInterface Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { @@ -147,7 +144,6 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw } - Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) { if (rType == cppu::UnoType<css::ui::dialogs::XExecutableDialog>::get()) @@ -174,21 +170,18 @@ Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) th } - void SAL_CALL XMLFilterDialogComponent::acquire() throw () { OComponentHelper::acquire(); } - void SAL_CALL XMLFilterDialogComponent::release() throw () { OComponentHelper::release(); } - OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException ) { return OUString( "com.sun.star.comp.ui.XSLTFilterDialog" ); @@ -218,7 +211,6 @@ Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId() th } - namespace { class DialogComponentTypes @@ -275,7 +267,6 @@ void SAL_CALL XMLFilterDialogComponent::disposing() } - // XTerminateListener void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException, std::exception) { @@ -297,7 +288,6 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* } - void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException, std::exception) { // we are going down, so dispose us! diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 813accbee57c..f5a44eb616b5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -235,9 +235,6 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt } - - - void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ) { try diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 4d3e83573083..60e084799d8e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1578,7 +1578,6 @@ bool filter_info_impl::operator==( const filter_info_impl& r ) const } - Sequence< OUString > filter_info_impl::getFilterUserData() const { Sequence< OUString > aUserData(8); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 5d700704444b..02b01823754d 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -81,7 +81,6 @@ public: }; - class XMLFilterSettingsDialog : public ModelessDialog { public: diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 9f9c3e785e5a..ae4610619bf7 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -72,7 +72,6 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, } - XMLFilterTabDialog::~XMLFilterTabDialog() { disposeOnce(); @@ -89,7 +88,6 @@ void XMLFilterTabDialog::dispose() } - bool XMLFilterTabDialog::onOk() { mpXSLTPage->FillInfo( mpNewInfo ); @@ -280,10 +278,6 @@ bool XMLFilterTabDialog::onOk() } - - - - IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) { if( onOk() ) @@ -291,7 +285,6 @@ IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) } - IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); @@ -300,5 +293,4 @@ IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabC } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 3aac59642e8b..613ada3b798f 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -294,7 +294,6 @@ void XMLFilterTestDialog::initDialog() m_pFTExportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maExportXSLT ) ); - m_pImport->Enable(bImport); m_pFTImportTemplate->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty()); m_pFTImportTemplateFile->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty()); diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index e0d083aef727..d9f72be2b7f8 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -222,7 +222,6 @@ namespace XSLT } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index fa7e66436489..f39f366ca894 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -533,7 +533,6 @@ namespace XSLT } - // Component management #define FILTER_SERVICE_NAME "com.sun.star.documentconversion.XSLTFilter" |