[Libreoffice-commits] core.git: 2 commits - include/svx sd/source vbahelper/source
Caolán McNamara
caolanm at redhat.com
Mon May 25 07:05:16 PDT 2015
include/svx/svxcommands.h | 1 +
sd/source/ui/app/menuids_tmpl.src | 9 +++++++++
vbahelper/source/msforms/vbacontrol.cxx | 4 ++--
vbahelper/source/msforms/vbacontrols.cxx | 2 +-
vbahelper/source/msforms/vbalistcontrolhelper.hxx | 2 +-
vbahelper/source/msforms/vbamultipage.cxx | 2 +-
vbahelper/source/msforms/vbanewfont.hxx | 2 +-
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 2 +-
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 2 +-
9 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 67c3e2abf353c4893a4680f7a5b2d8c457ef18d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 15:00:47 2015 +0100
impress: right click to insert image
Change-Id: I521f074bbd500b81d74be7e0e771bd49efc29c9c
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index df3ddee..1b02754 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -81,6 +81,7 @@
#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
#define CMD_SID_GRID_USE ".uno:GridUse"
#define CMD_SID_GRID_VISIBLE ".uno:GridVisible"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_EDIT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index cea91ed..9ed590a 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -35,6 +35,14 @@
Text [ en-US ] = "~Distribution..." ; \
};
+#define MN_INSERT_GRAPHIC \
+ MenuItem\
+ {\
+ Identifier = SID_INSERT_GRAPHIC; \
+ HelpId = CMD_SID_INSERT_GRAPHIC; \
+ Text [ en-US ] = "Insert I~mage..." ; \
+ };
+
#define MN_CAPTUREPOINT \
MenuItem\
{\
@@ -168,6 +176,7 @@
#define MN_SLIDE_MENU \
MN_SELECT_BACKGROUND\
+ MN_INSERT_GRAPHIC\
MN_FORMAT_SLIDE\
MenuItem\
{\
commit c0fe0578273cfb2be404223531d96615fe3c2867
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon May 25 12:36:55 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: Ic323f07196d8a0d106d9ddf73a06db377c23fb98
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 56bc102..cdfc8a7 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -99,7 +99,7 @@ class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
private:
ScVbaControl *pControl;
public:
- ScVbaControlListener( ScVbaControl *pTmpControl );
+ explicit ScVbaControlListener( ScVbaControl *pTmpControl );
virtual ~ScVbaControlListener();
virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -776,7 +776,7 @@ class ControlProviderImpl : public ControlProvider_BASE
{
uno::Reference< uno::XComponentContext > m_xCtx;
public:
- ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
+ explicit ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 85a7bd4..ce70d05 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -82,7 +82,7 @@ private:
}
}
public:
- ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
+ explicit ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
{
try
{
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
index 3c895bd..ad580f4 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
@@ -27,7 +27,7 @@ class ListControlHelper
css::uno::Reference< css::beans::XPropertySet > m_xProps;
public:
- ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
+ explicit ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
virtual ~ListControlHelper() {}
void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 2fb7016..3422032 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -31,7 +31,7 @@ class PagesImpl : public PagesImpl_Base
{
sal_Int32 mnPages;
public:
- PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
+ explicit PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mnPages; }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx
index 546cb52..5afea01 100644
--- a/vbahelper/source/msforms/vbanewfont.hxx
+++ b/vbahelper/source/msforms/vbanewfont.hxx
@@ -30,7 +30,7 @@ typedef cppu::WeakImplHelper1< ov::msforms::XNewFont > VbaNewFont_BASE;
class VbaNewFont : public VbaNewFont_BASE
{
public:
- VbaNewFont(
+ explicit VbaNewFont(
const css::uno::Reference< css::beans::XPropertySet >& rxModelProps ) throw (css::uno::RuntimeException);
// XNewFont attributes
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index b01179e..a47b33c 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -29,7 +29,7 @@ class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
CommandBarControls_BASE* m_pCommandBarControls;
sal_Int32 m_nCurrentPosition;
public:
- CommandBarControlEnumeration( CommandBarControls_BASE* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
+ explicit CommandBarControlEnumeration( CommandBarControls_BASE* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 4f32530..9540e70 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -80,7 +80,7 @@ public:
{
m_it = m_documents.begin();
}
- DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext )
+ explicit DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext )
{
uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( m_xContext );
uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
More information about the Libreoffice-commits
mailing list