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
4cce7027
Kaydet (Commit)
4cce7027
authored
Eyl 19, 2012
tarafından
Andrzej J.R. Hunt
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Rename Impress-sdremote.xcs to ImpressSdRemote.xcs + add to postprocess.
Change-Id: Iead72e5dca861a422507cf70d9b35366c701c84a
üst
88303a83
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk
+1
-1
files.mk
officecfg/registry/files.mk
+1
-1
makefile.mk
postprocess/packregistry/makefile.mk
+1
-0
Server.cxx
sd/source/ui/remotecontrol/Server.cxx
+3
-3
No files found.
officecfg/Configuration_officecfg.mk
Dosyayı görüntüle @
4cce7027
...
@@ -121,7 +121,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
...
@@ -121,7 +121,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
ifeq ($(ENABLE_SDREMOTE),YES)
ifeq ($(ENABLE_SDREMOTE),YES)
$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/Impress-sdr
emote.xcs \
org/openoffice/Office/ImpressSdR
emote.xcs \
))
))
endif
endif
...
...
officecfg/registry/files.mk
Dosyayı görüntüle @
4cce7027
...
@@ -22,7 +22,7 @@ officecfg_FILES := \
...
@@ -22,7 +22,7 @@ officecfg_FILES := \
Office/FormWizard \
Office/FormWizard \
Office/Histories \
Office/Histories \
Office/Impress \
Office/Impress \
$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress
-sdr
emote) \
$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress
SdR
emote) \
Office/Java \
Office/Java \
Office/Jobs \
Office/Jobs \
Office/Labels \
Office/Labels \
...
...
postprocess/packregistry/makefile.mk
Dosyayı görüntüle @
4cce7027
...
@@ -152,6 +152,7 @@ MY_FILES_main = \
...
@@ -152,6 +152,7 @@ MY_FILES_main = \
$(MY_XCS)
/Office/FormWizard.xcs
\
$(MY_XCS)
/Office/FormWizard.xcs
\
$(MY_XCS)
/Office/Histories.xcs
\
$(MY_XCS)
/Office/Histories.xcs
\
$(MY_XCS)
/Office/Impress.xcs
\
$(MY_XCS)
/Office/Impress.xcs
\
$(MY_XCS)
/Office/ImpressSdRemote.xcs
\
$(MY_XCS)
/Office/Java.xcs
\
$(MY_XCS)
/Office/Java.xcs
\
$(MY_XCS)
/Office/Jobs.xcs
\
$(MY_XCS)
/Office/Jobs.xcs
\
$(MY_XCS)
/Office/Labels.xcs
\
$(MY_XCS)
/Office/Labels.xcs
\
...
...
sd/source/ui/remotecontrol/Server.cxx
Dosyayı görüntüle @
4cce7027
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#include <vector>
#include <vector>
#include "officecfg/Office/Common.hxx"
#include "officecfg/Office/Common.hxx"
#include "officecfg/Office/Impress
-sdr
emote.hxx"
#include "officecfg/Office/Impress
SdR
emote.hxx"
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
...
@@ -126,7 +126,7 @@ void RemoteServer::execute()
...
@@ -126,7 +126,7 @@ void RemoteServer::execute()
// Check if we already have this server.
// Check if we already have this server.
Reference
<
XNameAccess
>
const
xConfig
=
officecfg
::
Office
Reference
<
XNameAccess
>
const
xConfig
=
officecfg
::
Office
::
Impress
_sdr
emote
::
Content
::
AuthorisedRemotes
::
get
();
::
Impress
SdR
emote
::
Content
::
AuthorisedRemotes
::
get
();
Sequence
<
OUString
>
aNames
=
xConfig
->
getElementNames
();
Sequence
<
OUString
>
aNames
=
xConfig
->
getElementNames
();
bool
aFound
=
false
;
bool
aFound
=
false
;
for
(
int
i
=
0
;
i
<
aNames
.
getLength
();
i
++
)
for
(
int
i
=
0
;
i
<
aNames
.
getLength
();
i
++
)
...
@@ -234,7 +234,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
...
@@ -234,7 +234,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
// Save in settings first
// Save in settings first
boost
::
shared_ptr
<
ConfigurationChanges
>
aChanges
=
ConfigurationChanges
::
create
();
boost
::
shared_ptr
<
ConfigurationChanges
>
aChanges
=
ConfigurationChanges
::
create
();
Reference
<
XNameContainer
>
const
xConfig
=
officecfg
::
Office
Reference
<
XNameContainer
>
const
xConfig
=
officecfg
::
Office
::
Impress
_sdr
emote
::
Content
::
AuthorisedRemotes
::
get
(
aChanges
);
::
Impress
SdR
emote
::
Content
::
AuthorisedRemotes
::
get
(
aChanges
);
Reference
<
XSingleServiceFactory
>
xChildFactory
(
Reference
<
XSingleServiceFactory
>
xChildFactory
(
xConfig
,
UNO_QUERY
);
xConfig
,
UNO_QUERY
);
...
...
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