[Libreoffice-commits] core.git: framework/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 9 05:22:20 PDT 2014
framework/source/fwe/classes/addonsoptions.cxx | 3
framework/source/fwe/helper/documentundoguard.cxx | 4 -
framework/source/services/autorecovery.cxx | 9 --
framework/source/services/frame.cxx | 33 ----------
framework/source/services/sessionlistener.cxx | 2
framework/source/services/substitutepathvars.cxx | 32 +--------
framework/source/uielement/langselectionstatusbarcontroller.cxx | 6 -
framework/source/uielement/menubarmanager.cxx | 14 ----
framework/source/uielement/uicommanddescription.cxx | 1
9 files changed, 7 insertions(+), 97 deletions(-)
New commits:
commit 4198039441542f15e3f58d43e39d488a844b45ec
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 9 14:21:42 2014 +0200
Remove unused functions
Change-Id: I0f305ef5b9f13e3516b3bbf45d405fad5115521a
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 2c7c99c..fef1ad7 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -309,7 +309,6 @@ class AddonsOptions_Impl : public ConfigItem
bool AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
bool ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
bool ReadStatusBarItem( const OUString& aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem );
- bool ReadImagesItem( const OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem );
ImageEntry* ReadImageData( const OUString& aImagesNodeName );
void ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId );
Image ReadImageFromURL( const OUString& aURL );
@@ -329,8 +328,6 @@ class AddonsOptions_Impl : public ConfigItem
// private member
private:
- ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName );
-
sal_Int32 m_nRootAddonPopupMenuId;
OUString m_aPropNames[PROPERTYCOUNT_INDEX];
OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index debb6b0..26d435a 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -63,10 +63,6 @@ namespace framework
osl_atomic_decrement( &m_refCount );
}
- UndoManagerContextListener():m_nRelativeContextDepth(0), m_documentDisposed(false)
- {
- }
-
void finish()
{
OSL_ENSURE( m_nRelativeContextDepth >= 0, "UndoManagerContextListener: more contexts left than entered?" );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 146031c..cba5dd5 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -118,7 +118,6 @@ public:
DispatchParams();
DispatchParams(const ::comphelper::SequenceAsHashMap& lArgs ,
const css::uno::Reference< css::uno::XInterface >& xOwner);
- DispatchParams(const DispatchParams& rCopy);
~DispatchParams();
DispatchParams& operator=(const DispatchParams& rCopy);
@@ -1234,14 +1233,6 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap&
m_xHoldRefForAsyncOpAlive = xOwner;
};
-DispatchParams::DispatchParams(const DispatchParams& rCopy)
-{
- m_xProgress = rCopy.m_xProgress;
- m_sSavePath = rCopy.m_sSavePath;
- m_nWorkingEntryID = rCopy.m_nWorkingEntryID;
- m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive;
-};
-
DispatchParams::~DispatchParams()
{};
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index ec6a352..7873ba5 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -338,11 +338,8 @@ private:
void implts_setIconOnWindow ( );
void implts_startWindowListening ( );
void implts_stopWindowListening ( );
- void implts_saveWindowAttributes ( );
void implts_checkSuicide ( );
void implts_forgetSubFrames ( );
- DECL_LINK( implts_windowClosing, void* );
- css::uno::Reference< css::awt::XTopWindow > impl_searchTopWindow ( const css::uno::Reference< css::awt::XWindow >& xWindow );
// non threadsafe
void impl_checkMenuCloser ( );
@@ -418,36 +415,6 @@ private:
protected:
FrameContainer m_aChildFrameContainer; /// array of child frames
-
- inline css::uno::Reference< css::uno::XComponentContext > impl_getComponentContext()
- {
- SolarMutexGuard g;
- return m_xContext;
- }
-
- inline OUString impl_getName()
- {
- SolarMutexGuard g;
- return m_sName;
- }
-
- inline css::uno::Reference< css::awt::XWindow > impl_getContainerWindow()
- {
- SolarMutexGuard g;
- return m_xContainerWindow;
- }
-
- inline css::uno::Reference< css::frame::XDispatchProvider > impl_getDispatchHelper()
- {
- SolarMutexGuard g;
- return m_xDispatchHelper;
- }
-
- inline css::uno::Reference< css::frame::XFramesSupplier > impl_getParent()
- {
- SolarMutexGuard g;
- return m_xParent;
- }
};
css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame2 >();
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 1a498ea..5820f21 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -153,8 +153,6 @@ public:
// XStatusListener
virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- void doSaveImpl( bool bShutdown, bool bCancelable ) throw (css::uno::RuntimeException);
};
SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext )
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index abc4b72..b780ad1 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -107,24 +107,8 @@ struct SubstituteRule
EnvironmentType aEnvType;
};
-struct SubstitutePathNotify
-{
- SubstitutePathNotify() {};
-
- const com::sun::star::uno::Sequence<OUString> aPropertyNames;
-};
-
-class SubstituteVariables : public ::boost::unordered_map< OUString,
- SubstituteRule,
- OUStringHash,
- ::std::equal_to< OUString > >
-{
- public:
- inline void free()
- {
- SubstituteVariables().swap( *this );
- }
-};
+typedef boost::unordered_map<OUString, SubstituteRule, OUStringHash>
+ SubstituteVariables;
typedef std::vector< SubstituteRule > SubstituteRuleVector;
class SubstitutePathVariables_Impl : public utl::ConfigItem
@@ -298,16 +282,8 @@ protected:
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- class VarNameToIndexMap : public boost::unordered_map< OUString,
- PreDefVariable,
- OUStringHash,
- ::std::equal_to< OUString > >
- {
- inline void free()
- {
- VarNameToIndexMap().swap( *this );
- }
- };
+ typedef boost::unordered_map<OUString, PreDefVariable, OUStringHash>
+ VarNameToIndexMap;
VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access
SubstituteVariables m_aSubstVarMap; // Active rule set map indexed by variable name!
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index fc64ba9..dcb1ee3 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -26,6 +26,7 @@
#include <vcl/status.hxx>
#include <toolkit/helper/convert.hxx>
+#include <boost/noncopyable.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/awt/PopupMenu.hpp>
@@ -76,7 +77,8 @@ class SvtLanguageTable;
namespace {
-class LangSelectionStatusbarController : public svt::StatusbarController
+class LangSelectionStatusbarController:
+ public svt::StatusbarController, private boost::noncopyable
{
public:
explicit LangSelectionStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
@@ -117,8 +119,6 @@ public:
private:
virtual ~LangSelectionStatusbarController() {}
- LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined
- void operator =(LangSelectionStatusbarController &); // not defined
bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text)
sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 5adc7b4..4a05243 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -119,20 +119,6 @@ static const sal_Int32 LEN_DESCRIPTOR_ENABLED = 7;
const sal_uInt16 ADDONMENU_MERGE_ITEMID_START = 1500;
-class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
-{
- public:
- StringLength() {}
- virtual ~StringLength() {}
-
- // XStringWidth
- sal_Int32 SAL_CALL queryStringWidth( const OUString& aString )
- throw (RuntimeException, std::exception) SAL_OVERRIDE
- {
- return aString.getLength();
- }
-};
-
namespace framework
{
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 7bf22b0..11ba44f 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -131,7 +131,6 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
Any getSequenceFromCache( const OUString& aCommandURL );
Any getInfoFromCommand( const OUString& rCommandURL );
void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel );
- Any getUILabelFromCommand( const OUString& rCommandURL );
Sequence< OUString > getAllCommands();
bool fillCache();
bool addGenericInfoToCache();
More information about the Libreoffice-commits
mailing list