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
2241dd8d
Kaydet (Commit)
2241dd8d
authored
May 10, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SdStyleSheetPool: de-dent that
Change-Id: Ifce20de3068e12c42bfcd115ad852371f97b971c
üst
3440766f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
21 deletions
+19
-21
stlpool.cxx
sd/source/core/stlpool.cxx
+19
-21
No files found.
sd/source/core/stlpool.cxx
Dosyayı görüntüle @
2241dd8d
...
...
@@ -688,32 +688,30 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
bAddToList
=
true
;
}
}
// we do not already have a sheet with the same name and contents. Create a new one.
if
(
!
pExistingSheet
)
{
// we do not already have a sheet with the same name and contents. Create a new one.
if
(
!
pExistingSheet
)
{
assert
(
!
Find
(
aName
,
eFamily
));
rtl
::
Reference
<
SfxStyleSheetBase
>
xNewSheet
(
&
Make
(
aName
,
eFamily
)
);
assert
(
!
Find
(
aName
,
eFamily
));
rtl
::
Reference
<
SfxStyleSheetBase
>
xNewSheet
(
&
Make
(
aName
,
eFamily
)
);
xNewSheet
->
SetMask
(
xSheet
->
GetMask
()
);
xNewSheet
->
SetMask
(
xSheet
->
GetMask
()
);
// Also set parent relation for copied style sheets
OUString
aParent
(
xSheet
->
GetParent
()
);
if
(
!
aParent
.
isEmpty
()
)
aNewStyles
.
push_back
(
std
::
pair
<
rtl
::
Reference
<
SfxStyleSheetBase
>
,
OUString
>
(
xNewSheet
,
aParent
)
);
// Also set parent relation for copied style sheets
OUString
aParent
(
xSheet
->
GetParent
()
);
if
(
!
aParent
.
isEmpty
()
)
aNewStyles
.
push_back
(
std
::
pair
<
rtl
::
Reference
<
SfxStyleSheetBase
>
,
OUString
>
(
xNewSheet
,
aParent
)
);
xNewSheet
->
SetHelpId
(
aHelpFile
,
xSheet
->
GetHelpId
(
aHelpFile
)
);
xNewSheet
->
GetItemSet
().
Put
(
xSheet
->
GetItemSet
()
);
xNewSheet
->
SetHelpId
(
aHelpFile
,
xSheet
->
GetHelpId
(
aHelpFile
)
);
xNewSheet
->
GetItemSet
().
Put
(
xSheet
->
GetItemSet
()
);
rCreatedSheets
.
push_back
(
SdStyleSheetRef
(
static_cast
<
SdStyleSheet
*
>
(
xNewSheet
.
get
()
)
)
);
aRenamedList
.
push_back
(
std
::
pair
<
OUString
,
OUString
>
(
xSheet
->
GetName
(),
aName
)
);
}
else
if
(
bAddToList
)
{
// Add to list - used for renaming
rCreatedSheets
.
push_back
(
SdStyleSheetRef
(
static_cast
<
SdStyleSheet
*
>
(
pExistingSheet
)
)
);
aRenamedList
.
push_back
(
std
::
pair
<
OUString
,
OUString
>
(
xSheet
->
GetName
(),
aName
)
);
}
rCreatedSheets
.
push_back
(
SdStyleSheetRef
(
static_cast
<
SdStyleSheet
*
>
(
xNewSheet
.
get
()
)
)
);
aRenamedList
.
push_back
(
std
::
pair
<
OUString
,
OUString
>
(
xSheet
->
GetName
(),
aName
)
);
}
else
if
(
bAddToList
)
{
// Add to list - used for renaming
rCreatedSheets
.
push_back
(
SdStyleSheetRef
(
static_cast
<
SdStyleSheet
*
>
(
pExistingSheet
)
)
);
aRenamedList
.
push_back
(
std
::
pair
<
OUString
,
OUString
>
(
xSheet
->
GetName
(),
aName
)
);
}
}
...
...
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