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
7dde56f2
Kaydet (Commit)
7dde56f2
authored
Ara 05, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use a std::unique_ptr
Change-Id: I23fdc5f86d8fb9da3c74fab4e47636600fa408b7
üst
aa54f8aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
outline.cxx
sw/source/ui/misc/outline.cxx
+7
-7
outline.hxx
sw/source/uibase/inc/outline.hxx
+2
-2
No files found.
sw/source/ui/misc/outline.cxx
Dosyayı görüntüle @
7dde56f2
...
@@ -167,7 +167,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
...
@@ -167,7 +167,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
pUserButton
->
SetClickHdl
(
LINK
(
this
,
SwOutlineTabDialog
,
FormHdl
));
pUserButton
->
SetClickHdl
(
LINK
(
this
,
SwOutlineTabDialog
,
FormHdl
));
pUserButton
->
SetAccessibleRole
(
css
::
accessibility
::
AccessibleRole
::
BUTTON_MENU
);
pUserButton
->
SetAccessibleRole
(
css
::
accessibility
::
AccessibleRole
::
BUTTON_MENU
);
pNumRule
=
new
SwNumRule
(
*
rSh
.
GetOutlineNumRule
()
);
xNumRule
.
reset
(
new
SwNumRule
(
*
rSh
.
GetOutlineNumRule
())
);
GetCancelButton
().
SetClickHdl
(
LINK
(
this
,
SwOutlineTabDialog
,
CancelHdl
));
GetCancelButton
().
SetClickHdl
(
LINK
(
this
,
SwOutlineTabDialog
,
CancelHdl
));
m_nNumPosId
=
AddTabPage
(
"position"
,
&
SwNumPositionTabPage
::
Create
,
nullptr
);
m_nNumPosId
=
AddTabPage
(
"position"
,
&
SwNumPositionTabPage
::
Create
,
nullptr
);
...
@@ -208,7 +208,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog()
...
@@ -208,7 +208,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog()
void
SwOutlineTabDialog
::
dispose
()
void
SwOutlineTabDialog
::
dispose
()
{
{
delete
pNumRule
;
xNumRule
.
reset
()
;
SfxTabDialog
::
dispose
();
SfxTabDialog
::
dispose
();
}
}
...
@@ -294,7 +294,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
...
@@ -294,7 +294,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
{
const
OUString
aName
(
pDlg
->
GetName
());
const
OUString
aName
(
pDlg
->
GetName
());
pChapterNumRules
->
ApplyNumRules
(
SwNumRulesWithName
(
pChapterNumRules
->
ApplyNumRules
(
SwNumRulesWithName
(
*
p
NumRule
,
aName
),
pDlg
->
GetCurEntryPos
()
);
*
x
NumRule
,
aName
),
pDlg
->
GetCurEntryPos
()
);
pMenu
->
SetItemText
(
pMenu
->
GetItemId
(
pDlg
->
GetCurEntryPos
()),
aName
);
pMenu
->
SetItemText
(
pMenu
->
GetItemId
(
pDlg
->
GetCurEntryPos
()),
aName
);
}
}
return
false
;
return
false
;
...
@@ -305,11 +305,11 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
...
@@ -305,11 +305,11 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
const
SwNumRulesWithName
*
pRules
=
pChapterNumRules
->
GetRules
(
nLevelNo
);
const
SwNumRulesWithName
*
pRules
=
pChapterNumRules
->
GetRules
(
nLevelNo
);
if
(
pRules
)
if
(
pRules
)
{
{
*
p
NumRule
=
pRules
->
MakeNumRule
(
rWrtSh
);
*
x
NumRule
=
pRules
->
MakeNumRule
(
rWrtSh
);
p
NumRule
->
SetRuleType
(
OUTLINE_RULE
);
x
NumRule
->
SetRuleType
(
OUTLINE_RULE
);
}
}
else
else
*
p
NumRule
=
*
rWrtSh
.
GetOutlineNumRule
();
*
x
NumRule
=
*
rWrtSh
.
GetOutlineNumRule
();
}
}
sal_uInt16
nPageId
=
GetCurPageId
();
sal_uInt16
nPageId
=
GetCurPageId
();
...
@@ -406,7 +406,7 @@ short SwOutlineTabDialog::Ok()
...
@@ -406,7 +406,7 @@ short SwOutlineTabDialog::Ok()
}
}
}
}
rWrtSh
.
SetOutlineNumRule
(
*
p
NumRule
);
rWrtSh
.
SetOutlineNumRule
(
*
x
NumRule
);
// #i30443#
// #i30443#
rWrtSh
.
EndAction
();
rWrtSh
.
EndAction
();
...
...
sw/source/uibase/inc/outline.hxx
Dosyayı görüntüle @
7dde56f2
...
@@ -52,7 +52,7 @@ class SwOutlineTabDialog : public SfxTabDialog
...
@@ -52,7 +52,7 @@ class SwOutlineTabDialog : public SfxTabDialog
OUString
aCollNames
[
MAXLEVEL
];
OUString
aCollNames
[
MAXLEVEL
];
SwWrtShell
&
rWrtSh
;
SwWrtShell
&
rWrtSh
;
SwNumRule
*
p
NumRule
;
std
::
unique_ptr
<
SwNumRule
>
x
NumRule
;
SwChapterNumRules
*
pChapterNumRules
;
SwChapterNumRules
*
pChapterNumRules
;
bool
bModified
:
1
;
bool
bModified
:
1
;
...
@@ -72,7 +72,7 @@ public:
...
@@ -72,7 +72,7 @@ public:
virtual
~
SwOutlineTabDialog
()
override
;
virtual
~
SwOutlineTabDialog
()
override
;
virtual
void
dispose
()
override
;
virtual
void
dispose
()
override
;
SwNumRule
*
GetNumRule
()
{
return
pNumRule
;
}
SwNumRule
*
GetNumRule
()
{
return
xNumRule
.
get
();
}
sal_uInt16
GetLevel
(
const
OUString
&
rFormatName
)
const
;
sal_uInt16
GetLevel
(
const
OUString
&
rFormatName
)
const
;
OUString
*
GetCollNames
()
{
return
aCollNames
;}
OUString
*
GetCollNames
()
{
return
aCollNames
;}
...
...
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