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
ee2d0d06
Kaydet (Commit)
ee2d0d06
authored
Kas 06, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
refactor delete code into FuDeleteSelectedObjects
Change-Id: If6929dfae5e284b1201da5505b9c4e5abceedc6d
üst
8ec5b1a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
15 deletions
+24
-15
DrawViewShell.hxx
sd/source/ui/inc/DrawViewShell.hxx
+1
-0
drviewse.cxx
sd/source/ui/view/drviewse.cxx
+23
-15
No files found.
sd/source/ui/inc/DrawViewShell.hxx
Dosyayı görüntüle @
ee2d0d06
...
@@ -221,6 +221,7 @@ public:
...
@@ -221,6 +221,7 @@ public:
void
FuTemporary
(
SfxRequest
&
rReq
);
void
FuTemporary
(
SfxRequest
&
rReq
);
void
FuPermanent
(
SfxRequest
&
rReq
);
void
FuPermanent
(
SfxRequest
&
rReq
);
void
FuSupport
(
SfxRequest
&
rReq
);
void
FuSupport
(
SfxRequest
&
rReq
);
void
FuDeleteSelectedObjects
();
void
FuSupportRotate
(
SfxRequest
&
rReq
);
void
FuSupportRotate
(
SfxRequest
&
rReq
);
void
FuTable
(
SfxRequest
&
rReq
);
void
FuTable
(
SfxRequest
&
rReq
);
...
...
sd/source/ui/view/drviewse.cxx
Dosyayı görüntüle @
ee2d0d06
...
@@ -624,6 +624,28 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
...
@@ -624,6 +624,28 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
}
}
}
}
void
DrawViewShell
::
FuDeleteSelectedObjects
()
{
if
(
mpDrawView
->
IsPresObjSelected
(
false
,
true
,
false
,
true
)
)
{
::
sd
::
Window
*
pWindow
=
GetActiveWindow
();
InfoBox
(
pWindow
,
SD_RESSTR
(
STR_ACTION_NOTPOSSIBLE
)
).
Execute
();
}
else
{
::
vcl
::
KeyCode
aKCode
(
KEY_DELETE
);
KeyEvent
aKEvt
(
0
,
aKCode
);
bool
bConsumed
=
mpDrawView
&&
mpDrawView
->
getSmartTags
().
KeyInput
(
aKEvt
);
if
(
!
bConsumed
&&
HasCurrentFunction
()
)
bConsumed
=
GetCurrentFunction
()
->
KeyInput
(
aKEvt
);
if
(
!
bConsumed
&&
mpDrawView
)
mpDrawView
->
DeleteMarked
();
}
}
void
DrawViewShell
::
FuSupport
(
SfxRequest
&
rReq
)
void
DrawViewShell
::
FuSupport
(
SfxRequest
&
rReq
)
{
{
if
(
rReq
.
GetSlot
()
==
SID_STYLE_FAMILY
&&
rReq
.
GetArgs
())
if
(
rReq
.
GetSlot
()
==
SID_STYLE_FAMILY
&&
rReq
.
GetArgs
())
...
@@ -871,23 +893,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
...
@@ -871,23 +893,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
pOLV
->
PostKeyEvent
(
aKEvt
);
pOLV
->
PostKeyEvent
(
aKEvt
);
}
}
}
}
else
if
(
mpDrawView
->
IsPresObjSelected
(
false
,
true
,
false
,
true
)
)
{
::
sd
::
Window
*
pWindow
=
GetActiveWindow
();
InfoBox
(
pWindow
,
SD_RESSTR
(
STR_ACTION_NOTPOSSIBLE
)
).
Execute
();
}
else
else
{
{
::
vcl
::
KeyCode
aKCode
(
KEY_DELETE
);
FuDeleteSelectedObjects
();
KeyEvent
aKEvt
(
0
,
aKCode
);
bool
bConsumed
=
mpDrawView
&&
mpDrawView
->
getSmartTags
().
KeyInput
(
aKEvt
);
if
(
!
bConsumed
&&
HasCurrentFunction
()
)
bConsumed
=
GetCurrentFunction
()
->
KeyInput
(
aKEvt
);
if
(
!
bConsumed
&&
mpDrawView
)
mpDrawView
->
DeleteMarked
();
}
}
rReq
.
Ignore
();
rReq
.
Ignore
();
}
}
...
...
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