diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:05:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:48 +0300 |
commit | 951ed199f1a47c02dad3dc899b9804b4574a151d (patch) | |
tree | d8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/source/inc | |
parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/source/inc')
-rw-r--r-- | framework/source/inc/accelerators/acceleratorcache.hxx | 19 | ||||
-rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 21 | ||||
-rw-r--r-- | framework/source/inc/accelerators/istoragelistener.hxx | 4 | ||||
-rw-r--r-- | framework/source/inc/accelerators/keymapping.hxx | 13 | ||||
-rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 37 | ||||
-rw-r--r-- | framework/source/inc/accelerators/storageholder.hxx | 25 | ||||
-rw-r--r-- | framework/source/inc/dispatch/loaddispatcher.hxx | 4 | ||||
-rw-r--r-- | framework/source/inc/dispatch/windowcommanddispatch.hxx | 12 | ||||
-rw-r--r-- | framework/source/inc/loadenv/actionlockguard.hxx | 10 | ||||
-rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 7 | ||||
-rw-r--r-- | framework/source/inc/loadenv/targethelper.hxx | 6 | ||||
-rw-r--r-- | framework/source/inc/pattern/frame.hxx | 3 | ||||
-rw-r--r-- | framework/source/inc/pattern/window.hxx | 5 |
13 files changed, 0 insertions, 166 deletions
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 932cfcaf2dc5..a49cb1ca3393 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -27,13 +27,11 @@ #include <comphelper/sequenceasvector.hxx> - // definition namespace framework { - /** @short implements a cache for any accelerator configuration. @@ -50,14 +48,12 @@ class AcceleratorCache public: - /** TODO document me commands -> keys */ typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; - /** TODO document me keys -> commands */ @@ -66,40 +62,32 @@ class AcceleratorCache KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; - // member private: - /** map commands to keys in relation 1:n. First key is interpreted as preferred one! */ TCommand2Keys m_lCommand2Keys; - /** map keys to commands in relation 1:1. */ TKey2Commands m_lKey2Commands; - // interface public: - /** @short creates a new - but empty - cache instance. */ AcceleratorCache(); - /** @short make a copy of this cache. @descr Used for the copy-on-write feature. */ AcceleratorCache(const AcceleratorCache& rCopy); - /** @short does nothing real. */ virtual ~AcceleratorCache(); - /** @short write changes back to the original container. @param rCopy @@ -108,11 +96,9 @@ class AcceleratorCache */ virtual void takeOver(const AcceleratorCache& rCopy); - /** TODO document me */ AcceleratorCache& operator=(const AcceleratorCache& rCopy); - /** @short checks if the specified key exists. @param aKey @@ -124,11 +110,9 @@ class AcceleratorCache virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; virtual sal_Bool hasCommand(const OUString& sCommand) const; - /** TODO document me */ virtual TKeyList getAllKeys() const; - /** @short add a new or change an existing key-command pair of this container. @@ -141,7 +125,6 @@ class AcceleratorCache virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand); - /** @short returns the list of keys, which are registered for this command. @@ -153,11 +136,9 @@ class AcceleratorCache */ virtual TKeyList getKeysByCommand(const OUString& sCommand) const; - /** TODO */ virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; - /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); virtual void removeCommand(const OUString& sCommand); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 27095364888b..8065456744f6 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -50,7 +50,6 @@ #include <cppuhelper/implbase4.hxx> #include <salhelper/singletonref.hxx> - // definition namespace framework @@ -64,7 +63,6 @@ const char CFG_ENTRY_MODULES[] = "Modules"; in combination with the salhelper::SingletonRef mechanism! */ typedef PresetHandler AcceleratorPresets; - /** implements a read/write access to the accelerator configuration. */ @@ -80,12 +78,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, protected: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** used to: i ) copy configuration files from the share to the user layer ii ) provide access to these config files @@ -93,15 +89,12 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, iv ) provide commit for changes. */ PresetHandler m_aPresetHandler; - /** contains the cached configuration data */ AcceleratorCache m_aReadCache; - /** used to implement the copy on write pattern! */ AcceleratorCache* m_pWriteCache; - // native interface! public: @@ -109,7 +102,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~XMLBasedAcceleratorConfiguration( ); - // uno interface! public: @@ -192,12 +184,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, // IStorageListener virtual void changesOccurred(const OUString& sPath) SAL_OVERRIDE; - // helper for derived classes protected: - /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -208,12 +198,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ OUString impl_ts_getLocale() const; - // helper private: - /** @short load a configuration set, using the given stream. @param xStream @@ -221,7 +209,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ void impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream); - /** @short save a configuration set, using the given stream. @param xStream @@ -229,7 +216,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ void impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream); - /** @short try to locate and open a sub storage. @descr It search at the root storage for the specified @@ -257,7 +243,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, const OUString& sSubStorage , sal_Bool bOutStream ); - /** @short returns a reference to one of our internal cache members. @descr We implement the copy-on-write pattern. Doing so @@ -293,7 +278,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< protected: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -309,7 +293,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - // native interface! public: @@ -317,7 +300,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~XCUBasedAcceleratorConfiguration( ); - // uno interface! public: @@ -410,12 +392,10 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper for derived classes protected: - /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -426,7 +406,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< */ OUString impl_ts_getLocale() const; - // helper private: diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index 154a1eb0caee..b6786dc6bc79 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -23,14 +23,11 @@ #include <general.h> #include <stdtypes.h> - - // definition namespace framework { - /** TODO document me */ @@ -38,7 +35,6 @@ class IStorageListener { public: - /** @short TODO */ virtual void changesOccurred(const OUString& sPath) = 0; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 0336934f4358..be7821e07738 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -30,7 +30,6 @@ namespace framework { - /** can be used to map key identifier to the corresponding key codes ... @@ -42,7 +41,6 @@ class KeyMapping private: - /** @short is used to map a key code to the right key identifier, which is used to make the xml file "human readable" @@ -53,33 +51,27 @@ class KeyMapping const char* Identifier; }; - /** @short hash structure to map identifier to key codes. */ typedef BaseHash< sal_Int16 > Identifier2CodeHash; - /** @short hash structure to map key codes to identifier. */ typedef ::boost::unordered_map< sal_Int16 , OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; - // member private: static KeyIdentifierInfo KeyIdentifierMap[]; - /** @short hash to map identifier to key codes. */ Identifier2CodeHash m_lIdentifierHash; - /** @short hash to map key codes to identifier. */ Code2IdentifierHash m_lCodeHash; - // interface public: @@ -87,7 +79,6 @@ class KeyMapping KeyMapping(); virtual ~KeyMapping(); - /** @short return a suitable key code for the specified key identifier. @@ -105,7 +96,6 @@ class KeyMapping virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException); - /** @short return a suitable key identifier for the specified key code. @@ -116,19 +106,16 @@ class KeyMapping */ virtual OUString mapCodeToIdentifier(sal_uInt16 nCode); - // helper private: - /** @short check if the given string describe a numeric value ... and convert it. @param sIdentifier the string value, which should be converted. - @param rCode contains the converted code, but is defined only if this method returns sal_True! diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 86fa1cc13ace..d7cea6a7e097 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -52,7 +52,6 @@ namespace framework class PresetHandler { - public: static OUString PRESET_DEFAULT(); @@ -63,12 +62,10 @@ class PresetHandler static OUString RESOURCETYPE_ACCELERATOR(); static OUString RESOURCETYPE_STATUSBAR(); - // types public: - /** @short this handler can provide different types of configuration. @@ -84,7 +81,6 @@ class PresetHandler private: - /** @short because a concurrent access to the same storage from different implementations isnt supported, we have to share it with others. @@ -109,23 +105,19 @@ class PresetHandler virtual ~TSharedStorages() {}; }; - // member private: - /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short knows the type of provided configuration. @descr e.g. global, modules, ... */ EConfigType m_eConfigType; - /** @short specify the type of resource, which configuration sets must be provided here. @@ -133,7 +125,6 @@ class PresetHandler */ OUString m_sResourceType; - /** @short specify the application module for a module dependend configuration. @@ -143,19 +134,16 @@ class PresetHandler */ OUString m_sModule; - /** @short provides access to the: a) shared root storages b) shared "inbetween" storages of the share and user layer. */ ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - /** @short if we run in document mode, we cant use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; - /** @short holds the folder storage of the share layer alive, where the current configuration set exists. @@ -168,12 +156,10 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; - /** @short global language-independent storage */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; - /** @short holds the folder storage of the user layer alive, where the current configuration set exists. @@ -186,17 +172,14 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser; - /** @short knows the names of all presets inside the current working storage of the share layer. */ OUStringList m_lPresets; - /** @short knows the names of all targets inside the current working storage of the user layer. */ OUStringList m_lTargets; - /** @short its the current office locale and will be used to handle localized presets. @@ -204,18 +187,15 @@ class PresetHandler localized handling inside this class! */ LanguageTag m_aLanguageTag; - /** @short knows the relative path from the root. */ OUString m_sRelPathShare; OUString m_sRelPathNoLang; OUString m_sRelPathUser; - // native interface public: - /** @short does nothing real. @descr Because this class should be useable in combination @@ -228,19 +208,15 @@ class PresetHandler */ PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext); - /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); - /** @short closes all open storages ... if user forgot that .-) */ virtual ~PresetHandler(); - /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); - /** @short return access to the internally used and cached root storage. @descr These root storages are the base of all further opened @@ -258,7 +234,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser(); - /** @short provides access to the current working storages. @descr Working storages are the "lowest" storages, where the @@ -270,7 +245,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); - /** @short check if there is a parent storage well known for the specified child storage and return it. @@ -283,7 +257,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild); - /** @short free all internal structures and let this handler work on a new type of configuration sets. @@ -324,7 +297,6 @@ class PresetHandler const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , const LanguageTag& rLanguageTag = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)); - /** @short try to copy the specified preset from the share layer to the user layer and establish it as the specified target. @@ -348,7 +320,6 @@ class PresetHandler void copyPresetToTarget(const OUString& sPreset, const OUString& sTarget); - /** @short open the specified preset as stream object and return it. @@ -366,7 +337,6 @@ class PresetHandler css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); - /** @short open the specified target as stream object and return it. @@ -388,7 +358,6 @@ class PresetHandler css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing); - /** @short do anything which is necessary to flush all changes back to disk. @@ -398,17 +367,14 @@ class PresetHandler */ void commitUserChanges(); - /** TODO */ void addStorageListener(IStorageListener* pListener); void removeStorageListener(IStorageListener* pListener); - // helper private: - /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -428,7 +394,6 @@ class PresetHandler sal_Int32 eMode , sal_Bool bShare); - /** @short try to find the specified locale inside list of possible ones. @descr The lits of possible locale values was e.g. retrieved from the system @@ -455,7 +420,6 @@ class PresetHandler OUString& rLanguageTag , sal_Bool bAllowFallbacks ); - /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -489,7 +453,6 @@ class PresetHandler OUString& rLanguageTag , sal_Bool bAllowFallback); - /** @short returns the names of all sub storages of specified storage. @param xFolder diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 07c0b116c999..c0c4269dba66 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -26,12 +26,9 @@ #include <com/sun/star/embed/XStorage.hpp> - namespace framework { - - /** TODO document me */ @@ -64,7 +61,6 @@ class StorageHolder OUStringHash , ::std::equal_to< OUString > > TPath2StorageInfo; - // member private: mutable osl::Mutex m_mutex; @@ -75,95 +71,77 @@ class StorageHolder /** @short TODO */ TPath2StorageInfo m_lStorages; - // interface public: - /** @short TODO */ StorageHolder(); - /** @short TODO */ virtual ~StorageHolder(); - /** @short TODO */ virtual void forgetCachedStorages(); - /** @short TODO */ virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; - /** @short TODO open or get! */ virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , sal_Int32 nOpenMode); - /** @short TODO */ virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); - /** @short TODO */ virtual void commitPath(const OUString& sPath); - /** @short TODO */ virtual void closePath(const OUString& sPath); - /** @short TODO */ virtual void notifyPath(const OUString& sPath); - /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, const OUString& sPath ); - /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, const OUString& sPath ); - /** @short TODO */ virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); - /** @short TODO */ void operator=(const StorageHolder& rCopy); - /** @short opens a sub element of the specified base storage. @descr First this method try to open the requested sub element @@ -197,16 +175,13 @@ class StorageHolder sal_Int32 eOpenMode , sal_Bool bAllowFallback); - // helper private: - /** @short TODO */ static OUString impl_st_normPath(const OUString& sPath); - /** @short TODO */ static OUStringList impl_st_parsePath(const OUString& sPath); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index b3aec4cd4070..f9b6fa0bb936 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -59,7 +59,6 @@ class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDi /** @short TODO document me */ LoadEnv m_aLoader; - // native interface public: @@ -88,13 +87,10 @@ class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDi const OUString& sTargetName , sal_Int32 nSearchFlags); - - /** @short used to free internal resources. */ virtual ~LoadDispatcher(); - // uno interface public: diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 6436b32fe26f..11329a2017d6 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -59,13 +59,10 @@ class WindowCommandDispatch /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; - // native interface public: - - /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such MACDispatch can be used for the specified context only. @@ -81,19 +78,14 @@ class WindowCommandDispatch WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame); - - /** @short used to free internal resources. */ virtual ~WindowCommandDispatch(); - // implementation private: - - /** @short establish all listener connections we need. @descr Those listener connections will be created one times only (see ctor). @@ -107,14 +99,10 @@ class WindowCommandDispatch */ void impl_stopListening(); - - /** @short callback from VCL to notify new commands */ DECL_LINK( impl_notifyCommand, void* ); - - /** @short dispatch right command URLs into our frame context. @param sCommand diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 589deeab7fa4..1cedab697e53 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX - #include <com/sun/star/document/XActionLockable.hpp> - namespace framework{ /** @short implements a guard, which can use the interface @@ -47,12 +45,10 @@ class ActionLockGuard forced by this guard instance. */ sal_Bool m_bActionLocked; - // interface public: - /** @short default ctor to initialize a "non working guard". @descr That can be useful in cases, where no resource still exists, @@ -64,7 +60,6 @@ class ActionLockGuard { } - /** @short initialize new guard instance and lock the given resource immediately. @param xLock @@ -76,7 +71,6 @@ class ActionLockGuard setResource(xLock); } - /** @short release this guard instance and make shure, that no lock will exist afterwards on the internal wrapped resource. */ @@ -85,7 +79,6 @@ class ActionLockGuard unlock(); } - /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -111,7 +104,6 @@ class ActionLockGuard return sal_True; } - /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -141,7 +133,6 @@ class ActionLockGuard xLock->removeActionLock(); } - /** @short lock the internal wrapped resource, if its not already done. */ virtual void lock() { @@ -153,7 +144,6 @@ class ActionLockGuard } } - /** @short unlock the internal wrapped resource, if its not already done. */ virtual void unlock() { diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 29b65999ae3b..3006e82adbc1 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX - #include <loadenv/loadenvexception.hxx> #include <loadenv/actionlockguard.hxx> @@ -38,7 +37,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/implbase2.hxx> - namespace framework { class QuietInteraction; @@ -305,8 +303,6 @@ public: */ void startLoading(); - - /** @short wait for an alreay running load request (started by calling startLoading() before). @@ -329,7 +325,6 @@ public: */ sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0); - /** TODO document me ... */ css::uno::Reference< css::lang::XComponent > getTargetComponent() const; @@ -381,8 +376,6 @@ public: /** TODO document me ... */ css::uno::Reference< css::uno::XInterface > impl_searchLoader(); - - /** @short it means; show the frame, bring it to front, might set the right icon etcpp. in case loading was successfully or reactivate a might existing old document or diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 8ec03e2c09ad..618cc486d8a7 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -34,7 +34,6 @@ namespace framework{ class TargetHelper { - public: /** @short its used at the following interfaces to classify @@ -54,13 +53,10 @@ class TargetHelper E_HELPTASK }; - // interface public: - - /** @short it checks the given unknown target name, if it's the expected special one. @@ -78,8 +74,6 @@ class TargetHelper static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); - - /** @short it checks, if the given name can be used to set it at a frame using XFrame.setName() method. diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index e8d400bab416..38a0b8551274 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -35,8 +35,6 @@ namespace framework{ namespace pattern{ namespace frame{ - - inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XModel > xModel; @@ -48,7 +46,6 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un return xModel; } - /** @short close (or dispose) the given resource. @descr It try to close the given resource first. diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 222fd319077f..19ff84bb55e7 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -33,17 +33,14 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> - // namespaces namespace framework{ - class WindowHelper { public: - static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { if (!xWindow.is()) @@ -68,7 +65,6 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } - static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { @@ -99,7 +95,6 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // <- SOLAR SAFE ---------------------------- } - static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed |