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
06b4b58f
Kaydet (Commit)
06b4b58f
authored
May 06, 2013
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
No need for conditionality has been turned on since 2004
Change-Id: I0e1708f1102dab8e0424d12b50da25f726e8a5f6
üst
3155a8e6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
persistence.cxx
embeddedobj/source/commonembedding/persistence.cxx
+1
-11
No files found.
embeddedobj/source/commonembedding/persistence.cxx
Dosyayı görüntüle @
06b4b58f
...
...
@@ -56,8 +56,6 @@
#include <tools/diagnose_ex.h>
#define USE_STORAGEBASED_DOCUMENT
using
namespace
::
com
::
sun
::
star
;
...
...
@@ -259,7 +257,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
m_xParentStorage
=
xNewParentStorage
;
m_aEntryName
=
aNewName
;
#ifdef USE_STORAGEBASED_DOCUMENT
// the linked document should not be switched
if
(
!
m_bIsLink
)
{
...
...
@@ -267,7 +264,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
if
(
xDoc
.
is
()
)
SwitchDocToStorage_Impl
(
xDoc
,
m_xObjectStorage
);
}
#endif
try
{
if
(
xComponent
.
is
()
)
...
...
@@ -494,11 +490,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
}
uno
::
Reference
<
frame
::
XLoadable
>
xLoadable
(
xDocument
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
document
::
XStorageBasedDocument
>
xDoc
#ifdef USE_STORAGEBASED_DOCUMENT
(
xDocument
,
uno
::
UNO_QUERY
)
#endif
;
uno
::
Reference
<
document
::
XStorageBasedDocument
>
xDoc
(
xDocument
,
uno
::
UNO_QUERY
);
if
(
!
xDoc
.
is
()
&&
!
xLoadable
.
is
()
)
///BUG: This should be || instead of && ?
throw
uno
::
RuntimeException
();
...
...
@@ -744,7 +736,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
if
(
!
xStorage
.
is
()
)
throw
uno
::
RuntimeException
();
// TODO:
#ifdef USE_STORAGEBASED_DOCUMENT
uno
::
Reference
<
document
::
XStorageBasedDocument
>
xDoc
;
{
osl
::
MutexGuard
aGuard
(
m_aMutex
);
...
...
@@ -773,7 +764,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
SwitchDocToStorage_Impl
(
xDoc
,
xStorage
);
}
else
#endif
{
// store document to temporary stream based on temporary file
uno
::
Reference
<
io
::
XInputStream
>
xTempIn
=
StoreDocumentToTempStream_Impl
(
nStorageFormat
,
aBaseURL
,
aHierarchName
);
...
...
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