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
26b4c8e5
Kaydet (Commit)
26b4c8e5
authored
Mar 19, 2014
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
webdav: loplugin warnings and sal_Bool -> bool
Change-Id: I0f1797aa03868e7652a0f90a5cf72ba851537b41
üst
910c2888
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
88 additions
and
88 deletions
+88
-88
ContentProperties.cxx
ucb/source/ucp/webdav/ContentProperties.cxx
+18
-18
ContentProperties.hxx
ucb/source/ucp/webdav/ContentProperties.hxx
+1
-1
SerfRequestProcessorImpl.cxx
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+1
-1
SerfSession.cxx
ucb/source/ucp/webdav/SerfSession.cxx
+1
-1
SerfSession.hxx
ucb/source/ucp/webdav/SerfSession.hxx
+1
-1
webdavcontent.cxx
ucb/source/ucp/webdav/webdavcontent.cxx
+59
-59
webdavcontent.hxx
ucb/source/ucp/webdav/webdavcontent.hxx
+7
-7
No files found.
ucb/source/ucp/webdav/ContentProperties.cxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -113,27 +113,27 @@ ContentProperties::ContentProperties( const DAVResource& rResource )
}
if
(
rResource
.
uri
.
endsWith
(
"/"
)
)
m_bTrailingSlash
=
sal_T
rue
;
m_bTrailingSlash
=
t
rue
;
}
ContentProperties
::
ContentProperties
(
const
OUString
&
rTitle
,
sal_B
ool
bFolder
)
const
OUString
&
rTitle
,
b
ool
bFolder
)
:
m_xProps
(
new
PropertyValueMap
),
m_bTrailingSlash
(
sal_F
alse
)
m_bTrailingSlash
(
f
alse
)
{
(
*
m_xProps
)[
OUString
(
"Title"
)
]
=
PropertyValue
(
uno
::
makeAny
(
rTitle
),
true
);
(
*
m_xProps
)[
OUString
(
"IsFolder"
)
]
=
PropertyValue
(
uno
::
makeAny
(
bFolder
),
true
);
(
*
m_xProps
)[
OUString
(
"IsDocument"
)
]
=
PropertyValue
(
uno
::
makeAny
(
sal_B
ool
(
!
bFolder
)
),
true
);
=
PropertyValue
(
uno
::
makeAny
(
b
ool
(
!
bFolder
)
),
true
);
}
ContentProperties
::
ContentProperties
(
const
OUString
&
rTitle
)
:
m_xProps
(
new
PropertyValueMap
),
m_bTrailingSlash
(
sal_F
alse
)
m_bTrailingSlash
(
f
alse
)
{
(
*
m_xProps
)[
OUString
(
"Title"
)
]
=
PropertyValue
(
uno
::
makeAny
(
rTitle
),
true
);
...
...
@@ -142,7 +142,7 @@ ContentProperties::ContentProperties( const OUString & rTitle )
ContentProperties
::
ContentProperties
()
:
m_xProps
(
new
PropertyValueMap
),
m_bTrailingSlash
(
sal_F
alse
)
m_bTrailingSlash
(
f
alse
)
{
}
...
...
@@ -219,11 +219,11 @@ void ContentProperties::UCBNamesToDAVNames(
// resourcetype <- IsFolder, IsDocument, ContentType
// (taken from URI) <- Title
sal_Bool
bCreationDate
=
sal_F
alse
;
sal_Bool
bLastModified
=
sal_F
alse
;
sal_Bool
bContentType
=
sal_F
alse
;
sal_Bool
bContentLength
=
sal_F
alse
;
sal_Bool
bResourceType
=
sal_F
alse
;
bool
bCreationDate
=
f
alse
;
bool
bLastModified
=
f
alse
;
bool
bContentType
=
f
alse
;
bool
bContentLength
=
f
alse
;
bool
bResourceType
=
f
alse
;
sal_Int32
nCount
=
rProps
.
getLength
();
for
(
sal_Int32
n
=
0
;
n
<
nCount
;
++
n
)
...
...
@@ -241,7 +241,7 @@ void ContentProperties::UCBNamesToDAVNames(
if
(
!
bCreationDate
)
{
propertyNames
.
push_back
(
DAVProperties
::
CREATIONDATE
);
bCreationDate
=
sal_T
rue
;
bCreationDate
=
t
rue
;
}
}
else
if
(
rProp
.
Name
==
"DateModified"
||
...
...
@@ -251,7 +251,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames
.
push_back
(
DAVProperties
::
GETLASTMODIFIED
);
bLastModified
=
sal_T
rue
;
bLastModified
=
t
rue
;
}
}
else
if
(
rProp
.
Name
==
"MediaType"
||
...
...
@@ -261,7 +261,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames
.
push_back
(
DAVProperties
::
GETCONTENTTYPE
);
bContentType
=
sal_T
rue
;
bContentType
=
t
rue
;
}
}
else
if
(
rProp
.
Name
==
"Size"
||
...
...
@@ -271,7 +271,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames
.
push_back
(
DAVProperties
::
GETCONTENTLENGTH
);
bContentLength
=
sal_T
rue
;
bContentLength
=
t
rue
;
}
}
else
if
(
rProp
.
Name
==
"ContentType"
||
...
...
@@ -282,7 +282,7 @@ void ContentProperties::UCBNamesToDAVNames(
if
(
!
bResourceType
)
{
propertyNames
.
push_back
(
DAVProperties
::
RESOURCETYPE
);
bResourceType
=
sal_T
rue
;
bResourceType
=
t
rue
;
}
}
else
...
...
@@ -514,13 +514,13 @@ void ContentProperties::addProperty( const OUString & rName,
rValue
>>=
aValue
;
// Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
sal_B
ool
bFolder
=
b
ool
bFolder
=
aValue
.
equalsIgnoreAsciiCase
(
"collection"
);
(
*
m_xProps
)[
OUString
(
"IsFolder"
)
]
=
PropertyValue
(
uno
::
makeAny
(
bFolder
),
true
);
(
*
m_xProps
)[
OUString
(
"IsDocument"
)
]
=
PropertyValue
(
uno
::
makeAny
(
sal_B
ool
(
!
bFolder
)
),
true
);
=
PropertyValue
(
uno
::
makeAny
(
b
ool
(
!
bFolder
)
),
true
);
(
*
m_xProps
)[
OUString
(
"ContentType"
)
]
=
PropertyValue
(
uno
::
makeAny
(
bFolder
?
OUString
(
WEBDAV_COLLECTION_TYPE
)
...
...
ucb/source/ucp/webdav/ContentProperties.hxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -102,7 +102,7 @@ public:
ContentProperties
(
const
DAVResource
&
rResource
);
// Mini props for transient contents.
ContentProperties
(
const
OUString
&
rTitle
,
sal_B
ool
bFolder
);
ContentProperties
(
const
OUString
&
rTitle
,
b
ool
bFolder
);
// Micro props for non-existing contents.
ContentProperties
(
const
OUString
&
rTitle
);
...
...
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -119,7 +119,7 @@ bool SerfRequestProcessorImpl::processSerfResponseBucket( serf_request_t * /*inS
const
char
*
data
;
apr_size_t
len
;
while
(
1
)
{
while
(
true
)
{
outStatus
=
serf_bucket_read
(
inSerfResponseBucket
,
8096
,
&
data
,
&
len
);
if
(
SERF_BUCKET_READ_ERROR
(
outStatus
))
{
...
...
ucb/source/ucp/webdav/SerfSession.cxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -1559,7 +1559,7 @@ SerfSession::getDataFromInputStream(
sal_Bool
SerfSession
::
isDomainMatch
(
OUString
certHostName
)
SerfSession
::
isDomainMatch
(
const
OUString
&
certHostName
)
{
OUString
hostName
=
getHostName
();
...
...
ucb/source/ucp/webdav/SerfSession.hxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -250,7 +250,7 @@ public:
const
OUString
&
getHostName
()
const
{
return
m_aUri
.
GetHost
();
}
int
getPort
()
const
{
return
m_aUri
.
GetPort
();
}
sal_Bool
isDomainMatch
(
OUString
certHostName
);
sal_Bool
isDomainMatch
(
const
OUString
&
certHostName
);
private
:
friend
class
SerfLockStore
;
...
...
ucb/source/ucp/webdav/webdavcontent.cxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -233,7 +233,7 @@ Content::Content(
ContentProvider
*
pProvider
,
const
uno
::
Reference
<
ucb
::
XContentIdentifier
>&
Identifier
,
rtl
::
Reference
<
DAVSessionFactory
>
const
&
rSessionFactory
,
sal_B
ool
isCollection
)
b
ool
isCollection
)
throw
(
ucb
::
ContentCreationException
)
:
ContentImplHelper
(
rxContext
,
pProvider
,
Identifier
),
m_eResourceType
(
UNKNOWN
),
...
...
@@ -343,7 +343,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
uno
::
Sequence
<
uno
::
Type
>
SAL_CALL
Content
::
getTypes
()
throw
(
uno
::
RuntimeException
,
std
::
exception
)
{
sal_Bool
bFolder
=
sal_F
alse
;
bool
bFolder
=
f
alse
;
try
{
bFolder
...
...
@@ -461,7 +461,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
OUString
SAL_CALL
Content
::
getContentType
()
throw
(
uno
::
RuntimeException
)
{
sal_Bool
bFolder
=
sal_F
alse
;
bool
bFolder
=
f
alse
;
try
{
bFolder
...
...
@@ -560,7 +560,7 @@ uno::Any SAL_CALL Content::execute(
// Note: Implemented by base class.
aRet
<<=
getPropertySetInfo
(
Environment
,
sal_F
alse
/* don't cache data */
);
f
alse
/* don't cache data */
);
}
else
if
(
aCommand
.
Name
==
"getCommandInfo"
)
{
...
...
@@ -569,7 +569,7 @@ uno::Any SAL_CALL Content::execute(
// Note: Implemented by base class.
aRet
<<=
getCommandInfo
(
Environment
,
sal_F
alse
);
aRet
<<=
getCommandInfo
(
Environment
,
f
alse
);
}
else
if
(
aCommand
.
Name
==
"open"
)
{
...
...
@@ -617,7 +617,7 @@ uno::Any SAL_CALL Content::execute(
// delete
sal_Bool
bDeletePhysical
=
sal_F
alse
;
bool
bDeletePhysical
=
f
alse
;
aCommand
.
Argument
>>=
bDeletePhysical
;
// KSO: Ignore parameter and destroy the content, if you don't support
...
...
@@ -640,7 +640,7 @@ uno::Any SAL_CALL Content::execute(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
Environment
,
sal_T
rue
);
cancelCommandExecution
(
e
,
Environment
,
t
rue
);
// Unreachable
}
// }
...
...
@@ -649,7 +649,7 @@ uno::Any SAL_CALL Content::execute(
destroy
(
bDeletePhysical
);
// Remove own and all children's Additional Core Properties.
removeAdditionalPropertySet
(
sal_T
rue
);
removeAdditionalPropertySet
(
t
rue
);
}
else
if
(
aCommand
.
Name
==
"transfer"
&&
isFolder
(
Environment
)
)
{
...
...
@@ -881,7 +881,7 @@ throw( beans::PropertyExistException,
bool
bIsSpecial
=
DAVProperties
::
isUCBSpecialProperty
(
aProperty
.
Name
,
aSpecialName
);
// Note: This requires network access!
if
(
getPropertySetInfo
(
xEnv
,
sal_F
alse
/* don't cache data */
)
if
(
getPropertySetInfo
(
xEnv
,
f
alse
/* don't cache data */
)
->
hasPropertyByName
(
bIsSpecial
?
aSpecialName
:
aProperty
.
Name
)
)
{
// Property does already exist.
...
...
@@ -985,7 +985,7 @@ throw( beans::UnknownPropertyException,
try
{
beans::Property aProp
= getPropertySetInfo( xEnv,
sal_F
alse /* don't cache data */ )
= getPropertySetInfo( xEnv,
f
alse /* don't cache data */ )
->getPropertyByName( Name );
if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVABLE ) )
...
...
@@ -1176,16 +1176,16 @@ Content::createNewContent( const ucb::ContentInfo& Info )
if
(
(
aURL
.
lastIndexOf
(
'/'
)
+
1
)
!=
aURL
.
getLength
()
)
aURL
+=
"/"
;
sal_B
ool
isCollection
;
b
ool
isCollection
;
if
(
Info
.
Type
==
WEBDAV_COLLECTION_TYPE
)
{
aURL
+=
"New_Collection"
;
isCollection
=
sal_T
rue
;
isCollection
=
t
rue
;
}
else
{
aURL
+=
"New_Content"
;
isCollection
=
sal_F
alse
;
isCollection
=
f
alse
;
}
uno
::
Reference
<
ucb
::
XContentIdentifier
>
xId
(
...
...
@@ -1259,7 +1259,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if
(
nCount
)
{
uno
::
Reference
<
beans
::
XPropertySet
>
xAdditionalPropSet
;
sal_Bool
bTriedToGetAdditionalPropSet
=
sal_F
alse
;
bool
bTriedToGetAdditionalPropSet
=
f
alse
;
const
beans
::
Property
*
pProps
=
rProperties
.
getConstArray
();
for
(
sal_Int32
n
=
0
;
n
<
nCount
;
++
n
)
...
...
@@ -1280,9 +1280,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xAdditionalPropSet
=
uno
::
Reference
<
beans
::
XPropertySet
>
(
rProvider
->
getAdditionalPropertySet
(
rContentId
,
sal_F
alse
),
f
alse
),
uno
::
UNO_QUERY
);
bTriedToGetAdditionalPropSet
=
sal_T
rue
;
bTriedToGetAdditionalPropSet
=
t
rue
;
}
if
(
!
xAdditionalPropSet
.
is
()
||
...
...
@@ -1318,7 +1318,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// Append all local Additional Properties.
uno
::
Reference
<
beans
::
XPropertySet
>
xSet
(
rProvider
->
getAdditionalPropertySet
(
rContentId
,
sal_F
alse
),
rProvider
->
getAdditionalPropertySet
(
rContentId
,
f
alse
),
uno
::
UNO_QUERY
);
xRow
->
appendPropertySet
(
xSet
);
}
...
...
@@ -1635,7 +1635,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else
if
(
rName
==
"CreatableContentsInfo"
)
{
// Add CreatableContentsInfo property, if requested.
sal_Bool
bFolder
=
sal_F
alse
;
bool
bFolder
=
f
alse
;
xProps
->
getValue
(
OUString
(
"IsFolder"
)
)
>>=
bFolder
;
...
...
@@ -1678,7 +1678,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
uno
::
Reference
<
ucb
::
XContentIdentifier
>
xIdentifier
;
rtl
::
Reference
<
ContentProvider
>
xProvider
;
sal_B
ool
bTransient
;
b
ool
bTransient
;
boost
::
scoped_ptr
<
DAVResourceAccess
>
xResAccess
;
{
...
...
@@ -1696,7 +1696,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
beans
::
PropertyChangeEvent
aEvent
;
aEvent
.
Source
=
static_cast
<
cppu
::
OWeakObject
*
>
(
this
);
aEvent
.
Further
=
sal_F
alse
;
aEvent
.
Further
=
f
alse
;
// aEvent.PropertyName =
aEvent
.
PropertyHandle
=
-
1
;
// aEvent.OldValue =
...
...
@@ -1706,9 +1706,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
std
::
vector
<
sal_Int32
>
aProppatchPropsPositions
;
uno
::
Reference
<
ucb
::
XPersistentPropertySet
>
xAdditionalPropSet
;
sal_Bool
bTriedToGetAdditionalPropSet
=
sal_F
alse
;
bool
bTriedToGetAdditionalPropSet
=
f
alse
;
sal_Bool
bExchange
=
sal_F
alse
;
bool
bExchange
=
f
alse
;
OUString
aNewTitle
;
OUString
aOldTitle
;
sal_Int32
nTitlePos
=
-
1
;
...
...
@@ -1776,7 +1776,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// modified title -> modified URL -> exchange !
if
(
!
bTransient
)
bExchange
=
sal_T
rue
;
bExchange
=
t
rue
;
// new value will be set later...
aNewTitle
=
aNewValue
;
...
...
@@ -1820,7 +1820,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if
(
!
xInfo
.
is
()
)
xInfo
=
getPropertySetInfo
(
xEnv
,
sal_F
alse
/* don't cache data */
);
f
alse
/* don't cache data */
);
if
(
!
xInfo
->
hasPropertyByName
(
bIsSpecial
?
aSpecialName
:
rName
)
)
{
...
...
@@ -1888,8 +1888,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
!
xAdditionalPropSet
.
is
()
)
{
xAdditionalPropSet
=
getAdditionalPropertySet
(
sal_F
alse
);
bTriedToGetAdditionalPropSet
=
sal_T
rue
;
=
getAdditionalPropertySet
(
f
alse
);
bTriedToGetAdditionalPropSet
=
t
rue
;
}
if
(
xAdditionalPropSet
.
is
()
)
...
...
@@ -1982,7 +1982,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
while
(
it
!=
end
)
{
// Set error.
aRet
[
(
*
it
)
]
<<=
MapDAVException
(
e
,
sal_T
rue
);
aRet
[
(
*
it
)
]
<<=
MapDAVException
(
e
,
t
rue
);
++
it
;
}
#endif
...
...
@@ -2010,7 +2010,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
targetURI
.
SetScheme
(
sourceURI
.
GetScheme
()
);
xResAccess
->
MOVE
(
sourceURI
.
GetPath
(),
targetURI
.
GetURI
(),
sal_F
alse
,
xEnv
);
sourceURI
.
GetPath
(),
targetURI
.
GetURI
(),
f
alse
,
xEnv
);
// @@@ Should check for resources that could not be moved
// (due to source access or target overwrite) and send
// this information through the interaction handler.
...
...
@@ -2029,7 +2029,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
// // Adapt Additional Core Properties.
// renameAdditionalPropertySet( xOldId->getContentIdentifier(),
// xNewId->getContentIdentifier(),
//
sal_T
rue );
//
t
rue );
}
else
{
...
...
@@ -2048,7 +2048,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
aNewTitle
=
OUString
();
// Set error .
aRet
[
nTitlePos
]
<<=
MapDAVException
(
e
,
sal_T
rue
);
aRet
[
nTitlePos
]
<<=
MapDAVException
(
e
,
t
rue
);
}
}
...
...
@@ -2088,7 +2088,7 @@ uno::Any Content::open(
{
uno
::
Any
aRet
;
sal_B
ool
bOpenFolder
=
(
(
rArg
.
Mode
==
ucb
::
OpenMode
::
ALL
)
||
b
ool
bOpenFolder
=
(
(
rArg
.
Mode
==
ucb
::
OpenMode
::
ALL
)
||
(
rArg
.
Mode
==
ucb
::
OpenMode
::
FOLDERS
)
||
(
rArg
.
Mode
==
ucb
::
OpenMode
::
DOCUMENTS
)
);
if
(
bOpenFolder
)
...
...
@@ -2283,7 +2283,7 @@ void Content::post(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
xEnv
,
sal_T
rue
);
cancelCommandExecution
(
e
,
xEnv
,
t
rue
);
// Unreachable
}
}
...
...
@@ -2315,7 +2315,7 @@ void Content::post(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
xEnv
,
sal_T
rue
);
cancelCommandExecution
(
e
,
xEnv
,
t
rue
);
// Unreachable
}
}
...
...
@@ -2387,11 +2387,11 @@ void Content::queryChildren( ContentRefList& rChildren )
void
Content
::
insert
(
const
uno
::
Reference
<
io
::
XInputStream
>
&
xInputStream
,
sal_B
ool
bReplaceExisting
,
b
ool
bReplaceExisting
,
const
uno
::
Reference
<
ucb
::
XCommandEnvironment
>&
Environment
)
throw
(
uno
::
Exception
)
{
sal_B
ool
bTransient
,
bCollection
;
b
ool
bTransient
,
bCollection
;
OUString
aEscapedTitle
;
boost
::
scoped_ptr
<
DAVResourceAccess
>
xResAccess
;
...
...
@@ -2474,7 +2474,7 @@ void Content::insert(
case
ucbhelper
:
:
CONTINUATION_APPROVE
:
// Continue -> Overwrite.
bReplaceExisting
=
sal_T
rue
;
bReplaceExisting
=
t
rue
;
break
;
case
ucbhelper
:
:
CONTINUATION_DISAPPROVE
:
...
...
@@ -2541,7 +2541,7 @@ void Content::insert(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
Environment
,
sal_T
rue
);
cancelCommandExecution
(
e
,
Environment
,
t
rue
);
// Unreachable
}
...
...
@@ -2582,7 +2582,7 @@ void Content::insert(
}
}
cancelCommandExecution
(
except
,
Environment
,
sal_T
rue
);
cancelCommandExecution
(
except
,
Environment
,
t
rue
);
// Unreachable
}
...
...
@@ -2596,7 +2596,7 @@ void Content::insert(
{
osl
::
Guard
<
osl
::
Mutex
>
aGuard
(
m_aMutex
);
m_bTransient
=
sal_F
alse
;
m_bTransient
=
f
alse
;
}
}
else
...
...
@@ -2618,7 +2618,7 @@ void Content::insert(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
Environment
,
sal_T
rue
);
cancelCommandExecution
(
e
,
Environment
,
t
rue
);
// Unreachable
}
}
...
...
@@ -2766,14 +2766,14 @@ void Content::transfer(
if
(
xSource
.
is
()
)
{
// Propagate destruction to listeners.
xSource
->
destroy
(
sal_T
rue
);
xSource
->
destroy
(
t
rue
);
}
// DAV resources store all additional props on server!
// // Rename own and all children's Additional Core Properties.
// renameAdditionalPropertySet( xId->getContentIdentifier(),
// xTargetId->getContentIdentifier(),
//
sal_T
rue );
//
t
rue );
}
else
{
...
...
@@ -2794,7 +2794,7 @@ void Content::transfer(
// // Copy own and all children's Additional Core Properties.
// copyAdditionalPropertySet( xId->getContentIdentifier(),
// xTargetId->getContentIdentifier(),
//
sal_T
rue );
//
t
rue );
}
// Note: The static cast is okay here, because its sure that
...
...
@@ -2855,7 +2855,7 @@ void Content::transfer(
}
}
cancelCommandExecution
(
e
,
Environment
,
sal_T
rue
);
cancelCommandExecution
(
e
,
Environment
,
t
rue
);
// Unreachable
}
...
...
@@ -2866,7 +2866,7 @@ void Content::transfer(
}
void
Content
::
destroy
(
sal_B
ool
bDeletePhysical
)
void
Content
::
destroy
(
b
ool
bDeletePhysical
)
throw
(
uno
::
Exception
)
{
// @@@ take care about bDeletePhysical -> trashcan support
...
...
@@ -2952,7 +2952,7 @@ void Content::lock(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
Environment
,
sal_F
alse
);
cancelCommandExecution
(
e
,
Environment
,
f
alse
);
// Unreachable
}
}
...
...
@@ -2979,17 +2979,17 @@ void Content::unlock(
}
catch
(
DAVException
const
&
e
)
{
cancelCommandExecution
(
e
,
Environment
,
sal_F
alse
);
cancelCommandExecution
(
e
,
Environment
,
f
alse
);
// Unreachable
}
}
sal_B
ool
Content
::
exchangeIdentity
(
b
ool
Content
::
exchangeIdentity
(
const
uno
::
Reference
<
ucb
::
XContentIdentifier
>&
xNewId
)
{
if
(
!
xNewId
.
is
()
)
return
sal_F
alse
;
return
f
alse
;
osl
::
ClearableGuard
<
osl
::
Mutex
>
aGuard
(
m_aMutex
);
...
...
@@ -2999,7 +2999,7 @@ sal_Bool Content::exchangeIdentity(
if
(
m_bTransient
)
{
SAL_WARN
(
"ucb.ucp.webdav"
,
"Content::exchangeIdentity - Not persistent!"
);
return
sal_F
alse
;
return
f
alse
;
}
// Exchange own identitity.
...
...
@@ -3038,22 +3038,22 @@ sal_Bool Content::exchangeIdentity(
=
new
::
ucbhelper
::
ContentIdentifier
(
aNewChildURL
);
if
(
!
xChild
->
exchangeIdentity
(
xNewChildId
)
)
return
sal_F
alse
;
return
f
alse
;
++
it
;
}
return
sal_T
rue
;
return
t
rue
;
}
}
SAL_WARN
(
"ucb.ucp.webdav"
,
"Content::exchangeIdentity - "
"Panic! Cannot exchange identity!"
);
return
sal_F
alse
;
return
f
alse
;
}
sal_B
ool
Content
::
isFolder
(
b
ool
Content
::
isFolder
(
const
uno
::
Reference
<
ucb
::
XCommandEnvironment
>&
xEnv
)
throw
(
uno
::
Exception
)
{
...
...
@@ -3079,11 +3079,11 @@ sal_Bool Content::isFolder(
}
}
return
sal_F
alse
;
return
f
alse
;
}
uno
::
Any
Content
::
MapDAVException
(
const
DAVException
&
e
,
sal_B
ool
bWrite
)
uno
::
Any
Content
::
MapDAVException
(
const
DAVException
&
e
,
b
ool
bWrite
)
{
// Map DAVException...
uno
::
Any
aException
;
...
...
@@ -3200,7 +3200,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
static_cast
<
cppu
::
OWeakObject
*
>
(
this
),
task
::
InteractionClassification_ERROR
,
aURL
,
sal_F
alse
);
// not SelfOwned
f
alse
);
// not SelfOwned
#else
{
uno
::
Sequence
<
uno
::
Any
>
aArgs
(
1
);
...
...
@@ -3227,7 +3227,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
static_cast
<
cppu
::
OWeakObject
*
>
(
this
),
task
::
InteractionClassification_ERROR
,
aURL
,
sal_T
rue
);
// SelfOwned
t
rue
);
// SelfOwned
break
;
case
DAVException
:
:
DAV_NOT_LOCKED
:
...
...
@@ -3278,7 +3278,7 @@ bool Content::shouldAccessNetworkAfterException( const DAVException & e )
void
Content
::
cancelCommandExecution
(
const
DAVException
&
e
,
const
uno
::
Reference
<
ucb
::
XCommandEnvironment
>
&
xEnv
,
sal_Bool
bWrite
/* = sal_F
alse */
)
bool
bWrite
/* = f
alse */
)
throw
(
uno
::
Exception
)
{
ucbhelper
::
cancelCommandExecution
(
MapDAVException
(
e
,
bWrite
),
xEnv
);
...
...
ucb/source/ucp/webdav/webdavcontent.hxx
Dosyayı görüntüle @
26b4c8e5
...
...
@@ -95,7 +95,7 @@ private:
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>
&
xEnv
);
virtual
OUString
getParentURL
();
sal_B
ool
isFolder
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
b
ool
isFolder
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>&
xEnv
)
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
...
...
@@ -117,7 +117,7 @@ private:
typedef
std
::
list
<
ContentRef
>
ContentRefList
;
void
queryChildren
(
ContentRefList
&
rChildren
);
sal_B
ool
b
ool
exchangeIdentity
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ucb
::
XContentIdentifier
>&
xNewId
);
...
...
@@ -151,7 +151,7 @@ private:
// Command "insert"
void
insert
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
io
::
XInputStream
>
&
xInputStream
,
sal_B
ool
bReplaceExisting
,
b
ool
bReplaceExisting
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>&
Environment
)
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
...
...
@@ -163,7 +163,7 @@ private:
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
// Command "delete"
void
destroy
(
sal_B
ool
bDeletePhysical
)
void
destroy
(
b
ool
bDeletePhysical
)
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
// Command "lock"
...
...
@@ -177,12 +177,12 @@ private:
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
::
com
::
sun
::
star
::
uno
::
Any
MapDAVException
(
const
DAVException
&
e
,
sal_B
ool
bWrite
);
b
ool
bWrite
);
void
cancelCommandExecution
(
const
DAVException
&
e
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
ucb
::
XCommandEnvironment
>
&
xEnv
,
sal_Bool
bWrite
=
sal_F
alse
)
bool
bWrite
=
f
alse
)
throw
(
::
com
::
sun
::
star
::
uno
::
Exception
);
static
bool
shouldAccessNetworkAfterException
(
const
DAVException
&
e
);
...
...
@@ -220,7 +220,7 @@ public:
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
ucb
::
XContentIdentifier
>&
Identifier
,
rtl
::
Reference
<
DAVSessionFactory
>
const
&
rSessionFactory
,
sal_B
ool
isCollection
)
b
ool
isCollection
)
throw
(
::
com
::
sun
::
star
::
ucb
::
ContentCreationException
);
virtual
~
Content
();
...
...
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