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
606232e4
Kaydet (Commit)
606232e4
authored
Agu 30, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
rework for coverity#1371269 Missing move assignment operator
Change-Id: I10f9ed448854b4ece61fd84b8aa49674d0828cac
üst
29730225
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
20 deletions
+17
-20
outline.cxx
sw/source/ui/misc/outline.cxx
+1
-1
uinums.cxx
sw/source/uibase/config/uinums.cxx
+14
-16
uinums.hxx
sw/source/uibase/inc/uinums.hxx
+2
-3
No files found.
sw/source/ui/misc/outline.cxx
Dosyayı görüntüle @
606232e4
...
...
@@ -305,7 +305,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
const
SwNumRulesWithName
*
pRules
=
pChapterNumRules
->
GetRules
(
nLevelNo
);
if
(
pRules
)
{
pRules
->
MakeNumRule
(
rWrtSh
,
*
pNumRule
);
*
pNumRule
=
pRules
->
MakeNumRule
(
rWrtSh
);
pNumRule
->
SetRuleType
(
OUTLINE_RULE
);
}
else
...
...
sw/source/uibase/config/uinums.cxx
Dosyayı görüntüle @
606232e4
...
...
@@ -159,21 +159,19 @@ SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCop
return
*
this
;
}
void
SwNumRulesWithName
::
MakeNumRule
(
SwWrtShell
&
rSh
,
SwNumRule
&
rChg
)
const
SwNumRule
SwNumRulesWithName
::
MakeNumRule
(
SwWrtShell
&
rSh
)
const
{
// #i89178#
rChg
=
SwNumRule
(
maName
,
numfunc
::
GetDefaultPositionAndSpaceMode
()
);
r
Chg
.
SetAutoRule
(
false
);
for
(
sal_uInt16
n
=
0
;
n
<
MAXLEVEL
;
++
n
)
SwNumRule
aChg
(
maName
,
numfunc
::
GetDefaultPositionAndSpaceMode
()
);
a
Chg
.
SetAutoRule
(
false
);
for
(
sal_uInt16
n
=
0
;
n
<
MAXLEVEL
;
++
n
)
{
SwNumFormatGlobal
*
pFormat
=
aFormats
[
n
];
if
(
nullptr
!=
pFormat
)
{
SwNumFormat
aNew
;
pFormat
->
ChgNumFormat
(
rSh
,
aNew
);
rChg
.
Set
(
n
,
aNew
);
}
if
(
!
pFormat
)
continue
;
aChg
.
Set
(
n
,
pFormat
->
MakeNumFormat
(
rSh
));
}
return
aChg
;
}
void
SwNumRulesWithName
::
GetNumFormat
(
...
...
@@ -236,8 +234,7 @@ SwNumRulesWithName::SwNumFormatGlobal::~SwNumFormatGlobal()
{
}
void
SwNumRulesWithName
::
SwNumFormatGlobal
::
ChgNumFormat
(
SwWrtShell
&
rSh
,
SwNumFormat
&
rNew
)
const
SwNumFormat
SwNumRulesWithName
::
SwNumFormatGlobal
::
MakeNumFormat
(
SwWrtShell
&
rSh
)
const
{
SwCharFormat
*
pFormat
=
nullptr
;
if
(
!
sCharFormatName
.
isEmpty
()
)
...
...
@@ -272,10 +269,11 @@ void SwNumRulesWithName::SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh,
}
}
}
const_cast
<
SwNumFormat
&>
(
aFormat
).
SetCharFormat
(
pFormat
);
rNew
=
aFormat
;
if
(
pFormat
)
const_cast
<
SwNumFormat
&>
(
aFormat
).
SetCharFormat
(
nullptr
);
const_cast
<
SwNumFormat
&>
(
aFormat
).
SetCharFormat
(
pFormat
);
SwNumFormat
aNew
=
aFormat
;
if
(
pFormat
)
const_cast
<
SwNumFormat
&>
(
aFormat
).
SetCharFormat
(
nullptr
);
return
aNew
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/inc/uinums.hxx
Dosyayı görüntüle @
606232e4
...
...
@@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwNumRulesWithName
SwNumFormatGlobal
(
const
SwNumFormatGlobal
&
);
~
SwNumFormatGlobal
();
void
ChgNumFormat
(
SwWrtShell
&
rSh
,
SwNumFormat
&
rChg
)
const
;
SwNumFormat
MakeNumFormat
(
SwWrtShell
&
rSh
)
const
;
};
SwNumFormatGlobal
*
aFormats
[
MAXLEVEL
];
...
...
@@ -73,8 +73,7 @@ public:
SwNumRulesWithName
&
operator
=
(
const
SwNumRulesWithName
&
);
const
OUString
&
GetName
()
const
{
return
maName
;
}
void
MakeNumRule
(
SwWrtShell
&
rSh
,
SwNumRule
&
rChg
)
const
;
SwNumRule
MakeNumRule
(
SwWrtShell
&
rSh
)
const
;
void
GetNumFormat
(
size_t
,
SwNumFormat
const
*&
,
OUString
const
*&
)
const
;
};
...
...
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