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
74b0d908
Kaydet (Commit)
74b0d908
authored
Eyl 27, 2017
tarafından
Katarina Behrens
Kaydeden (comit)
Thorsten Behrens
Eki 25, 2017
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
kde5: convert KDE5SalInstance to SvpSalInstance
Change-Id: I72da846525128a689d92598b64e6a70062ff1c69
üst
b899ba17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
KDE5SalInstance.cxx
vcl/unx/kde5/KDE5SalInstance.cxx
+4
-4
KDE5SalInstance.hxx
vcl/unx/kde5/KDE5SalInstance.hxx
+3
-3
No files found.
vcl/unx/kde5/KDE5SalInstance.cxx
Dosyayı görüntüle @
74b0d908
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
using
namespace
com
::
sun
::
star
;
using
namespace
com
::
sun
::
star
;
KDE5SalInstance
::
KDE5SalInstance
(
SalYieldMutex
*
pMutex
)
KDE5SalInstance
::
KDE5SalInstance
(
SalYieldMutex
*
pMutex
)
:
X11SalInstance
(
pMutex
)
:
SvpSalInstance
(
pMutex
)
{
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
delete
pSVData
->
maAppData
.
mpToolkitName
;
delete
pSVData
->
maAppData
.
mpToolkitName
;
...
@@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker(
...
@@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker(
return uno::Reference< ui::dialogs::XFilePicker2 >(
return uno::Reference< ui::dialogs::XFilePicker2 >(
kdeXLib->createFilePicker(xMSF) );
kdeXLib->createFilePicker(xMSF) );
else*/
else*/
return
X11
SalInstance
::
createFilePicker
(
xMSF
);
return
SalInstance
::
createFilePicker
(
xMSF
);
}
}
SalX11Display
*
KDE5SalInstance
::
CreateDisplay
()
const
/*
SalX11Display* KDE5SalInstance::CreateDisplay() const
{
{
return new SalKDE5Display( QX11Info::display() );
return new SalKDE5Display( QX11Info::display() );
}
}
*/
bool
KDE5SalInstance
::
IsMainThread
()
const
bool
KDE5SalInstance
::
IsMainThread
()
const
{
{
...
...
vcl/unx/kde5/KDE5SalInstance.hxx
Dosyayı görüntüle @
74b0d908
...
@@ -19,15 +19,15 @@
...
@@ -19,15 +19,15 @@
#pragma once
#pragma once
#include <
unx/salinst.h
>
#include <
headless/svpinst.hxx
>
class
SalYieldMutex
;
class
SalYieldMutex
;
class
SalFrame
;
class
SalFrame
;
class
KDE5SalInstance
:
public
X11
SalInstance
class
KDE5SalInstance
:
public
Svp
SalInstance
{
{
protected
:
protected
:
virtual
SalX11Display
*
CreateDisplay
()
const
override
;
//
virtual SalX11Display* CreateDisplay() const override;
public
:
public
:
explicit
KDE5SalInstance
(
SalYieldMutex
*
pMutex
);
explicit
KDE5SalInstance
(
SalYieldMutex
*
pMutex
);
...
...
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