[Libreoffice-commits] core.git: include/sfx2 include/svtools reportdesign/inc reportdesign/source sfx2/source svtools/source vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 22 13:18:58 UTC 2020
include/sfx2/titledockwin.hxx | 1
include/svtools/editbrowsebox.hxx | 1
reportdesign/inc/reportformula.hxx | 3 -
reportdesign/source/core/misc/reportformula.cxx | 56 ++++++++++--------------
sfx2/source/dialog/titledockwin.cxx | 5 --
svtools/source/brwbox/editbrowsebox.cxx | 23 +++------
vcl/inc/wizdlg.hxx | 3 -
vcl/source/control/roadmapwizard.cxx | 33 ++++++++------
vcl/source/control/wizardmachine.cxx | 17 -------
9 files changed, 54 insertions(+), 88 deletions(-)
New commits:
commit cbadc090a273a1d07d7b917fe0317d5450067662
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 22 14:36:56 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 22 14:18:25 2020 +0100
inline some construction methods
only called from one constructor
Change-Id: I082cf3b459c936b79a6df695fffac5e3cf43705b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index c40808c3289d..87d745b639a0 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -72,7 +72,6 @@ namespace sfx2
private:
DECL_LINK( OnToolboxItemSelected, ToolBox*, void );
- void impl_construct();
void impl_layout();
void impl_scheduleLayout();
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index c878fe7fc39a..213af400f35a 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -627,7 +627,6 @@ namespace svt
inline void EnableAndShow() const;
SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp);
- SVT_DLLPRIVATE void impl_construct();
DECL_DLLPRIVATE_LINK( ModifyHdl, LinkParamNone*, void );
DECL_DLLPRIVATE_LINK( StartEditHdl, void*, void );
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 987ea96927ce..b94368701e9a 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -94,9 +94,6 @@ namespace rptui
which indicates a field or an expression.
*/
OUString getBracketedFieldOrExpression() const;
-
- private:
- void impl_construct( const OUString& _rFormula );
};
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index 1f743afd765f..b035493e6e42 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -38,7 +38,31 @@ namespace rptui
ReportFormula::ReportFormula( const OUString& _rFormula )
:m_eType( Invalid )
{
- impl_construct( _rFormula );
+ m_sCompleteFormula = _rFormula;
+
+ // is it an ordinary expression?
+ if ( m_sCompleteFormula.startsWith( sExpressionPrefix, &m_sUndecoratedContent ) )
+ {
+ m_eType = Expression;
+ return;
+ }
+
+ /// does it refer to a field?
+ if ( m_sCompleteFormula.startsWith( sFieldPrefix ) )
+ {
+ sal_Int32 nPrefixLen = strlen(sFieldPrefix);
+ if ( ( m_sCompleteFormula.getLength() >= nPrefixLen + 2 )
+ && ( m_sCompleteFormula[ nPrefixLen ] == '[' )
+ && ( m_sCompleteFormula[ m_sCompleteFormula.getLength() - 1 ] == ']' )
+ )
+ {
+ m_eType = Field;
+ m_sUndecoratedContent = m_sCompleteFormula.copy( nPrefixLen + 1, m_sCompleteFormula.getLength() - nPrefixLen - 2 );
+ return;
+ }
+ }
+
+ m_eType = Invalid;
}
@@ -73,36 +97,6 @@ namespace rptui
{
}
- void ReportFormula::impl_construct( const OUString& _rFormula )
- {
- m_sCompleteFormula = _rFormula;
-
- // is it an ordinary expression?
- if ( m_sCompleteFormula.startsWith( sExpressionPrefix, &m_sUndecoratedContent ) )
- {
- m_eType = Expression;
- return;
- }
-
- /// does it refer to a field?
- if ( m_sCompleteFormula.startsWith( sFieldPrefix ) )
- {
- sal_Int32 nPrefixLen = strlen(sFieldPrefix);
- if ( ( m_sCompleteFormula.getLength() >= nPrefixLen + 2 )
- && ( m_sCompleteFormula[ nPrefixLen ] == '[' )
- && ( m_sCompleteFormula[ m_sCompleteFormula.getLength() - 1 ] == ']' )
- )
- {
- m_eType = Field;
- m_sUndecoratedContent = m_sCompleteFormula.copy( nPrefixLen + 1, m_sCompleteFormula.getLength() - nPrefixLen - 2 );
- return;
- }
- }
-
- m_eType = Invalid;
- }
-
-
OUString ReportFormula::getBracketedFieldOrExpression() const
{
bool bIsField = ( getType() == Field );
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index ab5709974a73..104abcc9e294 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -41,11 +41,6 @@ namespace sfx2
,m_aBorder( 3, 1, 3, 3 )
,m_bLayoutPending( false )
,m_nTitleBarHeight(0)
- {
- impl_construct();
- }
-
- void TitledDockingWindow::impl_construct()
{
SetBackground( Wallpaper() );
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index c84ef2eb8cfd..ff76e1798531 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -102,19 +102,6 @@ namespace svt
}
}
- void EditBrowseBox::impl_construct()
- {
- m_aImpl.reset(new EditBrowseBoxImpl);
-
- SetCompoundControl(true);
-
- ImplInitSettings(true, true, true);
-
- pCheckBoxPaint = VclPtr<CheckBoxControl>::Create(&GetDataWindow());
- pCheckBoxPaint->SetPaintTransparent( true );
- pCheckBoxPaint->SetBackground();
- }
-
EditBrowseBox::EditBrowseBox( vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags, WinBits nBits, BrowserMode _nMode )
:BrowseBox( pParent, nBits, _nMode )
,nStartEvent(nullptr)
@@ -130,7 +117,15 @@ namespace svt
,m_nBrowserFlags(nBrowserFlags)
,pHeader(nullptr)
{
- impl_construct();
+ m_aImpl.reset(new EditBrowseBoxImpl);
+
+ SetCompoundControl(true);
+
+ ImplInitSettings(true, true, true);
+
+ pCheckBoxPaint = VclPtr<CheckBoxControl>::Create(&GetDataWindow());
+ pCheckBoxPaint->SetPaintTransparent( true );
+ pCheckBoxPaint->SetBackground();
}
void EditBrowseBox::Init()
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index eeb17934d617..9bb9f77abb38 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -256,8 +256,6 @@ namespace vcl
*/
void implUpdateRoadmap( );
- void impl_construct();
-
public:
class AccessGuard
{
@@ -274,7 +272,6 @@ namespace vcl
TabPage* GetOrCreatePage(const WizardTypes::WizardState i_nState);
private:
- void ImplInitData();
void ImplCalcSize( Size& rSize );
void ImplPosCtrls();
void ImplPosTabPage();
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index a6c718039b22..f4a35bb7861a 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -130,22 +130,22 @@ namespace vcl
, m_xWizardImpl(new WizardMachineImplData)
, m_xRoadmapImpl(new RoadmapWizardImpl)
{
- ImplInitData();
+ mpFirstPage = nullptr;
+ mpFirstBtn = nullptr;
+ mpCurTabPage = nullptr;
+ mpPrevBtn = nullptr;
+ mpNextBtn = nullptr;
+ mpViewWindow = nullptr;
+ mnCurLevel = 0;
+ meViewAlign = WindowAlign::Left;
+ mbEmptyViewMargin = false;
+ mnLeftAlignCount = 0;
+
+ maWizardLayoutIdle.SetPriority(TaskPriority::RESIZE);
+ maWizardLayoutIdle.SetInvokeHandler( LINK( this, RoadmapWizard, ImplHandleWizardLayoutTimerHdl ) );
implConstruct(WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP);
- impl_construct();
- }
-
- RoadmapWizardMachine::RoadmapWizardMachine(weld::Window* pParent)
- : WizardMachine(pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP)
- , m_pImpl( new RoadmapWizardImpl )
- {
- m_xAssistant->connect_jump_page(LINK(this, RoadmapWizardMachine, OnRoadmapItemSelected));
- }
-
- void RoadmapWizard::impl_construct()
- {
SetLeftAlignedButtonCount( 1 );
mbEmptyViewMargin = true;
@@ -163,6 +163,13 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->Show();
}
+ RoadmapWizardMachine::RoadmapWizardMachine(weld::Window* pParent)
+ : WizardMachine(pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP)
+ , m_pImpl( new RoadmapWizardImpl )
+ {
+ m_xAssistant->connect_jump_page(LINK(this, RoadmapWizardMachine, OnRoadmapItemSelected));
+ }
+
void RoadmapWizard::ShowRoadmap(bool bShow)
{
m_xRoadmapImpl->pRoadmap->Show(bShow);
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index a92c4c4b68cb..4971a5c53bb7 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -75,23 +75,6 @@ namespace vcl
return true;
}
- void RoadmapWizard::ImplInitData()
- {
- mpFirstPage = nullptr;
- mpFirstBtn = nullptr;
- mpCurTabPage = nullptr;
- mpPrevBtn = nullptr;
- mpNextBtn = nullptr;
- mpViewWindow = nullptr;
- mnCurLevel = 0;
- meViewAlign = WindowAlign::Left;
- mbEmptyViewMargin = false;
- mnLeftAlignCount = 0;
-
- maWizardLayoutIdle.SetPriority(TaskPriority::RESIZE);
- maWizardLayoutIdle.SetInvokeHandler( LINK( this, RoadmapWizard, ImplHandleWizardLayoutTimerHdl ) );
- }
-
void RoadmapWizard::SetLeftAlignedButtonCount( sal_Int16 _nCount )
{
mnLeftAlignCount = _nCount;
More information about the Libreoffice-commits
mailing list