[Libreoffice-commits] core.git: framework/inc framework/qa framework/source
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 12:42:14 PST 2014
framework/inc/classes/actiontriggerpropertyset.hxx | 12
framework/inc/classes/actiontriggerseparatorpropertyset.hxx | 12
framework/inc/classes/checkediterator.hxx | 38 -
framework/inc/classes/filtercache.hxx | 26 -
framework/inc/classes/filtercachedata.hxx | 138 ++---
framework/inc/classes/framecontainer.hxx | 6
framework/inc/classes/propertysethelper.hxx | 26 -
framework/inc/classes/protocolhandlercache.hxx | 10
framework/inc/classes/taskcreator.hxx | 8
framework/inc/classes/wildcard.hxx | 20
framework/inc/dispatch/closedispatcher.hxx | 52 +-
framework/inc/dispatch/dispatchinformationprovider.hxx | 8
framework/inc/dispatch/interceptionhelper.hxx | 28 -
framework/inc/dispatch/menudispatcher.hxx | 52 +-
framework/inc/dispatch/oxt_handler.hxx | 36 -
framework/inc/dispatch/popupmenudispatcher.hxx | 8
framework/inc/dispatch/startmoduledispatcher.hxx | 36 -
framework/inc/dispatchcommands.h | 2
framework/inc/helper/dockingareadefaultacceptor.hxx | 16
framework/inc/helper/mischelper.hxx | 6
framework/inc/helper/ocomponentaccess.hxx | 50 +-
framework/inc/helper/ocomponentenumeration.hxx | 48 +-
framework/inc/helper/oframes.hxx | 26 -
framework/inc/helper/persistentwindowstate.hxx | 26 -
framework/inc/helper/statusindicator.hxx | 20
framework/inc/helper/statusindicatorfactory.hxx | 36 -
framework/inc/helper/tagwindowasmodified.hxx | 20
framework/inc/helper/titlebarupdate.hxx | 30 -
framework/inc/helper/uiconfigelementwrapperbase.hxx | 8
framework/inc/helper/uielementwrapperbase.hxx | 8
framework/inc/helper/vclstatusindicator.hxx | 8
framework/inc/helper/wakeupthread.hxx | 12
framework/inc/jobs/configaccess.hxx | 6
framework/inc/jobs/helponstartup.hxx | 38 -
framework/inc/jobs/job.hxx | 8
framework/inc/jobs/jobconst.hxx | 2
framework/inc/jobs/jobdata.hxx | 6
framework/inc/jobs/jobresult.hxx | 8
framework/inc/jobs/joburl.hxx | 12
framework/inc/jobs/shelljob.hxx | 24 -
framework/inc/macros/generic.hxx | 4
framework/inc/macros/registration.hxx | 8
framework/inc/macros/xinterface.hxx | 36 -
framework/inc/macros/xtypeprovider.hxx | 32 -
framework/inc/properties.h | 22
framework/inc/protocols.h | 8
framework/inc/queries.h | 56 +-
framework/inc/recording/dispatchrecordersupplier.hxx | 12
framework/inc/services.h | 8
framework/inc/services/contenthandlerfactory.hxx | 42 -
framework/inc/services/desktop.hxx | 42 -
framework/inc/services/dispatchhelper.hxx | 14
framework/inc/services/layoutmanager.hxx | 42 -
framework/inc/services/mediatypedetectionhelper.hxx | 32 -
framework/inc/stdtypes.h | 12
framework/inc/tabwin/tabwindow.hxx | 18
framework/inc/targets.h | 4
framework/inc/threadhelp/fairrwlock.hxx | 22
framework/inc/threadhelp/gate.hxx | 22
framework/inc/threadhelp/igate.h | 8
framework/inc/threadhelp/inoncopyable.h | 2
framework/inc/threadhelp/irwlock.h | 10
framework/inc/threadhelp/itransactionmanager.h | 14
framework/inc/threadhelp/lockhelper.hxx | 26 -
framework/inc/threadhelp/readguard.hxx | 26 -
framework/inc/threadhelp/resetableguard.hxx | 26 -
framework/inc/threadhelp/threadhelpbase.hxx | 10
framework/inc/threadhelp/transactionbase.hxx | 6
framework/inc/threadhelp/transactionguard.hxx | 22
framework/inc/threadhelp/transactionmanager.hxx | 14
framework/inc/threadhelp/writeguard.hxx | 30 -
framework/inc/uielement/itemcontainer.hxx | 4
framework/inc/uielement/menubarwrapper.hxx | 4
framework/inc/uielement/progressbarwrapper.hxx | 8
framework/inc/uielement/rootitemcontainer.hxx | 2
framework/inc/uielement/statusindicatorinterfacewrapper.hxx | 4
framework/inc/uielement/toolbarwrapper.hxx | 4
framework/inc/uifactory/factoryconfiguration.hxx | 8
framework/inc/xml/acceleratorconfigurationreader.hxx | 38 -
framework/inc/xml/acceleratorconfigurationwriter.hxx | 20
framework/inc/xml/imagesdocumenthandler.hxx | 2
framework/inc/xml/statusbardocumenthandler.hxx | 2
framework/inc/xml/toolboxdocumenthandler.hxx | 2
framework/qa/complex/ModuleManager/CheckXModuleManager.java | 32 -
framework/qa/complex/XUserInputInterception/EventTest.java | 16
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 50 +-
framework/qa/complex/broken_document/LoadDocument.java | 2
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 2
framework/qa/complex/desktop/DesktopTerminate.java | 2
framework/qa/complex/dispatches/Interceptor.java | 48 +-
framework/qa/complex/dispatches/checkdispatchapi.java | 64 +-
framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java | 2
framework/qa/complex/framework/autosave/AutoSave.java | 26 -
framework/qa/complex/framework/autosave/ConfigHelper.java | 8
framework/qa/complex/framework/autosave/Protocol.java | 32 -
framework/qa/complex/imageManager/CheckImageManager.java | 2
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 22
framework/qa/complex/loadAllDocuments/InteractionHandler.java | 4
framework/qa/complex/loadAllDocuments/StatusIndicator.java | 18
framework/qa/complex/loadAllDocuments/StreamSimulator.java | 12
framework/qa/complex/path_settings/PathSettingsTest.java | 6
framework/source/accelerators/globalacceleratorconfiguration.cxx | 4
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 4
framework/source/accelerators/storageholder.cxx | 2
framework/source/classes/taskcreator.cxx | 6
framework/source/dispatch/menudispatcher.cxx | 39 -
framework/source/dispatch/oxt_handler.cxx | 12
framework/source/fwe/classes/addonsoptions.cxx | 232 +++++-----
framework/source/fwe/dispatch/interaction.cxx | 2
framework/source/fwe/helper/documentundoguard.cxx | 20
framework/source/fwe/helper/titlehelper.cxx | 8
framework/source/fwe/helper/undomanagerhelper.cxx | 32 -
framework/source/fwi/threadhelp/lockhelper.cxx | 22
framework/source/fwi/threadhelp/transactionmanager.cxx | 16
framework/source/fwi/uielement/itemcontainer.cxx | 4
framework/source/helper/dockingareadefaultacceptor.cxx | 11
framework/source/helper/ocomponentaccess.cxx | 27 -
framework/source/helper/ocomponentenumeration.cxx | 26 -
framework/source/helper/oframes.cxx | 46 -
framework/source/helper/persistentwindowstate.cxx | 20
framework/source/helper/statusindicator.cxx | 14
framework/source/helper/tagwindowasmodified.cxx | 14
framework/source/helper/titlebarupdate.cxx | 20
framework/source/helper/wakeupthread.cxx | 6
framework/source/inc/accelerators/acceleratorcache.hxx | 40 -
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 46 -
framework/source/inc/accelerators/istoragelistener.hxx | 6
framework/source/inc/accelerators/keymapping.hxx | 26 -
framework/source/inc/accelerators/presethandler.hxx | 72 +--
framework/source/inc/accelerators/storageholder.hxx | 48 +-
framework/source/inc/dispatch/loaddispatcher.hxx | 8
framework/source/inc/dispatch/windowcommanddispatch.hxx | 14
framework/source/inc/loadenv/actionlockguard.hxx | 18
framework/source/inc/loadenv/loadenv.hxx | 6
framework/source/inc/loadenv/targethelper.hxx | 6
framework/source/inc/pattern/frame.hxx | 4
framework/source/inc/pattern/window.hxx | 8
framework/source/layoutmanager/layoutmanager.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 42 -
framework/source/recording/dispatchrecorder.cxx | 20
framework/source/recording/dispatchrecordersupplier.cxx | 4
framework/source/services/desktop.cxx | 91 +--
framework/source/services/frame.cxx | 149 ++----
framework/source/services/license.cxx | 16
framework/source/services/mediatypedetectionhelper.cxx | 12
framework/source/services/tabwindowservice.cxx | 72 +--
framework/source/services/uriabbreviation.cxx | 4
framework/source/services/urltransformer.cxx | 14
framework/source/tabwin/tabwindow.cxx | 4
framework/source/tabwin/tabwinfactory.cxx | 4
framework/source/uiconfiguration/globalsettings.cxx | 10
framework/source/uiconfiguration/uicategorydescription.cxx | 4
framework/source/uiconfiguration/windowstateconfiguration.cxx | 6
framework/source/uielement/menubarwrapper.cxx | 4
framework/source/uielement/toolbarmanager.cxx | 6
framework/source/uielement/uicommanddescription.cxx | 8
framework/source/uifactory/factoryconfiguration.cxx | 4
157 files changed, 1652 insertions(+), 1725 deletions(-)
New commits:
commit fcbefea01766e0888f7813672d9eddbdec5a9046
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:54:02 2014 +0100
Remove visual noise from framework
Conflicts:
framework/inc/dispatch/oxt_handler.hxx
framework/inc/services/layoutmanager.hxx
framework/inc/tabwin/tabwindow.hxx
framework/source/dispatch/menudispatcher.cxx
framework/source/helper/dockingareadefaultacceptor.cxx
framework/source/helper/ocomponentaccess.cxx
framework/source/helper/ocomponentenumeration.cxx
framework/source/helper/oframes.cxx
framework/source/layoutmanager/toolbarlayoutmanager.hxx
framework/source/recording/dispatchrecorder.cxx
framework/source/services/desktop.cxx
framework/source/services/frame.cxx
framework/source/services/urltransformer.cxx
Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4
Reviewed-on: https://gerrit.libreoffice.org/8265
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 4542001..c321969 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -65,9 +65,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
private:
- //---------------------------------------------------------------------------------------------------------
+
// OPropertySetHelper
- //---------------------------------------------------------------------------------------------------------
+
virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue,
com::sun::star::uno::Any& aOldValue,
sal_Int32 nHandle,
@@ -88,9 +88,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
- //---------------------------------------------------------------------------------------------------------
+
// helper
- //---------------------------------------------------------------------------------------------------------
+
sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue ,
const com::sun::star::uno::Any& aNewValue ,
@@ -107,9 +107,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
com::sun::star::uno::Any& aOldValue ,
com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
- //---------------------------------------------------------------------------------------------------------
+
// members
- //---------------------------------------------------------------------------------------------------------
+
OUString m_aCommandURL;
OUString m_aHelpURL;
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 025b9b0..de90232 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -64,9 +64,9 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
private:
- //---------------------------------------------------------------------------------------------------------
+
// OPropertySetHelper
- //---------------------------------------------------------------------------------------------------------
+
virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue,
com::sun::star::uno::Any& aOldValue,
sal_Int32 nHandle,
@@ -87,18 +87,18 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase
static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
- //---------------------------------------------------------------------------------------------------------
+
// helper
- //---------------------------------------------------------------------------------------------------------
+
sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue ,
const com::sun::star::uno::Any& aNewValue ,
com::sun::star::uno::Any& aOldValue ,
com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
- //---------------------------------------------------------------------------------------------------------
+
// members
- //---------------------------------------------------------------------------------------------------------
+
sal_Int16 m_nSeparatorType;
};
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index ceb3d74..f207e65 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -26,7 +26,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short implement a iterator which support 2 end states!
@descr For our search methods we need a "walking" iterator object with special functionality!
We must check for 3 different states of an iterator - normal position, exact end, after end.
@@ -47,17 +47,17 @@ namespace framework{
template< class TContainer >
class CheckedIterator
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short standard constructor
@descr Set default values on members.
We set it internal to E_UNKNOWN to detect uninitialized instances of this class.
@@ -77,11 +77,11 @@ class CheckedIterator
{
}
- //---------------------------------------------------------------------------------------------------------
+
// interface methods
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short initialize instance with valid container
@descr Set new container at an instance of this class. The other member will set automaticly!
m_pPosition = first element in container
@@ -110,7 +110,7 @@ class CheckedIterator
}
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short set internal states to E_END
@descr Sometimes we need a "walking" check-iterator which is initialized with the END-state!
We need it to return one default value if no other ones exist ...
@@ -129,7 +129,7 @@ class CheckedIterator
m_eEndState = E_END ;
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short set internal states to E_AFTEREND
@descr Sometimes we need a "walking" check-iterator which is initialized with AFTEREND-state!
We need it if we don't have a container but must prevent us against further searching!
@@ -148,7 +148,7 @@ class CheckedIterator
m_eEndState = E_AFTEREND ;
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short reset this iterator
@descr It must be called on an already initialized iterator.
Means the member m_pContainer must be valid. Otherwise the reaction
@@ -166,7 +166,7 @@ class CheckedIterator
m_pContainer = NULL;
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short step to next element in container.
@descr If end of container is reached we change our internal "m_eEndState".
If end reached for first time; we set it to E_END;
@@ -207,7 +207,7 @@ class CheckedIterator
return *this;
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short return true if internal iterator was not initialized before
@descr These will be true, if use start a new search by using these iterator mechanism!
@@ -224,7 +224,7 @@ class CheckedIterator
return( m_eEndState == E_UNKNOWN );
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short return true if internal iterator reached end of container
@descr These will be true if you step to the end of internal container.
@@ -245,7 +245,7 @@ class CheckedIterator
);
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short return true if you call operator++ again and end already reached
@descr These indicate, that end already reached but you call operator++ again and again!
@@ -263,7 +263,7 @@ class CheckedIterator
return( m_eEndState == E_AFTEREND );
}
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short support readonly access to container entry
@descr Use it to get the value of current container item.
@@ -285,9 +285,9 @@ class CheckedIterator
return m_pPosition;
}
- //-------------------------------------------------------------------------------------------------------------
+
// private member
- //-------------------------------------------------------------------------------------------------------------
+
private:
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 52a3dcd..797ba14 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -50,7 +50,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short cache for all filter and type information
@descr Frameloader - and filterfactory need some information about our current registered filters and types.
For better performance its necessary to cache all needed values.
@@ -68,20 +68,20 @@ class FilterCache : private ThreadHelpBase
{
public:
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
+
FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short standard destructor to delete instance
@descr This will clear the cache if last owner release it.
@@ -97,7 +97,7 @@ class FilterCache : private ThreadHelpBase
void flush( DataContainer::ECFGType eType );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short get the current state of the cache
@descr Call this methods to get information about the state of the current cache.
@@ -117,7 +117,7 @@ class FilterCache : private ThreadHelpBase
sal_Bool hasLoaders () const;
sal_Bool hasContentHandlers () const;
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short search routines to find items which match given parameter
@descr Mostly we search for a type first and get all information about filter, detector and loader
services from the other configuration tables which are registered for this type.
@@ -164,7 +164,7 @@ class FilterCache : private ThreadHelpBase
CheckedStringListIterator& aStartEntry ,
OUString& sResult ) const;
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short get all properties of a cache entry by given name
@descr If you need additional information about our internal cache values
you can use these methods to get a list of all cached config values
@@ -205,7 +205,7 @@ class FilterCache : private ThreadHelpBase
sal_Bool existsLoader ( const OUString& sName ) const;
sal_Bool existsContentHandler ( const OUString& sName ) const;
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short support special query modes
@descr Our owner services need sometimes a special mode to query for subsets of our configuration!
They give us a special query string - we return right values.
@@ -223,7 +223,7 @@ class FilterCache : private ThreadHelpBase
css::uno::Any queryFilters( const OUString& sQuery ) const;
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short support registration of elements in current configuration
@descr Use this methods to add or remove items in our configuration files.
We use the globale configuration to do that ... in fat office "share/config/registry/..."!
@@ -313,9 +313,9 @@ class FilterCache : private ThreadHelpBase
sal_Bool validateAndRepairLoader();
sal_Bool validateAndRepairHandler();
- //-------------------------------------------------------------------------------------------------------------
+
// private variables
- //-------------------------------------------------------------------------------------------------------------
+
private:
static sal_Int32 m_nRefCount ;
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 82336b4..dc566f7 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -66,16 +66,16 @@ enum EFilterPackage
E_ADDITIONAL
};
-//*****************************************************************************************************************
+
// These struct define a type, which present the type of a file.
// He is used for easy filter detection without file stream detection!
// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-//*****************************************************************************************************************
+
struct FileType
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
inline FileType ( ) { impl_clear(); }
@@ -84,9 +84,9 @@ struct FileType
inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
inline void impl_clear()
@@ -114,9 +114,9 @@ struct FileType
return (*this);
}
- //-------------------------------------------------------------------------------------------------------------
+
// public member
- //-------------------------------------------------------------------------------------------------------------
+
public:
sal_Bool bPreferred ;
@@ -129,17 +129,17 @@ struct FileType
OUStringList lExtensions ;
};
-//*****************************************************************************************************************
+
// These struct describe a filter which is registered for one type.
// He hold information about services which present the document himself (like a item) and a filter service which
// filter a file in these document.
// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-//*****************************************************************************************************************
+
struct Filter
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
inline Filter ( ) { impl_clear(); }
@@ -148,9 +148,9 @@ struct Filter
inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
inline void impl_clear()
@@ -184,9 +184,9 @@ struct Filter
return (*this);
}
- //-------------------------------------------------------------------------------------------------------------
+
// public member
- //-------------------------------------------------------------------------------------------------------------
+
public:
sal_Int32 nOrder ;
@@ -202,16 +202,16 @@ struct Filter
OUString sTemplateName ;
};
-//*****************************************************************************************************************
+
// Programmer can register his own services for an content detection of different types.
// The implementation or service name of these is the keyname of an item with these structure
// in our hash map or our configuration set!
-//*****************************************************************************************************************
+
struct Detector
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
inline Detector ( ) { impl_clear(); }
@@ -220,9 +220,9 @@ struct Detector
inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
inline void impl_clear()
@@ -238,25 +238,25 @@ struct Detector
return (*this);
}
- //-------------------------------------------------------------------------------------------------------------
+
// public member
- //-------------------------------------------------------------------------------------------------------------
+
public:
OUString sName ;
OUStringList lTypes ;
};
-//*****************************************************************************************************************
+
// Programmer can register his own services for loading documents in a frame.
// The implementation or service name of these is the keyname of an item with these structure
// in our hash map or our configuration set!
-//*****************************************************************************************************************
+
struct Loader
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
inline Loader ( ) { impl_clear(); }
@@ -265,9 +265,9 @@ struct Loader
inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
inline void impl_clear()
@@ -285,9 +285,9 @@ struct Loader
return (*this);
}
- //-------------------------------------------------------------------------------------------------------------
+
// public member
- //-------------------------------------------------------------------------------------------------------------
+
public:
OUString sName ;
@@ -295,15 +295,15 @@ struct Loader
OUStringList lTypes ;
};
-//*****************************************************************************************************************
+
// Programmer can register his own services to handle a FileType and intercept dispatches.
// Don't forget: It's not a FrameLoader - it's a ContentHandler! (normaly without any UI)
-//*****************************************************************************************************************
+
struct ContentHandler
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
inline ContentHandler( ) { impl_clear(); }
@@ -312,9 +312,9 @@ struct ContentHandler
inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
inline void impl_clear()
@@ -330,33 +330,33 @@ struct ContentHandler
return (*this);
}
- //-------------------------------------------------------------------------------------------------------------
+
// public member
- //-------------------------------------------------------------------------------------------------------------
+
public:
OUString sName ;
OUStringList lTypes ;
};
-//*****************************************************************************************************************
+
// We need different hash maps for different tables of our configuration management.
// Follow maps convert <names> to <properties> of type, filter, detector, loader ...
// and could be used in a generic way
-//*****************************************************************************************************************
+
template< class HashType >
class SetNodeHash : public ::boost::unordered_map< OUString ,
HashType ,
OUStringHash ,
::std::equal_to< OUString > >
{
- //-------------------------------------------------------------------------------------------------------------
+
// interface
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// The only way to free ALL memory really!
- //---------------------------------------------------------------------------------------------------------
+
inline void free()
{
SetNodeHash().swap( *this );
@@ -365,48 +365,48 @@ class SetNodeHash : public ::boost::unordered_map< OUString ,
lRemovedItems.free();
}
- //---------------------------------------------------------------------------------------------------------
+
// Append changed, added or removed items to special lists
// Necessary for saving changes
- //---------------------------------------------------------------------------------------------------------
+
void appendChange( const OUString& sName ,
EModifyState eState );
- //-------------------------------------------------------------------------------------------------------------
+
// member
- //-------------------------------------------------------------------------------------------------------------
+
public:
OUStringList lAddedItems ;
OUStringList lChangedItems ;
OUStringList lRemovedItems ;
};
-//*****************************************************************************************************************
+
// Use these hashes to implement different tables which assign types to frame loader or detect services.
// It's an optimism to find registered services faster!
// The preferred hash maps file extensions to preferred types to find these ones faster.
-//*****************************************************************************************************************
+
class PerformanceHash : public ::boost::unordered_map< OUString ,
OUStringList ,
OUStringHash ,
::std::equal_to< OUString > >
{
public:
- //---------------------------------------------------------------------------------------------------------
+
// try to free all used memory REALY!
- //---------------------------------------------------------------------------------------------------------
+
inline void free()
{
PerformanceHash().swap( *this );
}
- //---------------------------------------------------------------------------------------------------------
+
// normaly a complete string must match our hash key values ...
// But sometimes we need a search by using these key values as pattern!
// The in/out parameter "pStepper" is used to return a pointer to found element in hash ...
// and could be used for further searches again, which should be started at next element!
// We stop search at the end of hash. You can start it again by setting it to the begin by himself.
- //---------------------------------------------------------------------------------------------------------
+
inline sal_Bool findPatternKey( const OUString& sSearchValue ,
const_iterator& pStepper )
{
@@ -435,9 +435,9 @@ class PerformanceHash : public ::boost::unordered_map< OUString
}
};
-//*****************************************************************************************************************
+
// Define easy usable types
-//*****************************************************************************************************************
+
typedef SetNodeHash< FileType > FileTypeHash ;
typedef SetNodeHash< Filter > FilterHash ;
typedef SetNodeHash< Detector > DetectorHash ;
@@ -452,9 +452,9 @@ typedef CheckedIterator< PerformanceHash > CheckedPerfo
typedef ::std::vector< FilterHash::const_iterator > FilterQuery ;
-//*****************************************************************************************************************
+
// Use private static data container to hold all values of configuration!
-//*****************************************************************************************************************
+
class DataContainer : private ThreadHelpBase
{
public:
@@ -586,7 +586,7 @@ class DataContainer : private ThreadHelpBase
sal_Bool m_bHandlersModified ;
};
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short capsulate configuration access for fiter configuration
@descr We use the ConfigItem mechanism to read/write values from/to configuration.
This implementation could be used to handle standard AND additional filter configurations in the same way.
@@ -602,9 +602,9 @@ class DataContainer : private ThreadHelpBase
*//*-*************************************************************************************************************/
class FilterCFGAccess : public ::utl::ConfigItem
{
- //-------------------------------------------------------------------------------------------------------------
+
// interface
- //-------------------------------------------------------------------------------------------------------------
+
public:
FilterCFGAccess ( const OUString& sPath ,
sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION ,
@@ -628,9 +628,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
void setProductName ( OUStringHashMap& lUINames );
void resetProductName ( OUStringHashMap& lUINames );
- //-------------------------------------------------------------------------------------------------------------
+
// internal helper
- //-------------------------------------------------------------------------------------------------------------
+
private:
void impl_initKeyCounts ( ); // set right key counts, which are used at reading/writing of set node properties
void impl_removeNodes ( OUStringList& rChangesList , // helper to remove list of set nodes
@@ -650,9 +650,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
void impl_saveLoaders ( DataContainer& rData );
void impl_saveContentHandlers ( DataContainer& rData );
- //-------------------------------------------------------------------------------------------------------------
+
// debug checks
- //-------------------------------------------------------------------------------------------------------------
+
private:
static sal_Bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods!
sal_Int32 nVersion ,
@@ -660,9 +660,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
static sal_Bool implcp_read ( const DataContainer& rData );
static sal_Bool implcp_write( const DataContainer& rData );
- //-------------------------------------------------------------------------------------------------------------
+
// member
- //-------------------------------------------------------------------------------------------------------------
+
private:
EFilterPackage m_ePackage ; // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter
sal_Int32 m_nVersion ; // file format version of configuration! (necessary for "xml2xcd" transformation!)
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index a53a007..0866a5e 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -46,7 +46,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContai
typedef TFrameContainer::iterator TFrameIterator ;
typedef TFrameContainer::const_iterator TConstFrameIterator ;
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short implement a container to hold children of frame, task or desktop
@descr Every object of frame, task or desktop hold reference to his children. These container is used as helper
to do this. Some helper-classe like OFrames or OTasksAccess use it to. They hold a pointer to an instance
@@ -62,7 +62,7 @@ typedef TFrameContainer::const_iterator TConstFrameI
*//*-*************************************************************************************************************/
class FrameContainer : private ThreadHelpBase
{
- //_______________________________________
+
// member
private:
@@ -72,7 +72,7 @@ class FrameContainer : private ThreadHelpBase
/// one container item can be the current active frame. Its necessary for Desktop or Frame implementation.
css::uno::Reference< css::frame::XFrame > m_xActiveFrame;
- //_______________________________________
+
// interface
public:
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index a99e8a1..a297628 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -36,7 +36,7 @@
namespace framework{
-//_________________________________________________________________________________________________________________
+
/** supports the API XPropertySet and XPropertySetInfo.
*
@@ -50,13 +50,13 @@ namespace framework{
class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
, public css::beans::XPropertySetInfo
{
- //-------------------------------------------------------------------------
+
/* types */
protected:
typedef BaseHash< css::beans::Property > TPropInfoHash;
- //-------------------------------------------------------------------------
+
/* member */
protected:
@@ -73,11 +73,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
LockHelper& m_rLock;
TransactionManager& m_rTransactionManager;
- //-------------------------------------------------------------------------
+
/* native interface */
public:
- //---------------------------------------------------------------------
+
/** initialize new instance of this helper.
*
* @param pExternalLock
@@ -97,12 +97,12 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
TransactionManager* pExternalTransactionManager ,
sal_Bool bReleaseLockOnCall );
- //---------------------------------------------------------------------
+
/** free all needed memory.
*/
virtual ~PropertySetHelper();
- //---------------------------------------------------------------------
+
/** set a new owner for this helper.
*
* This owner is used as source for all broadcasted events.
@@ -110,7 +110,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
*/
void impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster);
- //---------------------------------------------------------------------
+
/** add a new property info to the set of supported ones.
*
* @param aProperty
@@ -128,7 +128,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
throw(css::beans::PropertyExistException,
css::uno::Exception );
- //---------------------------------------------------------------------
+
/** remove an existing property info from the set of supported ones.
*
* @param sProperty
@@ -141,7 +141,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
throw(css::beans::UnknownPropertyException,
css::uno::Exception );
- //---------------------------------------------------------------------
+
/** mark the object as "useable for working" or "dead".
*
* This correspond to the lifetime handling implemented by the base class TransactionBase.
@@ -151,7 +151,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual void SAL_CALL impl_enablePropertySet();
virtual void SAL_CALL impl_disablePropertySet();
- //---------------------------------------------------------------------
+
/**
*/
virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
@@ -161,7 +161,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ) = 0;
- //-------------------------------------------------------------------------
+
/* uno interface */
public:
@@ -217,7 +217,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName)
throw(css::uno::RuntimeException, std::exception);
- //-------------------------------------------------------------------------
+
/* internal helper */
private:
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index c824832a..ef27b69 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -38,7 +38,7 @@ namespace framework{
#define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package
#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler
-//_________________________________________________________________________________________________________________
+
/**
Programmer can register his own services to handle different protocols.
@@ -58,7 +58,7 @@ struct FWI_DLLPUBLIC ProtocolHandler
OUStringList m_lProtocols;
};
-//_________________________________________________________________________________________________________________
+
/**
This hash use registered pattern of all protocol handlers as keys and provide her
@@ -73,14 +73,14 @@ class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString >
PatternHash::iterator findPatternKey( const OUString& sURL );
};
-//_________________________________________________________________________________________________________________
+
/**
This hash holds protocol handler structs by her names.
*/
typedef BaseHash< ProtocolHandler > HandlerHash;
-//_________________________________________________________________________________________________________________
+
/**
@short this hash makes it easy to find a protocol handler by using his uno implementation name.
@@ -128,7 +128,7 @@ class FWI_DLLPUBLIC HandlerCache
void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
};
-//_________________________________________________________________________________________________________________
+
/**
@short implements configuration access for handler configuration
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index cf0b5d7..aaef28c 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -32,7 +32,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short a helper to create new tasks or sub frames for "_blank" or FrameSearchFlag::CREATE
@descr There are different places to create new (task)frames. Its not easy to service this code!
Thats the reason for this helper. He capsulate asynchronous/synchronous creation by calling
@@ -43,13 +43,13 @@ namespace framework{
*//*-*************************************************************************************************************/
class TaskCreator : private ThreadHelpBase
{
- //_______________________
+
// member
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- //_______________________
+
// interface
public:
@@ -59,7 +59,7 @@ class TaskCreator : private ThreadHelpBase
css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName ,
sal_Bool bVisible );
- //_______________________
+
// helper
private:
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 088dd18..ee6217f 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -24,7 +24,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short implement wildcard-mechanism for unicode
@descr This class can be used to get information about the matching of a pattern to a given text.
It's suitable for 8-Bit- AND 16-Bit-strings!
@@ -39,17 +39,17 @@ namespace framework{
class Wildcard
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short standard ctor
@descr We do nothing here.
@@ -63,7 +63,7 @@ class Wildcard
Wildcard();
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short standard dtor
@descr We do nothing here.
@@ -77,11 +77,11 @@ class Wildcard
virtual ~Wildcard();
- //---------------------------------------------------------------------------------------------------------
+
// interface
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short try to find an agreement between given text and searchpattern
@descr You can use wildcards in pattern only!
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 05f694e..f5cdb15 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -45,7 +45,7 @@ class SystemWindow;
namespace framework{
-//-----------------------------------------------
+
/**
@short helper to dispatch the URLs ".uno:CloseDoc"/".uno:CloseWin"/".uno:CloseFrame"
to close a frame/document or the whole application implicitly in case it was the last frame
@@ -62,12 +62,12 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
css::frame::XNotifyingDispatch, // => XDispatch
css::frame::XDispatchInformationProvider >
{
- //-------------------------------------------
+
// types
private:
- //---------------------------------------
+
/** @short describe, which request must be done here.
@descr The incoming URLs {.uno:CloseDoc/CloseWin and CloseFrame
can be classified so and checked later performant.}*/
@@ -78,53 +78,53 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
E_CLOSE_WIN
};
- //-------------------------------------------
+
// member
private:
- //---------------------------------------
+
/** @short reference to an uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- //---------------------------------------
+
/** @short reference to the target frame, which should be
closed by this dispatch. */
css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame;
- //---------------------------------------
+
/** @short used for asynchronous callbacks within the main thread.
@descr Internally we work asynchronous. Because our callis
are not aware, that her request can kill its own environment ... */
::vcl::EventPoster m_aAsyncCallback;
- //---------------------------------------
+
/** @short used inside asyncronous callback to decide,
which operation must be executed. */
EOperation m_eOperation;
- //---------------------------------------
+
/** @short for asynchronous operations we must hold us self alive! */
css::uno::Reference< css::uno::XInterface > m_xSelfHold;
- //---------------------------------------
+
/** @short list of registered status listener */
ListenerHash m_lStatusListener;
- //---------------------------------------
+
/** @short holded alive for internally asynchronous operations! */
css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener;
SystemWindow* m_pSysWindow;
- //-------------------------------------------
+
// native interface
public:
- //---------------------------------------
+
/** @short connect a new CloseDispatcher instance to its frame.
@descr One CloseDispatcher instance is bound to onw frame only.
That makes an implementation (e.g. of listener support)
@@ -144,22 +144,22 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget);
- //---------------------------------------
+
/** @short does nothing real. */
virtual ~CloseDispatcher();
- //-------------------------------------------
+
// uno interface
public:
- //---------------------------------------
+
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception);
- //---------------------------------------
+
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception);
@@ -168,17 +168,17 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception);
- //---------------------------------------
+
// XDispatchInformationProvider
virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception);
- //-------------------------------------------
+
// internal helper
private:
- //---------------------------------------
+
/** @short a callback for asynchronous started operations.
@descr As already mentione, we make internally all operations
@@ -187,7 +187,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
*/
DECL_LINK( impl_asyncCallback, void* );
- //---------------------------------------
+
/** @short prepare m_xCloseFrame so it should be closeable without problems.
@descr Thats needed to be shure, that the document cant disagree
@@ -213,7 +213,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
sal_Bool bCloseAllOtherViewsToo,
sal_Bool& bControllerSuspended );
- //---------------------------------------
+
/** @short close the member m_xCloseFrame.
@descr This method does not look for any document
@@ -230,7 +230,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
*/
sal_Bool implts_closeFrame();
- //---------------------------------------
+
/** @short set the special BackingComponent (now StartModule)
as new component of our m_xCloseFrame.
@@ -239,7 +239,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
*/
sal_Bool implts_establishBackingMode();
- //---------------------------------------
+
/** @short calls XDesktop->terminate().
@descr No office code has to be called
@@ -253,7 +253,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
*/
sal_Bool implts_terminateApplication();
- //---------------------------------------
+
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.
@@ -273,7 +273,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
sal_Int16 nState ,
const css::uno::Any& aResult );
- //---------------------------------------
+
/** @short try to find the right target frame where this close request
must be really done.
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 36fe400..1f5fcb2 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -36,20 +36,20 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short a helper to merge dispatch information of different sources together.
*//*-*************************************************************************************************************/
class DispatchInformationProvider : private ThreadHelpBase
, public ::cppu::WeakImplHelper1< css::frame::XDispatchInformationProvider >
{
- //_______________________
+
// member
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::WeakReference< css::frame::XFrame > m_xFrame;
- //_______________________
+
// interface
public:
@@ -64,7 +64,7 @@ class DispatchInformationProvider : private ThreadHelpBase
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
throw (css::uno::RuntimeException, std::exception);
- //_______________________
+
// helper
private:
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 55c630c..2f2162e 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -55,7 +55,7 @@ class InterceptionHelper : // order of base classes is important for right initi
css::frame::XDispatchProviderInterception,
css::lang::XEventListener >
{
- //_____________________________________________________
+
// structs, helper
/** @short bind an interceptor component to it's URL pattern registration. */
@@ -73,7 +73,7 @@ class InterceptionHelper : // order of base classes is important for right initi
css::uno::Sequence< OUString > lURLPattern;
};
- //_____________________________________________________
+
/** @short implements a list of items of type InterceptorInfo, and provides some special
functions on it.
@@ -85,7 +85,7 @@ class InterceptionHelper : // order of base classes is important for right initi
{
public:
- //_____________________________________________
+
/** @short search for an interceptor inside this list using it's reference.
@@ -107,7 +107,7 @@ class InterceptionHelper : // order of base classes is important for right initi
return end();
}
- //_____________________________________________
+
/** @short search for an interceptor inside this list using it's reference.
@@ -136,7 +136,7 @@ class InterceptionHelper : // order of base classes is important for right initi
}
};
- //_____________________________________________________
+
// member
private:
@@ -157,12 +157,12 @@ class InterceptionHelper : // order of base classes is important for right initi
The last or the first registered one. */
static sal_Bool m_bPreferrFirstInterceptor;
- //_____________________________________________________
+
// native interface
public:
- //_________________________________________________
+
/** @short creates a new interception helper instance.
@@ -177,7 +177,7 @@ class InterceptionHelper : // order of base classes is important for right initi
protected:
- //_________________________________________________
+
/** @short standard destructor.
@@ -187,12 +187,12 @@ class InterceptionHelper : // order of base classes is important for right initi
*/
virtual ~InterceptionHelper();
- //_____________________________________________________
+
// uno interface
public:
- //_________________________________________________
+
// XDispatchProvider
/** @short query for a dispatch, which implements the requested feature.
@@ -220,7 +220,7 @@ class InterceptionHelper : // order of base classes is important for right initi
sal_Int32 nSearchFlags )
throw(css::uno::RuntimeException, std::exception);
- //_________________________________________________
+
// XDispatchProvider
/** @short implements an optimized queryDispatch() for remote.
@@ -237,7 +237,7 @@ class InterceptionHelper : // order of base classes is important for right initi
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor)
throw(css::uno::RuntimeException, std::exception);
- //_________________________________________________
+
// XDispatchProviderInterception
/** @short register an interceptor.
@@ -256,7 +256,7 @@ class InterceptionHelper : // order of base classes is important for right initi
virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
throw(css::uno::RuntimeException, std::exception);
- //_________________________________________________
+
// XDispatchProviderInterception
/** @short release an interceptor.
@@ -271,7 +271,7 @@ class InterceptionHelper : // order of base classes is important for right initi
*/
virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception );
- //_________________________________________________
+
// XEventListener
/** @short Is called from our owner frame, in case he will be disposed.
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 2a92015..9cb73ae 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -48,7 +48,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
We must save information about our listener and URL for listening.
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
@@ -57,7 +57,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to ouer SUPERCLASS!
@@ -80,17 +80,17 @@ class MenuDispatcher : // baseclasses
css::frame::XDispatch ,
css::frame::XFrameActionListener >
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short standard ctor
@descr These initialize a new instance of ths class with needed information for work.
@@ -106,11 +106,11 @@ class MenuDispatcher : // baseclasses
MenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
const css::uno::Reference< css::frame::XFrame >& xOwner );
- //---------------------------------------------------------------------------------------------------------
+
// XDispatch
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short dispatch URL with arguments
@descr Every dispatch create a new task. If load of URL failed task will deleted automaticly!
@@ -126,7 +126,7 @@ class MenuDispatcher : // baseclasses
virtual void SAL_CALL dispatch( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException, std::exception );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short add listener for state events
@descr You can add a listener to get information about status of dispatch: OK or Failed.
@@ -143,7 +143,7 @@ class MenuDispatcher : // baseclasses
virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl,
const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short remove listener for state events
@descr You can remove a listener if information of dispatch isn't important for you any longer.
@@ -161,17 +161,17 @@ class MenuDispatcher : // baseclasses
const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception );
- //---------------------------------------------------------------------------------------------------------
+
// XFrameActionListener
- //---------------------------------------------------------------------------------------------------------
+
virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception );
- //---------------------------------------------------------------------------------------------------------
+
// XEventListener
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short dispose current instance
@descr If service helper isn't required any longer call this method to release all used resources.
@@ -185,13 +185,13 @@ class MenuDispatcher : // baseclasses
void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
- //-------------------------------------------------------------------------------------------------------------
+
// protected methods
- //-------------------------------------------------------------------------------------------------------------
+
protected:
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short standard destructor
@descr This method destruct an instance of this class and clear some member.
This method is protected, because its not allowed to use an instance of this class as a member!
@@ -207,13 +207,13 @@ class MenuDispatcher : // baseclasses
virtual ~MenuDispatcher();
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short -
@descr -
@@ -227,7 +227,7 @@ class MenuDispatcher : // baseclasses
sal_Bool impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource = sal_False );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short -
@descr -
@@ -241,10 +241,10 @@ class MenuDispatcher : // baseclasses
void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel );
- //-------------------------------------------------------------------------------------------------------------
+
// variables
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
+
private:
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 2ec6b63..706901f 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -43,7 +43,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short handler to detect and play sounds ("wav" and "au" only!)
@descr Register this implementation as a content handler to detect and/or play wav- and au-sounds.
It doesn't depend from the target platform. But one instance of this class
@@ -63,32 +63,32 @@ class Oxt_Handler : // baseclasses
css::frame::XNotifyingDispatch, // => XDispatch
css::document::XExtendedFilterDetection >
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
+
Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
virtual ~Oxt_Handler( );
- //---------------------------------------------------------------------------------------------------------
+
// XInterface, XTypeProvider, XServiceInfo
- //---------------------------------------------------------------------------------------------------------
+
DECLARE_XSERVICEINFO
- //---------------------------------------------------------------------------------------------------------
+
// XNotifyingDispatch
- //---------------------------------------------------------------------------------------------------------
+
virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception );
- //---------------------------------------------------------------------------------------------------------
+
// XDispatch
- //---------------------------------------------------------------------------------------------------------
+
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception );
// not supported !
@@ -97,25 +97,23 @@ class Oxt_Handler : // baseclasses
virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) {};
- //---------------------------------------------------------------------------------------------------------
+
// XExtendedFilterDetection
- //---------------------------------------------------------------------------------------------------------
virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception );
- //-------------------------------------------------------------------------------------------------------------
// protected methods
- //-------------------------------------------------------------------------------------------------------------
+
protected:
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
- //-------------------------------------------------------------------------------------------------------------
+
// variables
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
+
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// global uno service factory to create new services
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index b35fb4c..8b58855 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -50,7 +50,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
We must save information about our listener and URL for listening.
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
@@ -59,7 +59,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to our SUPERCLASS!
@@ -85,9 +85,9 @@ class PopupMenuDispatcher : // baseclasses
css::frame::XFrameActionListener,
css::lang::XInitialization >
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
// constructor / destructor
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 966ba30..681593b 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -44,7 +44,7 @@
namespace framework{
-//-----------------------------------------------
+
/**
@short helper to handle all URLs related to the StartModule
*/
@@ -54,35 +54,35 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
css::frame::XNotifyingDispatch, // => XDispatch
css::frame::XDispatchInformationProvider >
{
- //-------------------------------------------
+
// member
private:
- //---------------------------------------
+
/** @short reference to an uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- //---------------------------------------
+
/** @short our "context" frame. */
css::uno::WeakReference< css::frame::XFrame > m_xOwner;
- //---------------------------------------
+
/** @short the original queryDispatch() target. */
OUString m_sDispatchTarget;
- //---------------------------------------
+
/** @short list of registered status listener */
ListenerHash m_lStatusListener;
- //-------------------------------------------
+
// native interface
public:
- //---------------------------------------
+
/** @short connect a new StartModuleDispatcher instance to its "owner frame".
@descr Such "owner frame" is used as context for all related operations.
@@ -101,24 +101,24 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget);
- //---------------------------------------
+
/** @short does nothing real. */
virtual ~StartModuleDispatcher();
- //-------------------------------------------
+
// uno interface
public:
- //---------------------------------------
- //---------------------------------------
+
+
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception);
- //---------------------------------------
+
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception);
@@ -127,22 +127,22 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception);
- //---------------------------------------
+
// XDispatchInformationProvider
virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception);
- //-------------------------------------------
+
// internal helper
private:
- //---------------------------------------
+
/** @short check if StartModule can be shown.
*/
::sal_Bool implts_isBackingModePossible();
- //---------------------------------------
+
/** @short open the special BackingComponent (now StartModule)
@return [bool]
@@ -150,7 +150,7 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
*/
::sal_Bool implts_establishBackingMode();
- //---------------------------------------
+
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 4b43e28..3f92319 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -24,7 +24,7 @@
namespace framework{
-//_________________________________________________________________________________________________________________
+
#define CMD_UNO_SHOWSTARTMODULE ".uno:ShowStartModule"
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index e14c107..8c302e6 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -34,7 +34,7 @@
namespace framework{
-//_________________________________________________________________________________________________________________
+
class DockingAreaDefaultAcceptor : private ThreadHelpBase ,
@@ -42,11 +42,11 @@ class DockingAreaDefaultAcceptor : private ThreadHelpBase
{
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short constructor to initialize this instance
@descr A docking area acceptor
But we need a instance to create more then one enumerations to the same tasklist!
@@ -64,19 +64,19 @@ class DockingAreaDefaultAcceptor : private ThreadHelpBase
DockingAreaDefaultAcceptor( const css::uno::Reference< css::frame::XFrame >& xOwner );
virtual ~DockingAreaDefaultAcceptor();
- //---------------------------------------------------------------------------------------------------------
+
// XDockingAreaAcceptor
- //---------------------------------------------------------------------------------------------------------
+
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception);
- //-------------------------------------------------------------------------------------------------------------
+
// variables
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
+
private:
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 15c87c3..225088c 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -148,14 +148,14 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
//It's common for an object to want to create and own a Broadcaster and set
//itself as a Listener on its own Broadcaster member.
-//
+
//However, calling addListener on a Broadcaster means that the Broadcaster adds
//a reference to the Listener leading to an ownership cycle where the Listener
//owns the Broadcaster which "owns" the Listener.
-//
+
//The WeakContainerListener allows breaking this cycle and retrofitting
//afflicted implentations fairly easily.
-//
+
//OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
//which forwards the events to the OriginalListener without taking ownership of
//it.
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 306686f..5e4cb9a 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -38,7 +38,7 @@
namespace framework{
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
@short implement XEnumerationAccess interface as helper to create many oneway enumeration of components
@descr We share mutex and framecontainer with ouer owner and have full access to his child tasks.
(Ouer owner can be the Desktop only!) We create oneway enumerations on demand. These "lists"
@@ -59,17 +59,17 @@ namespace framework{
class OComponentAccess : private ThreadHelpBase , // Must be the first of baseclasses - Is necessary for right initialization of objects!
public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess >
{
- //-------------------------------------------------------------------------------------------------------------
+
// public methods
- //-------------------------------------------------------------------------------------------------------------
+
public:
- //---------------------------------------------------------------------------------------------------------
+
// constructor / destructor
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short constructor to initialize this instance
@descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a
snapshot of the components of current tasks under the desktop.
@@ -86,11 +86,11 @@ class OComponentAccess : private ThreadHelpBase , // M
OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner );
- //---------------------------------------------------------------------------------------------------------
+
// XEnumerationAccess
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short create a new enumeration of components
@descr You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration.
@@ -107,11 +107,11 @@ class OComponentAccess : private ThreadHelpBase , // M
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception );
- //---------------------------------------------------------------------------------------------------------
+
// XElementAccess
- //---------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short get the type of elements in enumeration
@descr -
@@ -126,7 +126,7 @@ class OComponentAccess : private ThreadHelpBase , // M
virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short get state of componentlist of enumeration.
@descr -
@@ -141,13 +141,13 @@ class OComponentAccess : private ThreadHelpBase , // M
virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception );
- //-------------------------------------------------------------------------------------------------------------
+
// protected methods
- //-------------------------------------------------------------------------------------------------------------
+
protected:
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short standard destructor
@descr This method destruct an instance of this class and clear some member.
Don't use an instance of this class as normal member. Use it dynamicly with a pointer.
@@ -164,13 +164,13 @@ class OComponentAccess : private ThreadHelpBase , // M
virtual ~OComponentAccess();
- //-------------------------------------------------------------------------------------------------------------
+
// private methods
- //-------------------------------------------------------------------------------------------------------------
+
private:
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short recursive method (!) to collect all components of all frames from the subtree of given node
@descr This is necessary to create the enumeration.
@@ -187,7 +187,7 @@ class OComponentAccess : private ThreadHelpBase , // M
void impl_collectAllChildComponents( const css::uno::Reference< css::frame::XFramesSupplier >& xNode ,
css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents );
- /*-****************************************************************************************************//**
+ /*-****************************************************************************************************
@short get the component of a frame
@descr The component of a frame can be the window, the controller or the model.
@@ -201,12 +201,12 @@ class OComponentAccess : private ThreadHelpBase , // M
css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
- //-------------------------------------------------------------------------------------------------------------
+
// debug methods
// (should be private everyway!)
- //-------------------------------------------------------------------------------------------------------------
- /*-****************************************************************************************************//**
+
+ /*-****************************************************************************************************
@short debug-method to check incoming parameter of some other mehods of this class
@descr The following methods are used to check parameters for other methods
of this class. The return value is used directly for an ASSERT(...).
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list