diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:47:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 06:10:36 -0600 |
| commit | aeaded675c43ae8fdf795fd002f1bf6c2451fa2e (patch) | |
| tree | 97490e78315e2ecf7c8e1cbe11159696b2f07b9f /filter | |
| parent | 2991d2d65bf8b99d82d1f7d209332d0c303dff21 (diff) | |
Remove visual noise from filter
Change-Id: Ieab1d12204bcf917b2e1bf74f3145fc96d7b207c
Reviewed-on: https://gerrit.libreoffice.org/8261
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
74 files changed, 572 insertions, 572 deletions
diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java index c270d8e83c84..c997831290cd 100644 --- a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java +++ b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java @@ -38,7 +38,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; -// ------------------------------------------ + /** * This complex test checks the functionality of the properties "Finalized" and "Mandatory" of diff --git a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java index deb1422a28ef..14c04273f7d3 100644 --- a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java +++ b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java @@ -36,7 +36,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; -// ------------------------------------------ + public class TypeDetection6FileFormat { diff --git a/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct b/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct Binary files differindex 0fb06023557a..1e1f6d5b5f05 100644 --- a/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct +++ b/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 647cd52d38b2..985bc631d0ee 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -38,7 +38,7 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements the interface css::container::XNameContainer on top of a FilterCache reference. @@ -59,7 +59,7 @@ class BaseContainer : public BaseLock css::container::XContainerQuery , css::util::XFlushable > { - //------------------------------------------- + // member protected: @@ -103,12 +103,12 @@ class BaseContainer : public BaseLock /** @short holds all listener, which are registered at this instance. */ ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; - //------------------------------------------- + // native interface public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor. @@ -123,13 +123,13 @@ class BaseContainer : public BaseLock */ BaseContainer(); - //--------------------------------------- + /** @short standard dtor. */ virtual ~BaseContainer(); - //--------------------------------------- + /** @short initialize this generic intsnace with some specialized values from our derived object. @@ -160,19 +160,19 @@ class BaseContainer : public BaseLock const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ); - //------------------------------------------- + // helper protected: - //--------------------------------------- + /** @short check if the underlying configuration data was already loaded and do it if necessary automaticly. */ 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 @@ -184,7 +184,7 @@ class BaseContainer : public BaseLock void impl_initFlushMode() throw (css::uno::RuntimeException); - //--------------------------------------- + /** @short returns a pointer to the current used cache member. @@ -206,12 +206,12 @@ class BaseContainer : public BaseLock */ FilterCache* impl_getWorkingCache() const; - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -223,7 +223,7 @@ class BaseContainer : public BaseLock virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XNameContainer virtual void SAL_CALL insertByName(const OUString& sItem , @@ -238,7 +238,7 @@ class BaseContainer : public BaseLock css::lang::WrappedTargetException , css::uno::RuntimeException, std::exception ); - //--------------------------------------- + // XNameReplace virtual void SAL_CALL replaceByName(const OUString& sItem , @@ -248,7 +248,7 @@ class BaseContainer : public BaseLock css::lang::WrappedTargetException , css::uno::RuntimeException, std::exception ); - //--------------------------------------- + // XElementAccess virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) @@ -268,7 +268,7 @@ class BaseContainer : public BaseLock virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XContainerQuery // must be implemented really by derived class ... @@ -280,7 +280,7 @@ class BaseContainer : public BaseLock virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XFlushable virtual void SAL_CALL flush() diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 8480e516404c..7657f88b67be 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -51,7 +51,7 @@ struct BaseLock typedef ::comphelper::SequenceAsVector< OUString > OUStringList; -//_______________________________________________ + /** @short represent an item of a FilterCache instance. @@ -62,15 +62,15 @@ typedef ::comphelper::SequenceAsVector< OUString > OUStringList; */ class CacheItem : public ::comphelper::SequenceAsHashMap { - //------------------------------------------- + public: - //--------------------------------------- + /** @short creates an empty item. */ CacheItem(); - //--------------------------------------- + /** @short update only properties, which are given by the specified rItem. @@ -85,7 +85,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap */ void update(const CacheItem& rUpdateItem); - //--------------------------------------- + /** @short check, if the given properties exists at this item. @@ -102,7 +102,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap */ sal_Bool haveProps(const CacheItem& lProps) const; - //--------------------------------------- + /** @short check, if the given properties dont exists at this item. @@ -119,7 +119,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap */ sal_Bool dontHaveProps(const CacheItem& lProps) const; - //--------------------------------------- + /** @short check, if the given properties dont exists at this item. @@ -136,7 +136,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap */ sal_Bool excludeProps(const CacheItem& lProps) const; - //--------------------------------------- + /** @short because we know two UIName properties (a list with all locales and the value @@ -150,7 +150,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap */ void validateUINames(const OUString& sActLocale); - //--------------------------------------- + /** @short convert this structure to a seq< PropertyValue > and ignore all empty properties! @@ -167,7 +167,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap css::uno::Sequence< css::beans::PropertyValue > getAsPackedPropertyValueList(); }; -//_______________________________________________ + /** @short represent an item list of a FilterCache instance. @@ -177,7 +177,7 @@ typedef ::boost::unordered_map< OUString , OUStringHash , ::std::equal_to< OUString > > CacheItemList; -//_______________________________________________ + /** @short supports registration of multiple key to another string information. @@ -196,7 +196,7 @@ typedef ::boost::unordered_map< OUString , OUStringHash , ::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.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 89c8d724a3f6..4b2196e9dd33 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -30,7 +30,7 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements a listener, which will update the global filter cache, if the underlying configuration @@ -39,7 +39,7 @@ namespace filter{ class CacheUpdateListener : public BaseLock // must be the first one to guarantee right initialized mutex member! , public ::cppu::WeakImplHelper1< css::util::XChangesListener > { - //------------------------------------------- + // member private: @@ -57,12 +57,12 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante it must put into the filter cache, if the configuration notifys changes ... */ FilterCache::EItemType m_eConfigType; - //------------------------------------------- + // native interface public: - //--------------------------------------- + // ctor/dtor /** @short initialize new instance of this class. @@ -82,36 +82,36 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante const css::uno::Reference< css::uno::XInterface >& xConfigAccess, FilterCache::EItemType eConfigType); - //--------------------------------------- + /** @short standard dtor. */ virtual ~CacheUpdateListener(); - //--------------------------------------- + /** @short starts listening. */ virtual void startListening(); - //--------------------------------------- + /** @short stop listening. */ virtual void stopListening(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception); diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 6595a514bde4..1861098c7cd3 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -30,7 +30,7 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short supports registration of XRefreshListener on the global filter configuration. @@ -44,7 +44,7 @@ class ConfigFlush : public BaseLock css::lang::XServiceInfo > { - //------------------------------------------- + // member protected: @@ -56,30 +56,30 @@ class ConfigFlush : public BaseLock /** @short holds all listener, which are registered at this instance. */ ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; - //------------------------------------------- + // native interface public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor. */ ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - //--------------------------------------- + /** @short standard dtor. */ virtual ~ConfigFlush(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -91,7 +91,7 @@ class ConfigFlush : public BaseLock virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XRefreshable virtual void SAL_CALL refresh() @@ -103,7 +103,7 @@ class ConfigFlush : public BaseLock virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // interface to register/create this instance as an UNO service static OUString impl_getImplementationName(); static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 1cab3ce6c775..7cb60d134ecb 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -26,7 +26,7 @@ can be used instead of loadAll()!*/ // #define LOAD_IMPLICIT -//_______________________________________________ + /** @short used to identify a some generic item properties against the configuration API and can be used at all name containers diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index d65a62930286..bfb3bbdb97a4 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -30,21 +30,21 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements the service <type scope="com.sun.star.document">ContentHandlerFactory</type>. */ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , css::frame::XLoaderFactory > { - //------------------------------------------- + // native interface css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor to connect this interface wrapper to @@ -55,18 +55,18 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain */ ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short standard dtor. */ virtual ~ContentHandlerFactory(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) @@ -81,12 +81,12 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception); - //------------------------------------------- + // static uno helper! public: - //--------------------------------------- + /** @short return the uno implementation name of this class. @@ -98,7 +98,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain */ static OUString impl_getImplementationName(); - //--------------------------------------- + /** @short return the list of supported uno services of this class. @@ -110,7 +110,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain */ static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - //--------------------------------------- + /** @short return a new intsnace of this class. diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 04cc0ab6b632..56f1723965f6 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -691,7 +691,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - //******************************************* + // i) Step over all well known URL pattern // and add registered types to the return list too // Do it as first one - because: if a type match by a @@ -715,7 +715,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , } } - //******************************************* + // ii) search types matching to the given extension. // Copy every macthing type without changing its order! // Because preferred types was added as first one during diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index a3e408ff43fd..5bb39ce828d8 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -40,7 +40,7 @@ namespace filter{ class CacheUpdateListener; -//_______________________________________________ + /** @short implements a cache, which contains all elements of our filter and type detection @@ -60,12 +60,12 @@ class CacheUpdateListener; */ class FilterCache : public BaseLock { - //------------------------------------------- + // public types public: - //--------------------------------------- + /** @short identify the type of a container item. @@ -81,7 +81,7 @@ class FilterCache : public BaseLock E_DETECTSERVICE }; - //--------------------------------------- + /** @short indicates, which items already exists inside this cache and which not. @@ -108,12 +108,12 @@ class FilterCache : public BaseLock E_CONTAINS_ALL = 63 // must be a combination of all excepting E_CONTAINS_NOTHING! Please update if items will be added or removed ... }; - //------------------------------------------- + // private types private: - //--------------------------------------- + /** @short regulate, which properties of a configured item will be readed. @@ -132,7 +132,7 @@ class FilterCache : public BaseLock E_READ_ALL = 3 }; - //--------------------------------------- + /** @short indicates the state of a configuration set item. @descr Inside method flush we check: @@ -154,7 +154,7 @@ class FilterCache : public BaseLock E_ITEM_ADDED = 3 }; - //--------------------------------------- + /** TODO document me */ enum EConfigProvider { @@ -164,65 +164,65 @@ class FilterCache : public BaseLock E_PROVIDER_OLD = 3 }; - //------------------------------------------- + // member private: - //--------------------------------------- + /** @short holds the used configuration provider alive, which provides access to the list of types. */ mutable css::uno::Reference< css::uno::XInterface > m_xConfigTypes; - //--------------------------------------- + /** @short holds the used configuration provider alive, which provides access to the list of filters. */ mutable css::uno::Reference< css::uno::XInterface > m_xConfigFilters; - //--------------------------------------- + /** @short holds the used configuration provider alive, which provides access to the list of other values needed by our type detection framework. */ mutable css::uno::Reference< css::uno::XInterface > m_xConfigOthers; - //--------------------------------------- + /** @short contains all loaded types with its properties. */ mutable CacheItemList m_lTypes; - //--------------------------------------- + /** @short contains all well known detect service with its properties. */ mutable CacheItemList m_lDetectServices; - //--------------------------------------- + /** @short contains all loaded filters with its properties. */ mutable CacheItemList m_lFilters; - //--------------------------------------- + /** @short contains all loaded frame loader with its properties. */ mutable CacheItemList m_lFrameLoaders; - //--------------------------------------- + /** @short contains all loaded content handler with its properties. */ mutable CacheItemList m_lContentHandlers; - //--------------------------------------- + /** @short optimize mapping of URL extensions to a type representation, by using extensions as key and a list of internal type names as value. */ mutable CacheItemRegistration m_lExtensions2Types; - //--------------------------------------- + /** @short optimize mapping of URL pattern to a type representation, by using patterns as key and a list of internal type names as value. */ mutable CacheItemRegistration m_lURLPattern2Types; - //--------------------------------------- + /** @short contains the current locale of the office and will be used to work with localized configuration values. */ OUString m_sActLocale; - //--------------------------------------- + /** @short contains status, which cache items/properties was already loaded from the underlying configuration. @@ -234,7 +234,7 @@ class FilterCache : public BaseLock */ EFillState m_eFillState; - //--------------------------------------- + /** TODO document me ... */ OUStringList m_lChangedTypes; OUStringList m_lChangedFilters; @@ -242,19 +242,19 @@ class FilterCache : public BaseLock OUStringList m_lChangedFrameLoaders; OUStringList m_lChangedContentHandlers; - //--------------------------------------- + /// readonly acccess to the module configuration of OOo css::uno::Reference< css::container::XNameAccess > m_xModuleCfg; rtl::Reference< CacheUpdateListener > m_xTypesChglisteners; rtl::Reference< CacheUpdateListener > m_xFiltersChgListener; - //------------------------------------------- + // interface public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor @@ -273,13 +273,13 @@ class FilterCache : public BaseLock */ FilterCache(); - //--------------------------------------- + /** @short standard dtor. */ virtual ~FilterCache(); - //--------------------------------------- + /** @short creates a copy of this container. @@ -304,13 +304,13 @@ class FilterCache : public BaseLock */ virtual FilterCache* clone() const; - //--------------------------------------- + /** @short copy the cache content or rClone back to this instance. */ virtual void takeOver(const FilterCache& rClone); - //--------------------------------------- + /** @short force special fill state of this cache. @@ -349,7 +349,7 @@ class FilterCache : public BaseLock sal_Bool bByThread = sal_False) throw(css::uno::Exception); - //--------------------------------------- + /** @short return the current fill state of this cache. @@ -365,7 +365,7 @@ class FilterCache : public BaseLock virtual sal_Bool isFillState(EFillState eRequired) const throw(css::uno::Exception); - //--------------------------------------- + /** @short return a list of key names for items, which match the specified criteria. @@ -403,7 +403,7 @@ class FilterCache : public BaseLock const CacheItem& lEProps = CacheItem()) const throw(css::uno::Exception); - //--------------------------------------- + /** @short indicates if the requested sub container contains some items. @@ -429,7 +429,7 @@ class FilterCache : public BaseLock virtual sal_Bool hasItems(EItemType eType) const throw(css::uno::Exception); - //--------------------------------------- + /** @short return a list of all key names, which represent an item inside the specified sub container. @@ -454,7 +454,7 @@ class FilterCache : public BaseLock virtual OUStringList getItemNames(EItemType eType) const throw(css::uno::Exception); - //--------------------------------------- + /** @short check if the required item exist inside this container. @@ -479,7 +479,7 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** @short return an item, which match the specified type and name. @@ -509,7 +509,7 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO document me ... */ @@ -517,7 +517,7 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO document me ... */ @@ -526,7 +526,7 @@ class FilterCache : public BaseLock const CacheItem& aValue) throw(css::uno::Exception); - //--------------------------------------- + /** TODO document me ... */ @@ -534,7 +534,7 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** @short add some implicit properties to the given cache item reference. @@ -576,14 +576,14 @@ class FilterCache : public BaseLock CacheItem& rItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO document me */ virtual 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. @@ -597,7 +597,7 @@ class FilterCache : public BaseLock virtual void flush() throw(css::uno::Exception); - //--------------------------------------- + /** @short supports a flat type detection for given URL. @@ -629,12 +629,12 @@ class FilterCache : public BaseLock FlatDetection& rFlatTypes) const throw(css::uno::Exception); - //------------------------------------------- + // private helper private: - //--------------------------------------- + /** @short return a reference to one of our internal sub container, which contains items of the @@ -653,7 +653,7 @@ class FilterCache : public BaseLock CacheItemList& impl_getItemList(EItemType eType); - //--------------------------------------- + /** @short return a valid configuration update access to the underlying configuration package, which @@ -675,7 +675,7 @@ class FilterCache : public BaseLock css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide) throw(css::uno::Exception); - //--------------------------------------- + /** @short tries to open the requested configuration root using the specified modi. @@ -699,7 +699,7 @@ class FilterCache : public BaseLock sal_Bool bReadOnly , sal_Bool bLocalesMode); - //--------------------------------------- + /** @short reads the specified configuration key and return its value. @@ -722,7 +722,7 @@ class FilterCache : public BaseLock */ css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); - //--------------------------------------- + /** @short load the underlying configuration into this cache. @@ -737,7 +737,7 @@ class FilterCache : public BaseLock void impl_load(EFillState eRequiredState) throw(css::uno::Exception); - //--------------------------------------- + /** @short validate the whole cache and create structures for optimized items access. @@ -758,7 +758,7 @@ class FilterCache : public BaseLock void impl_validateAndOptimize() throw(css::uno::Exception); - //--------------------------------------- + /** @short register the specified item for the given type. @@ -789,12 +789,12 @@ class FilterCache : public BaseLock const OUString& sType) throw(css::uno::Exception); - //------------------------------------------- + // static helper private: - //--------------------------------------- + /** @short read the specified config set into the cache. @@ -827,7 +827,7 @@ class FilterCache : public BaseLock CacheItemList* pCache ) throw(css::uno::Exception); - //--------------------------------------- + /** @short read the specified container item from the given configuration set. @@ -857,7 +857,7 @@ class FilterCache : public BaseLock EReadOption eOption) throw(css::uno::Exception); - //--------------------------------------- + /** @short try to load the requested item on demand from the underlying configuration layer. @@ -888,7 +888,7 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet , @@ -896,7 +896,7 @@ class FilterCache : public BaseLock const CacheItem& aValue) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_addItem2FlushList( EItemType eType, @@ -904,7 +904,7 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , @@ -913,7 +913,7 @@ class FilterCache : public BaseLock const OUStringList& lItems) throw(css::uno::Exception); - //--------------------------------------- + /** @short specify, which save operation is necessary for the specified item. @@ -947,27 +947,27 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_readOldFormat() throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , @@ -975,27 +975,27 @@ class FilterCache : public BaseLock const OUString& sItem) throw(css::uno::Exception); - //--------------------------------------- + /** TODO */ void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - //--------------------------------------- + /** TODO */ void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - //--------------------------------------- + /** TODO */ OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator); - //--------------------------------------- + #if OSL_DEBUG_LEVEL > 0 /** TODO */ @@ -1003,7 +1003,7 @@ class FilterCache : public BaseLock OUString impl_searchContentHandlerForType(const OUString& sType) const; #endif - //--------------------------------------- + /** @short check if the specified OOo module is installed. @param sModule @@ -1013,7 +1013,7 @@ class FilterCache : public BaseLock */ sal_Bool impl_isModuleInstalled(const OUString& sModule); - //--------------------------------------- + /** @short convert a list of flag names to its int representation. @@ -1025,7 +1025,7 @@ class FilterCache : public BaseLock */ static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); - //--------------------------------------- + /** @short convert a flag field value to its list representation of flag names. diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 3fc3a5b11321..37fe8b154bf5 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -31,21 +31,21 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements the service <type scope="com.sun.star.document">FilterFactory</type>. */ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , css::lang::XMultiServiceFactory > { - //------------------------------------------- + // native interface css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor to connect this interface wrapper to @@ -56,18 +56,18 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ FilterFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short standard dtor. */ virtual ~FilterFactory(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) @@ -82,18 +82,18 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // XContainerQuery virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException, std::exception); - //------------------------------------------- + // internal helper! private: - //--------------------------------------- + /** @short implement the container string query: "matchByDocumentService=:iflags=:eflags=:..." @@ -105,13 +105,13 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< 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>]" @@ -124,7 +124,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ OUStringList impl_getSortedFilterList(const QueryTokenizer& lTokens) const; - //--------------------------------------- + /** TODO document me */ @@ -132,7 +132,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer sal_Int32 nIFlags, sal_Int32 nEFlags) const; - //--------------------------------------- + /** @short read a specialized and sorted list of filter names from the configuration (matching the specified module) @@ -145,12 +145,12 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ OUStringList impl_readSortedFilterListFromConfig(const OUString& sModule) const; - //------------------------------------------- + // static uno helper! public: - //--------------------------------------- + /** @short return the uno implementation name of this class. @@ -162,7 +162,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ static OUString impl_getImplementationName(); - //--------------------------------------- + /** @short return the list of supported uno services of this class. @@ -174,7 +174,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - //--------------------------------------- + /** @short return a new intsnace of this class. diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index bbe6209d824e..62f530aa75bc 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -30,21 +30,21 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements the service <type scope="com.sun.star.document">FrameLoaderFactory</type>. */ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer , css::frame::XLoaderFactory > { - //------------------------------------------- + // native interface css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor to connect this interface wrapper to @@ -55,18 +55,18 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short standard dtor. */ virtual ~FrameLoaderFactory(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) @@ -81,12 +81,12 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception); - //------------------------------------------- + // static uno helper! public: - //--------------------------------------- + /** @short return the uno implementation name of this class. @@ -98,7 +98,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ static OUString impl_getImplementationName(); - //--------------------------------------- + /** @short return the list of supported uno services of this class. @@ -110,7 +110,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer */ static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - //--------------------------------------- + /** @short return a new intsnace of this class. diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx index a7654baa9de3..fa4326f41df3 100644 --- a/filter/source/config/cache/lateinitlistener.hxx +++ b/filter/source/config/cache/lateinitlistener.hxx @@ -35,7 +35,7 @@ namespace filter{ namespace config{ -//_______________________________________________ + /** @short implements a listener, which will update the global filter cache of an office, after zje office @@ -50,7 +50,7 @@ namespace filter{ class LateInitListener : public BaseLock // must be the first one to guarantee right initialized mutex member! , public ::cppu::WeakImplHelper1< css::document::XEventListener > { - //------------------------------------------- + // member private: @@ -59,12 +59,12 @@ class LateInitListener : public BaseLock // must be the first one to guarantee r out, when the first office document was opened successfully. */ css::uno::Reference< css::document::XEventBroadcaster > m_xBroadcaster; - //------------------------------------------- + // native interface public: - //--------------------------------------- + // ctor/dtor /** @short initialize new instance of this class. @@ -80,24 +80,24 @@ class LateInitListener : public BaseLock // must be the first one to guarantee r */ LateInitListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short standard dtor. */ virtual ~LateInitListener(); - //------------------------------------------- + // uno interface public: - //--------------------------------------- + // document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception); - //--------------------------------------- + // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception); diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx index fe580eb67eb8..8a2e5319453b 100644 --- a/filter/source/config/cache/macros.hxx +++ b/filter/source/config/cache/macros.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX -//_______________________________________________ + #include <rtl/ustring.hxx> diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index e1847c63df10..43bd7d6c2491 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -50,7 +50,7 @@ class QueryTokenizer : public ::boost::unordered_map< OUString OUStringHash , ::std::equal_to< OUString > > { - //------------------------------------------- + // member private: @@ -63,7 +63,7 @@ class QueryTokenizer : public ::boost::unordered_map< OUString */ sal_Bool m_bValid; - //------------------------------------------- + // interface public: @@ -80,13 +80,13 @@ class QueryTokenizer : public ::boost::unordered_map< OUString */ 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 3cb439077130..40fcae860814 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -376,7 +376,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - //******************************************* + // parse given URL to split it into e.g. main and jump marks ... OUString sURL = stlDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString()); @@ -415,7 +415,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: try { - //******************************************* + // verify every flat detected (or preselected!) type // by calling its registered deep detection service. // But break this loop if a type match to the given descriptor @@ -427,7 +427,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: if (lFlatTypes.size()>0) sType = impl_detectTypeFlatAndDeep(stlDescriptor, lFlatTypes, bAllowDeep, lUsedDetectors, sLastChance); - //******************************************* + // flat detection failed // pure deep detection failed // => ask might existing InteractionHandler @@ -435,7 +435,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: if (sType.isEmpty()) sType = impl_askUserForTypeAndFilterIfAllowed(stlDescriptor); - //******************************************* + // no real detected type - but a might valid one. // update descriptor and set last chance for return. if (sType.isEmpty() && !sLastChance.isEmpty()) @@ -455,7 +455,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: sType = OUString(); } - //******************************************* + // adapt media descriptor, so it contains the right values // for type/filter name/document service/ etcpp. impl_checkResultsAndAddBestFilter(stlDescriptor, sType); // Attention: sType is used as IN/OUT param here and will might be changed inside this method !!! diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 09018d4c7f27..f861a72732cf 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -29,21 +29,21 @@ namespace filter{ namespace config { -//_______________________________________________ + /** @short implements the service <type scope="com.sun.star.document">TypeDetection</type>. */ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer , css::document::XTypeDetection > { -//------------------------------------------- + // native interface css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - //--------------------------------------- + // ctor/dtor /** @short standard ctor to connect this interface wrapper to @@ -54,13 +54,13 @@ public: */ TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - //--------------------------------------- + /** @short standard dtor. */ virtual ~TypeDetection(); -//------------------------------------------- + // private helper private: @@ -80,7 +80,7 @@ private: const com::sun::star::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor, FlatDetection& rFlatTypes); - //--------------------------------------- + /** @short make a combined flat/deep type detection @@ -132,7 +132,7 @@ private: OUStringList& rUsedDetectors, OUString& rLastChance ); - //--------------------------------------- + /** @short seek a might existing stream to position 0. @@ -146,7 +146,7 @@ private: */ void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor); - //--------------------------------------- + /** @short make deep type detection for a specified detect service (threadsafe!). @@ -168,7 +168,7 @@ private: OUString impl_askDetectService(const OUString& sDetectService, utl::MediaDescriptor& rDescriptor ); - //--------------------------------------- + /** @short try to find an interaction handler and ask him to select a possible filter for @@ -185,7 +185,7 @@ 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. @@ -223,7 +223,7 @@ private: void impl_openStream(utl::MediaDescriptor& rDescriptor) throw (css::uno::Exception); - //--------------------------------------- + /** @short validate the specified type and its relation ships and set all needed information related to this type @@ -246,7 +246,7 @@ private: sal_Bool impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sType ); - //--------------------------------------- + /** @short validate the specified filter and its relation ships and set all needed information related to this filter @@ -268,7 +268,7 @@ private: sal_Bool impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sFilter ); - //--------------------------------------- + /** @short remove anythimng related to a TYPE/FILTER entry from the specified MediaDescriptor. @@ -283,7 +283,7 @@ private: */ void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor); - //--------------------------------------- + /** @short search the best suitable filter for the given type and add it into the media descriptor. @@ -318,12 +318,12 @@ private: void impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDescriptor, OUString& sType ); -//------------------------------------------- + // uno interface public: - //--------------------------------------- + // XTypeDetection virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) @@ -333,12 +333,12 @@ public: sal_Bool bAllowDeep ) throw (css::uno::RuntimeException, std::exception); -//------------------------------------------- + // static uno helper! public: - //--------------------------------------- + /** @short return the uno implementation name of this class. @@ -350,7 +350,7 @@ public: */ static OUString impl_getImplementationName(); - //--------------------------------------- + /** @short return the list of supported uno services of this class. @@ -362,7 +362,7 @@ public: */ static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - //--------------------------------------- + /** @short return a new intsnace of this class. diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index 8adf7ca143ea..2c0f9111283d 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX -//_______________________________________________ + #define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java index 76a6b1a6b5ee..90c8028334c4 100644 --- a/filter/source/config/tools/split/FCFGSplit.java +++ b/filter/source/config/tools/split/FCFGSplit.java @@ -18,14 +18,14 @@ package com.sun.star.filter.config.tools.split; -//_______________________________________________ + import java.lang.*; import java.util.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; -//_______________________________________________ + /** * Implements a simple command line tool, which can read a given xml @@ -37,7 +37,7 @@ import com.sun.star.filter.config.tools.utils.*; */ public class FCFGSplit { - //___________________________________________ + // private const /** specify the command line parameter to set the debug level for this app. */ @@ -127,7 +127,7 @@ public class FCFGSplit private static final java.lang.String DEFAULT_SUBDIR_MODULE_SCHART = "SChart" ; private static final java.lang.String DEFAULT_SUBDIR_MODULE_OTHERS = "Others" ; - //___________________________________________ + // private member /** contains the name of the reading xcu file. */ @@ -235,7 +235,7 @@ public class FCFGSplit private static boolean m_bRemoveGraphicFilters; private static boolean m_bSetDefaultDetector; - //___________________________________________ + // main /** main. @@ -256,7 +256,7 @@ public class FCFGSplit // can be used as exit code int nErr = 0; - // -------------------------------------------------------------------- + // analyze command line parameter ConfigHelper aCmdLine = null; try @@ -270,7 +270,7 @@ public class FCFGSplit System.exit(--nErr); } - // -------------------------------------------------------------------- + // help requested? if (aCmdLine.isHelp()) { @@ -278,7 +278,7 @@ public class FCFGSplit System.exit(--nErr); } - // -------------------------------------------------------------------- + // initialize an output channel for errors/warnings etc. int nLevel = aCmdLine.getInt(CMD_DEBUG, Logger.LEVEL_DETAILEDINFOS); m_aDebug = new Logger(nLevel); @@ -292,7 +292,7 @@ public class FCFGSplit System.exit(--nErr); } - // -------------------------------------------------------------------- + // check if the required resources exists java.io.File aXMLFile = new java.io.File(m_sXMLFile); if (!aXMLFile.exists() || !aXMLFile.isFile()) @@ -320,7 +320,7 @@ public class FCFGSplit System.exit(--nErr); } - // -------------------------------------------------------------------- + // load the xml file m_aDebug.setGlobalInfo("loading xml file \""+aXMLFile.getPath()+"\" ..."); long t_load_start = System.currentTimeMillis(); @@ -336,7 +336,7 @@ public class FCFGSplit } long t_load_end = System.currentTimeMillis(); - // -------------------------------------------------------------------- + // validate the content, fix some problems and convert it to the output format m_aDebug.setGlobalInfo("validate and transform to output format ..."); long t_transform_start = System.currentTimeMillis(); @@ -365,7 +365,7 @@ public class FCFGSplit } long t_transform_end = System.currentTimeMillis(); - // -------------------------------------------------------------------- + // generate all xml fragments m_aDebug.setGlobalInfo("generate xml fragments into directory \""+aOutDir.getPath()+"\" ..."); long t_split_start = System.currentTimeMillis(); @@ -421,7 +421,7 @@ public class FCFGSplit } long t_split_end = System.currentTimeMillis(); - // -------------------------------------------------------------------- + // generate some special views m_aDebug.setGlobalInfo("generate views and statistics ..."); long t_statistics_start = System.currentTimeMillis(); @@ -438,7 +438,7 @@ public class FCFGSplit } long t_statistics_end = System.currentTimeMillis(); - // -------------------------------------------------------------------- + // analyze some time stamps long t_end = System.currentTimeMillis(); @@ -467,7 +467,7 @@ public class FCFGSplit System.exit(0); } - //___________________________________________ + /** read the configuration file. * @@ -516,7 +516,7 @@ public class FCFGSplit m_nOutFormat = Cache.mapFormatString2Format(sFormat); } - //___________________________________________ + /** prints out a copyright message on stdout. */ @@ -529,7 +529,7 @@ public class FCFGSplit System.out.println(sOut.toString()); } - //___________________________________________ + /** prints out a help message on stdout. */ diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java index b4d40e257b74..a347fd93edda 100644 --- a/filter/source/config/tools/split/Splitter.java +++ b/filter/source/config/tools/split/Splitter.java @@ -18,14 +18,14 @@ package com.sun.star.filter.config.tools.split; -//_______________________________________________ + import java.lang.*; import java.util.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; -//_______________________________________________ + /** * Can split one xml file into its different xml fragments. @@ -34,7 +34,7 @@ import com.sun.star.filter.config.tools.utils.*; */ public class Splitter { - //___________________________________________ + // member /** contains all real member of this instance. @@ -42,7 +42,7 @@ public class Splitter * of this class inside a multi-threaded environment. */ private SplitterData m_aDataSet; - //___________________________________________ + // interface /** initialize a new instance of this class with all @@ -57,7 +57,7 @@ public class Splitter m_aDataSet = aDataSet; } - //___________________________________________ + // interface /** generate xml fragments for all cache items. @@ -214,7 +214,7 @@ public class Splitter } } - //___________________________________________ + /** generate a xml fragment file from the specified cache item. * @@ -253,7 +253,7 @@ public class Splitter m_aDataSet.m_aDebug.setDetailedInfo("fragment["+eItemType+", \""+sItemName+"\"] => \""+aFile.getPath()+"\" ... OK"); } - //___________________________________________ + /** create all needed directory structures. * diff --git a/filter/source/config/tools/split/SplitterData.java b/filter/source/config/tools/split/SplitterData.java index 38226a8a61bd..fd73bbbba44d 100644 --- a/filter/source/config/tools/split/SplitterData.java +++ b/filter/source/config/tools/split/SplitterData.java @@ -18,13 +18,13 @@ package com.sun.star.filter.config.tools.split; -//_______________________________________________ + import java.lang.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; -//_______________________________________________ + /** * Data container for class Splitter. diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 4571de170dee..b663c081ceff 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -31,9 +31,9 @@ #include <vcl/FilterConfigItem.hxx> -// ---------------- + // - ImpSWFDialog - -// ---------------- + class ResMgr; class Window; diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index e7ff9df17f1b..8c1d584c5e01 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -25,9 +25,9 @@ #include <svtools/genericunodialog.hxx> -// ------------- + // - SWFDialog - -// ------------- + class Window; class ResMgr; @@ -75,7 +75,7 @@ public: virtual ~SWFDialog(); }; -// ----------------------------------------------------------------------------- + #endif // SWFDialog_HXX diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 67e5c1db3b2f..59138e3375ce 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -52,7 +52,7 @@ inline OUString VAL(sal_Int32 in) namespace swf { class Writer; -// ----------------------------------------------------------------------------- + class ShapeInfo { @@ -101,7 +101,7 @@ public: typedef ::std::vector<ShapeInfo*> ShapeInfoVector; -// ----------------------------------------------------------------------------- + struct ShapeAnimationInfo { @@ -113,7 +113,7 @@ struct ShapeAnimationInfo typedef std::vector<ShapeAnimationInfo> ShapeAnimationInfoVector; -// ----------------------------------------------------------------------------- + struct PageInfo { @@ -141,11 +141,11 @@ struct PageInfo }; -// ----------------------------------------------------------------------------- + typedef ::std::map<sal_uInt32, PageInfo> PageInfoMap; -// ----------------------------------------------------------------------------- + class FlashExporter { diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index a94ee9b396fe..9e3aa1919f55 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -535,7 +535,7 @@ sal_Bool Writer::streamSound( const char * filename ) // mp3buffer_size (in bytes) = 1.25*num_samples + 7200. // num_samples = the number of PCM samples in each channel. It is // not the sum of the number of samples in the L and R channels. -// + // The return code = number of bytes output in mp3buffer. This can be 0. // If it is <0, an error occurred. diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index ef887ac1468e..38ee30b9cdd9 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -105,12 +105,12 @@ 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<sal_uInt32, sal_uInt16> ChecksumCache; @@ -123,7 +123,7 @@ struct ltuint16 } }; -/////////////////////////////////////////////////////////////////////// + /** container class to create bit structures */ class BitStream @@ -146,7 +146,7 @@ private: sal_uInt8 mnCurrentByte; }; -/////////////////////////////////////////////////////////////////////// + /** this class collects all used glyphs for a given fonts and maps characters to glyph ids. @@ -175,7 +175,7 @@ private: typedef std::vector<FlashFont*> FontMap; -/////////////////////////////////////////////////////////////////////// + /** this class helps creating flash tags */ class Tag : public SvMemoryStream @@ -206,7 +206,7 @@ private: sal_uInt8 mnTagId; }; -/////////////////////////////////////////////////////////////////////// + /** this class helps to define flash sprites */ class Sprite @@ -227,7 +227,7 @@ private: sal_uInt32 mnFrames; }; -/////////////////////////////////////////////////////////////////////// + /** this class stores a flash fill style for shapes */ class FillStyle @@ -257,7 +257,7 @@ private: Rectangle maBoundRect; }; -/////////////////////////////////////////////////////////////////////// + /** this class creates a flash movie from vcl geometry */ class Writer @@ -445,7 +445,7 @@ private: sal_Int32 mnJPEGCompressMode; }; -/////////////////////////////////////////////////////////////////////// + } diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index d27ce022fa1b..0d7b7b0ed03b 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1849,7 +1849,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } -///////////////////////////////////////////////////////////////////////// + void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 131777dccf13..6a2a40529851 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -132,7 +132,7 @@ sal_uInt32 BitStream::getOffset() const return maData.size(); } -//////////////////////////////////////////////////////////////////////////////// + Tag::Tag( sal_uInt8 nTagId ) { @@ -361,7 +361,7 @@ void Tag::addStream( SvStream& rIn ) (*this).WriteStream( rIn ); } -//////////////////////////////////////////////////////////////////////////////// + Sprite::Sprite( sal_uInt16 nId ) : mnId( nId ), mnFrames(0) @@ -409,7 +409,7 @@ void Sprite::addTag( Tag* pNewTag ) } } -///////////////////////////////////////////////////////////////////////////////// + sal_uInt32 swf::getFixed( double fValue ) { @@ -422,7 +422,7 @@ sal_uInt32 swf::getFixed( double fValue ) return temp; } -///////////////////////////////////////////////////////////////////////////////// + /** constructs a new flash font for the given VCL Font */ FlashFont::FlashFont( const Font& rFont, sal_uInt16 nId ) @@ -515,7 +515,7 @@ void FlashFont::write( SvStream& out ) aTag.write( out ); } -//////////////////////////////////////////////////////////////////////////////// + /** this c'tor creates a solid fill style */ FillStyle::FillStyle( const Color& rSolidColor ) diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx index cc76369129be..992e51cdb2cd 100644 --- a/filter/source/graphicfilter/egif/giflzwc.hxx +++ b/filter/source/graphicfilter/egif/giflzwc.hxx @@ -22,9 +22,9 @@ #include <vcl/bmpacc.hxx> -// -------------------- + // - GIFLZWCompressor - -// -------------------- + class GIFImageDataOutputStream; struct GIFLZWCTreeNode; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 18e3c9b8d7eb..d443bbadf5ad 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -120,20 +120,20 @@ private: double nBoundingY1; double nBoundingX2; double nBoundingY2; - // + StackMember* pGDIStack; sal_uLong mnCursorPos; // current cursor position in output Color aColor; // current color which is used for output sal_Bool bLineColor; Color aLineColor; // current GDIMetafile color settings - sal_Bool bFillColor; // - Color aFillColor; // - Color aTextColor; // - sal_Bool bTextFillColor; // - Color aTextFillColor; // - Color aBackgroundColor; // + sal_Bool bFillColor; + Color aFillColor; + Color aTextColor; + sal_Bool bTextFillColor; + Color aTextFillColor; + Color aBackgroundColor; sal_Bool bRegionChanged; - TextAlign eTextAlign; // + TextAlign eTextAlign; double fLineWidth; double fMiterLimit; diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index fe18cadbe89d..bf738a358831 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -79,7 +79,7 @@ void RASWriter::ImplCallback( sal_uLong nYPos ) xStatusIndicator->setValue( (sal_uInt16)( ( 100 * nYPos ) / mnHeight ) ); } -// ------------------------------------------------------------------------ + sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 3affd3586aad..fdd13b63ab7a 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -80,7 +80,7 @@ void XPMWriter::ImplCallback( sal_uInt16 nPercent ) } } -// ------------------------------------------------------------------------ + sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index 08f17f2d4153..235525a97782 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -25,7 +25,7 @@ #include <vcl/salbtype.hxx> #include <vector> -// --------------------------------------------------------------- + class Bundle { @@ -50,7 +50,7 @@ public: virtual ~Bundle() {} ; }; -// --------------------------------------------------------------- + class LineBundle : public Bundle { @@ -68,7 +68,7 @@ public: LineBundle& operator=( LineBundle& rLineBundle ); }; -// --------------------------------------------------------------- + class MarkerBundle : public Bundle { @@ -87,7 +87,7 @@ public: virtual ~MarkerBundle() {}; }; -// --------------------------------------------------------------- + class EdgeBundle : public Bundle { @@ -104,7 +104,7 @@ public: EdgeBundle& operator=( EdgeBundle& rEdgeBundle ); }; -// --------------------------------------------------------------- + class TextBundle : public Bundle { @@ -127,7 +127,7 @@ public: virtual ~TextBundle() {}; }; -// --------------------------------------------------------------- + class FillBundle : public Bundle { @@ -147,7 +147,7 @@ public: }; -// --------------------------------------------------------------- + class FontEntry { @@ -163,7 +163,7 @@ public: ~FontEntry(); }; -// --------------------------------------------------------------- + typedef ::std::vector< FontEntry* > FontEntryList; diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 206d66369c0e..7cc8fc0f8cb3 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -90,9 +90,9 @@ class CGM // the temp input buffer sal_uInt32 mnMode; // source description - sal_uInt32 mnEscape; // - sal_uInt32 mnElementClass; // - sal_uInt32 mnElementID; // + sal_uInt32 mnEscape; + sal_uInt32 mnElementClass; + sal_uInt32 mnElementID; sal_uInt32 mnElementSize; // full parameter size for the latest action void ImplCGMInit(); diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx index 1fe856f11ea2..9f17599a5c44 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx @@ -22,9 +22,9 @@ #include <dxfentrd.hxx> -//---------------------------------------------------------------------------- + //---------------- Ein Block (= Menge von Entities) -------------------------- -//---------------------------------------------------------------------------- + class DXFBlock : public DXFEntities { @@ -49,9 +49,9 @@ public: }; -//---------------------------------------------------------------------------- + //---------------- Eine Menge von Bloecken ----------------------------------- -//---------------------------------------------------------------------------- + class DXFBlocks { diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index fc2aacabd808..fbb451072327 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -27,9 +27,9 @@ typedef std::deque< Point > DXFPointArray; -//------------------------------------------------------------------------------ + //----------------------------- entity kind ------------------------------------ -//------------------------------------------------------------------------------ + enum DXFEntityType { DXF_LINE, @@ -52,9 +52,9 @@ enum DXFEntityType { DXF_HATCH }; -//------------------------------------------------------------------------------ + //------------------------ base class of an entity ----------------------------- -//------------------------------------------------------------------------------ + class DXFBasicEntity { @@ -97,9 +97,9 @@ protected: }; -//------------------------------------------------------------------------------ + //------------------- the different kinds of entities -------------------------- -//------------------------------------------------------------------------------ + //--------------------------Line------------------------------------------------ @@ -551,9 +551,9 @@ protected: virtual void EvaluateGroup(DXFGroupReader & rDGR); }; -//------------------------------------------------------------------------------ + //----------------- read and represent the set of entities --------------------- -//------------------------------------------------------------------------------ + class DXFEntities { @@ -573,9 +573,9 @@ public: // deletes all entities }; -//------------------------------------------------------------------------------ + //--------------------------------- inlines ------------------------------------ -//------------------------------------------------------------------------------ + inline DXFEntities::DXFEntities() { diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx index 6e420069de2a..27985c95bd31 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx @@ -24,9 +24,9 @@ #include <dxftblrd.hxx> -//---------------------------------------------------------------------------- + //--------------------Other stuff--------------------------------------------- -//---------------------------------------------------------------------------- + //-------------------A 3D-Min/Max-Box----------------------------------------- @@ -66,9 +66,9 @@ private: }; -//---------------------------------------------------------------------------- + //-----------------read and represent DXF file-------------------------------- -//---------------------------------------------------------------------------- + class DXFRepresentation { @@ -113,9 +113,9 @@ private: DXFBoundingBox & rBox); }; -//---------------------------------------------------------------------------- + //-------------------inlines-------------------------------------------------- -//---------------------------------------------------------------------------- + inline sal_uInt8 DXFPalette::GetRed(sal_uInt8 nIndex) const { return pRed[nIndex]; } inline sal_uInt8 DXFPalette::GetGreen(sal_uInt8 nIndex) const { return pGreen[nIndex]; } diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx index 3cf0ec7bb155..569dc317300c 100644 --- a/filter/source/graphicfilter/idxf/dxftblrd.hxx +++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx @@ -24,9 +24,9 @@ #include <dxfvec.hxx> -//---------------------------------------------------------------------------- + //------------------- Line Type ---------------------------------------------- -//---------------------------------------------------------------------------- + #define DXF_MAX_DASH_COUNT 32 @@ -48,9 +48,9 @@ public: }; -//---------------------------------------------------------------------------- + //------------------ Layer --------------------------------------------------- -//---------------------------------------------------------------------------- + class DXFLayer { @@ -68,9 +68,9 @@ public: }; -//---------------------------------------------------------------------------- + //------------------ Style --------------------------------------------------- -//---------------------------------------------------------------------------- + class DXFStyle { @@ -93,9 +93,9 @@ public: }; -//---------------------------------------------------------------------------- + //------------------ VPort --------------------------------------------------- -//---------------------------------------------------------------------------- + class DXFVPort { @@ -141,9 +141,9 @@ public: }; -//---------------------------------------------------------------------------- + //------------------ Tabellen ------------------------------------------------ -//---------------------------------------------------------------------------- + class DXFTables { diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx index be505992a255..a82cf28a56a2 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.hxx +++ b/filter/source/graphicfilter/idxf/dxfvec.hxx @@ -56,9 +56,9 @@ public: }; -//------------------------------------------------------------------------------ + //---------------------------- DXFVector --------------------------------------- -//------------------------------------------------------------------------------ + // common 3D vector with doubles class DXFVector { @@ -97,9 +97,9 @@ public: sal_Bool operator != (const DXFVector & rV) const; }; -//------------------------------------------------------------------------------ + //---------------------------- DXFTransform ------------------------------------ -//------------------------------------------------------------------------------ + // a transformation matrice specialized for our problem class DXFTransform { @@ -167,9 +167,9 @@ private: DXFVector aMP; }; -//------------------------------------------------------------------------------ + //------------------------------- inlines -------------------------------------- -//------------------------------------------------------------------------------ + inline DXFVector::DXFVector(double fX, double fY, double fZ) diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 5fbbe06574eb..c8e1e96bea1b 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -43,7 +43,7 @@ private: sal_uLong nWidth, nHeight; // dimension in pixel sal_uInt16 nResX, nResY; // resolution in pixel per inch oder 0,0 sal_uInt16 nDestBitsPerPixel; // bits per pixel in destination bitmap 1,4,8 or 24 - sal_uInt8* pPalette; // + sal_uInt8* pPalette; sal_Bool nStatus; // from now on do not read status from stream ( SJ ) diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx index e6f9c4ddd06d..c9da3435d50d 100644 --- a/filter/source/graphicfilter/ipict/shape.cxx +++ b/filter/source/graphicfilter/ipict/shape.cxx @@ -105,9 +105,9 @@ namespace PictReaderShape { return true; } - // + //-------------------- draws a line -------------------- - // + void drawLine(VirtualDevice *dev, Point const &orig, Point const &dest, Size const &pSize) { if (drawLineHQ(dev,orig,dest,pSize)) return; diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index e7cd5de7427d..ce708113f6d8 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -562,7 +562,7 @@ const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={ { CCIUNCOMP_4White_End , 0x0001, 11 } }; -//========================================================================= + CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) : diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index cd156a7fca05..4c2e1fb4c55a 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -62,33 +62,33 @@ private: // Data taken from the TIFF tags: sal_Bool bByteSwap; // sal_True if bits 0..7 -> 7..0 should get converted ( FILLORDER = 2 ); - sal_uLong nNewSubFile; // - sal_uLong nSubFile; // + sal_uLong nNewSubFile; + sal_uLong nSubFile; sal_uLong nImageWidth; // picture width in pixels sal_uLong nImageLength; // picture height in pixels sal_uLong nBitsPerSample; // bits per pixel per layer sal_uLong nCompression; // kind of compression - sal_uLong nPhotometricInterpretation; // - sal_uLong nThresholding; // - sal_uLong nCellWidth; // - sal_uLong nCellLength; // - sal_uLong nFillOrder; // + sal_uLong nPhotometricInterpretation; + sal_uLong nThresholding; + sal_uLong nCellWidth; + sal_uLong nCellLength; + sal_uLong nFillOrder; sal_uLong* pStripOffsets; // field of offsets to the Bitmap-Data-"Strips" sal_uLong nNumStripOffsets; // size of the field above - sal_uLong nOrientation; // + sal_uLong nOrientation; sal_uLong nSamplesPerPixel; // number of layers sal_uLong nRowsPerStrip; // if it's not compressed: number of rows per Strip sal_uLong* pStripByteCounts; // if compressed (in a certain way): size of the strips sal_uLong nNumStripByteCounts; // number of entries in the field above - sal_uLong nMinSampleValue; // - sal_uLong nMaxSampleValue; // + sal_uLong nMinSampleValue; + sal_uLong nMaxSampleValue; double fXResolution; // X-resolution or 0.0 double fYResolution; // Y-resolution or 0.0 - sal_uLong nPlanarConfiguration; // - sal_uLong nGroup3Options; // - sal_uLong nGroup4Options; // + sal_uLong nPlanarConfiguration; + sal_uLong nGroup3Options; + sal_uLong nGroup4Options; sal_uLong nResolutionUnit; // unit of fX/YResolution: 1=unknown, 2(default)=inch, 3=cm - sal_uLong nPredictor; // + sal_uLong nPredictor; sal_uLong* pColorMap; // color palette sal_uLong nNumColors; // number of colors within the color palette diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index dab46f859072..a50b72a3766f 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4853,8 +4853,8 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) { sal_uInt32 nRecHdPos, nCurrentPos, nSize; rStrm .WriteUInt16( (sal_uInt16)( ( nCount << 4 ) | 0xf ) ) // open an ESCHER_SolverContainer - .WriteUInt16( (sal_uInt16)ESCHER_SolverContainer ) // - .WriteUInt32( (sal_uInt32)0 ); // + .WriteUInt16( (sal_uInt16)ESCHER_SolverContainer ) + .WriteUInt32( (sal_uInt32)0 ); nRecHdPos = rStrm.Tell() - 4; @@ -4876,7 +4876,7 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) aConnectorRule.ncptiB = pPtr->GetConnectorRule( sal_False ); } rStrm .WriteUInt32( (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) ) // atom hd - .WriteUInt32( (sal_uInt32)24 ) // + .WriteUInt32( (sal_uInt32)24 ) .WriteUInt32( aConnectorRule.nRuleId ) .WriteUInt32( aConnectorRule.nShapeA ) .WriteUInt32( aConnectorRule.nShapeB ) @@ -4888,10 +4888,10 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) } nCurrentPos = rStrm.Tell(); // close the ESCHER_SolverContainer - nSize = ( nCurrentPos - nRecHdPos ) - 4;// - rStrm.Seek( nRecHdPos ); // - rStrm.WriteUInt32( nSize ); // - rStrm.Seek( nCurrentPos ); // + nSize = ( nCurrentPos - nRecHdPos ) - 4; + rStrm.Seek( nRecHdPos ); + rStrm.WriteUInt32( nSize ); + rStrm.Seek( nCurrentPos ); } } diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 6b742ba34d25..23b7cdb35bba 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -141,7 +141,7 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty rObj.SetRect( aRect ); } -// ----------------------------------------------------------------------- + #define ADD_SHAPE( nType, nFlags ) \ { \ diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index dd78abaf3b56..ff3eff083117 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -22,7 +22,7 @@ #include <svx/unopage.hxx> #include <vcl/mapmod.hxx> -// =================================================================== + // fractions of Draw PPTWriter etc. enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 }; @@ -92,7 +92,7 @@ public: -// ------------------------------------------------------------------- + // fractions of the Draw PPTWriter class EscherEx; @@ -173,7 +173,7 @@ public: }; -// =================================================================== + class SdrObject; class SdrPage; diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 8f14db6752d2..17cbd8b665f7 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; namespace msfilter { -// ============================================================================ + namespace { @@ -115,7 +115,7 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Size nBufferSize ) } // namespace -// ============================================================================ + MSCodec_Xor95::MSCodec_Xor95(int nRotateDistance) : mnOffset( 0 ), @@ -247,7 +247,7 @@ void MSCodec_Xor95::Skip( sal_Size nBytes ) mnOffset = (mnOffset + nBytes) & 0x0F; } -// ============================================================================ + MSCodec_Std97::MSCodec_Std97 () { @@ -543,7 +543,7 @@ void MSCodec_Std97::GetDocId( sal_uInt8 pDocId[16] ) (void)memcpy( pDocId, m_pDocId, 16 ); } -// ============================================================================ + } // namespace svx diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index a7de3077f957..f87c8e3b6495 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -366,7 +366,7 @@ DffPropertyReader::~DffPropertyReader() delete pDefaultPropSet; } -//////////////////////////////////////////////////////////////////////////////////////////////////// + SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) { @@ -762,7 +762,7 @@ 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, @@ -1007,9 +1007,9 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh if ( nLineFlags & 0x10 ) { sal_Bool bScaleArrows = rManager.pSdrModel->GetScaleUnit() == MAP_TWIP; - /////////////// - // LineStart // - /////////////// + + // LineStart + if ( IsProperty( DFF_Prop_lineStartArrowhead ) ) { MSO_LineEnd eLineEnd = (MSO_LineEnd)GetPropertyValue( DFF_Prop_lineStartArrowhead ); @@ -1025,9 +1025,9 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh rSet.Put( XLineStartItem( aArrowName, aPolyPoly) ); rSet.Put( XLineStartCenterItem( bArrowCenter ) ); } - ///////////// - // LineEnd // - ///////////// + + // LineEnd + if ( IsProperty( DFF_Prop_lineEndArrowhead ) ) { MSO_LineEnd eLineEnd = (MSO_LineEnd)GetPropertyValue( DFF_Prop_lineEndArrowhead ); @@ -1516,9 +1516,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt sal_uInt32 nAdjustmentsWhichNeedsToBeConverted = 0; - /////////////////////////////////////// - // creating SdrCustomShapeGeometryItem // - /////////////////////////////////////// + + // creating SdrCustomShapeGeometryItem + typedef uno::Sequence< beans::PropertyValue > PropSeq; typedef std::vector< beans::PropertyValue > PropVec; typedef PropVec::iterator PropVecIter; @@ -1530,17 +1530,17 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt PropVec aPropVec; PropertyValue aProp; - ///////////////////////////////////////////////////////////////////// - // "Type" property, including the predefined CustomShape type name // - ///////////////////////////////////////////////////////////////////// + + // "Type" property, including the predefined CustomShape type name + const OUString sType( "Type" ); aProp.Name = sType; aProp.Value <<= EnhancedCustomShapeTypeNames::Get( rObjData.eShapeType ); aPropVec.push_back( aProp ); - /////////////// - // "ViewBox" // - /////////////// + + // "ViewBox" + sal_Int32 nCoordWidth = 21600; // needed to replace handle type center with absolute value sal_Int32 nCoordHeight= 21600; @@ -1556,9 +1556,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aProp.Value <<= aViewBox; aPropVec.push_back( aProp ); } - ///////////////////// - // TextRotateAngle // - ///////////////////// + + // TextRotateAngle + if ( IsProperty( DFF_Prop_txflTextFlow ) || IsProperty( DFF_Prop_cdirFont ) ) { sal_Int32 nTextRotateAngle = 0; @@ -1592,9 +1592,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aPropVec.push_back( aProp ); } } - ////////////////////////////////////////// - // "Extrusion" PropertySequence element // - ////////////////////////////////////////// + + // "Extrusion" PropertySequence element + sal_Bool bExtrusionOn = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 8 ) != 0; if ( bExtrusionOn ) { @@ -1860,9 +1860,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aPropVec.push_back( aProp ); } - ///////////////////////////////////////// - // "Equations" PropertySequence element // - ///////////////////////////////////////// + + // "Equations" PropertySequence element + if ( IsProperty( DFF_Prop_pFormulas ) ) { sal_uInt16 nNumElem = 0; @@ -1889,9 +1889,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aPropVec.push_back( aProp ); } - //////////////////////////////////////// - // "Handles" PropertySequence element // - //////////////////////////////////////// + + // "Handles" PropertySequence element + if ( IsProperty( DFF_Prop_Handles ) ) { sal_uInt16 nNumElem = 0; @@ -2099,9 +2099,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt } } } - ///////////////////////////////////// - // "Path" PropertySequence element // - ///////////////////////////////////// + + // "Path" PropertySequence element + { PropVec aPathPropVec; @@ -2396,9 +2396,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aPropVec.push_back( aProp ); } } - ///////////////////////////////////////// - // "TextPath" PropertySequence element // - ///////////////////////////////////////// + + // "TextPath" PropertySequence element + sal_Bool bTextPathOn = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x4000 ) != 0; if ( bTextPathOn ) { @@ -2464,7 +2464,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt aProp.Value <<= aTextPathPropSeq; aPropVec.push_back( aProp ); } - //////////////////////// + // "AdjustmentValues" // The AdjustmentValues are imported at last, because depending to the type of the //////////////////////// handle (POLAR) we will convert the adjustment value from a fixed float to double @@ -4094,7 +4094,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r rSt.ReadUInt32( nUDData ); if ( rSt.GetError() != 0 ) break; - if ( nPID == 447 ) // + if ( nPID == 447 ) { mbRotateGranientFillWithAngle = nUDData & 0x20; break; @@ -5745,7 +5745,7 @@ void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ ) // from here on: Drawing Group Container i.e. Ddocument-wide valid data // ======================= ======== -// + void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLenDgg ) { sal_uInt8 nVer; @@ -5830,7 +5830,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe // from now on: Drawing Container which means Pages (Sheet, Slide) - wide valid data // ================= ====== -// + void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, const unsigned long nDrawingContainerId ) { @@ -5928,7 +5928,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, MSO_SPT eShapeType = mso_sptNil; // analyze Shape - // + do { if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return sal_False; @@ -6053,9 +6053,9 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, } while( nReadSpCont < nLenShapeCont ); - // + // Now possibly store the information for subsequent accesses to the shape - // + if( aInfo.nShapeId ) { // Possibly allow replacement of textboxes with frames diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index d5051c1a152a..6c48eed593e7 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -505,7 +505,7 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno:: #endif } -// ============================================================================ + uno::Sequence< OUString > VBAMacroResolver_getSupportedServiceNames() { @@ -524,7 +524,7 @@ uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( cons return static_cast< ::cppu::OWeakObject* >( new VBAMacroResolver ); } -// ============================================================================ + VBAMacroResolver::VBAMacroResolver() : mpObjShell( 0 ) @@ -779,7 +779,7 @@ void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, c xAcc->setKeyEvent( rKeyEvent, ooo::vba::makeMacroURL( MacroName ) ); } -// ============================================================================ + } // namespace vba } // namespace ooo diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index 53725874c394..87ea38532d96 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -33,7 +33,7 @@ namespace ooo { namespace vba { DECLARE_FUNCTIONS( VBAMacroResolver ); } } #undef DECLARE_FUNCTIONS -// ============================================================================ + namespace { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f52f47795f12..7b4551bad159 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4564,7 +4564,7 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerP // when bullet offset is > 0x7fff, the paragraph should look like // * first line text // second line text - // + // we add to bullet para indent 0xffff - bullet offset. it looks like // best we can do for now mpImplRuler->nTextOfs[ i ] += 0xffff - mpImplRuler->nBulletOfs[ i ]; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 189f7e226508..9062ba57d818 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -55,7 +55,7 @@ PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMg using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////////////////////////////// + // tabbed PDF dialog implementation // please note: the default used here are the same as per specification, // they should be the same in PDFFilter::implExport and in PDFExport::PDFExport @@ -275,7 +275,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi //remove the reset button, not needed in this tabbed dialog RemoveResetButton(); -///////////////// + } ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const @@ -983,7 +983,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) return 0; } -//////////////////////////////////////////////////////// + // The Viewer preferences tab page ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, @@ -1290,7 +1290,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls() mpContent->Enable(bLocalEnable); } -//////////////////////////////////////////////////////// + // This tab page is under control of the PDF/A-1a checkbox: // implement a method to do it. @@ -1307,7 +1307,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity enablePermissionControls(); } -//////////////////////////////////////////////////////// + // The link preferences tab page (relative and other stuff) ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, @@ -1396,7 +1396,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) // now check the status of PDF/A selection // and set the link action accordingly // PDF/A-1 doesn't allow launch action on links - // + ImpPDFTabGeneralPage* pGeneralPage = paParent ? paParent->getGeneralPage() : NULL; if (pGeneralPage) ImplPDFALinkControl(!pGeneralPage->mpCbPDFA1b->IsChecked()); @@ -1553,7 +1553,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) return 0; } -//////////////////////////////////////////////////////// + // The digital signatures tab page ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet) diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 808b31495dde..89a7648a9d2d 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -39,9 +39,9 @@ #include "com/sun/star/beans/NamedValue.hpp" -// ---------------- + // - ImpPDFDialog - -// ---------------- + class ImpPDFTabGeneralPage; class ImpPDFTabViewerPage; @@ -72,7 +72,7 @@ class ImplErrorDialog : public ModalDialog class ImpPDFTabSecurityPage; class ImpPDFTabLinksPage; -//////////////////////////////////////////////////////////////////////// + //class tabbed dialog class ImpPDFTabDialog : public SfxTabDialog { diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index e4243e969eea..420eca5eaa26 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -25,9 +25,9 @@ #include <cppuhelper/implbase2.hxx> -// ------------- + // - PDFDialog - -// ------------- + class Window; @@ -72,7 +72,7 @@ public: virtual ~PDFDialog(); }; -// ----------------------------------------------------------------------------- + OUString PDFDialog_getImplementationName () throw (RuntimeException); Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() throw(RuntimeException); diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 25511bb2bd4e..39c5d2242ab4 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -249,7 +249,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, { bRet = sal_True; // #i18334# SJ: nPageCount == 0, rPDFWriter.NewPage( 10000, 10000 ); // creating dummy page - rPDFWriter.SetMapMode( MAP_100TH_MM ); // + rPDFWriter.SetMapMode( MAP_100TH_MM ); } } } diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index 8db104da05c5..48791e13d35f 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -31,9 +31,9 @@ class Size; namespace vcl { class PDFWriter; } -// ------------- + // - PDFExport - -// ------------- + class PDFExport { diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 9eb8dedaefbd..e9b26af66ef8 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -52,9 +52,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; using namespace ::com::sun::star::io; -// ------------- + // - PDFFilter - -// ------------- + class PDFFilter : public cppu::WeakImplHelper4 < XFilter, XExporter, @@ -91,22 +91,22 @@ public: virtual ~PDFFilter(); }; -// ----------------------------------------------------------------------------- + OUString PDFFilter_getImplementationName () throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL PDFFilter_supportsService( const OUString& ServiceName ) throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index 070cab0b1599..a5b34929841a 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -// ------------- + // - PDFFilter - -// ------------- + class PDFInteractionHandler : public cppu::WeakImplHelper2 < task::XInteractionHandler2, XServiceInfo > @@ -54,22 +54,22 @@ public: virtual ~PDFInteractionHandler(); }; -// ----------------------------------------------------------------------------- + OUString PDFInteractionHandler_getImplementationName () throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL PDFInteractionHandler_supportsService( const OUString& ServiceName ) throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ) throw ( RuntimeException ); -// ----------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr) diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 86564f850ec3..266bd2711321 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -37,9 +37,9 @@ #define SVG_PROP_OPACITY "Opacity" #define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters" -// ---------------- + // - ImpSVGDialog - -// ---------------- + class ResMgr; class Window; diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 5c30c417a516..812f808d5723 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -376,7 +376,7 @@ bool parseOpacity (const char* sOpacity, ARGBColor& rColor ) return false; } -////////////////////////////////////////////////////////////// + bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) { @@ -492,7 +492,7 @@ bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) return bRes; } -////////////////////////////////////////////////////////////// + bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) { @@ -520,7 +520,7 @@ bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) return true; } -////////////////////////////////////////////////////////////// + bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector ) { @@ -544,7 +544,7 @@ bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector space_p).full; } -////////////////////////////////////////////////////////////// + bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, std::pair<ARGBColor,bool>& io_rColor, @@ -570,7 +570,7 @@ bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, return bRes; } -////////////////////////////////////////////////////////////// + bool parseXlinkHref( const char* sXlinkHref, std::string& data ) { diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index c77ff1db8424..892b76a950c5 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -887,7 +887,7 @@ function instantiate( TemplateClass, BaseType ) } -// ------------------------------------------------------------------------------------------ // + /********************************** ** Helper functions and classes ** **********************************/ @@ -1082,7 +1082,7 @@ function isTextFieldElement( aElement ) ( sClassName === aDateTimeClassName ); } -// ------------------------------------------------------------------------------------------ // + /********************* ** Debug Utilities ** *********************/ @@ -1151,7 +1151,7 @@ aAnimatedElementDebugPrinter.off(); -// ------------------------------------------------------------------------------------------ // + /************************ *** Core Classes *** ************************/ @@ -2201,7 +2201,7 @@ SlideNumberFieldHandler.prototype.update = function( nPageNumber ) this.aTextContentProvider.update( this, nPageNumber ); }; -// ------------------------------------------------------------------------------------------ // + /****************************************************************************** * Text Field Content Provider Class Hierarchy * @@ -2351,7 +2351,7 @@ SlideNumberProvider.prototype.createSlideNumberText = function( nSlideNumber, sN -//------------------------------------------------------------------------------------------- // + /******************************** ** Slide Index Classes ** ********************************/ @@ -2745,7 +2745,7 @@ Thumbnail.prototype.onMouseOver = function() -// ------------------------------------------------------------------------------------------ // + /** Initialization function. * The whole presentation is set-up in this function. */ @@ -2778,9 +2778,9 @@ function init() // } - //=====================================// - // == animations parsing test == // - //=====================================// + + // == animations parsing test == + // var aSlideShowContext = aSlideShow.getContext(); // var aSlideAnimations = new SlideAnimations( aSlideShowContext ); @@ -2945,7 +2945,7 @@ function abandonIndexMode() -// ------------------------------------------------------------------------------------------ // + // helper functions @@ -3121,7 +3121,7 @@ function matrixToString( aSVGMatrix ) -// ------------------------------------------------------------------------------------------ // + // Attribute Parsers function numberParser( sValue ) @@ -3226,7 +3226,7 @@ function colorParser( sValue ) * RGB and HSL color classes **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function RGBColor( nRed, nGreen, nBlue ) { this.eColorSpace = COLOR_SPACE_RGB; @@ -3344,7 +3344,7 @@ RGBColor.interpolate = function( aStartRGB , aEndRGB, nT ) -// ------------------------------------------------------------------------------------------ // + function HSLColor( nHue, nSaturation, nLuminance ) { this.eColorSpace = COLOR_SPACE_HSL; @@ -3814,7 +3814,7 @@ PriorityQueue.prototype.pop = function() * AnimationNode Class Hierarchy **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + // Node Types var ANIMATION_NODE_CUSTOM = 0; @@ -3844,7 +3844,7 @@ aAnimationNodeTypeInMap = { -// ------------------------------------------------------------------------------------------ // + function getAnimationElementType( aElement ) { var sName = aElement.localName.toLowerCase(); @@ -3858,7 +3858,7 @@ function getAnimationElementType( aElement ) -// ------------------------------------------------------------------------------------------ // + // Node States var INVALID_NODE = 0; @@ -4223,7 +4223,7 @@ REVERSEMETHOD_FLIP_Y = 6; aReverseMethodOutMap = ['ignore', 'invert sweep', 'subtract polygon', 'subtract and invert', 'rotate 180', 'flip x', 'flip y']; -// ------------------------------------------------------------------------------------------ // + // Transition filter info table var aTransitionInfoTable = {}; @@ -4445,7 +4445,7 @@ aTransitionInfoTable[CHECKERBOARDWIPE_TRANSITION][ACROSS_TRANS_SUBTYPE] = 'scaleIsotropically' : false }; -// ------------------------------------------------------------------------------------------ // + // Transition tables function createStateTransitionTable() @@ -4530,7 +4530,7 @@ function createStateTransitionTable() var aStateTransitionTable = createStateTransitionTable(); -// ------------------------------------------------------------------------------------------ // + function getTransitionTable( eRestartMode, eFillMode ) { // If restart mode has not been resolved we use 'never'. @@ -4555,7 +4555,7 @@ function getTransitionTable( eRestartMode, eFillMode ) -// ------------------------------------------------------------------------------------------ // + // Event Triggers var EVENT_TRIGGER_UNKNOWN = 0; @@ -4593,7 +4593,7 @@ function getEventTriggerType( sEventTrigger ) -// ------------------------------------------------------------------------------------------ // + // Timing Types var UNKNOWN_TIMING = 0; @@ -4859,7 +4859,7 @@ Timing.prototype.info = function( bVerbose ) -// ------------------------------------------------------------------------------------------ // + function Duration( sDurationAttribute ) { this.bIndefinite = false; @@ -4925,7 +4925,7 @@ Duration.prototype.info= function() -// ------------------------------------------------------------------------------------------ // + function AnimationNode() { } @@ -4941,7 +4941,7 @@ AnimationNode.prototype.notifyDeactivating = function() {}; -// ------------------------------------------------------------------------------------------ // + function NodeContext( aSlideShowContext ) { this.aContext = aSlideShowContext; @@ -4978,7 +4978,7 @@ NodeContext.prototype.makeSourceEventElement = function( sId, aEventBaseElem ) -// ------------------------------------------------------------------------------------------ // + function StateTransition( aBaseNode ) { this.aNode = aBaseNode; @@ -5027,7 +5027,7 @@ StateTransition.prototype.clear = function() -// ------------------------------------------------------------------------------------------ // + function BaseNode( aAnimElem, aParentNode, aNodeContext ) { this.nId = getUniqueId(); @@ -5586,7 +5586,7 @@ BaseNode.prototype.DBG = function( sMessage, nTime ) -// ------------------------------------------------------------------------------------------ // + function AnimationBaseNode( aAnimElem, aParentNode, aNodeContext ) { AnimationBaseNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -5836,7 +5836,7 @@ AnimationBaseNode.prototype.info = function( bVerbose ) }; -// ------------------------------------------------------------------------------------------ // + function AnimationBaseNode2( aAnimElem, aParentNode, aNodeContext ) { AnimationBaseNode2.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -5898,7 +5898,7 @@ AnimationBaseNode2.prototype.info = function( bVerbose ) -// ------------------------------------------------------------------------------------------ // + function AnimationBaseNode3( aAnimElem, aParentNode, aNodeContext ) { AnimationBaseNode3.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6027,7 +6027,7 @@ AnimationBaseNode3.prototype.info = function( bVerbose ) -// ------------------------------------------------------------------------------------------ // + function BaseContainerNode( aAnimElem, aParentNode, aNodeContext ) { BaseContainerNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6309,7 +6309,7 @@ BaseContainerNode.prototype.info = function( bVerbose ) return sInfo; }; -// ------------------------------------------------------------------------------------------ // + function ParallelTimeContainer( aAnimElem, aParentNode, aNodeContext ) { ParallelTimeContainer.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6355,7 +6355,7 @@ ParallelTimeContainer.prototype.notifyDeactivating = function( aAnimationNode ) -// ------------------------------------------------------------------------------------------ // + function SequentialTimeContainer( aAnimElem, aParentNode, aNodeContext ) { SequentialTimeContainer.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6626,7 +6626,7 @@ SequentialTimeContainer.prototype.dispose = function() -// ------------------------------------------------------------------------------------------ // + function PropertyAnimationNode( aAnimElem, aParentNode, aNodeContext ) { PropertyAnimationNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6725,7 +6725,7 @@ PropertyAnimationNode.prototype.createActivity = function() -// ------------------------------------------------------------------------------------------ // + function AnimationSetNode( aAnimElem, aParentNode, aNodeContext ) { AnimationSetNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6749,7 +6749,7 @@ AnimationSetNode.prototype.createActivity = function() -// ------------------------------------------------------------------------------------------ // + function AnimationColorNode( aAnimElem, aParentNode, aNodeContext ) { AnimationColorNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -6905,7 +6905,7 @@ AnimationColorNode.prototype.info = function( bVerbose ) -// ------------------------------------------------------------------------------------------ // + function AnimationTransitionFilterNode( aAnimElem, aParentNode, aNodeContext ) { AnimationTransitionFilterNode.superclass.constructor.call( this, aAnimElem, aParentNode, aNodeContext ); @@ -7024,7 +7024,7 @@ AnimationTransitionFilterNode.prototype.info = function( bVerbose ) * Animation Node Factory **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function createAnimationTree( aRootElement, aNodeContext ) { return createAnimationNode( aRootElement, null, aNodeContext ); @@ -7032,7 +7032,7 @@ function createAnimationTree( aRootElement, aNodeContext ) -// ------------------------------------------------------------------------------------------ // + function createAnimationNode( aElement, aParentNode, aNodeContext ) { assert( aElement, 'createAnimationNode: invalid animation element' ); @@ -7110,7 +7110,7 @@ function createAnimationNode( aElement, aParentNode, aNodeContext ) -// ------------------------------------------------------------------------------------------ // + function createChildNode( aElement, aParentNode, aNodeContext ) { var aChildNode = createAnimationNode( aElement, aParentNode, aNodeContext ); @@ -7129,7 +7129,7 @@ function createChildNode( aElement, aParentNode, aNodeContext ) -// ------------------------------------------------------------------------------------------ // + function createIteratedNodes( aElement, aContainerNode, aNodeContext ) { // not implemented @@ -7142,7 +7142,7 @@ function createIteratedNodes( aElement, aContainerNode, aNodeContext ) **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function makeScaler( nScale ) { if( ( typeof( nScale ) !== typeof( 0 ) ) || !isFinite( nScale ) ) @@ -7159,7 +7159,7 @@ function makeScaler( nScale ) -// ------------------------------------------------------------------------------------------ // + function createPropertyAnimation( sAttrName, aAnimatedElement, nWidth, nHeight ) { if( !aAttributeMap[ sAttrName ] ) @@ -7192,7 +7192,7 @@ function createPropertyAnimation( sAttrName, aAnimatedElement, nWidth, nHeight ) -// ------------------------------------------------------------------------------------------ // + /** createShapeTransition * * @param aActivityParamSet @@ -7259,7 +7259,7 @@ function createShapeTransition( aActivityParamSet, aAnimatedElement, -// ------------------------------------------------------------------------------------------ // + /** Class ClippingAnimation * This class performs a shape transition where the effect is achieved by * clipping the shape to be animated with a parametric path. @@ -7339,7 +7339,7 @@ ClippingAnimation.prototype.getUnderlyingValue = function() -// ------------------------------------------------------------------------------------------ // + function GenericAnimation( aGetValueFunc, aSetValueFunc, aGetModifier, aSetModifier ) { assert( aGetValueFunc && aSetValueFunc, @@ -7392,7 +7392,7 @@ GenericAnimation.prototype.getUnderlyingValue = function() -// ------------------------------------------------------------------------------------------ // + function HSLAnimationWrapper( aColorAnimation ) { assert( aColorAnimation, @@ -7423,7 +7423,7 @@ HSLAnimationWrapper.prototype.getUnderlyingValue = function() -// ------------------------------------------------------------------------------------------ // + /** Class SlideChangeBase * The base abstract class of classes performing slide transitions. * @@ -7501,7 +7501,7 @@ SlideChangeBase.prototype.performOut = function( nValue ) -// ------------------------------------------------------------------------------------------ // + /** Class FadingSlideChange * This class performs a slide transition by fading out the leaving slide and * fading in the entering slide. @@ -7560,7 +7560,7 @@ FadingSlideChange.prototype.performOut = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class FadingOverColorSlideChange * This class performs a slide transition by fading out the leaving slide to * a given color and fading in the entering slide from the same color. @@ -7647,7 +7647,7 @@ FadingOverColorSlideChange.prototype.createColorPlaneElement = function() -// ------------------------------------------------------------------------------------------ // + /** Class MovingSlideChange * This class performs a slide transition that involves translating the leaving * slide and/or the entering one in a given direction. @@ -7719,7 +7719,7 @@ MovingSlideChange.prototype.performOut = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class ClippedSlideChange * This class performs a slide transition where the entering slide wipes * the leaving one out. The wipe effect is achieved by clipping the entering @@ -7783,7 +7783,7 @@ ClippedSlideChange.prototype.performOut = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class ClippingFunctor * This class is responsible for computing the <path> used for clipping * the entering slide in a polypolygon clipping slide transition or the @@ -7944,7 +7944,7 @@ ClippingFunctor.prototype.perform = function( nT, nWidth, nHeight ) -// ------------------------------------------------------------------------------------------ // + /** createClipPolyPolygon * * @param nType @@ -8002,7 +8002,7 @@ function createClipPolyPolygon( nType, nSubtype ) -// ------------------------------------------------------------------------------------------ // + function createUnitSquarePath() { var aPath = document.createElementNS( NSS['svg'], 'path' ); @@ -8019,7 +8019,7 @@ function pruneScaleValue( nVal ) return (nVal > 0.00001 ? nVal : 0.00001); } -// ------------------------------------------------------------------------------------------ // + /** Class BarWipePath * This class handles a <path> element that defines a unit square and * transforms it accordingly to a parameter in the [0,1] range for performing @@ -8070,7 +8070,7 @@ BarWipePath.prototype.perform = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class FourBoxWipePath * This class handles a path made up by four squares and is utilized for * performing fourBoxWipe transitions. @@ -8137,7 +8137,7 @@ FourBoxWipePath.prototype.perform = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class EllipseWipePath * This class handles a parametric ellipse represented by a path made up of * cubic Bezier curve segments that helps in performing the ellipseWipe @@ -8177,7 +8177,7 @@ EllipseWipePath.prototype.perform = function( nT ) -// ------------------------------------------------------------------------------------------ // + /** Class PinWheelWipePath * This class handles a parametric poly-path that is used for performing * a spinWheelWipe transition. @@ -8251,7 +8251,7 @@ PinWheelWipePath.prototype.perform = function( nT ) }; -// ------------------------------------------------------------------------------------------ // + /** Class CheckerBoardWipePath * * @param unitsPerEdge @@ -8307,7 +8307,7 @@ CheckerBoardWipePath.prototype.perform = function( nT ) }; -// ------------------------------------------------------------------------------------------ // + /** Class AnimatedSlide * This class handle a slide element during a slide transition. * @@ -8545,7 +8545,7 @@ AnimatedSlide.prototype.setClipPath = function( aClipPathContent ) }; -// ------------------------------------------------------------------------------------------ // + function AnimatedElement( aElement ) { if( !aElement ) @@ -9119,7 +9119,7 @@ AnimatedElement.prototype.DBG = function( sMessage, nTime ) aAnimatedElementDebugPrinter.print( 'AnimatedElement(' + this.getId() + ')' + sMessage, nTime ); }; -// ------------------------------------------------------------------------------------------ // + function AnimatedTextElement( aElement, aEventMultiplexer ) { var theDocument = document; @@ -9406,7 +9406,7 @@ AnimatedTextElement.prototype.restoreState = function( nAnimationNodeId ) -// ------------------------------------------------------------------------------------------ // + /** Class SlideTransition * This class is responsible for initializing the properties of a slide * transition and create the object that actually will perform the transition. @@ -9699,7 +9699,7 @@ SlideTransition.prototype.info = function() -// ------------------------------------------------------------------------------------------ // + // SlideAnimations function SlideAnimations( aSlideShowContext ) @@ -9851,7 +9851,7 @@ SlideAnimations.prototype.chargeInterAnimEvents = function() * Event classes and helper functions **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function Event() { this.nId = Event.getUniqueId(); @@ -9872,7 +9872,7 @@ Event.prototype.getId = function() }; -// ------------------------------------------------------------------------------------------ // + function DelayEvent( aFunctor, nTimeout ) { DelayEvent.superclass.constructor.call( this ); @@ -9917,7 +9917,7 @@ DelayEvent.prototype.charge = function() }; -// ------------------------------------------------------------------------------------------ // + function makeEvent( aFunctor ) { return new DelayEvent( aFunctor, 0.0 ); @@ -9925,7 +9925,7 @@ function makeEvent( aFunctor ) -// ------------------------------------------------------------------------------------------ // + function makeDelay( aFunctor, nTimeout ) { return new DelayEvent( aFunctor, nTimeout ); @@ -9933,7 +9933,7 @@ function makeDelay( aFunctor, nTimeout ) -// ------------------------------------------------------------------------------------------ // + function registerEvent( nNodeId, aTiming, aEvent, aNodeContext ) { var aSlideShowContext = aNodeContext.aContext; @@ -10061,7 +10061,7 @@ registerEvent.DBG = function( aTiming, nTime ) -// ------------------------------------------------------------------------------------------ // + function SourceEventElement( sId, aElement, aEventMultiplexer ) { this.sId = sId; @@ -10126,7 +10126,7 @@ SourceEventElement.prototype.setDefaultCursor = function() this.aElement.setAttribute( 'style', 'cursor: default' ); }; -// ------------------------------------------------------------------------------------------ // + function HyperlinkElement( sId, aEventMultiplexer ) { @@ -10245,7 +10245,7 @@ HyperlinkElement.prototype.setDefaultCursor = function() }; -// ------------------------------------------------------------------------------------------ // + function InteractiveAnimationSequence( nId ) { this.nId = nId; @@ -10302,7 +10302,7 @@ InteractiveAnimationSequence.prototype.end = function() this.bIsRunning = false; }; -// ------------------------------------------------------------------------------------------ // + /** class PriorityEntry * It provides an entry type for priority queues. * Higher is the value of nPriority higher is the priority of the created entry. @@ -10336,7 +10336,7 @@ PriorityEntry.compare = function( aLhsEntry, aRhsEntry ) }; -// ------------------------------------------------------------------------------------------ // + function EventMultiplexer( aTimerEventQueue ) { this.nId = EventMultiplexer.getUniqueId(); @@ -10619,7 +10619,7 @@ aInterpolatorHandler.aLerpFunctorMap[ CALC_MODE_LINEAR ][ COLOR_PROPERTY ][ COLO -// ------------------------------------------------------------------------------------------ // + function KeyStopLerp( aValueList ) { KeyStopLerp.validateInput( aValueList ); @@ -10766,7 +10766,7 @@ aOperatorSetMap[ COLOR_PROPERTY ].scale = function( k, v ) * Activity Class Hierarchy **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function ActivityParamSet() { this.aEndEvent = null; @@ -10783,7 +10783,7 @@ function ActivityParamSet() this.aDiscreteTimes = new Array(); } -// ------------------------------------------------------------------------------------------ // + function AnimationActivity() { this.nId = AnimationActivity.getUniqueId(); @@ -10805,7 +10805,7 @@ AnimationActivity.prototype.getId = function() -// ------------------------------------------------------------------------------------------ // + function SetActivity( aCommonParamSet, aAnimation, aToAttr ) { SetActivity.superclass.constructor.call( this ); @@ -10881,7 +10881,7 @@ SetActivity.prototype.setTargets = function( aTargetElement ) -// ------------------------------------------------------------------------------------------ // + function ActivityBase( aCommonParamSet ) { ActivityBase.superclass.constructor.call( this ); @@ -11092,7 +11092,7 @@ ActivityBase.prototype.performEnd = function() -// ------------------------------------------------------------------------------------------ // + function SimpleContinuousActivityBase( aCommonParamSet ) { SimpleContinuousActivityBase.superclass.constructor.call( this, aCommonParamSet ); @@ -11297,7 +11297,7 @@ SimpleContinuousActivityBase.prototype.simplePerform = function( nSimpleTime, nR -// ------------------------------------------------------------------------------------------ // + function ContinuousKeyTimeActivityBase( aCommonParamSet ) { var nSize = aCommonParamSet.aDiscreteTimes.length; @@ -11340,7 +11340,7 @@ ContinuousKeyTimeActivityBase.prototype.simplePerform = function( nSimpleTime, n -// ------------------------------------------------------------------------------------------ // + function ContinuousActivityBase( aCommonParamSet ) { ContinuousActivityBase.superclass.constructor.call( this, aCommonParamSet ); @@ -11361,7 +11361,7 @@ ContinuousActivityBase.prototype.simplePerform = function( nSimpleTime, nRepeatC -// ------------------------------------------------------------------------------------------ // + function SimpleActivity( aCommonParamSet, aNumberAnimation, eDirection ) { assert( ( eDirection == BACKWARD ) || ( eDirection == FORWARD ), @@ -11416,7 +11416,7 @@ SimpleActivity.prototype.performEnd = function() -// ------------------------------------------------------------------------------------------ // + // FromToByActivity< BaseType > template class @@ -11631,7 +11631,7 @@ var LinearFromToByActivity = instantiate( FromToByActivityTemplate, ContinuousAc -// ------------------------------------------------------------------------------------------ // + // ValueListActivity< BaseType > template class @@ -11748,7 +11748,7 @@ var LinearValueListActivity = instantiate( ValueListActivityTemplate, Continuous * Activity Factory **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + function createActivity( aActivityParamSet, aAnimationNode, aAnimation, aInterpolator ) { var eCalcMode = aAnimationNode.getCalcMode(); @@ -11844,7 +11844,7 @@ function createActivity( aActivityParamSet, aAnimationNode, aAnimation, aInterpo -// ------------------------------------------------------------------------------------------ // + function createValueListActivity( aActivityParamSet, aAnimationNode, aAnimation, aInterpolator, ClassTemplateInstance, bAccumulate, eValueType ) { @@ -11874,7 +11874,7 @@ function createValueListActivity( aActivityParamSet, aAnimationNode, aAnimation, -// ------------------------------------------------------------------------------------------ // + function createFromToByActivity( aActivityParamSet, aAnimationNode, aAnimation, aInterpolator, ClassTemplateInstance, bAccumulate, eValueType ) { @@ -11913,7 +11913,7 @@ function createFromToByActivity( aActivityParamSet, aAnimationNode, aAnimation, } -// ------------------------------------------------------------------------------------------ // + function extractAttributeValues( eValueType, aValueList, aValueSet, aBBox, nSlideWidth, nSlideHeight ) { var i; @@ -11954,7 +11954,7 @@ function extractAttributeValues( eValueType, aValueList, aValueSet, aBBox, nSlid } -// ------------------------------------------------------------------------------------------ // + function evalValuesAttribute( aValueList, aValueSet, aBBox, nSlideWidth, nSlideHeight ) { var width = aBBox.width / nSlideWidth; @@ -11975,7 +11975,7 @@ function evalValuesAttribute( aValueList, aValueSet, aBBox, nSlideWidth, nSlideH * SlideShow, SlideShowContext and FrameSynchronization **********************************************************************************************/ -// ------------------------------------------------------------------------------------------ // + // direction of animation, important: not change the values! var BACKWARD = 0; @@ -12031,7 +12031,7 @@ Effect.prototype.end = function() this.eState = Effect.ENDED; }; -// ------------------------------------------------------------------------------------------ // + function SlideShow() { @@ -12674,7 +12674,7 @@ var aSlideShow = null; -// ------------------------------------------------------------------------------------------ // + function SlideShowContext( aTimerEventQueue, aEventMultiplexer, aNextEffectEventArray, aInteractiveAnimationSequenceMap, aActivityQueue) { this.aTimerEventQueue = aTimerEventQueue; @@ -12687,7 +12687,7 @@ function SlideShowContext( aTimerEventQueue, aEventMultiplexer, aNextEffectEvent -// ------------------------------------------------------------------------------------------ // + function FrameSynchronization( nFrameDuration ) { this.nFrameDuration = nFrameDuration; @@ -12733,7 +12733,7 @@ FrameSynchronization.prototype.deactivate = function() * TimerEventQueue, ActivityQueue and ElapsedTime **********************************************************************************************/ -//------------------------------------------------------------------------------------------- // + function NextEffectEventArray() { this.aEventArray = new Array(); @@ -12773,7 +12773,7 @@ NextEffectEventArray.prototype.clear = function( ) -//------------------------------------------------------------------------------------------- // + function TimerEventQueue( aTimer ) { this.aTimer = aTimer; @@ -12870,7 +12870,7 @@ TimerEventQueue.prototype.insert = function( aEventEntry ) -// ------------------------------------------------------------------------------------------ // + function EventEntry( aEvent, nTime ) { this.aEvent = aEvent; @@ -12885,7 +12885,7 @@ EventEntry.compare = function( aLhsEventEntry, aRhsEventEntry ) -// ------------------------------------------------------------------------------------------ // + function ActivityQueue( aTimer ) { this.aTimer = aTimer; @@ -13018,7 +13018,7 @@ ActivityQueue.prototype.size = function() -// ------------------------------------------------------------------------------------------ // + function ElapsedTime( aTimeBase ) { this.aTimeBase = aTimeBase; diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 8e8f59c3723f..254931d8b195 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -26,9 +26,9 @@ #include <svtools/genericunodialog.hxx> #include <memory> -// ------------- + // - SVGDialog - -// ------------- + class ResMgr; @@ -76,22 +76,22 @@ public: virtual ~SVGDialog(); }; -// ----------------------------------------------------------------------------- + OUString SVGDialog_getImplementationName () throw ( ::com::sun::star::uno::RuntimeException ); -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SVGDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index bbb413d61f6f..126c05edbb89 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -823,7 +823,7 @@ sal_Bool SVGFilter::implExportDocument() // Append aField to aFieldSet if it is not already present in the set // and create the field id sFieldId -// + template< typename TextFieldType > OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet, diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index e042a5f6abae..9ef5059eb306 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -30,9 +30,9 @@ #include <rtl/ustring.hxx> #include <tools/fontenum.hxx> -// ----------------- + // - SVGFontExport - -// ----------------- + class ObjectRepresentation; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 570ea10861be..b4eabbe3ec87 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -1891,9 +1891,9 @@ sal_Bool SVGReader::parseAndConvert() // the root state for svg document State aInitialState; - ///////////////////////////////////////////////////////////////// + // doc boilerplate - ///////////////////////////////////////////////////////////////// + m_xDocumentHandler->startDocument(); @@ -2036,7 +2036,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->endElement( "office:automatic-styles" ); - //////////////////////////////////////////////////////////////////// + xAttrs->Clear(); m_xDocumentHandler->startElement( "office:styles", xUnoAttrs); @@ -2045,7 +2045,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler); m_xDocumentHandler->endElement( "office:styles" ); - //////////////////////////////////////////////////////////////////// + m_xDocumentHandler->startElement( "office:master-styles", xUnoAttrs ); xAttrs->Clear(); @@ -2057,7 +2057,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->endElement( "office:master-styles" ); - //////////////////////////////////////////////////////////////////// + xAttrs->Clear(); m_xDocumentHandler->startElement( "office:body", xUnoAttrs ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index a5ac3092f0b0..bdc83e0c64e5 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -59,7 +59,7 @@ #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/svg/XSVGWriter.hpp> -// ----------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -70,7 +70,7 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::svg; using namespace ::com::sun::star::xml::sax; -// ----------------------------------------------------------------------------- + #define SVG_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" ) #define SVG_TINY_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" ) @@ -80,9 +80,9 @@ using namespace ::com::sun::star::xml::sax; #define SVGWRITER_WRITE_TEXT 0x00000002 #define SVGWRITER_NO_SHAPE_COMMENTS 0x01000000 -// ---------------------- + // - SVGAttributeWriter - -// ---------------------- + class SVGActionWriter; class SVGExport; @@ -138,7 +138,7 @@ struct SVGShapeDescriptor basegfx::B2DLineJoin maLineJoin; com::sun::star::drawing::LineCap maLineCap; - // ------------------------------------------------------------------------- + SVGShapeDescriptor() : maShapeFillColor( Color( COL_TRANSPARENT ) ), @@ -157,9 +157,9 @@ class SVGExport; class GDIMetaFile; -// --------------------------- + // - BulletListItemInfo - -// --------------------------- + struct BulletListItemInfo { long nFontSize; @@ -168,9 +168,9 @@ struct BulletListItemInfo sal_Unicode cBulletChar; }; -// --------------------------- + // - OUStringHasher - -// --------------------------- + struct OUStringHasher { @@ -178,9 +178,9 @@ struct OUStringHasher }; -// ------------------- + // - SVGTextWriter - -// ------------------- + class SVGTextWriter { public: @@ -297,9 +297,9 @@ class SVGTextWriter }; -// ------------------- + // - SVGActionWriter - -// ------------------- + class SVGActionWriter { diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 3c6640db6d1e..93f19e8e89e9 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -65,9 +65,9 @@ OUString getImplementationName() throw ( ::com::sun::star::uno::Exception ); -// + // class T602ImportFilter -// + struct inistruct { diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 328f215e959f..fdfe30d0ecd9 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -119,9 +119,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star xStatusIndicator->setValue(nSteps++); } - //********************* + // Creating a ConverterBridge instance - //********************* + Reference< XInterface > xConvBridge(mxContext->getServiceManager()->createInstanceWithContext(udConvertClass, mxContext), UNO_QUERY); if(! xConvBridge.is()){ OSL_FAIL( "XMLReader::Read: %s service missing\n" ); @@ -132,9 +132,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star Reference< XImportFilter > xConverter( xConvBridge, UNO_QUERY ); - //******************** + //Template Loading if Required - //******************** + if (!msTemplateName.isEmpty()){ Reference< XStyleFamiliesSupplier > xstylefamiliessupplier(mxDoc, UNO_QUERY); Reference< XStyleLoader > xstyleLoader (xstylefamiliessupplier->getStyleFamilies(), UNO_QUERY); @@ -159,9 +159,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star if (xStatusIndicator.is()){ xStatusIndicator->setValue(nSteps++); } - //********************* + // Calling Filtering Component - //********************* + try { if (!xConverter->importer(aDescriptor,xHandler,msUserData)) { if (xStatusIndicator.is()) diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 8e1266612283..3f043123b751 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::osl; -//================================================================== + //= OOutputStreamWrapper -//================================================================== + void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index 62e7ceaf02ba..1fbca34a03ee 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -35,9 +35,9 @@ namespace foo namespace stario = ::com::sun::star::io; namespace staruno = ::com::sun::star::uno; -//================================================================== + //= OOutputStreamWrapper -//================================================================== + typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamWrapper_Base; // needed for some compilers class OOutputStreamWrapper : public OutputStreamWrapper_Base diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 92d081a639b2..14e2de77867c 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -28,21 +28,21 @@ #include <vector> -// -------------------------------------------------------------------- + extern OUString string_encode( const OUString & rText ); extern OUString string_decode( const OUString & rText ); -// -------------------------------------------------------------------- + extern bool isFileURL( const OUString & rURL ); -// -------------------------------------------------------------------- + bool copyStreams( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xIS, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOS ); bool createDirectory( OUString& rURL ); -// -------------------------------------------------------------------- + class filter_info_impl { @@ -76,7 +76,7 @@ public: com::sun::star::uno::Sequence< OUString > getFilterUserData() const; }; -// -------------------------------------------------------------------- + struct application_info_impl { @@ -88,7 +88,7 @@ struct application_info_impl application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ); }; -// -------------------------------------------------------------------- + extern std::vector< application_info_impl* >& getApplicationInfos(); extern OUString getApplicationUIName( const OUString& rServiceName ); diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index fb916b035a31..c6cc5e420486 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -238,7 +238,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt -// + void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ) { diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index ef17342c7a9f..2404c52fc916 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -32,7 +32,7 @@ #include "xmlfiltercommon.hxx" -// -------------------------------------------------------------------- + class HeaderBar; class XMLFilterListBox; @@ -54,7 +54,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); }; -// -------------------------------------------------------------------- + class HeaderBar; @@ -80,7 +80,7 @@ public: virtual void Paint( const Rectangle& rRect ); }; -// -------------------------------------------------------------------- + class XMLFilterSettingsDialog : public ModelessDialog { |