[Libreoffice-commits] core.git: filter/qa filter/source
Alexander Wilms
f.alexander.wilms at gmail.com
Thu Feb 27 04:11:03 PST 2014
filter/qa/complex/filter/misc/FinalizedMandatoryTest.java | 2
filter/qa/complex/filter/misc/TypeDetection6FileFormat.java | 2
filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct |binary
filter/source/config/cache/basecontainer.hxx | 34 +-
filter/source/config/cache/cacheitem.hxx | 24 -
filter/source/config/cache/cacheupdatelistener.hxx | 20 -
filter/source/config/cache/configflush.hxx | 18 -
filter/source/config/cache/constant.hxx | 2
filter/source/config/cache/contenthandlerfactory.hxx | 20 -
filter/source/config/cache/filtercache.cxx | 4
filter/source/config/cache/filtercache.hxx | 138 ++++----
filter/source/config/cache/filterfactory.hxx | 34 +-
filter/source/config/cache/frameloaderfactory.hxx | 20 -
filter/source/config/cache/lateinitlistener.hxx | 16
filter/source/config/cache/macros.hxx | 2
filter/source/config/cache/querytokenizer.hxx | 8
filter/source/config/cache/typedetection.cxx | 10
filter/source/config/cache/typedetection.hxx | 40 +-
filter/source/config/cache/versions.hxx | 2
filter/source/config/tools/split/FCFGSplit.java | 34 +-
filter/source/config/tools/split/Splitter.java | 14
filter/source/config/tools/split/SplitterData.java | 4
filter/source/flash/impswfdialog.hxx | 4
filter/source/flash/swfdialog.hxx | 6
filter/source/flash/swfexporter.hxx | 10
filter/source/flash/swfwriter.cxx | 2
filter/source/flash/swfwriter.hxx | 18 -
filter/source/flash/swfwriter1.cxx | 2
filter/source/flash/swfwriter2.cxx | 10
filter/source/graphicfilter/egif/giflzwc.hxx | 4
filter/source/graphicfilter/eps/eps.cxx | 16
filter/source/graphicfilter/eras/eras.cxx | 2
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/icgm/bundles.hxx | 16
filter/source/graphicfilter/icgm/cgm.hxx | 6
filter/source/graphicfilter/idxf/dxfblkrd.hxx | 8
filter/source/graphicfilter/idxf/dxfentrd.hxx | 20 -
filter/source/graphicfilter/idxf/dxfreprd.hxx | 12
filter/source/graphicfilter/idxf/dxftblrd.hxx | 20 -
filter/source/graphicfilter/idxf/dxfvec.hxx | 12
filter/source/graphicfilter/ipcx/ipcx.cxx | 2
filter/source/graphicfilter/ipict/shape.cxx | 4
filter/source/graphicfilter/itiff/ccidecom.cxx | 2
filter/source/graphicfilter/itiff/itiff.cxx | 28 -
filter/source/msfilter/escherex.cxx | 14
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/eschesdo.hxx | 6
filter/source/msfilter/mscodec.cxx | 8
filter/source/msfilter/msdffimp.cxx | 84 ++---
filter/source/msfilter/msvbahelper.cxx | 6
filter/source/msfilter/services.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
filter/source/pdf/impdialog.cxx | 14
filter/source/pdf/impdialog.hxx | 6
filter/source/pdf/pdfdialog.hxx | 6
filter/source/pdf/pdfexport.cxx | 2
filter/source/pdf/pdfexport.hxx | 4
filter/source/pdf/pdffilter.hxx | 12
filter/source/pdf/pdfinteract.hxx | 12
filter/source/svg/impsvgdialog.hxx | 4
filter/source/svg/parserfragments.cxx | 10
filter/source/svg/presentation_engine.js | 198 ++++++------
filter/source/svg/svgdialog.hxx | 12
filter/source/svg/svgexport.cxx | 2
filter/source/svg/svgfontexport.hxx | 4
filter/source/svg/svgreader.cxx | 10
filter/source/svg/svgwriter.hxx | 26 -
filter/source/t602/t602filter.hxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 12
filter/source/xmlfilteradaptor/streamwrap.cxx | 4
filter/source/xmlfilteradaptor/streamwrap.hxx | 4
filter/source/xsltdialog/xmlfiltercommon.hxx | 12
filter/source/xsltdialog/xmlfilterjar.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 6
74 files changed, 572 insertions(+), 572 deletions(-)
New commits:
commit aeaded675c43ae8fdf795fd002f1bf6c2451fa2e
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:47:51 2014 +0100
Remove visual noise from filter
Change-Id: Ieab1d12204bcf917b2e1bf74f3145fc96d7b207c
Reviewed-on: https://gerrit.libreoffice.org/8261
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
index c270d8e..c997831 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 deb1422..14c0427 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
index 0fb0602..1e1f6d5 100644
Binary files a/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct and b/filter/qa/cppunit/data/pict/fail/CVE-2013-2577-1.pct differ
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 647cd52..985bc63 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 8480e51..7657f88 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 89c8d72..4b2196e 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 6595a51..1861098 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 1cab3ce..7cb60d1 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 d65a629..bfb3bbd 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 04cc0ab6..56f1723 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 a3e408f..5bb39ce 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 3fc3a5b..37fe8b1 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 bbe6209..62f530a 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 a7654ba..fa4326f 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 fe580eb..8a2e531 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 e1847c6..43bd7d6 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 3cb4390..40fcae8 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 09018d4c7..f861a72 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 8adf7ca..2c0f911 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 76a6b1a..90c8028 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 b4d40e2..a347fd9 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 38226a8..fd73bbb 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 4571de1..b663c08 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 e7ff9df..8c1d584 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 67e5c1d..59138e3 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 a94ee9b..9e3aa19 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 ef887ac..38ee30b 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 d27ce02..0d7b7b0 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 131777d..6a2a405 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 cc76369..992e51c 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 18e3c9b..d443bba 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 fe18cad..bf738a3 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 3affd35..fdd13b6 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 08f17f2..235525a 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 206d663..7cc8fc0 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 1fe856f..9f17599 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 fc2aaca..fbb4510 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 6e42006..27985c9 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 3cf0ec7..569dc31 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 be50599..a82cf28 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 5fbbe06..c8e1e96 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 e6f9c4d..c9da343 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 e7cd5de..ce70811 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 cd156a7..4c2e1fb 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 dab46f8..a50b72a 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 6b742ba..23b7cdb 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 dd78aba..ff3eff0 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 8f14db6..17cbd8b 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 a7de307..f87c8e3 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
}
}
}
- /////////////////////////////////////
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list