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
45739fad
Kaydet (Commit)
45739fad
authored
Şub 22, 2013
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix sfx2 build
Change-Id: I17b8ab426e7aabeb5db9d49391e0c1be99e63a51
üst
321bd3a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
fltfnc.cxx
sfx2/source/bastyp/fltfnc.cxx
+1
-1
docfile.cxx
sfx2/source/doc/docfile.cxx
+5
-5
No files found.
sfx2/source/bastyp/fltfnc.cxx
Dosyayı görüntüle @
45739fad
...
@@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
...
@@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
sal_Bool
bPreview
=
rMedium
.
IsPreview_Impl
();
sal_Bool
bPreview
=
rMedium
.
IsPreview_Impl
();
SFX_ITEMSET_ARG
(
rMedium
.
GetItemSet
(),
pReferer
,
SfxStringItem
,
SID_REFERER
,
sal_False
);
SFX_ITEMSET_ARG
(
rMedium
.
GetItemSet
(),
pReferer
,
SfxStringItem
,
SID_REFERER
,
sal_False
);
if
(
bPreview
&&
rMedium
.
IsRemote
()
&&
(
!
pReferer
||
pReferer
->
GetValue
().
CompareToAscii
(
"private:searchfolder:"
,
21
)
!=
COMPARE_EQUAL
)
)
if
(
bPreview
&&
rMedium
.
IsRemote
()
&&
(
!
pReferer
||
!
pReferer
->
GetValue
().
match
(
"private:searchfolder:"
)
)
)
return
ERRCODE_ABORT
;
return
ERRCODE_ABORT
;
ErrCode
nErr
=
GuessFilter
(
rMedium
,
&
pFilter
);
ErrCode
nErr
=
GuessFilter
(
rMedium
,
&
pFilter
);
...
...
sfx2/source/doc/docfile.cxx
Dosyayı görüntüle @
45739fad
...
@@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
...
@@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
SFX_ITEMSET_ARG
(
&
aTargetSet
,
pNewPassItem
,
SfxStringItem
,
SID_PASSWORD
,
false
);
SFX_ITEMSET_ARG
(
&
aTargetSet
,
pNewPassItem
,
SfxStringItem
,
SID_PASSWORD
,
false
);
SFX_ITEMSET_ARG
(
GetItemSet
(),
pOldPassItem
,
SfxStringItem
,
SID_PASSWORD
,
false
);
SFX_ITEMSET_ARG
(
GetItemSet
(),
pOldPassItem
,
SfxStringItem
,
SID_PASSWORD
,
false
);
if
(
(
!
pNewPassItem
&&
!
pOldPassItem
)
if
(
(
!
pNewPassItem
&&
!
pOldPassItem
)
||
(
pNewPassItem
&&
pOldPassItem
&&
pNewPassItem
->
GetValue
()
.
Equals
(
pOldPassItem
->
GetValue
()
)
)
)
||
(
pNewPassItem
&&
pOldPassItem
&&
pNewPassItem
->
GetValue
()
==
pOldPassItem
->
GetValue
(
)
)
)
{
{
// the filter must be the same
// the filter must be the same
SFX_ITEMSET_ARG
(
&
aTargetSet
,
pNewFilterItem
,
SfxStringItem
,
SID_FILTER_NAME
,
false
);
SFX_ITEMSET_ARG
(
&
aTargetSet
,
pNewFilterItem
,
SfxStringItem
,
SID_FILTER_NAME
,
false
);
SFX_ITEMSET_ARG
(
GetItemSet
(),
pOldFilterItem
,
SfxStringItem
,
SID_FILTER_NAME
,
false
);
SFX_ITEMSET_ARG
(
GetItemSet
(),
pOldFilterItem
,
SfxStringItem
,
SID_FILTER_NAME
,
false
);
if
(
pNewFilterItem
&&
pOldFilterItem
&&
pNewFilterItem
->
GetValue
()
.
Equals
(
pOldFilterItem
->
GetValue
()
)
)
if
(
pNewFilterItem
&&
pOldFilterItem
&&
pNewFilterItem
->
GetValue
()
==
pOldFilterItem
->
GetValue
(
)
)
{
{
// get the input stream and copy it
// get the input stream and copy it
// in case of success return true
// in case of success return true
...
@@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl()
...
@@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl()
pImp
->
bDisposeStorage
=
false
;
pImp
->
bDisposeStorage
=
false
;
SFX_ITEMSET_ARG
(
pImp
->
m_pSet
,
pSalvageItem
,
SfxStringItem
,
SID_DOC_SALVAGE
,
false
);
SFX_ITEMSET_ARG
(
pImp
->
m_pSet
,
pSalvageItem
,
SfxStringItem
,
SID_DOC_SALVAGE
,
false
);
if
(
pSalvageItem
&&
!
pSalvageItem
->
GetValue
().
Len
()
)
if
(
pSalvageItem
&&
pSalvageItem
->
GetValue
().
isEmpty
()
)
{
{
pSalvageItem
=
NULL
;
pSalvageItem
=
NULL
;
pImp
->
m_pSet
->
ClearItem
(
SID_DOC_SALVAGE
);
pImp
->
m_pSet
->
ClearItem
(
SID_DOC_SALVAGE
);
...
@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl()
...
@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl()
}
}
}
}
if
(
pSalvageItem
&&
pSalvageItem
->
GetValue
().
Len
()
)
if
(
pSalvageItem
&&
!
pSalvageItem
->
GetValue
().
isEmpty
()
)
{
{
pImp
->
m_aLogicName
=
pSalvageItem
->
GetValue
();
pImp
->
m_aLogicName
=
pSalvageItem
->
GetValue
();
DELETEZ
(
pImp
->
m_pURLObj
);
DELETEZ
(
pImp
->
m_pURLObj
);
...
@@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
...
@@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
if
(
pSalvageItem
)
if
(
pSalvageItem
)
{
{
// QUESTION: there is some treatment of Salvage in Init_Impl; align!
// QUESTION: there is some treatment of Salvage in Init_Impl; align!
if
(
pSalvageItem
->
GetValue
().
Len
()
)
if
(
!
pSalvageItem
->
GetValue
().
isEmpty
()
)
{
{
// if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
// if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
// that must be copied here
// that must be copied here
...
...
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