[Libreoffice-commits] .: 2 commits - comphelper/source sc/source sfx2/inc

[Libreoffice Gerrit user]

 comphelper/source/container/embeddedobjectcontainer.cxx |    2 +-
 sc/source/ui/dbgui/subtdlg.cxx                          |    2 +-
 sfx2/inc/sfx2/tabdlg.hxx                                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 75b8d8f597d360e8d789358ca99e78e4742749c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 18 12:59:04 2012 +0100

    expose m_pActionArea so subclasses can add buttons to the right place
    
    Change-Id: If0169cc12dc7b2b70996a5798b8c59b2e6e2edae

diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index eb49b75..6be149e 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -35,7 +35,7 @@ ScSubTotalDlg::ScSubTotalDlg( Window*           pParent,
         SfxTabDialog( pParent,
                       ScResId( RID_SCDLG_SUBTOTALS ),
                       pArgSet ),
-        aBtnRemove  ( this, ScResId( BTN_REMOVE ) )
+        aBtnRemove  ( m_pActionArea, ScResId( BTN_REMOVE ) )
 {
     AddTabPage( PAGE_GROUP1,  ScTpSubTotalGroup1::Create,  0 );
     AddTabPage( PAGE_GROUP2,  ScTpSubTotalGroup2::Create,  0 );
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index fe244b8..c3e010a 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -68,7 +68,6 @@ friend class SfxTabDialogController;
     VclVBox *m_pVBox;
     TabControl *m_pTabCtrl;
 
-    VclHButtonBox *m_pActionArea;
     OKButton *m_pOKBtn;
     PushButton* m_pApplyBtn;
     PushButton* m_pUserBtn;
@@ -115,6 +114,7 @@ protected:
     virtual void                PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
     virtual long                Notify( NotifyEvent& rNEvt );
 
+    VclHButtonBox*  m_pActionArea;
     SfxItemSet*     pExampleSet;
     SfxItemSet*     GetInputSetImpl();
     SfxTabPage*     GetTabPage( sal_uInt16 nPageId ) const;
commit 5870db7df278780724f8fba7aa32bec3550a9874
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 17 17:32:59 2012 +0100

    better to throw and report exact failure

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 13dcb7d..ca0e4f1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -361,7 +361,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
         // object was not added until now - should happen only by calling this method from "inside"
         //TODO/LATER: it would be good to detect an error when an object should be created already, but isn't (not an "inside" call)
         uno::Reference < embed::XEmbedObjectCreator > xFactory( ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.EmbeddedObjectCreator")) ), uno::UNO_QUERY );
+                OUString("com.sun.star.embed.EmbeddedObjectCreator") ), uno::UNO_QUERY_THROW );
         uno::Sequence< beans::PropertyValue > aObjDescr( xCopy.is() ? 2 : 1 );
         aObjDescr[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent" ) );
         aObjDescr[0].Value <<= pImpl->m_xModel.get();