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
48d0affa
Kaydet (Commit)
48d0affa
authored
May 18, 2016
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: tdf#99930 SetReplaceLeadingSingleQuotationMark(false) for Calc
Change-Id: I29906de6a4075b7de82bd6e16560b56b9b648e91
üst
fe3d9ac2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
1 deletion
+27
-1
editeng.cxx
editeng/source/editeng/editeng.cxx
+5
-0
impedit.hxx
editeng/source/editeng/impedit.hxx
+6
-0
impedit2.cxx
editeng/source/editeng/impedit2.cxx
+10
-1
editeng.hxx
include/editeng/editeng.hxx
+4
-0
inputhdl.cxx
sc/source/ui/app/inputhdl.cxx
+1
-0
inputwin.cxx
sc/source/ui/app/inputwin.cxx
+1
-0
No files found.
editeng/source/editeng/editeng.cxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -2712,6 +2712,11 @@ void EditEngine::SetFirstWordCapitalization( bool bCapitalize )
pImpEditEngine
->
SetFirstWordCapitalization
(
bCapitalize
);
}
void
EditEngine
::
SetReplaceLeadingSingleQuotationMark
(
bool
bReplace
)
{
pImpEditEngine
->
SetReplaceLeadingSingleQuotationMark
(
bReplace
);
}
bool
EditEngine
::
IsImportHandlerSet
()
const
{
return
pImpEditEngine
->
aImportHdl
.
IsSet
();
...
...
editeng/source/editeng/impedit.hxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -510,6 +510,7 @@ private:
bool
bImpConvertFirstCall
:
1
;
// specifies if ImpConvert is called the very first time after Convert was called
bool
bFirstWordCapitalization
:
1
;
// specifies if auto-correction should capitalize the first word or not
bool
mbLastTryMerge
:
1
;
bool
mbReplaceLeadingSingleQuotationMark
:
1
;
// Methods...
...
...
@@ -1020,6 +1021,11 @@ public:
/// specifies if auto-correction should capitalize the first word or not (default is on)
void
SetFirstWordCapitalization
(
bool
bCapitalize
)
{
bFirstWordCapitalization
=
bCapitalize
;
}
bool
IsFirstWordCapitalization
()
const
{
return
bFirstWordCapitalization
;
}
/** specifies if auto-correction should replace a leading single quotation
mark (apostrophe) or not (default is on) */
void
SetReplaceLeadingSingleQuotationMark
(
bool
bReplace
)
{
mbReplaceLeadingSingleQuotationMark
=
bReplace
;
}
bool
IsReplaceLeadingSingleQuotationMark
()
const
{
return
mbReplaceLeadingSingleQuotationMark
;
}
};
inline
EPaM
ImpEditEngine
::
CreateEPaM
(
const
EditPaM
&
rPaM
)
...
...
editeng/source/editeng/impedit2.cxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -102,7 +102,8 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bCallParaInsertedOrDeleted
(
false
),
bImpConvertFirstCall
(
false
),
bFirstWordCapitalization
(
true
),
mbLastTryMerge
(
false
)
mbLastTryMerge
(
false
),
mbReplaceLeadingSingleQuotationMark
(
true
)
{
pEditEngine
=
pEE
;
pRefDev
=
nullptr
;
...
...
@@ -2464,6 +2465,14 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
EditPaM
ImpEditEngine
::
AutoCorrect
(
const
EditSelection
&
rCurSel
,
sal_Unicode
c
,
bool
bOverwrite
,
vcl
::
Window
*
pFrameWin
)
{
// i.e. Calc has special needs regarding a leading single quotation mark
// when starting cell input.
if
(
c
==
'\''
&&
!
IsReplaceLeadingSingleQuotationMark
()
&&
rCurSel
.
Min
()
==
rCurSel
.
Max
()
&&
rCurSel
.
Max
().
GetIndex
()
==
0
)
{
return
InsertTextUserInput
(
rCurSel
,
c
,
bOverwrite
);
}
EditSelection
aSel
(
rCurSel
);
SvxAutoCorrect
*
pAutoCorrect
=
SvxAutoCorrCfg
::
Get
().
GetAutoCorrect
();
if
(
pAutoCorrect
)
...
...
include/editeng/editeng.hxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -527,6 +527,10 @@ public:
/// specifies if auto-correction should capitalize the first word or not (default is on)
void
SetFirstWordCapitalization
(
bool
bCapitalize
);
/** specifies if auto-correction should replace a leading single quotation
mark (apostrophe) or not (default is on) */
void
SetReplaceLeadingSingleQuotationMark
(
bool
bReplace
);
EditDoc
&
GetEditDoc
();
const
EditDoc
&
GetEditDoc
()
const
;
...
...
sc/source/ui/app/inputhdl.cxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -730,6 +730,7 @@ void ScInputHandler::ImplCreateEditEngine()
pEditDefaults
=
new
SfxItemSet
(
pEngine
->
GetEmptyItemSet
()
);
pEngine
->
SetControlWord
(
pEngine
->
GetControlWord
()
|
EEControlBits
::
AUTOCORRECT
);
pEngine
->
SetReplaceLeadingSingleQuotationMark
(
false
);
pEngine
->
SetModifyHdl
(
LINK
(
this
,
ScInputHandler
,
ModifyHdl
)
);
}
}
...
...
sc/source/ui/app/inputwin.cxx
Dosyayı görüntüle @
48d0affa
...
...
@@ -1299,6 +1299,7 @@ void ScTextWnd::InitEditEngine()
pEditEngine
->
SetPaperSize
(
PixelToLogic
(
Size
(
barSize
.
Width
(),
10000
))
);
pEditEngine
->
SetWordDelimiters
(
ScEditUtil
::
ModifyDelimiters
(
pEditEngine
->
GetWordDelimiters
()
)
);
pEditEngine
->
SetReplaceLeadingSingleQuotationMark
(
false
);
UpdateAutoCorrFlag
();
...
...
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