summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2013-05-28 10:01:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-24 11:25:34 +0100
commit57207cab004cb78c3fa6d9ed43cc4bf81f4e6981 (patch)
tree064fa263ec60f38b437df1d93c570e2e787f4173 /framework/inc
parenta1748501d81425d26d09509eec2fd141f2f28f05 (diff)
Add missing copy&paste of SfxAppToolBoxControl_Impl::Select
(cherry picked from commit 47204c74d9e52f54f6983af19b66af2a96b42e61) Conflicts: framework/inc/uielement/popuptoolbarcontroller.hxx svtools/inc/svtools/toolboxcontroller.hxx Change-Id: I304d17c662450f29eeffb17f576b418986f3fb0a
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/uielement/popuptoolbarcontroller.hxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx b/framework/inc/uielement/popuptoolbarcontroller.hxx
index 89acb766c0e1..f8e8bf951ebd 100644
--- a/framework/inc/uielement/popuptoolbarcontroller.hxx
+++ b/framework/inc/uielement/popuptoolbarcontroller.hxx
@@ -78,7 +78,10 @@ namespace framework
private:
void functionExecuted( const OUString &rCommand );
void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw ( ::com::sun::star::uno::RuntimeException );
+ void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException);
void setItemImage( const OUString &rCommand );
+
+ OUString m_aLastURL;
};
class WizardsToolbarController : public PopupMenuToolbarController