Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6a820f13
Kaydet (Commit)
6a820f13
authored
Nis 10, 2014
tarafından
Ariel Constenla-Haile
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
i124629 - UNO Wizard - avoid crash by removing unneeded reference
üst
87a8aa9a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
10 deletions
+3
-10
unowizard.cxx
svtools/source/uno/wizard/unowizard.cxx
+1
-1
wizardshell.cxx
svtools/source/uno/wizard/wizardshell.cxx
+2
-3
wizardshell.hxx
svtools/source/uno/wizard/wizardshell.hxx
+0
-6
No files found.
svtools/source/uno/wizard/unowizard.cxx
Dosyayı görüntüle @
6a820f13
...
@@ -228,7 +228,7 @@ namespace svt { namespace uno
...
@@ -228,7 +228,7 @@ namespace svt { namespace uno
//--------------------------------------------------------------------
//--------------------------------------------------------------------
Dialog
*
Wizard
::
createDialog
(
Window
*
i_pParent
)
Dialog
*
Wizard
::
createDialog
(
Window
*
i_pParent
)
{
{
WizardShell
*
pDialog
(
new
WizardShell
(
i_pParent
,
this
,
m_xController
,
m_aWizardSteps
)
);
WizardShell
*
pDialog
(
new
WizardShell
(
i_pParent
,
m_xController
,
m_aWizardSteps
)
);
pDialog
->
SetHelpId
(
lcl_getHelpId
(
m_sHelpURL
)
);
pDialog
->
SetHelpId
(
lcl_getHelpId
(
m_sHelpURL
)
);
pDialog
->
setTitleBase
(
m_sTitle
);
pDialog
->
setTitleBase
(
m_sTitle
);
return
pDialog
;
return
pDialog
;
...
...
svtools/source/uno/wizard/wizardshell.cxx
Dosyayı görüntüle @
6a820f13
...
@@ -72,14 +72,13 @@ namespace svt { namespace uno
...
@@ -72,14 +72,13 @@ namespace svt { namespace uno
//= WizardShell
//= WizardShell
//==================================================================================================================
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------------
WizardShell
::
WizardShell
(
Window
*
i_pParent
,
const
Reference
<
XWizard
>&
i_rWizard
,
const
Reference
<
XWizard
Controller
>&
i_rController
,
WizardShell
::
WizardShell
(
Window
*
i_pParent
,
const
Reference
<
XWizardController
>&
i_rController
,
const
Sequence
<
Sequence
<
sal_Int16
>
>&
i_rPaths
)
const
Sequence
<
Sequence
<
sal_Int16
>
>&
i_rPaths
)
:
WizardShell_Base
(
i_pParent
,
WB_MOVEABLE
|
WB_CLOSEABLE
)
:
WizardShell_Base
(
i_pParent
,
WB_MOVEABLE
|
WB_CLOSEABLE
)
,
m_xWizard
(
i_rWizard
)
,
m_xController
(
i_rController
)
,
m_xController
(
i_rController
)
,
m_nFirstPageID
(
lcl_determineFirstPageID
(
i_rPaths
)
)
,
m_nFirstPageID
(
lcl_determineFirstPageID
(
i_rPaths
)
)
{
{
ENSURE_OR_THROW
(
m_x
Wizard
.
is
()
&&
m_xController
.
is
(),
"invalid wizard/
controller"
);
ENSURE_OR_THROW
(
m_x
Controller
.
is
(),
"invalid
controller"
);
// declare the paths
// declare the paths
for
(
sal_Int32
i
=
0
;
i
<
i_rPaths
.
getLength
();
++
i
)
for
(
sal_Int32
i
=
0
;
i
<
i_rPaths
.
getLength
();
++
i
)
...
...
svtools/source/uno/wizard/wizardshell.hxx
Dosyayı görüntüle @
6a820f13
...
@@ -51,7 +51,6 @@ namespace svt { namespace uno
...
@@ -51,7 +51,6 @@ namespace svt { namespace uno
public
:
public
:
WizardShell
(
WizardShell
(
Window
*
_pParent
,
Window
*
_pParent
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizard
>&
i_rWizard
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizardController
>&
i_rController
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizardController
>&
i_rController
,
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Sequence
<
sal_Int16
>
>&
i_rPaths
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Sequence
<
sal_Int16
>
>&
i_rPaths
);
);
...
@@ -70,10 +69,6 @@ namespace svt { namespace uno
...
@@ -70,10 +69,6 @@ namespace svt { namespace uno
virtual
IWizardPageController
*
virtual
IWizardPageController
*
getPageController
(
TabPage
*
_pCurrentPage
)
const
;
getPageController
(
TabPage
*
_pCurrentPage
)
const
;
// attribute access
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizard
>&
getWizard
()
const
{
return
m_xWizard
;
}
static
sal_Int16
convertCommitReasonToTravelType
(
const
CommitPageReason
i_eReason
);
static
sal_Int16
convertCommitReasonToTravelType
(
const
CommitPageReason
i_eReason
);
// operations
// operations
...
@@ -131,7 +126,6 @@ namespace svt { namespace uno
...
@@ -131,7 +126,6 @@ namespace svt { namespace uno
private
:
private
:
typedef
::
std
::
map
<
TabPage
*
,
PWizardPageController
>
Page2ControllerMap
;
typedef
::
std
::
map
<
TabPage
*
,
PWizardPageController
>
Page2ControllerMap
;
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizard
>
m_xWizard
;
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizardController
>
m_xController
;
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ui
::
dialogs
::
XWizardController
>
m_xController
;
const
sal_Int16
m_nFirstPageID
;
const
sal_Int16
m_nFirstPageID
;
Page2ControllerMap
m_aPageControllers
;
Page2ControllerMap
m_aPageControllers
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment