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
3fbc3ade
Kaydet (Commit)
3fbc3ade
authored
Eki 06, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:mergeclasses
Change-Id: I1347e51ef727da81be0c7937cad6e3f5edbf15a8
üst
6fbbb850
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
24 deletions
+10
-24
mergeclasses.results
compilerplugins/clang/mergeclasses.results
+0
-1
dropdownboxtoolbarcontroller.hxx
framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+7
-20
dropdownboxtoolbarcontroller.cxx
framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+3
-3
No files found.
compilerplugins/clang/mergeclasses.results
Dosyayı görüntüle @
3fbc3ade
...
@@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
...
@@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
merge formula::ExternalReferenceHelper with ScExternalRefManager
merge formula::ExternalReferenceHelper with ScExternalRefManager
merge formula::IStructHelper with formula::StructPage
merge formula::IStructHelper with formula::StructPage
merge framework::IListBoxListener with framework::DropdownToolbarController
merge framework::ISpinfieldListener with framework::SpinfieldToolbarController
merge framework::ISpinfieldListener with framework::SpinfieldToolbarController
merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration
merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration
merge frm::IAttributeHandler with frm::AttributeHandler
merge frm::IAttributeHandler with frm::AttributeHandler
...
...
framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
Dosyayı görüntüle @
3fbc3ade
...
@@ -35,20 +35,7 @@ namespace framework
...
@@ -35,20 +35,7 @@ namespace framework
class
ListBoxControl
;
class
ListBoxControl
;
class
IListBoxListener
class
DropdownToolbarController
:
public
ComplexToolbarController
{
public
:
virtual
void
Select
()
=
0
;
virtual
void
DoubleClick
()
=
0
;
virtual
void
GetFocus
()
=
0
;
virtual
void
LoseFocus
()
=
0
;
virtual
bool
PreNotify
(
NotifyEvent
&
rNEvt
)
=
0
;
protected
:
~
IListBoxListener
()
{}
};
class
DropdownToolbarController
:
public
IListBoxListener
,
public
ComplexToolbarController
{
{
public
:
public
:
...
@@ -63,12 +50,12 @@ class DropdownToolbarController : public IListBoxListener,
...
@@ -63,12 +50,12 @@ class DropdownToolbarController : public IListBoxListener,
// XComponent
// XComponent
virtual
void
SAL_CALL
dispose
()
throw
(
::
com
::
sun
::
star
::
uno
::
RuntimeException
,
std
::
exception
)
SAL_OVERRIDE
;
virtual
void
SAL_CALL
dispose
()
throw
(
::
com
::
sun
::
star
::
uno
::
RuntimeException
,
std
::
exception
)
SAL_OVERRIDE
;
//
IListBoxListener
//
called from ListBoxControl
v
irtual
void
Select
()
SAL_OVERRIDE
;
v
oid
Select
()
;
v
irtual
void
DoubleClick
()
SAL_OVERRIDE
;
v
oid
DoubleClick
()
;
v
irtual
void
GetFocus
()
SAL_OVERRIDE
;
v
oid
GetFocus
()
;
v
irtual
void
LoseFocus
()
SAL_OVERRIDE
;
v
oid
LoseFocus
()
;
virtual
bool
PreNotify
(
NotifyEvent
&
rNEvt
)
SAL_OVERRIDE
;
bool
PreNotify
(
NotifyEvent
&
rNEvt
)
;
protected
:
protected
:
virtual
void
executeControlCommand
(
const
::
com
::
sun
::
star
::
frame
::
ControlCommand
&
rControlCommand
)
SAL_OVERRIDE
;
virtual
void
executeControlCommand
(
const
::
com
::
sun
::
star
::
frame
::
ControlCommand
&
rControlCommand
)
SAL_OVERRIDE
;
...
...
framework/source/uielement/dropdownboxtoolbarcontroller.cxx
Dosyayı görüntüle @
3fbc3ade
...
@@ -52,7 +52,7 @@ namespace framework
...
@@ -52,7 +52,7 @@ namespace framework
class
ListBoxControl
:
public
ListBox
class
ListBoxControl
:
public
ListBox
{
{
public
:
public
:
ListBoxControl
(
vcl
::
Window
*
pParent
,
WinBits
nStyle
,
IListBoxListen
er
*
pListBoxListener
);
ListBoxControl
(
vcl
::
Window
*
pParent
,
WinBits
nStyle
,
DropdownToolbarControll
er
*
pListBoxListener
);
virtual
~
ListBoxControl
();
virtual
~
ListBoxControl
();
virtual
void
dispose
()
SAL_OVERRIDE
;
virtual
void
dispose
()
SAL_OVERRIDE
;
...
@@ -63,10 +63,10 @@ class ListBoxControl : public ListBox
...
@@ -63,10 +63,10 @@ class ListBoxControl : public ListBox
virtual
bool
PreNotify
(
NotifyEvent
&
rNEvt
)
SAL_OVERRIDE
;
virtual
bool
PreNotify
(
NotifyEvent
&
rNEvt
)
SAL_OVERRIDE
;
private
:
private
:
IListBoxListen
er
*
m_pListBoxListener
;
DropdownToolbarControll
er
*
m_pListBoxListener
;
};
};
ListBoxControl
::
ListBoxControl
(
vcl
::
Window
*
pParent
,
WinBits
nStyle
,
IListBoxListen
er
*
pListBoxListener
)
:
ListBoxControl
::
ListBoxControl
(
vcl
::
Window
*
pParent
,
WinBits
nStyle
,
DropdownToolbarControll
er
*
pListBoxListener
)
:
ListBox
(
pParent
,
nStyle
)
ListBox
(
pParent
,
nStyle
)
,
m_pListBoxListener
(
pListBoxListener
)
,
m_pListBoxListener
(
pListBoxListener
)
{
{
...
...
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