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
84e3e6ee
Kaydet (Commit)
84e3e6ee
authored
Kas 23, 2016
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert DELMODE to scoped enum
Change-Id: Idd3f45adb43930358420dba464dbdb88fe27b91d
üst
ba9b0fb7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
20 deletions
+21
-20
editdoc.hxx
editeng/source/editeng/editdoc.hxx
+3
-3
editeng.cxx
editeng/source/editeng/editeng.cxx
+9
-8
impedit.hxx
editeng/source/editeng/impedit.hxx
+1
-1
impedit2.cxx
editeng/source/editeng/impedit2.cxx
+8
-8
No files found.
editeng/source/editeng/editdoc.hxx
Dosyayı görüntüle @
84e3e6ee
...
...
@@ -338,9 +338,9 @@ enum class PortionKind
HYPHENATOR
=
4
};
#define DELMODE_SIMPLE 0
#define DELMODE_RESTOFWORD 1
#define DELMODE_RESTOFCONTENT 2
enum
class
DeleteMode
{
Simple
,
RestOfWord
,
RestOfContent
};
#define CHAR_NORMAL 0x00
#define CHAR_KANA 0x01
...
...
editeng/source/editeng/editeng.cxx
Dosyayı görüntüle @
84e3e6ee
...
...
@@ -1140,30 +1140,31 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
break
;
}
sal_uInt8
nDel
=
0
,
nMode
=
0
;
sal_uInt8
nDel
=
0
;
DeleteMode
nMode
=
DeleteMode
::
Simple
;
switch
(
nCode
)
{
case
css
:
:
awt
::
Key
::
DELETE_WORD_BACKWARD
:
nMode
=
D
ELMODE_RESTOFWORD
;
nMode
=
D
eleteMode
::
RestOfWord
;
nDel
=
DEL_LEFT
;
break
;
case
css
:
:
awt
::
Key
::
DELETE_WORD_FORWARD
:
nMode
=
D
ELMODE_RESTOFWORD
;
nMode
=
D
eleteMode
::
RestOfWord
;
nDel
=
DEL_RIGHT
;
break
;
case
css
:
:
awt
::
Key
::
DELETE_TO_BEGIN_OF_PARAGRAPH
:
nMode
=
D
ELMODE_RESTOFCONTENT
;
nMode
=
D
eleteMode
::
RestOfContent
;
nDel
=
DEL_LEFT
;
break
;
case
css
:
:
awt
::
Key
::
DELETE_TO_END_OF_PARAGRAPH
:
nMode
=
D
ELMODE_RESTOFCONTENT
;
nMode
=
D
eleteMode
::
RestOfContent
;
nDel
=
DEL_RIGHT
;
break
;
default
:
nDel
=
(
nCode
==
KEY_DELETE
)
?
DEL_RIGHT
:
DEL_LEFT
;
nMode
=
rKeyEvent
.
GetKeyCode
().
IsMod1
()
?
D
ELMODE_RESTOFWORD
:
DELMODE_SIMPLE
;
if
(
(
nMode
==
D
ELMODE_RESTOFWORD
)
&&
rKeyEvent
.
GetKeyCode
().
IsShift
()
)
nMode
=
D
ELMODE_RESTOFCONTENT
;
nMode
=
rKeyEvent
.
GetKeyCode
().
IsMod1
()
?
D
eleteMode
::
RestOfWord
:
DeleteMode
::
Simple
;
if
(
(
nMode
==
D
eleteMode
::
RestOfWord
)
&&
rKeyEvent
.
GetKeyCode
().
IsShift
()
)
nMode
=
D
eleteMode
::
RestOfContent
;
break
;
}
...
...
editeng/source/editeng/impedit.hxx
Dosyayı görüntüle @
84e3e6ee
...
...
@@ -795,7 +795,7 @@ public:
EditPaM
InsertTextUserInput
(
const
EditSelection
&
rCurEditSelection
,
sal_Unicode
c
,
bool
bOverwrite
);
EditPaM
InsertText
(
const
EditSelection
&
aCurEditSelection
,
const
OUString
&
rStr
);
EditPaM
AutoCorrect
(
const
EditSelection
&
rCurEditSelection
,
sal_Unicode
c
,
bool
bOverwrite
,
vcl
::
Window
*
pFrameWin
=
nullptr
);
EditPaM
DeleteLeftOrRight
(
const
EditSelection
&
rEditSelection
,
sal_uInt8
nMode
,
sal_uInt8
nDelMode
);
EditPaM
DeleteLeftOrRight
(
const
EditSelection
&
rEditSelection
,
sal_uInt8
nMode
,
DeleteMode
nDelMode
);
EditPaM
InsertParaBreak
(
const
EditSelection
&
rEditSelection
);
EditPaM
InsertLineBreak
(
const
EditSelection
&
aEditSelection
);
EditPaM
InsertTab
(
const
EditSelection
&
rEditSelection
);
...
...
editeng/source/editeng/impedit2.cxx
Dosyayı görüntüle @
84e3e6ee
...
...
@@ -2267,7 +2267,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
return
aPaM
;
}
EditPaM
ImpEditEngine
::
DeleteLeftOrRight
(
const
EditSelection
&
rSel
,
sal_uInt8
nMode
,
sal_uInt8
nDelMode
)
EditPaM
ImpEditEngine
::
DeleteLeftOrRight
(
const
EditSelection
&
rSel
,
sal_uInt8
nMode
,
DeleteMode
nDelMode
)
{
OSL_ENSURE
(
!
EditSelection
(
rSel
).
DbgIsBuggy
(
aEditDoc
),
"Index out of range in DeleteLeftOrRight"
);
...
...
@@ -2279,11 +2279,11 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
EditPaM
aDelEnd
(
aCurPos
);
if
(
nMode
==
DEL_LEFT
)
{
if
(
nDelMode
==
D
ELMODE_SIMPLE
)
if
(
nDelMode
==
D
eleteMode
::
Simple
)
{
aDelStart
=
CursorLeft
(
aCurPos
,
i18n
::
CharacterIteratorMode
::
SKIPCHARACTER
);
}
else
if
(
nDelMode
==
D
ELMODE_RESTOFWORD
)
else
if
(
nDelMode
==
D
eleteMode
::
RestOfWord
)
{
aDelStart
=
StartOfWord
(
aCurPos
);
if
(
aDelStart
.
GetIndex
()
==
aCurPos
.
GetIndex
()
)
...
...
@@ -2303,11 +2303,11 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
}
else
{
if
(
nDelMode
==
D
ELMODE_SIMPLE
)
if
(
nDelMode
==
D
eleteMode
::
Simple
)
{
aDelEnd
=
CursorRight
(
aCurPos
);
}
else
if
(
nDelMode
==
D
ELMODE_RESTOFWORD
)
else
if
(
nDelMode
==
D
eleteMode
::
RestOfWord
)
{
aDelEnd
=
EndOfWord
(
aCurPos
);
...
...
@@ -2355,12 +2355,12 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n
}
// ConnectParagraphs not enough for different Nodes when
// D
ELMODE_RESTOFCONTENT
.
if
(
(
nDelMode
==
D
ELMODE_RESTOFCONTENT
)
||
(
aDelStart
.
GetNode
()
==
aDelEnd
.
GetNode
()
)
)
// D
eleteMode::RestOfContent
.
if
(
(
nDelMode
==
D
eleteMode
::
RestOfContent
)
||
(
aDelStart
.
GetNode
()
==
aDelEnd
.
GetNode
()
)
)
return
ImpDeleteSelection
(
EditSelection
(
aDelStart
,
aDelEnd
)
);
// Decide now if to delete selection (RESTOFCONTENTS)
bool
bSpecialBackward
=
(
nMode
==
DEL_LEFT
)
&&
(
nDelMode
==
D
ELMODE_SIMPLE
);
bool
bSpecialBackward
=
(
nMode
==
DEL_LEFT
)
&&
(
nDelMode
==
D
eleteMode
::
Simple
);
if
(
aStatus
.
IsAnyOutliner
()
)
bSpecialBackward
=
false
;
...
...
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