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
f08d33f8
Kaydet (Commit)
f08d33f8
authored
Ock 25, 2017
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: I1ab99995e35714d6ef3358400b0805723c44678c
üst
160e11fe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
docshel4.cxx
sd/source/ui/docshell/docshel4.cxx
+10
-12
No files found.
sd/source/ui/docshell/docshel4.cxx
Dosyayı görüntüle @
f08d33f8
...
...
@@ -603,47 +603,45 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
{
std
::
shared_ptr
<
const
SfxFilter
>
pMediumFilter
=
rMedium
.
GetFilter
();
const
OUString
aTypeName
(
pMediumFilter
->
GetTypeName
()
);
SdFilter
*
pFilter
=
nullpt
r
;
std
::
unique_ptr
<
SdFilter
>
xFilte
r
;
if
(
aTypeName
.
indexOf
(
"graphic_HTML"
)
>=
0
)
{
pFilter
=
new
SdHTMLFilter
(
rMedium
,
*
this
);
xFilter
=
std
::
make_unique
<
SdHTMLFilter
>
(
rMedium
,
*
this
);
}
else
if
(
aTypeName
.
indexOf
(
"MS_PowerPoint_97"
)
>=
0
)
{
pFilter
=
new
SdPPTFilter
(
rMedium
,
*
this
);
static_cast
<
SdPPTFilter
*>
(
pFilter
)
->
PreSaveBasic
();
xFilter
=
std
::
make_unique
<
SdPPTFilter
>
(
rMedium
,
*
this
);
static_cast
<
SdPPTFilter
*>
(
xFilter
.
get
()
)
->
PreSaveBasic
();
}
else
if
(
aTypeName
.
indexOf
(
"CGM_Computer_Graphics_Metafile"
)
>=
0
)
{
pFilter
=
new
SdCGMFilter
(
rMedium
,
*
this
);
xFilter
=
std
::
make_unique
<
SdCGMFilter
>
(
rMedium
,
*
this
);
}
else
if
(
aTypeName
.
indexOf
(
"draw8"
)
>=
0
||
aTypeName
.
indexOf
(
"impress8"
)
>=
0
)
{
pFilter
=
new
SdXMLFilter
(
rMedium
,
*
this
);
xFilter
=
std
::
make_unique
<
SdXMLFilter
>
(
rMedium
,
*
this
);
}
else
if
(
aTypeName
.
indexOf
(
"StarOffice_XML_Impress"
)
>=
0
||
aTypeName
.
indexOf
(
"StarOffice_XML_Draw"
)
>=
0
)
{
pFilter
=
new
SdXMLFilter
(
rMedium
,
*
this
,
SDXMLMODE_Normal
,
SOFFICE_FILEFORMAT_60
);
xFilter
=
std
::
make_unique
<
SdXMLFilter
>
(
rMedium
,
*
this
,
SDXMLMODE_Normal
,
SOFFICE_FILEFORMAT_60
);
}
else
{
pFilter
=
new
SdGRFFilter
(
rMedium
,
*
this
);
xFilter
=
std
::
make_unique
<
SdGRFFilter
>
(
rMedium
,
*
this
);
}
if
(
pFilter
)
if
(
xFilter
)
{
const
SdrSwapGraphicsMode
nOldSwapMode
=
mpDoc
->
GetSwapGraphicsMode
();
mpDoc
->
SetSwapGraphicsMode
(
SdrSwapGraphicsMode
::
TEMP
);
bRet
=
p
Filter
->
Export
();
bRet
=
x
Filter
->
Export
();
if
(
!
bRet
)
mpDoc
->
SetSwapGraphicsMode
(
nOldSwapMode
);
delete
pFilter
;
}
}
...
...
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