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
291f55ed
Kaydet (Commit)
291f55ed
authored
Ara 15, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
assert that no ODF import happens without a BaseURL
Change-Id: I4520a9d0350349cb083ed627a19264a3a97e090f
üst
032e34d0
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
5 deletions
+13
-5
XMLFilter.cxx
chart2/source/model/filter/XMLFilter.cxx
+1
-0
databasedocument.cxx
dbaccess/source/core/dataaccess/databasedocument.cxx
+1
-0
xmlfilter.cxx
reportdesign/source/filter/xml/xmlfilter.cxx
+1
-0
xmlwrap.cxx
sc/source/filter/xml/xmlwrap.cxx
+1
-0
sdxmlwrp.cxx
sd/source/filter/xml/sdxmlwrp.cxx
+3
-1
mathmlimport.cxx
starmath/source/mathmlimport.cxx
+4
-4
swxml.cxx
sw/source/filter/xml/swxml.cxx
+2
-0
No files found.
chart2/source/model/filter/XMLFilter.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -383,6 +383,7 @@ sal_Int32 XMLFilter::impl_Import(
}
}
assert
(
!
aBaseUri
.
isEmpty
());
// needed for relative URLs
if
(
!
aBaseUri
.
isEmpty
()
)
xImportInfo
->
setPropertyValue
(
"BaseURI"
,
uno
::
makeAny
(
aBaseUri
)
);
...
...
dbaccess/source/core/dataaccess/databasedocument.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -485,6 +485,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
OUString
sBaseURI
=
_rResource
.
getOrDefault
(
"BaseURI"
,
OUString
());
if
(
sBaseURI
.
isEmpty
())
sBaseURI
=
_rResource
.
getOrDefault
(
"URL"
,
OUString
());
assert
(
!
sBaseURI
.
isEmpty
());
// needed for relative URLs
xInfoSet
->
setPropertyValue
(
"BaseURI"
,
uno
::
makeAny
(
sBaseURI
));
xInfoSet
->
setPropertyValue
(
"StreamName"
,
uno
::
makeAny
(
OUString
(
"content.xml"
)));
...
...
reportdesign/source/filter/xml/xmlfilter.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -512,6 +512,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
utl
::
MediaDescriptor
aDescriptor
(
rDescriptor
);
uno
::
Reference
<
beans
::
XPropertySet
>
xProp
=
comphelper
::
GenericPropertySet_CreateInstance
(
new
comphelper
::
PropertySetInfo
(
pMap
));
const
OUString
sVal
(
aDescriptor
.
getUnpackedValueOrDefault
(
utl
::
MediaDescriptor
::
PROP_DOCUMENTBASEURL
(),
OUString
())
);
assert
(
!
sVal
.
isEmpty
());
// needed for relative URLs
xProp
->
setPropertyValue
(
"BaseURI"
,
uno
::
makeAny
(
sVal
));
const
OUString
sHierarchicalDocumentName
(
aDescriptor
.
getUnpackedValueOrDefault
(
"HierarchicalDocumentName"
,
OUString
())
);
xProp
->
setPropertyValue
(
"StreamRelPath"
,
uno
::
makeAny
(
sHierarchicalDocumentName
));
...
...
sc/source/filter/xml/xmlwrap.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -379,6 +379,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError )
// Set base URI
OSL_ENSURE
(
pMedium
,
"There is no medium to get MediaDescriptor from!
\n
"
);
OUString
aBaseURL
=
pMedium
?
pMedium
->
GetBaseURL
()
:
OUString
();
assert
(
!
aBaseURL
.
isEmpty
());
// needed for relative URLs
OUString
sPropName
(
"BaseURI"
);
xInfoSet
->
setPropertyValue
(
sPropName
,
uno
::
makeAny
(
aBaseURL
)
);
...
...
sd/source/filter/xml/sdxmlwrp.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -587,7 +587,9 @@ bool SdXMLFilter::Import( ErrCode& nError )
}
// Set base URI
xInfoSet
->
setPropertyValue
(
"BaseURI"
,
makeAny
(
mrMedium
.
GetBaseURL
()
)
);
OUString
const
baseURI
(
mrMedium
.
GetBaseURL
());
assert
(
!
baseURI
.
isEmpty
());
// needed for relative URLs
xInfoSet
->
setPropertyValue
(
"BaseURI"
,
makeAny
(
baseURI
));
if
(
0
==
nRet
&&
SfxObjectCreateMode
::
EMBEDDED
==
mrDocShell
.
GetCreateMode
()
)
{
...
...
starmath/source/mathmlimport.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -141,8 +141,9 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
new
comphelper
::
PropertySetInfo
(
aInfoMap
)
)
);
// Set base URI
OUString
sPropName
(
"BaseURI"
);
xInfoSet
->
setPropertyValue
(
sPropName
,
makeAny
(
rMedium
.
GetBaseURL
()
)
);
OUString
const
baseURI
(
rMedium
.
GetBaseURL
());
assert
(
!
baseURI
.
isEmpty
());
// needed for relative URLs
xInfoSet
->
setPropertyValue
(
"BaseURI"
,
makeAny
(
baseURI
));
sal_Int32
nSteps
=
3
;
if
(
!
(
rMedium
.
IsStorage
()))
...
...
@@ -174,8 +175,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
if
(
!
aName
.
isEmpty
()
)
{
sPropName
=
"StreamRelPath"
;
xInfoSet
->
setPropertyValue
(
sPropName
,
makeAny
(
aName
)
);
xInfoSet
->
setPropertyValue
(
"StreamRelPath"
,
makeAny
(
aName
));
}
}
...
...
sw/source/filter/xml/swxml.cxx
Dosyayı görüntüle @
291f55ed
...
...
@@ -492,6 +492,8 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs(SwDoc& _rDoc)
sal_uLong
XMLReader
::
Read
(
SwDoc
&
rDoc
,
const
OUString
&
rBaseURL
,
SwPaM
&
rPaM
,
const
OUString
&
rName
)
{
// TODO: sadly SwXMLTextBlocks doesn't set this? assert(!rBaseURL.isEmpty()); // needed for relative URLs
// Get service factory
uno
::
Reference
<
uno
::
XComponentContext
>
xContext
=
comphelper
::
getProcessComponentContext
();
...
...
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