[Libreoffice-commits] core.git: framework/inc framework/source include/framework
Noel Grandin
noel at peralex.com
Wed Jul 15 04:33:48 PDT 2015
framework/inc/classes/filtercache.hxx | 201 ----------
framework/inc/classes/filtercachedata.hxx | 120 -----
framework/inc/classes/menumanager.hxx | 1
framework/inc/queries.h | 45 --
framework/inc/services/layoutmanager.hxx | 9
framework/inc/uielement/menubarmanager.hxx | 3
framework/inc/uielement/menubarwrapper.hxx | 1
framework/inc/xml/statusbardocumenthandler.hxx | 15
framework/inc/xml/toolboxdocumenthandler.hxx | 9
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 27 -
framework/source/inc/loadenv/actionlockguard.hxx | 11
framework/source/inc/loadenv/loadenv.hxx | 13
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2
include/framework/addonmenu.hxx | 4
include/framework/addonsoptions.hxx | 9
include/framework/menuconfiguration.hxx | 8
include/framework/titlehelper.hxx | 1
18 files changed, 10 insertions(+), 470 deletions(-)
New commits:
commit 269bf161e6904f33dda21e319982bfb119f24592
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 14 15:55:09 2015 +0200
loplugin:unusedmethods framework
Change-Id: Ibfeb0ef753a083f458c84f446f0729f05c73e2d6
Reviewed-on: https://gerrit.libreoffice.org/17060
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index f194385..f8f1da2 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -79,207 +79,6 @@ class FilterCache : private TransactionBase
virtual ~FilterCache();
- 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.
- *//*-*****************************************************************************************************/
-
- bool isValidOrRepairable() const;
- bool hasTypes () const;
- bool hasFilters () const;
- bool hasDetectors () const;
- bool hasLoaders () const;
- 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.
- These operations support a FindFirst/Next mechanism.
- If you call search...( ... nStartEntry=0 ... ) we search for
- the first entry. If these return a value different from <empty> you can work with these value.
- If found value isn't the right one - you can call search method again.
- DONT'T CHANGE THE VALUE OF "rStartEntry" between two search calls!
- You can use returned value as parameter for getBy...Name() functions of this implementation too!
-
- @attention returned type name is an internal name
- returned filter name is an internal name
- returned loader name is an implementation name of a service
- returned detector name is an implementation name of a service
- @param "sResult", name of found type, filter, ...
- @return true, if search was successful,
- false, otherwise.
-
- @onerror We return false.
- *//*-*****************************************************************************************************/
-
- bool searchType ( const OUString& sURL ,
- const OUString& sMediaType ,
- const OUString& sClipboardFormat ,
- CheckedTypeIterator& aStartEntry ,
- OUString& sResult ) const;
-
- bool searchFilterForType ( const OUString& sInternalTypeName ,
- CheckedStringListIterator& aStartEntry ,
- OUString& sResult ) const;
-
- bool searchDetectorForType ( const OUString& sInternalTypeName ,
- CheckedStringListIterator& aStartEntry ,
- OUString& sResult ) const;
-
- bool searchLoaderForType ( const OUString& sInternalTypeName ,
- CheckedStringListIterator& aStartEntry ,
- OUString& sResult ) const;
-
- bool searchContentHandlerForType ( const OUString& sInternalTypeName ,
- 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
- and subkeys of specified entry.
- @param "sName", name of suspected entry in cache
- @return A structure with valid information if item exists! An empty Any otherwise.
-
- @onerror We return an empty Any.
- *//*-*****************************************************************************************************/
-
- css::uno::Sequence< OUString > getAllTypeNames () const;
- css::uno::Sequence< OUString > getAllFilterNames () const;
- css::uno::Sequence< OUString > getAllDetectorNames () const; // without default detector!
- css::uno::Sequence< OUString > getAllLoaderNames () const; // without default loader!
- css::uno::Sequence< OUString > getAllContentHandlerNames () const;
- css::uno::Sequence< OUString > getAllDetectorNamesWithDefault () const; // default detector is last one!
- css::uno::Sequence< OUString > getAllLoaderNamesWithDefault () const; // default loader is last one!
- OUString getDefaultLoader () const;
-
- css::uno::Sequence< css::beans::PropertyValue > getTypeProperties ( const OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getFilterProperties ( const OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getDetectorProperties ( const OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getLoaderProperties ( const OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getContentHandlerProperties ( const OUString& sName ) const;
-
- FileType getType ( const OUString& sName ) const;
- Filter getFilter ( const OUString& sName ) const;
- Detector getDetector ( const OUString& sName ) const;
- Loader getLoader ( const OUString& sName ) const;
- ContentHandler getContentHandler ( const OUString& sName ) const;
-
- bool existsType ( const OUString& sName ) const;
- bool existsFilter ( const OUString& sName ) const;
- bool existsDetector ( const OUString& sName ) const;
- bool existsLoader ( const OUString& sName ) const;
- 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.
-
- @seealso file queries.h
- @seealso class FilterFactory
- @seealso class FrameLoaderFactory
- @seealso class TypeDetection
-
- @param "sName", name of query
- @return A structure with valid information!
-
- @onerror We return an empty result set.
- *//*-*****************************************************************************************************/
-
- 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/..."!
-
- *** structure of type properties **********************************************************
-
- PropertyValue.Name PropertyValue.Value Description
- ---------------------------------------------------------------------------------------
- ...
-
- *** structure of filter properties ********************************************************
-
- PropertyValue.Name PropertyValue.Value Description
- ---------------------------------------------------------------------------------------
- "Name" [string] internal name
- "Type" [string] registered for these type
- "UIName" [string] localized name for UI (valid for current locale at runtime!)
- "UINames" [stringlist] assignment of all supported localized names to right locales
- "DocumentService" [string] uno servicename of document services
- "FilterService" [string] uno servicename of filter implementation
- "Flags" [long] describe filter
- "UserData" [stringlist] additional user data (format not fixed!)
- "FileFormatVersion" [long] version numbher of supported files
- "TemplateName" [string] name of template
-
- *** structure of detector properties ******************************************************
-
- PropertyValue.Name PropertyValue.Value Description
- ---------------------------------------------------------------------------------------
- ...
-
- *** structure of loader properties ********************************************************
-
- PropertyValue.Name PropertyValue.Value Description
- ---------------------------------------------------------------------------------------
- ...
- @param "sName" , name of type, filter ...
- @param "lProperties" , values of new type, filter
- @return state of operation as bool
-
- @onerror We return false then.
- *//*-*****************************************************************************************************/
-
- bool addFilter ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::ElementExistException ,
- css::registry::InvalidRegistryException);
- bool replaceFilter( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
- bool removeFilter ( const OUString& sName ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
-
- bool addType ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::ElementExistException ,
- css::registry::InvalidRegistryException);
- bool replaceType ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
- bool removeType ( const OUString& sName ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
-
- bool addDetector ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::ElementExistException ,
- css::registry::InvalidRegistryException);
- bool replaceDetector( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
- bool removeDetector ( const OUString& sName ,
- bool bException ) throw(css::container::NoSuchElementException ,
- css::registry::InvalidRegistryException);
-
- bool validateAndRepair();
- bool validateAndRepairTypes();
- bool validateAndRepairFilter();
- bool validateAndRepairDetectors();
- bool validateAndRepairLoader();
- bool validateAndRepairHandler();
-
// private variables
private:
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index e8d231c..538f683 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -77,8 +77,6 @@ struct FileType
inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); }
inline ~FileType ( ) { impl_clear(); }
inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
- inline void free ( ) { impl_clear(); }
-
private:
@@ -137,8 +135,6 @@ struct Filter
inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); }
inline ~Filter ( ) { impl_clear(); }
inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
- inline void free ( ) { impl_clear(); }
-
private:
@@ -205,8 +201,6 @@ struct Detector
inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); }
inline ~Detector ( ) { impl_clear(); }
inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
- inline void free ( ) { impl_clear(); }
-
private:
@@ -246,8 +240,6 @@ struct Loader
inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); }
inline ~Loader ( ) { impl_clear(); }
inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
- inline void free ( ) { impl_clear(); }
-
private:
@@ -289,8 +281,6 @@ struct ContentHandler
inline ContentHandler( const ContentHandler& rCopy ) { impl_copy( rCopy ); }
inline ~ContentHandler( ) { impl_clear(); }
inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
- inline void free ( ) { impl_clear(); }
-
private:
@@ -358,49 +348,11 @@ class SetNodeHash : public std::unordered_map< OUString ,
// 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 std::unordered_map< OUString ,
- OUStringList ,
- OUStringHash ,
+class PerformanceHash : public std::unordered_map< OUString,
+ OUStringList,
+ OUStringHash,
std::equal_to< OUString > >
{
- public:
-
- // try to free all used memory REALLY!
-
- inline void free()
- {
- PerformanceHash().swap( *this ); // get rid of reserved capacity
- }
-
- // normally 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 bool findPatternKey( const OUString& sSearchValue ,
- const_iterator& pStepper )
- {
- bool bFound = false;
-
- // If this is the forst call - start search on first element.
- // Otherwise start search on further elements!
- if( pStepper != begin() )
- {
- ++pStepper;
- }
-
- while( pStepper != end() && !bFound )
- {
- bFound = Wildcard::match( sSearchValue, pStepper->first );
- // If element was found - break loop by setting right return value
- // and don't change "pStepper". He must point to found element!
- // Otherwise step to next one.
- if( !bFound )
- ++pStepper;
- }
- return bFound;
- }
};
// Define easy usable types
@@ -448,45 +400,6 @@ class DataContainer
DataContainer();
- void startListener();
- void stopListener ();
-
- bool isModified();
-
- void free();
-
- bool isValidOrRepairable () const;
- bool validateAndRepair ();
- bool validateAndRepairTypes ();
- bool validateAndRepairFilter ();
- bool validateAndRepairDetectors();
- bool validateAndRepairLoader ();
- bool validateAndRepairHandler ();
-
- bool existsType ( const OUString& sName );
- bool existsFilter ( const OUString& sName );
- bool existsDetector ( const OUString& sName );
- bool existsLoader ( const OUString& sName );
- bool existsContentHandler ( const OUString& sName );
-
- void addType ( const FileType& aType , bool bSetModified );
- void addFilter ( const Filter& aFilter , bool bSetModified );
- void addDetector ( const Detector& aDetector, bool bSetModified );
- void addLoader ( const Loader& aLoader , bool bSetModified );
- void addContentHandler ( const ContentHandler& aHandler , bool bSetModified );
-
- void replaceType ( const FileType& aType , bool bSetModified );
- void replaceFilter ( const Filter& aFilter , bool bSetModified );
- void replaceDetector ( const Detector& aDetector, bool bSetModified );
- void replaceLoader ( const Loader& aLoader , bool bSetModified );
- void replaceContentHandler( const ContentHandler& aHandler , bool bSetModified );
-
- void removeType ( const OUString& sName , bool bSetModified );
- void removeFilter ( const OUString& sName , bool bSetModified );
- void removeDetector ( const OUString& sName , bool bSetModified );
- void removeLoader ( const OUString& sName , bool bSetModified );
- void removeContentHandler ( const OUString& sName , bool bSetModified );
-
static void convertFileTypeToPropertySequence ( const FileType& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination ,
const OUString& sCurrentLocale );
@@ -572,11 +485,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration
virtual ~FilterCFGAccess( );
- void read ( DataContainer& rData ,
- DataContainer::ECFGType eType ); // read values from configuration into given struct
- void write ( DataContainer& rData ,
- DataContainer::ECFGType eType ); // write values from given struct to configuration
-
static OUString encodeTypeData ( const FileType& aType ); // build own formatted string of type properties
static void decodeTypeData ( const OUString& sData ,
FileType& aType );
@@ -586,29 +494,7 @@ class FilterCFGAccess : public ::utl::ConfigItem
static OUString encodeStringList( const OUStringList& lList ); // build own formatted string of OUStringList
static OUStringList decodeStringList( const OUString& sValue );
- 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
- const OUString& sTemplateType ,
- const OUString& sSetName );
-
- void impl_loadTypes ( DataContainer& rData ); // helper to load configuration parts
- void impl_loadFilters ( DataContainer& rData );
- void impl_loadDetectors ( DataContainer& rData );
- void impl_loadLoaders ( DataContainer& rData );
- void impl_loadContentHandlers ( DataContainer& rData );
- void impl_loadDefaults ( DataContainer& rData );
-
- void impl_saveTypes ( DataContainer& rData ); // helper to save configuration parts
- void impl_saveFilters ( DataContainer& rData );
- void impl_saveDetectors ( DataContainer& rData );
- void impl_saveLoaders ( DataContainer& rData );
- void impl_saveContentHandlers ( DataContainer& rData );
// debug checks
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 4c471a2..07de83d 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -81,7 +81,6 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
private:
void UpdateSpecialFileMenu( Menu* pMenu );
- void UpdateSpecialWindowMenu( Menu* pMenu );
void ClearMenuDispatch(const css::lang::EventObject& Source = css::lang::EventObject(),bool _bRemoveOnly = true);
void SetHdl();
void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,bool _bDelete,bool _bDeleteChildren);
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 8e0abff..1ce67f9 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -89,35 +89,6 @@ class QueryBuilder
resetAll();
}
- // returns full query as copy of internal set values
-
- OUString getQuery()
- {
- OUStringBuffer sCopy( m_sParams );
- sCopy.insert( 0, m_sBase );
- return sCopy.makeStringAndClear();
- }
-
- // set new or change existing base query part
-
- void setBase( const OUString& sBase )
- {
- m_sBase = sBase;
- }
-
- // add new parameter (with optional value) to param list
-
- void addParam( const OUString& sParam, const OUString& sValue = OUString() )
- {
- m_sParams.append( SEPARATOR_QUERYPARAM );
- m_sParams.append( sParam );
- if( sValue.getLength() > 0 )
- {
- m_sParams.append( SEPARATOR_QUERYPARAMVALUE );
- m_sParams.append( sValue );
- }
- }
-
// forget all setted params and start with empty ones
// Attention: base of query isn't changed!
@@ -312,22 +283,6 @@ class QueryAnalyzer
}
}
- // return type of query. User can decide then, which action should be started.
- // For faster work we converted query string into corresponding enum value!
-
- EQuery getQueryType() const { return m_eQuery; }
-
- // access to additional parameter values
- // Methods return default of really set values!
-
- sal_uInt32 getIFlags () const { return m_nIFlags; }
- sal_uInt32 getEFlags () const { return m_nEFlags; }
- ESortProp getSortProp () const { return m_eSortProp; }
- bool getDescending () const { return m_bDescending; }
- bool getCaseSensitive() const { return m_bCaseSensitive; }
- bool getUseOrder () const { return m_bUseOrder; }
- bool getDefaultFirst () const { return m_bDefaultFirst; }
-
// this method checks if given string match any supported query.
// (ignore additional parameters!)
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index f072724..a015ee2 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -204,24 +204,18 @@ namespace framework
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName );
- void implts_writeNewStateData( const OUString& aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData );
void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData );
- void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
- void implts_sortUIElements();
void implts_destroyElements();
void implts_toggleFloatingUIElementsVisibility( bool bActive );
void implts_reparentChildWindows();
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName );
bool implts_isEmbeddedLayoutManager() const;
- sal_Int16 implts_getCurrentSymbolsSize();
- sal_Int16 implts_getCurrentSymbolsStyle();
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const OUString& aName );
// layouting methods
bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos );
- ::Size implts_getTopBottomDockingAreaSizes();
::Size implts_getContainerWindowOutputSize();
void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace );
@@ -255,8 +249,6 @@ namespace framework
void implts_setCurrentUIVisibility( bool bShow );
void implts_notifyListeners(short nEvent, const css::uno::Any& rInfoParam);
- DECL_LINK( OptionsChanged, void* );
-
// OPropertySetHelper
virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,
@@ -282,7 +274,6 @@ namespace framework
sal_Int32 m_nLockCount;
bool m_bActive;
bool m_bInplaceMenuSet;
- bool m_bDockingInProgress;
bool m_bMenuVisible;
bool m_bComponentAttached;
bool m_bDoLayout;
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index b72d515..d62aaae 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -191,9 +191,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
};
void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts );
- void CreatePicklistArguments(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList,
- const MenuItemHandler* );
void CheckAndAddMenuExtension( Menu* pMenu );
static void impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
const ::com::sun::star::uno::Sequence< OUString >& rCommands,
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 5d47fc8..d2648c4 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -47,7 +47,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
FWK_DECLARE_XTYPEPROVIDER
MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); }
- void InvalidatePopupControllerCache() { m_bRefreshPopupControllerCache = true; }
// XComponent
virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index a917fe1..579c33c 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -104,21 +104,16 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
private:
OUString getErrorLineString();
- class StatusBarHashMap : public std::unordered_map<OUString ,
- StatusBar_XML_Entry ,
+ class StatusBarHashMap : public std::unordered_map<OUString,
+ StatusBar_XML_Entry,
OUStringHash,
std::equal_to< OUString > >
{
- public:
- inline void free()
- {
- StatusBarHashMap().swap( *this );// get rid of reserved capacity
- }
};
- bool m_bStatusBarStartFound;
- bool m_bStatusBarEndFound;
- bool m_bStatusBarItemStartFound;
+ bool m_bStatusBarStartFound;
+ bool m_bStatusBarEndFound;
+ bool m_bStatusBarItemStartFound;
StatusBarHashMap m_aStatusBarMap;
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_aStatusBarItems;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 82eefae..493527b 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -109,16 +109,11 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
private:
OUString getErrorLineString();
- class ToolBoxHashMap : public std::unordered_map<OUString ,
- ToolBox_XML_Entry ,
+ class ToolBoxHashMap : public std::unordered_map<OUString,
+ ToolBox_XML_Entry,
OUStringHash,
std::equal_to< OUString > >
{
- public:
- inline void free()
- {
- ToolBoxHashMap().swap( *this );// get rid of reserved capacity
- }
};
bool m_bToolBarStartFound : 1;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 290fd0a..b963daa 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -212,33 +212,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
- sub storage. If it exists - it will be opened.
- By default this method tries to open the storage
- for reading. But the calli can request a writeable
- storage.
-
- @param xRooStorage
- used to locate the sub storage.
-
- @param sSubStorage
- relativ path of the sub storage.
-
- @param bOutStream
- force open of the sub storage in
- write mode - instead of read mode, which
- is the default.
-
- @return [XInterface]
- will be a css::io::XInpoutStream or a css::io::XOutputStream.
- Depends from the parameter bWriteable!
- */
- css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage,
- const OUString& sSubStorage ,
- bool bOutStream );
-
/** @short returns a reference to one of our internal cache members.
@descr We implement the copy-on-write pattern. Doing so
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index caa7031..9a55f1c 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -134,17 +134,6 @@ class ActionLockGuard
xLock->removeActionLock();
}
- /** @short lock the internal wrapped resource, if its not already done. */
- void lock()
- {
- osl::MutexGuard g(m_mutex);
- if (!m_bActionLocked && m_xActionLock.is())
- {
- m_xActionLock->addActionLock();
- m_bActionLocked = m_xActionLock->isActionLocked();
- }
- }
-
/** @short unlock the internal wrapped resource, if its not already done. */
void unlock()
{
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 5eef584..7a6f317 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -414,19 +414,6 @@ private:
void impl_detectTypeAndFilter()
throw(LoadEnvException, css::uno::RuntimeException, std::exception);
- /** @short tries to ask user for it's filter decision in case
- normal detection failed.
-
- @descr We use a may existing interaction handler to do so.
-
- @return [string]
- the type selected by the user.
-
- @attention Internally we update the member m_lMediaDescriptor!
- */
- OUString impl_askUserForTypeAndFilterIfAllowed()
- throw(LoadEnvException, css::uno::RuntimeException);
-
/** @short tries to use ContentHandler objects for loading.
@descr It searches for a suitable content handler object, registered
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 584adef..fa868d6 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -109,7 +109,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
, m_nLockCount( 0 )
, m_bActive( false )
, m_bInplaceMenuSet( false )
- , m_bDockingInProgress( false )
, m_bMenuVisible( true )
, m_bComponentAttached( false )
, m_bDoLayout( false )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 50433e0..8ad4f13 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -112,7 +112,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
void refreshToolbarsVisibility( bool bAutomaticToolbars );
void setFloatingToolbarsVisibility( bool bVisible );
void setVisible(bool bVisible);
- bool isVisible() { return m_bVisible; }
// docking and further functions
bool dockToolbar( const OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos );
@@ -214,7 +213,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
const ::Size& rContainerSize );
void implts_setLayoutDirty();
void implts_setLayoutInProgress( bool bInProgress = true );
- bool implts_isLayoutInProgress() const { return m_bLayoutInProgress; }
// lookup/container methods
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index c53b140..b92d716 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -55,10 +55,6 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
static bool IsCommandURLPrefix( const OUString& aCmdURL );
void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
- const OUString& GetCommandURL() const { return m_aCommandURL; }
-
- protected:
- void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
private:
AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 25adf10..dee6ec0 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -113,15 +113,6 @@ class FWE_DLLPUBLIC AddonsOptions
~AddonsOptions();
/*-****************************************************************************************************
- @short clears completely the addons menu
- @descr Call this methods to clear the addons menu
- To fill it again use AppendItem().
- @param "eMenu" select right menu to clear.
- *//*-*****************************************************************************************************/
-
- void Clear();
-
- /*-****************************************************************************************************
@short returns if an addons menu is available
@descr Call to retrieve if a addons menu is available
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 2672ae8..7d35c55 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -116,18 +116,10 @@ class FWE_DLLPUBLIC MenuConfiguration
PopupMenu* CreateBookmarkMenu(css::uno::Reference<css::frame::XFrame >& rFrame, const OUString& aURL)
throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
- ToolBox* CreateToolBoxFromConfiguration(
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream )
- throw ( ::com::sun::star::lang::WrappedTargetException );
-
void StoreMenuBarConfigurationToXML( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rMenuBarConfiguration,
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
- void StoreToolBox( ToolBox* pToolBox,
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
- throw ( ::com::sun::star::lang::WrappedTargetException );
-
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext;
};
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index 4411163..817c8ec 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -158,7 +158,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
void impl_appendComponentTitle ( OUStringBuffer& sTitle ,
const css::uno::Reference< css::uno::XInterface >& xComponent);
void impl_appendProductName (OUStringBuffer& sTitle);
- void impl_appendProductExtension (OUStringBuffer& sTitle);
void impl_appendModuleName (OUStringBuffer& sTitle);
void impl_appendDebugVersion (OUStringBuffer& sTitle);
More information about the Libreoffice-commits
mailing list