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
29f17580
Kaydet (Commit)
29f17580
authored
Ock 09, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#46808, Convert svl/lockfile code to XComponentContext
Change-Id: I380944aa5e16b160ac76f939a839c513d4fbf232
üst
09cf6fe8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
20 deletions
+10
-20
documentlockfile.hxx
svl/inc/svl/documentlockfile.hxx
+1
-2
lockfilecommon.hxx
svl/inc/svl/lockfilecommon.hxx
+1
-5
sharecontrolfile.hxx
svl/inc/svl/sharecontrolfile.hxx
+2
-3
documentlockfile.cxx
svl/source/misc/documentlockfile.cxx
+3
-3
lockfilecommon.cxx
svl/source/misc/lockfilecommon.cxx
+1
-5
sharecontrolfile.cxx
svl/source/misc/sharecontrolfile.cxx
+2
-2
No files found.
svl/inc/svl/documentlockfile.hxx
Dosyayı görüntüle @
29f17580
...
...
@@ -27,7 +27,6 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <svl/lockfilecommon.hxx>
...
...
@@ -43,7 +42,7 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
void
WriteEntryToStream
(
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
rtl
::
OUString
>
aEntry
,
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
io
::
XOutputStream
>
xStream
);
public
:
DocumentLockFile
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>&
xFactory
=
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>
()
);
DocumentLockFile
(
const
::
rtl
::
OUString
&
aOrigURL
);
~
DocumentLockFile
();
sal_Bool
CreateOwnLockFile
();
...
...
svl/inc/svl/lockfilecommon.hxx
Dosyayı görüntüle @
29f17580
...
...
@@ -27,7 +27,6 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <osl/mutex.hxx>
#include <tools/urlobj.hxx>
...
...
@@ -46,15 +45,12 @@ class SVL_DLLPUBLIC LockFileCommon
{
protected
:
::
osl
::
Mutex
m_aMutex
;
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>
m_xFactory
;
::
rtl
::
OUString
m_aURL
;
INetURLObject
ResolveLinks
(
const
INetURLObject
&
aDocURL
);
public
:
LockFileCommon
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>&
xFactory
,
const
::
rtl
::
OUString
&
aPrefix
);
LockFileCommon
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
::
rtl
::
OUString
&
aPrefix
);
~
LockFileCommon
();
static
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
rtl
::
OUString
>
>
ParseList
(
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
sal_Int8
>&
aBuffer
);
...
...
svl/inc/svl/sharecontrolfile.hxx
Dosyayı görüntüle @
29f17580
...
...
@@ -27,7 +27,6 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <svl/lockfilecommon.hxx>
...
...
@@ -54,13 +53,13 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
void
Close
();
sal_Bool
IsValid
()
{
return
(
m_x
Factory
.
is
()
&&
m_x
Stream
.
is
()
&&
m_xInputStream
.
is
()
&&
m_xOutputStream
.
is
()
&&
m_xSeekable
.
is
()
&&
m_xTruncate
.
is
()
);
return
(
m_xStream
.
is
()
&&
m_xInputStream
.
is
()
&&
m_xOutputStream
.
is
()
&&
m_xSeekable
.
is
()
&&
m_xTruncate
.
is
()
);
}
public
:
// The constructor will throw exception in case the stream can not be opened
ShareControlFile
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>&
xFactory
=
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>
()
);
ShareControlFile
(
const
::
rtl
::
OUString
&
aOrigURL
);
~
ShareControlFile
();
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
rtl
::
OUString
>
>
GetUsersData
();
...
...
svl/source/misc/documentlockfile.cxx
Dosyayı görüntüle @
29f17580
...
...
@@ -53,8 +53,8 @@ namespace svt {
sal_Bool
DocumentLockFile
::
m_bAllowInteraction
=
sal_True
;
// ----------------------------------------------------------------------
DocumentLockFile
::
DocumentLockFile
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
uno
::
Reference
<
lang
::
XMultiServiceFactory
>&
xFactory
)
:
LockFileCommon
(
aOrigURL
,
xFactory
,
::
rtl
::
OUString
(
".~lock."
)
)
DocumentLockFile
::
DocumentLockFile
(
const
::
rtl
::
OUString
&
aOrigURL
)
:
LockFileCommon
(
aOrigURL
,
::
rtl
::
OUString
(
".~lock."
)
)
{
}
...
...
@@ -92,7 +92,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
try
{
uno
::
Reference
<
io
::
XStream
>
xTempFile
(
io
::
TempFile
::
create
(
comphelper
::
getComponentContext
(
m_xFactory
)
),
io
::
TempFile
::
create
(
comphelper
::
getProcessComponentContext
()
),
uno
::
UNO_QUERY_THROW
);
uno
::
Reference
<
io
::
XSeekable
>
xSeekable
(
xTempFile
,
uno
::
UNO_QUERY_THROW
);
...
...
svl/source/misc/lockfilecommon.cxx
Dosyayı görüntüle @
29f17580
...
...
@@ -54,12 +54,8 @@ using namespace ::com::sun::star;
namespace
svt
{
// ----------------------------------------------------------------------
LockFileCommon
::
LockFileCommon
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
uno
::
Reference
<
lang
::
XMultiServiceFactory
>&
xFactory
,
const
::
rtl
::
OUString
&
aPrefix
)
:
m_xFactory
(
xFactory
)
LockFileCommon
::
LockFileCommon
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
::
rtl
::
OUString
&
aPrefix
)
{
if
(
!
m_xFactory
.
is
()
)
m_xFactory
=
::
comphelper
::
getProcessServiceFactory
();
INetURLObject
aDocURL
=
ResolveLinks
(
INetURLObject
(
aOrigURL
)
);
::
rtl
::
OUString
aShareURLString
=
aDocURL
.
GetPartBeforeLastName
();
...
...
svl/source/misc/sharecontrolfile.cxx
Dosyayı görüntüle @
29f17580
...
...
@@ -52,8 +52,8 @@ using namespace ::com::sun::star;
namespace
svt
{
// ----------------------------------------------------------------------
ShareControlFile
::
ShareControlFile
(
const
::
rtl
::
OUString
&
aOrigURL
,
const
uno
::
Reference
<
lang
::
XMultiServiceFactory
>&
xFactory
)
:
LockFileCommon
(
aOrigURL
,
xFactory
,
::
rtl
::
OUString
(
".~sharing."
)
)
ShareControlFile
::
ShareControlFile
(
const
::
rtl
::
OUString
&
aOrigURL
)
:
LockFileCommon
(
aOrigURL
,
::
rtl
::
OUString
(
".~sharing."
)
)
{
OpenStream
();
...
...
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