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
0927bdaf
Kaydet (Commit)
0927bdaf
authored
Eki 13, 2016
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:mergeclasses merge SvxListBoxControl with SvxUndoRedoControl
Change-Id: I5ba9c9d970246d80bb60e27e3b703ec03376c35c
üst
6bdfb757
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
52 deletions
+11
-52
mergeclasses.results
compilerplugins/clang/mergeclasses.results
+0
-1
lboxctrl.hxx
include/svx/lboxctrl.hxx
+4
-19
lboxctrl.cxx
svx/source/tbxctrls/lboxctrl.cxx
+7
-32
No files found.
compilerplugins/clang/mergeclasses.results
Dosyayı görüntüle @
0927bdaf
...
...
@@ -145,7 +145,6 @@ merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl
merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl
merge SvXMLItemSetContext with SwXMLItemSetContext_Impl
merge SvxCSS1Parser with SwCSS1Parser
merge SvxListBoxControl with SvxUndoRedoControl
merge SvxRTFParser with EditRTFParser
merge SvxShapeMaster with SdXShape
merge SwAccessibleFrame with SwAccessibleContext
...
...
include/svx/lboxctrl.hxx
Dosyayı görüntüle @
0927bdaf
...
...
@@ -29,39 +29,24 @@ class ToolBox;
class
SvxPopupWindowListBox
;
class
S
vxListBox
Control
:
public
SfxToolBoxControl
class
S
VX_DLLPUBLIC
SvxUndoRedo
Control
:
public
SfxToolBoxControl
{
protected
:
OUString
aActionStr
;
VclPtr
<
SvxPopupWindowListBox
>
pPopupWin
;
std
::
vector
<
OUString
>
aUndoRedoList
;
OUString
aDefaultTooltip
;
void
Impl_SetInfo
(
sal_Int32
nCount
);
DECL_LINK
(
PopupModeEndHdl
,
FloatingWindow
*
,
void
);
DECL_LINK
(
SelectHdl
,
ListBox
&
,
void
);
public
:
SvxListBoxControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
virtual
~
SvxListBoxControl
()
override
;
virtual
VclPtr
<
SfxPopupWindow
>
CreatePopupWindow
()
override
;
virtual
void
StateChanged
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
)
override
;
};
class
SVX_DLLPUBLIC
SvxUndoRedoControl
:
public
SvxListBoxControl
{
std
::
vector
<
OUString
>
aUndoRedoList
;
OUString
aDefaultTooltip
;
public
:
SFX_DECL_TOOLBOX_CONTROL
();
SvxUndoRedoControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
virtual
~
SvxUndoRedoControl
()
override
;
virtual
void
StateChanged
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
)
override
;
...
...
svx/source/tbxctrls/lboxctrl.cxx
Dosyayı görüntüle @
0927bdaf
...
...
@@ -121,34 +121,7 @@ void SvxPopupWindowListBox::statusChanged( const css::frame::FeatureStateEvent&
SfxPopupWindow
::
statusChanged
(
rEvent
);
}
SvxListBoxControl
::
SvxListBoxControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
),
pPopupWin
(
nullptr
)
{
rTbx
.
SetItemBits
(
nId
,
ToolBoxItemBits
::
DROPDOWN
|
rTbx
.
GetItemBits
(
nId
)
);
rTbx
.
Invalidate
();
}
SvxListBoxControl
::~
SvxListBoxControl
()
{}
VclPtr
<
SfxPopupWindow
>
SvxListBoxControl
::
CreatePopupWindow
()
{
OSL_FAIL
(
"not implemented"
);
return
nullptr
;
}
void
SvxListBoxControl
::
StateChanged
(
sal_uInt16
,
SfxItemState
,
const
SfxPoolItem
*
pState
)
{
GetToolBox
().
EnableItem
(
GetId
(),
SfxItemState
::
DISABLED
!=
GetItemState
(
pState
)
);
}
IMPL_LINK_NOARG
(
SvxListBoxControl
,
PopupModeEndHdl
,
FloatingWindow
*
,
void
)
IMPL_LINK_NOARG
(
SvxUndoRedoControl
,
PopupModeEndHdl
,
FloatingWindow
*
,
void
)
{
if
(
pPopupWin
&&
FloatWinPopupFlags
::
NONE
==
pPopupWin
->
GetPopupModeFlags
()
&&
pPopupWin
->
IsUserSelected
()
)
...
...
@@ -165,7 +138,7 @@ IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void)
}
void
Svx
ListBox
Control
::
Impl_SetInfo
(
sal_Int32
nCount
)
void
Svx
UndoRedo
Control
::
Impl_SetInfo
(
sal_Int32
nCount
)
{
DBG_ASSERT
(
pPopupWin
,
"NULL pointer, PopupWindow missing"
);
...
...
@@ -184,7 +157,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_Int32 nCount )
}
IMPL_LINK_NOARG
(
Svx
ListBox
Control
,
SelectHdl
,
ListBox
&
,
void
)
IMPL_LINK_NOARG
(
Svx
UndoRedo
Control
,
SelectHdl
,
ListBox
&
,
void
)
{
if
(
pPopupWin
)
{
...
...
@@ -205,7 +178,8 @@ IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl, ListBox&, void)
SFX_IMPL_TOOLBOX_CONTROL
(
SvxUndoRedoControl
,
SfxStringItem
);
SvxUndoRedoControl
::
SvxUndoRedoControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxListBoxControl
(
nSlotId
,
nId
,
rTbx
)
:
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
),
pPopupWin
(
nullptr
)
{
rTbx
.
SetItemBits
(
nId
,
ToolBoxItemBits
::
DROPDOWN
|
rTbx
.
GetItemBits
(
nId
)
);
rTbx
.
Invalidate
();
...
...
@@ -233,7 +207,8 @@ void SvxUndoRedoControl::StateChanged(
const
OUString
&
aQuickHelpText
=
rItem
.
GetValue
();
rBox
.
SetQuickHelpText
(
GetId
(),
aQuickHelpText
);
}
SvxListBoxControl
::
StateChanged
(
nSID
,
eState
,
pState
);
GetToolBox
().
EnableItem
(
GetId
(),
SfxItemState
::
DISABLED
!=
GetItemState
(
pState
)
);
}
else
{
...
...
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