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
9ee69cbd
Kaydet (Commit)
9ee69cbd
authored
Haz 16, 2014
tarafından
Zolnai Tamás
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
glTF export: Use plural folder names
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
üst
7eceffef
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
modeltools.cxx
avmedia/source/framework/modeltools.cxx
+1
-1
media_embedding.odp
sd/qa/unit/data/media_embedding.odp
+0
-0
import-tests.cxx
sd/qa/unit/import-tests.cxx
+2
-2
shapeexport.cxx
xmloff/source/draw/shapeexport.cxx
+2
-2
No files found.
avmedia/source/framework/modeltools.cxx
Dosyayı görüntüle @
9ee69cbd
...
@@ -260,7 +260,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
...
@@ -260,7 +260,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
xSBD
->
getDocumentStorage
(),
uno
::
UNO_QUERY_THROW
);
xSBD
->
getDocumentStorage
(),
uno
::
UNO_QUERY_THROW
);
// Model storage
// Model storage
const
OUString
sModel
(
"Model"
);
const
OUString
sModel
(
"Model
s
"
);
uno
::
Reference
<
embed
::
XStorage
>
const
xModelStorage
(
uno
::
Reference
<
embed
::
XStorage
>
const
xModelStorage
(
xStorage
->
openStorageElement
(
sModel
,
embed
::
ElementModes
::
WRITE
));
xStorage
->
openStorageElement
(
sModel
,
embed
::
ElementModes
::
WRITE
));
...
...
sd/qa/unit/data/media_embedding.odp
Dosyayı görüntüle @
9ee69cbd
No preview for this file type
sd/qa/unit/import-tests.cxx
Dosyayı görüntüle @
9ee69cbd
...
@@ -727,7 +727,7 @@ void SdFiltersTest::testMediaEmbedding()
...
@@ -727,7 +727,7 @@ void SdFiltersTest::testMediaEmbedding()
// First object is a glTF model
// First object is a glTF model
SdrMediaObj
*
pModelObj
=
dynamic_cast
<
SdrMediaObj
*>
(
pPage
->
GetObj
(
2
));
SdrMediaObj
*
pModelObj
=
dynamic_cast
<
SdrMediaObj
*>
(
pPage
->
GetObj
(
2
));
CPPUNIT_ASSERT_MESSAGE
(
"missing model"
,
pModelObj
!=
NULL
);
CPPUNIT_ASSERT_MESSAGE
(
"missing model"
,
pModelObj
!=
NULL
);
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"vnd.sun.star.Package:Model/jeep/jeep.json"
),
pModelObj
->
getMediaProperties
().
getURL
());
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"vnd.sun.star.Package:Model
s
/jeep/jeep.json"
),
pModelObj
->
getMediaProperties
().
getURL
());
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"model/vnd.gltf+json"
),
pModelObj
->
getMediaProperties
().
getMimeType
());
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"model/vnd.gltf+json"
),
pModelObj
->
getMediaProperties
().
getMimeType
());
// Check the case when experimental mode is disabled
// Check the case when experimental mode is disabled
...
@@ -743,7 +743,7 @@ void SdFiltersTest::testMediaEmbedding()
...
@@ -743,7 +743,7 @@ void SdFiltersTest::testMediaEmbedding()
// If glTF is not supported, then the fallback image is imported
// If glTF is not supported, then the fallback image is imported
SdrGrafObj
*
pGrafic
=
dynamic_cast
<
SdrGrafObj
*>
(
pPage
->
GetObj
(
2
));
SdrGrafObj
*
pGrafic
=
dynamic_cast
<
SdrGrafObj
*>
(
pPage
->
GetObj
(
2
));
CPPUNIT_ASSERT_MESSAGE
(
"Could not load glTF fallback image"
,
pGrafic
!=
NULL
);
CPPUNIT_ASSERT_MESSAGE
(
"Could not load glTF fallback image"
,
pGrafic
!=
NULL
);
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"vnd.sun.star.Package:Model
/Fallback
/jeep.png"
),
pGrafic
->
GetGrafStreamURL
());
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"vnd.sun.star.Package:Model
s/Fallbacks
/jeep.png"
),
pGrafic
->
GetGrafStreamURL
());
// Second object is a sound
// Second object is a sound
SdrMediaObj
*
pMediaObj
=
dynamic_cast
<
SdrMediaObj
*>
(
pPage
->
GetObj
(
3
));
SdrMediaObj
*
pMediaObj
=
dynamic_cast
<
SdrMediaObj
*>
(
pPage
->
GetObj
(
3
));
...
...
xmloff/source/draw/shapeexport.cxx
Dosyayı görüntüle @
9ee69cbd
...
@@ -3206,7 +3206,7 @@ static void lcl_StoreJsonExternalsAndFallback(
...
@@ -3206,7 +3206,7 @@ static void lcl_StoreJsonExternalsAndFallback(
{
{
// Fallback storage
// Fallback storage
const
uno
::
Reference
<
embed
::
XStorage
>
xFallbackTarget
(
const
uno
::
Reference
<
embed
::
XStorage
>
xFallbackTarget
(
xModelsTarget
->
openStorageElement
(
OUString
(
"Fallback"
),
embed
::
ElementModes
::
WRITE
));
xModelsTarget
->
openStorageElement
(
OUString
(
"Fallback
s
"
),
embed
::
ElementModes
::
WRITE
));
uno
::
Reference
<
io
::
XStream
>
xPictureStream
(
uno
::
Reference
<
io
::
XStream
>
xPictureStream
(
xFallbackTarget
->
openStreamElement
(
sModelName
+
".png"
,
embed
::
ElementModes
::
WRITE
),
uno
::
UNO_QUERY_THROW
);
xFallbackTarget
->
openStreamElement
(
sModelName
+
".png"
,
embed
::
ElementModes
::
WRITE
),
uno
::
UNO_QUERY_THROW
);
...
@@ -3225,7 +3225,7 @@ static void lcl_StoreJsonExternalsAndFallback(
...
@@ -3225,7 +3225,7 @@ static void lcl_StoreJsonExternalsAndFallback(
xFallbackTransaction
->
commit
();
xFallbackTransaction
->
commit
();
}
}
const
OUString
sFallbackURL
(
sUrlPath
.
copy
(
0
,
sUrlPath
.
lastIndexOf
(
"/"
))
+
"/Fallback/"
+
sModelName
+
".png"
);
const
OUString
sFallbackURL
(
sUrlPath
.
copy
(
0
,
sUrlPath
.
lastIndexOf
(
"/"
))
+
"/Fallback
s
/"
+
sModelName
+
".png"
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_HREF
,
sFallbackURL
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_HREF
,
sFallbackURL
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_TYPE
,
XML_SIMPLE
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_TYPE
,
XML_SIMPLE
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_SHOW
,
XML_EMBED
);
rExport
.
AddAttribute
(
XML_NAMESPACE_XLINK
,
XML_SHOW
,
XML_EMBED
);
...
...
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