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
2759ea0e
Kaydet (Commit)
2759ea0e
authored
Kas 27, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
No need to extend css.awt.XToolkitExperimental
Change-Id: Idbaca99c9376ade11cd36526c0f667562a2d9c53
üst
11a8e72a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
23 deletions
+7
-23
Library_updatefeed.mk
extensions/Library_updatefeed.mk
+5
-0
updatefeed.cxx
extensions/source/update/feed/updatefeed.cxx
+2
-10
XToolkitExperimental.idl
offapi/com/sun/star/awt/XToolkitExperimental.idl
+0
-4
vclxtoolkit.cxx
toolkit/source/awt/vclxtoolkit.cxx
+0
-9
No files found.
extensions/Library_updatefeed.mk
Dosyayı görüntüle @
2759ea0e
...
...
@@ -11,12 +11,17 @@ $(eval $(call gb_Library_Library,updatefeed))
$(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed))
$(eval $(call gb_Library_use_externals,updatefeed, \
boost_headers \
))
$(eval $(call gb_Library_use_sdk_api,updatefeed))
$(eval $(call gb_Library_use_libraries,updatefeed,\
cppuhelper \
cppu \
sal \
vcl \
))
$(eval $(call gb_Library_add_exception_objects,updatefeed,\
...
...
extensions/source/update/feed/updatefeed.cxx
Dosyayı görüntüle @
2759ea0e
...
...
@@ -46,8 +46,6 @@
#include <com/sun/star/task/PasswordContainerInteractionHandler.hpp>
#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
#include <com/sun/star/xml/xpath/XPathAPI.hpp>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/awt/XToolkitExperimental.hpp>
#include <rtl/ref.hxx>
#include <rtl/bootstrap.hxx>
...
...
@@ -56,6 +54,7 @@
#include <osl/diagnose.h>
#include <osl/process.h>
#include <osl/conditn.hxx>
#include <vcl/svapp.hxx>
namespace
beans
=
com
::
sun
::
star
::
beans
;
namespace
container
=
com
::
sun
::
star
::
container
;
...
...
@@ -387,14 +386,7 @@ OUString UpdateInformationProvider::getUserAgent(bool bExtended)
OUString
aExtended
;
if
(
bExtended
)
{
try
{
uno
::
Reference
<
css
::
awt
::
XToolkitExperimental
>
xToolkit
(
css
::
awt
::
Toolkit
::
create
(
m_xContext
),
uno
::
UNO_QUERY_THROW
);
if
(
xToolkit
.
is
()
)
aExtended
=
xToolkit
->
getHWOSConfInfo
();
}
catch
(
const
uno
::
Exception
&
)
{
SAL_WARN
(
"extensions.update"
,
"Failed to find version info from toolkit"
);
}
aExtended
=
Application
::
GetHWOSConfInfo
();
}
rtl
::
Bootstrap
::
expandMacros
(
aUserAgent
);
aUserAgent
=
aUserAgent
.
replaceAll
(
"<PRODUCT>"
,
product
);
...
...
offapi/com/sun/star/awt/XToolkitExperimental.idl
Dosyayı görüntüle @
2759ea0e
...
...
@@ -22,10 +22,6 @@ interface XToolkitExperimental : XToolkit2
/** Process all pending idle events
*/
void processEventsToIdle();
/** Get misc. information for User-Agent:
*/
string getHWOSConfInfo();
};
}; }; }; };
...
...
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @
2759ea0e
...
...
@@ -194,8 +194,6 @@ public:
// css::awt::XToolkitExperimental
virtual
void
SAL_CALL
processEventsToIdle
()
throw
(
css
::
uno
::
RuntimeException
,
std
::
exception
)
override
;
virtual
OUString
SAL_CALL
getHWOSConfInfo
()
throw
(
::
css
::
uno
::
RuntimeException
,
::
std
::
exception
)
override
;
// css::awt::XToolkit
css
::
uno
::
Reference
<
css
::
awt
::
XWindowPeer
>
SAL_CALL
getDesktopWindow
(
)
throw
(
css
::
uno
::
RuntimeException
,
std
::
exception
)
override
;
...
...
@@ -1915,13 +1913,6 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
Scheduler
::
ProcessEventsToIdle
();
}
OUString
SAL_CALL
VCLXToolkit
::
getHWOSConfInfo
()
throw
(
::
css
::
uno
::
RuntimeException
,
::
std
::
exception
)
{
SolarMutexGuard
aSolarGuard
;
return
Application
::
GetHWOSConfInfo
();
}
// css:awt:XToolkitRobot
void
SAL_CALL
VCLXToolkit
::
keyPress
(
const
css
::
awt
::
KeyEvent
&
aKeyEvent
)
...
...
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