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
30dd9b2f
Kaydet (Commit)
30dd9b2f
authored
May 29, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#46808, Convert SfxFrameLoader service to new style
Change-Id: I6cdef298d69fef388e79b241abbe3a9a03d61492
üst
a8a35e54
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
3 deletions
+43
-3
services.h
framework/inc/services.h
+0
-1
loadenv.cxx
framework/source/loadenv/loadenv.cxx
+2
-1
UnoApi_offapi.mk
offapi/UnoApi_offapi.mk
+1
-0
OfficeFrameLoader.idl
offapi/com/sun/star/frame/OfficeFrameLoader.idl
+37
-0
frmload.cxx
sfx2/source/view/frmload.cxx
+2
-1
sfx.component
sfx2/util/sfx.component
+1
-0
No files found.
framework/inc/services.h
Dosyayı görüntüle @
30dd9b2f
...
...
@@ -59,7 +59,6 @@ namespace framework{
#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" )
#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" )
#define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" )
#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")
#define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" )
#define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" )
...
...
framework/source/loadenv/loadenv.cxx
Dosyayı görüntüle @
30dd9b2f
...
...
@@ -52,6 +52,7 @@
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/OfficeFrameLoader.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XFrameLoader.hpp>
#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
...
...
@@ -1194,7 +1195,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
{
try
{
return
m_xContext
->
getServiceManager
()
->
createInstanceWithContext
(
IMPLEMENTATIONNAME_GENERICFRAMELOADER
,
m_xContext
);
return
css
::
frame
::
OfficeFrameLoader
::
create
(
m_xContext
);
}
catch
(
const
css
::
uno
::
RuntimeException
&
)
{
throw
;
}
...
...
offapi/UnoApi_offapi.mk
Dosyayı görüntüle @
30dd9b2f
...
...
@@ -198,6 +198,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
LayoutManager \
MediaTypeDetectionHelper \
ModuleManager \
OfficeFrameLoader \
SessionListener \
StartModule \
TaskCreator \
...
...
offapi/com/sun/star/frame/OfficeFrameLoader.idl
0 → 100644
Dosyayı görüntüle @
30dd9b2f
/*
-*-
Mode
:
C
++
; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
*
This
file
is
part
of
the
LibreOffice
project
.
*
*
This
Source
Code
Form
is
subject
to
the
terms
of
the
Mozilla
Public
*
License
,
v
.
2.0
.
If
a
copy
of
the
MPL
was
not
distributed
with
this
*
file
,
You
can
obtain
one
at
http
:
//
mozilla
.
org/MPL/2.0/.
*
*
This
file
incorporates
work
covered
by
the
following
license
notice
:
*
*
Licensed
to
the
Apache
Software
Foundation
(
ASF
)
under
one
or
more
*
contributor
license
agreements
.
See
the
NOTICE
file
distributed
*
with
this
work
for
additional
information
regarding
copyright
*
ownership
.
The
ASF
licenses
this
file
to
you
under
the
Apache
*
License
,
Version
2.0
(
the
"License"
)
; you may not use this file
*
except
in
compliance
with
the
License
.
You
may
obtain
a
copy
of
*
the
License
at
http
:
//
www
.
apache.org/licenses/LICENSE-2.0
.
*/
#
ifndef
__com_sun_star_frame_OfficeFrameLoader_idl__
#
define
__com_sun_star_frame_OfficeFrameLoader_idl__
#
include
<
com
/
sun
/
star
/
frame
/
XSynchronousFrameLoader
.
idl>
module
com
{
module
sun
{
module
star
{
module
frame
{
/**
@
since
LibreOffice
4.2
*/
service
OfficeFrameLoader
:
XSynchronousFrameLoader
;
}
; }; }; };
#
endif
/*
vim
:
set
shiftwidth
=
4
softtabstop
=
4
expandtab
:
*/
sfx2/source/view/frmload.cxx
Dosyayı görüntüle @
30dd9b2f
...
...
@@ -681,8 +681,9 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() th
Sequence
<
OUString
>
SfxFrameLoader_Impl
::
impl_getStaticSupportedServiceNames
()
{
::
osl
::
MutexGuard
aGuard
(
::
osl
::
Mutex
::
getGlobalMutex
()
);
Sequence
<
OUString
>
seqServiceNames
(
1
);
Sequence
<
OUString
>
seqServiceNames
(
2
);
seqServiceNames
.
getArray
()
[
0
]
=
OUString
(
"com.sun.star.frame.SynchronousFrameLoader"
);
seqServiceNames
.
getArray
()
[
1
]
=
OUString
(
"com.sun.star.frame.OfficeFrameLoader"
);
return
seqServiceNames
;
}
...
...
sfx2/util/sfx.component
Dosyayı görüntüle @
30dd9b2f
...
...
@@ -38,6 +38,7 @@
</implementation>
<implementation
name=
"com.sun.star.comp.office.FrameLoader"
>
<service
name=
"com.sun.star.frame.SynchronousFrameLoader"
/>
<service
name=
"com.sun.star.frame.OfficeFrameLoader"
/>
</implementation>
<implementation
name=
"com.sun.star.comp.sfx2.AppDispatchProvider"
>
<service
name=
"com.sun.star.frame.ProtocolHandler"
/>
...
...
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