From c596fd59dc75823002bdfd3676d600a56e3bfb5e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 7 Mar 2023 15:56:53 +0200 Subject: no need to allocate these separately they are all one or two words in size Change-Id: I86611e14a32dda3ae2226bbfa775ad0234513888 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148425 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/filter/xml/xmlExport.cxx | 8 ++++---- dbaccess/source/filter/xml/xmlExport.hxx | 2 +- dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 10 +++++----- dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index aeb2d82bbd03..47b71fc82140 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -417,7 +417,7 @@ void ODBExport::exportDataSource() aSettingsMap.emplace(eToken,sValue); } if ( bAutoIncrementEnabled && !(aAutoIncrement.first.isEmpty() && aAutoIncrement.second.isEmpty()) ) - m_aAutoIncrement.reset( new TStringPair(aAutoIncrement)); + m_oAutoIncrement = aAutoIncrement; if ( aDelimiter.bUsed ) m_aDelimiter.reset( new TDelimiter( aDelimiter ) ); @@ -699,10 +699,10 @@ void ODBExport::exportDelimiter() void ODBExport::exportAutoIncrement() { - if (m_aAutoIncrement) + if (m_oAutoIncrement) { - AddAttribute(XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second); - AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first); + AddAttribute(XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,m_oAutoIncrement->second); + AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_oAutoIncrement->first); SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT, true, true); } } diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 4cded949d419..e35800efd298 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -83,7 +83,7 @@ class ODBExport : public SvXMLExport } }; - std::unique_ptr< TStringPair > m_aAutoIncrement; + std::optional< TStringPair > m_oAutoIncrement; std::unique_ptr< TDelimiter > m_aDelimiter; std::vector< TypedPropertyValue > m_aDataSourceSettings; std::vector< XMLPropertyState > m_aCurrentPropertyStates; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 7e6c4f111e5f..9f110d472017 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -28,9 +28,9 @@ using namespace dbaui; OTableFieldDescWin::OTableFieldDescWin(weld::Container* pParent, OTableDesignView* pView) : OChildWindow(pParent, "dbaccess/ui/fielddescpanel.ui", "FieldDescPanel") - , m_xHelpBar(new OTableDesignHelpBar(m_xBuilder->weld_text_view("textview"))) + , m_aHelpBar(m_xBuilder->weld_text_view("textview")) , m_xBox(m_xBuilder->weld_container("box")) - , m_xFieldControl(new OTableFieldControl(m_xBox.get(), m_xHelpBar.get(), pView)) + , m_xFieldControl(new OTableFieldControl(m_xBox.get(), &m_aHelpBar, pView)) , m_xHeader(m_xBuilder->weld_label("header")) , m_eChildFocus(NONE) { @@ -39,13 +39,13 @@ OTableFieldDescWin::OTableFieldDescWin(weld::Container* pParent, OTableDesignVie m_xFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL); - m_xHelpBar->connect_focus_in(LINK(this, OTableFieldDescWin, HelpFocusIn)); + m_aHelpBar.connect_focus_in(LINK(this, OTableFieldDescWin, HelpFocusIn)); m_xFieldControl->connect_focus_in(LINK(this, OTableFieldDescWin, FieldFocusIn)); } bool OTableFieldDescWin::HasChildPathFocus() const { - return m_xFieldControl->HasChildPathFocus() || m_xHelpBar->HasFocus(); + return m_xFieldControl->HasChildPathFocus() || m_aHelpBar.HasFocus(); } OTableFieldDescWin::~OTableFieldDescWin() @@ -81,7 +81,7 @@ IClipboardTest* OTableFieldDescWin::getActiveChild() const pTest = m_xFieldControl.get(); break; default: - pTest = m_xHelpBar.get(); + pTest = const_cast(&m_aHelpBar); break; } return pTest; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 9f15c1e1b90b..f14e468c561e 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -21,10 +21,10 @@ #include #include #include "TableFieldControl.hxx" +#include namespace dbaui { - class OTableDesignHelpBar; class OTableDesignView; class OFieldDescription; @@ -38,7 +38,7 @@ namespace dbaui NONE }; private: - std::unique_ptr m_xHelpBar; + OTableDesignHelpBar m_aHelpBar; std::unique_ptr m_xBox; std::unique_ptr m_xFieldControl; std::unique_ptr m_xHeader; -- cgit