cui/uiconfig/ui/connpooloptions.ui | 8 ++++---- sc/inc/documentlinkmgr.hxx | 1 + sc/source/ui/docshell/documentlinkmgr.cxx | 5 +++++ sfx2/inc/inettbc.hxx | 1 - sfx2/source/inet/inettbc.cxx | 4 +--- 5 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit 56994dca201b3573cc99aea1600acbfa43a892d6 Author: Caolán McNamara <[email protected]> Date: Thu Jan 9 14:53:32 2014 +0000 wrong title, copied and paste from its neighbour Change-Id: Ib9b7eb21cacdf864f309a0a853d64f299ec7b74c (cherry picked from commit 224da5bcde2a62d375490456f717e5c2a639a802) diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui index 2c2c7e4..811e49d 100644 --- a/cui/uiconfig/ui/connpooloptions.ui +++ b/cui/uiconfig/ui/connpooloptions.ui @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.0 on Thu Jan 9 14:52:53 2014 --> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">30</property> <property name="upper">600</property> @@ -41,7 +43,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -76,6 +77,7 @@ <object class="cuilo-DriverListControl" id="driverlist"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="vexpand">True</property> </object> <packing> <property name="expand">False</property> @@ -128,7 +130,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -164,7 +165,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustment1</property> </object> <packing> @@ -195,7 +195,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Registered databases</property> + <property name="label" translatable="yes">Connection pool</property> <attributes> <attribute name="weight" value="bold"/> </attributes> commit 41108628a8606873570cb5b40d64793d2f3cad91 Author: Kohei Yoshida <[email protected]> Date: Wed Jan 8 16:33:42 2014 -0500 Oops. We don't want to leak here. (cherry picked from commit 51bce89dbd620d3ed59279d0ae80e5587d723bef) Conflicts: sc/inc/documentlinkmgr.hxx Change-Id: I8bcca7d743d4be7038a4c2eb1436a6470774d40d diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index ead5698..d106b55 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -23,6 +23,7 @@ class DocumentLinkManager : boost::noncopyable public: DocumentLinkManager(); + ~DocumentLinkManager(); void setDataStream( DataStream* p ); DataStream* getDataStream(); diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 2b9998f..67b88ac 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -24,6 +24,11 @@ struct DocumentLinkManagerImpl : boost::noncopyable DocumentLinkManager::DocumentLinkManager() : mpImpl(new DocumentLinkManagerImpl) {} +DocumentLinkManager::~DocumentLinkManager() +{ + delete mpImpl; +} + void DocumentLinkManager::setDataStream( DataStream* p ) { mpImpl->mpDataStream.reset(p); commit 6e606b133bcece4b03f011dae25f02b112fe9d32 Author: Zolnai Tamás <[email protected]> Date: Thu Jan 9 15:36:47 2014 +0100 Remove unused private member: pAccExec Change-Id: Ie21f8a62213954da7f66c1fbe890ba9dee93cf77 diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 464bf82..1038c68 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -30,7 +30,6 @@ class SvtURLBox; class SfxURLToolBoxControl_Impl : public SfxToolBoxControl { private: - ::svt::AcceleratorExecute* pAccExec; SvtURLBox* GetURLBox() const; void OpenURL( const OUString& rName, sal_Bool bNew ) const; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index e7cec07..2f56911 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -62,15 +62,13 @@ using namespace ::com::sun::star::task; SFX_IMPL_TOOLBOX_CONTROL(SfxURLToolBoxControl_Impl,SfxStringItem) SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ) - : SfxToolBoxControl( nSlotId, nId, rBox ), - pAccExec( 0 ) + : SfxToolBoxControl( nSlotId, nId, rBox ) { addStatusListener( OUString( ".uno:CurrentURL" )); } SfxURLToolBoxControl_Impl::~SfxURLToolBoxControl_Impl() { - delete pAccExec; } SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
