[Libreoffice-commits] core.git: chart2/source dbaccess/source extensions/source include/svtools svtools/source sw/source
Caolán McNamara
caolanm at redhat.com
Fri Aug 15 00:26:28 PDT 2014
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 1
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 1
dbaccess/source/ui/dlg/dbwiz.cxx | 1
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1
extensions/source/abpilot/abspilot.cxx | 2
extensions/source/dbpilots/controlwizard.cxx | 7 --
include/svtools/roadmapwizard.hxx | 4 -
include/svtools/wizdlg.hxx | 10 ---
svtools/source/dialogs/roadmapwizard.cxx | 37 ------------
svtools/source/dialogs/wizdlg.cxx | 29 ---------
svtools/source/uno/wizard/wizardshell.cxx | 1
sw/source/ui/dbui/mailmergewizard.cxx | 1
12 files changed, 95 deletions(-)
New commits:
commit 85cf4881fc4e1bfa5f21ae3e719bbd40ba3fce8b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 14 16:57:53 2014 +0100
drop FixedLines from wizards to be consistent with the rest of the ui
and two virtual methods don't need to exist after that
Change-Id: I50ea8eaa99fddfed7e0c61e99e76631aa595f2dc
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 35fbcfb..a1cf29d 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -69,7 +69,6 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
, m_bCanTravel( true )
{
m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
- ShowButtonFixedLine( true );
defaultButton( WZB_FINISH );
if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 1c007e3..ba3611c 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -144,7 +144,6 @@ namespace dbmm
declarePath( PATH_DEFAULT, STATE_CLOSE_SUB_DOCS, STATE_BACKUP_DBDOC, STATE_MIGRATE, STATE_SUMMARY, WZS_INVALID_STATE );
SetPageSizePixel( LogicToPixel( ::Size( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ), MAP_APPFONT ) );
- ShowButtonFixedLine( true );
SetRoadmapInteractive( true );
enableAutomaticNextButtonState();
defaultButton( WZB_NEXT );
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 38eb785..94a9893 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -83,7 +83,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
m_eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MAP_APPFONT));
- ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
enableButtons(WZB_FINISH, false);
enableAutomaticNextButtonState( true );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index c770779..2270556 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -149,7 +149,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
- ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
enableButtons(WZB_FINISH, true);
enableAutomaticNextButtonState();
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 0e83f33..a93dd1e 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -67,8 +67,6 @@ namespace abp
{
SetPageSizePixel(LogicToPixel(Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT));
- ShowButtonFixedLine(true);
-
declarePath( PATH_COMPLETE,
STATE_SELECT_ABTYPE,
STATE_INVOKE_ADMIN_DIALOG,
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 09f487b..a60491a 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -253,10 +253,6 @@ namespace dbp
OControlWizardPage_Base::initializePage();
}
-
- //= OControlWizard
-
-
OControlWizard::OControlWizard( Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
:OWizardMachine(_pParent, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
@@ -266,17 +262,14 @@ namespace dbp
initContext();
SetPageSizePixel(LogicToPixel(::Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT));
- ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
enableButtons(WZB_FINISH, false);
}
-
OControlWizard::~OControlWizard()
{
}
-
short OControlWizard::Execute()
{
// get the class id of the control we're dealing with
diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx
index b1145b2..876b199 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -81,8 +81,6 @@ namespace svt
void SetRoadmapHelpId( const OString& _rId );
void SetRoadmapInteractive( bool _bInteractive );
- virtual void Resize() SAL_OVERRIDE;
- virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
// returns whether a given state is enabled
bool isStateEnabled( WizardState _nState ) const;
@@ -223,8 +221,6 @@ protected:
#endif
private:
- SVT_DLLPRIVATE void ResizeFixedLine();
-
DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, void* );
/** updates the roadmap control to show the given path, as far as possible
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 6ee3deb..7680d41 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -27,7 +27,6 @@
class TabPage;
class Button;
class PushButton;
-class FixedLine;
struct ImplWizPageData;
struct ImplWizButtonData;
@@ -88,9 +87,6 @@ den Buttons bei allen Dialogen gleich ist, gibt es das Define
WIZARDDIALOG_BUTTON_STDOFFSET_X, welches als Standard-Offset genommen
werden sollte.
-Mit ShowButtonFixedLine() kann gesteuert werden, ob die zwischen den
-Buttons und der TabPage eine Trennlinie angezeigt werden soll.
-
Mit SetViewWindow() und SetViewAlign() kann ein Control gesetzt werden,
welches als Preview-Window oder fuer die Anzeige von schoenen Bitmaps
genutzt werden kann.
@@ -135,9 +131,6 @@ maNextBtn.SetClickHdl( LINK( this, MyWizardDlg, ImplNextHdl ) );
// Set PreviewWindow
SetViewWindow( &maPreview );
-// Show line between Buttons and Page
-ShowButtonFixedLine( sal_True );
-
// Call ActivatePage, because the first page should be created an activated
ActivatePage();
@@ -214,7 +207,6 @@ private:
Size maPageSize;
ImplWizPageData* mpFirstPage;
ImplWizButtonData* mpFirstBtn;
- FixedLine* mpFixedLine;
TabPage* mpCurTabPage;
PushButton* mpPrevBtn;
PushButton* mpNextBtn;
@@ -284,8 +276,6 @@ public:
void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; }
PushButton* GetNextButton() const { return mpNextBtn; }
- void ShowButtonFixedLine( bool bVisible );
-
void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
Window* GetViewWindow() const { return mpViewWindow; }
void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index ba3a718..a1dc4f9 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -61,20 +61,17 @@ namespace svt
StateDescriptions aStateDescriptors;
StateSet aDisabledStates;
bool bActivePathIsDefinite;
- FixedLine* pFixedLine;
RoadmapWizardImpl()
:pRoadmap( NULL )
,nActivePath( -1 )
,bActivePathIsDefinite( false )
- ,pFixedLine(NULL)
{
}
~RoadmapWizardImpl()
{
delete pRoadmap;
- delete pFixedLine;
}
/// returns the index of the current state in given path, or -1
@@ -193,11 +190,6 @@ namespace svt
aRoadmapSize.Height() = GetSizePixel().Height();
m_pImpl->pRoadmap->SetSizePixel( aRoadmapSize );
- m_pImpl->pFixedLine = new FixedLine( this, WB_VERT );
- m_pImpl->pFixedLine->Show();
- m_pImpl->pFixedLine->SetPosPixel( Point( aRoadmapSize.Width() + 1, 0 ) );
- m_pImpl->pFixedLine->SetSizePixel( Size( LogicToPixel( Size( 2, 0 ) ).Width(), aRoadmapSize.Height() ) );
-
SetViewWindow( m_pImpl->pRoadmap );
SetViewAlign( WINDOWALIGN_LEFT );
m_pImpl->pRoadmap->Show();
@@ -634,40 +626,11 @@ namespace svt
return false;
}
-
bool RoadmapWizard::isStateEnabled( WizardState _nState ) const
{
return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end();
}
-
- void RoadmapWizard::Resize()
- {
- OWizardMachine::Resize();
-
- if ( IsReallyShown() && !IsInInitShow() )
- ResizeFixedLine();
- }
-
-
-
- void RoadmapWizard::StateChanged( StateChangedType nType )
- {
- WizardDialog::StateChanged( nType );
-
- if ( nType == STATE_CHANGE_INITSHOW )
- ResizeFixedLine();
- }
-
-
- void RoadmapWizard::ResizeFixedLine()
- {
- Size aSize( m_pImpl->pRoadmap->GetSizePixel() );
- aSize.Width() = m_pImpl->pFixedLine->GetSizePixel().Width();
- m_pImpl->pFixedLine->SetSizePixel( aSize );
- }
-
-
void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState )
{
const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 2c8b752..9ad0dfe 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -52,7 +52,6 @@ void WizardDialog::ImplInitData()
{
mpFirstPage = NULL;
mpFirstBtn = NULL;
- mpFixedLine = NULL;
mpCurTabPage = NULL;
mpPrevBtn = NULL;
mpNextBtn = NULL;
@@ -95,8 +94,6 @@ void WizardDialog::ImplCalcSize( Size& rSize )
}
if ( nMaxHeight )
nMaxHeight += WIZARDDIALOG_BUTTON_OFFSET_Y*2;
- if ( mpFixedLine && mpFixedLine->IsVisible() )
- nMaxHeight += mpFixedLine->GetSizePixel().Height();
rSize.Height() += nMaxHeight;
// View-Window-Groesse dazurechnen
@@ -192,13 +189,6 @@ void WizardDialog::ImplPosCtrls()
nOffY -= WIZARDDIALOG_BUTTON_OFFSET_Y;
}
- if ( mpFixedLine && mpFixedLine->IsVisible() )
- {
- nOffY -= mpFixedLine->GetSizePixel().Height();
- mpFixedLine->setPosSizePixel( 0, nOffY, aDlgSize.Width(), 0,
- WINDOW_POSSIZE_POS | WINDOW_POSSIZE_WIDTH );
- }
-
if ( mpViewWindow && mpViewWindow->IsVisible() )
{
long nViewOffX = 0;
@@ -285,8 +275,6 @@ void WizardDialog::ImplPosTabPage()
}
if ( nMaxHeight )
nMaxHeight += WIZARDDIALOG_BUTTON_OFFSET_Y*2;
- if ( mpFixedLine && mpFixedLine->IsVisible() )
- nMaxHeight += mpFixedLine->GetSizePixel().Height();
// TabPage positionieren
Size aDlgSize = GetOutputSizePixel();
@@ -377,8 +365,6 @@ WizardDialog::~WizardDialog()
{
maWizardLayoutTimer.Stop();
- delete mpFixedLine;
-
// Remove all buttons
while ( mpFirstBtn )
RemoveButton( mpFirstBtn->mpButton );
@@ -684,19 +670,4 @@ void WizardDialog::RemoveButton( Button* pButton )
OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" );
}
-
-
-void WizardDialog::ShowButtonFixedLine( bool bVisible )
-{
- if ( !mpFixedLine )
- {
- if ( !bVisible )
- return;
-
- mpFixedLine = new FixedLine( this );
- }
-
- mpFixedLine->Show( bVisible );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index c8e9a40..9b3022c 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -85,7 +85,6 @@ namespace svt { namespace uno
SetPageSizePixel( pStartPage->GetSizePixel() );
// some defaults
- ShowButtonFixedLine( true );
SetRoadmapInteractive( true );
enableAutomaticNextButtonState();
}
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index b816633..677717d 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -58,7 +58,6 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem
m_sFinish( SW_RES( ST_FINISH )),
m_nRestartPage( MM_DOCUMENTSELECTPAGE )
{
- ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
enableButtons(WZB_FINISH, false);
More information about the Libreoffice-commits
mailing list