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
63654692
Kaydet (Commit)
63654692
authored
May 26, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
bCptlSttSntnc -> bCapitalStartSentence
Change-Id: Ie22198837257163fd7211e93d97d97be2bca4b64
üst
2704d45a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
autocdlg.cxx
cui/source/tabpages/autocdlg.cxx
+3
-3
acorrcfg.cxx
editeng/source/misc/acorrcfg.cxx
+2
-2
swafopt.cxx
editeng/source/misc/swafopt.cxx
+2
-2
swafopt.hxx
include/editeng/swafopt.hxx
+1
-1
autofmt.cxx
sw/source/core/edit/autofmt.cxx
+5
-5
No files found.
cui/source/tabpages/autocdlg.cxx
Dosyayı görüntüle @
63654692
...
@@ -537,8 +537,8 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
...
@@ -537,8 +537,8 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
m_pCheckLB
->
IsChecked
(
CORR_UPPER
,
CBCOL_SECOND
));
m_pCheckLB
->
IsChecked
(
CORR_UPPER
,
CBCOL_SECOND
));
bCheck
=
m_pCheckLB
->
IsChecked
(
BEGIN_UPPER
,
CBCOL_FIRST
);
bCheck
=
m_pCheckLB
->
IsChecked
(
BEGIN_UPPER
,
CBCOL_FIRST
);
bModified
|=
pOpt
->
bC
ptlSttSntnc
!=
bCheck
;
bModified
|=
pOpt
->
bC
apitalStartSentence
!=
bCheck
;
pOpt
->
bC
ptlSttSntnc
=
bCheck
;
pOpt
->
bC
apitalStartSentence
=
bCheck
;
pAutoCorrect
->
SetAutoCorrFlag
(
CptlSttSntnc
,
pAutoCorrect
->
SetAutoCorrFlag
(
CptlSttSntnc
,
m_pCheckLB
->
IsChecked
(
BEGIN_UPPER
,
CBCOL_SECOND
));
m_pCheckLB
->
IsChecked
(
BEGIN_UPPER
,
CBCOL_SECOND
));
...
@@ -673,7 +673,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
...
@@ -673,7 +673,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
m_pCheckLB
->
CheckEntryPos
(
USE_REPLACE_TABLE
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
Autocorrect
));
m_pCheckLB
->
CheckEntryPos
(
USE_REPLACE_TABLE
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
Autocorrect
));
m_pCheckLB
->
CheckEntryPos
(
CORR_UPPER
,
CBCOL_FIRST
,
pOpt
->
bCptlSttWrd
);
m_pCheckLB
->
CheckEntryPos
(
CORR_UPPER
,
CBCOL_FIRST
,
pOpt
->
bCptlSttWrd
);
m_pCheckLB
->
CheckEntryPos
(
CORR_UPPER
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
CptlSttWrd
)
);
m_pCheckLB
->
CheckEntryPos
(
CORR_UPPER
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
CptlSttWrd
)
);
m_pCheckLB
->
CheckEntryPos
(
BEGIN_UPPER
,
CBCOL_FIRST
,
pOpt
->
bC
ptlSttSntnc
);
m_pCheckLB
->
CheckEntryPos
(
BEGIN_UPPER
,
CBCOL_FIRST
,
pOpt
->
bC
apitalStartSentence
);
m_pCheckLB
->
CheckEntryPos
(
BEGIN_UPPER
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
CptlSttSntnc
)
);
m_pCheckLB
->
CheckEntryPos
(
BEGIN_UPPER
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
CptlSttSntnc
)
);
m_pCheckLB
->
CheckEntryPos
(
BOLD_UNDERLINE
,
CBCOL_FIRST
,
pOpt
->
bChgWeightUnderl
);
m_pCheckLB
->
CheckEntryPos
(
BOLD_UNDERLINE
,
CBCOL_FIRST
,
pOpt
->
bChgWeightUnderl
);
m_pCheckLB
->
CheckEntryPos
(
BOLD_UNDERLINE
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
ChgWeightUnderl
)
);
m_pCheckLB
->
CheckEntryPos
(
BOLD_UNDERLINE
,
CBCOL_SECOND
,
0
!=
(
nFlags
&
ChgWeightUnderl
)
);
...
...
editeng/source/misc/acorrcfg.cxx
Dosyayı görüntüle @
63654692
...
@@ -411,7 +411,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
...
@@ -411,7 +411,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
case
3
:
rParent
.
bAutoTextTip
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Text/ShowToolTip",
case
3
:
rParent
.
bAutoTextTip
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Text/ShowToolTip",
case
4
:
rParent
.
bSearchInAllCategories
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
//"Text/SearchInAllCategories"
case
4
:
rParent
.
bSearchInAllCategories
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
//"Text/SearchInAllCategories"
case
5
:
rSwFlags
.
bAutoCorrect
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/UseReplacementTable",
case
5
:
rSwFlags
.
bAutoCorrect
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/UseReplacementTable",
case
6
:
rSwFlags
.
bC
ptlSttSntnc
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/TwoCapitalsAtStart",
case
6
:
rSwFlags
.
bC
apitalStartSentence
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/TwoCapitalsAtStart",
case
7
:
rSwFlags
.
bCptlSttWrd
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/CapitalAtStartSentence",
case
7
:
rSwFlags
.
bCptlSttWrd
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/CapitalAtStartSentence",
case
8
:
rSwFlags
.
bChgWeightUnderl
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/ChangeUnderlineWeight",
case
8
:
rSwFlags
.
bChgWeightUnderl
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/ChangeUnderlineWeight",
case
9
:
rSwFlags
.
bSetINetAttr
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/SetInetAttribute",
case
9
:
rSwFlags
.
bSetINetAttr
=
*
static_cast
<
sal_Bool
const
*>
(
pValues
[
nProp
].
getValue
());
break
;
// "Format/Option/SetInetAttribute",
...
@@ -565,7 +565,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
...
@@ -565,7 +565,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
case
3
:
pValues
[
nProp
].
setValue
(
&
rParent
.
bAutoTextTip
,
rType
);
break
;
// "Text/ShowToolTip",
case
3
:
pValues
[
nProp
].
setValue
(
&
rParent
.
bAutoTextTip
,
rType
);
break
;
// "Text/ShowToolTip",
case
4
:
pValues
[
nProp
].
setValue
(
&
rParent
.
bSearchInAllCategories
,
rType
);
break
;
//"Text/SearchInAllCategories"
case
4
:
pValues
[
nProp
].
setValue
(
&
rParent
.
bSearchInAllCategories
,
rType
);
break
;
//"Text/SearchInAllCategories"
case
5
:
bVal
=
rSwFlags
.
bAutoCorrect
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/UseReplacementTable",
case
5
:
bVal
=
rSwFlags
.
bAutoCorrect
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/UseReplacementTable",
case
6
:
bVal
=
rSwFlags
.
bC
ptlSttSntnc
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/TwoCapitalsAtStart",
case
6
:
bVal
=
rSwFlags
.
bC
apitalStartSentence
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/TwoCapitalsAtStart",
case
7
:
bVal
=
rSwFlags
.
bCptlSttWrd
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/CapitalAtStartSentence",
case
7
:
bVal
=
rSwFlags
.
bCptlSttWrd
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/CapitalAtStartSentence",
case
8
:
bVal
=
rSwFlags
.
bChgWeightUnderl
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/ChangeUnderlineWeight",
case
8
:
bVal
=
rSwFlags
.
bChgWeightUnderl
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/ChangeUnderlineWeight",
case
9
:
bVal
=
rSwFlags
.
bSetINetAttr
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/SetInetAttribute",
case
9
:
bVal
=
rSwFlags
.
bSetINetAttr
;
pValues
[
nProp
].
setValue
(
&
bVal
,
rType
);
break
;
// "Format/Option/SetInetAttribute",
...
...
editeng/source/misc/swafopt.cxx
Dosyayı görüntüle @
63654692
...
@@ -26,7 +26,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
...
@@ -26,7 +26,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
Size
(
0
,
14
)
)
Size
(
0
,
14
)
)
{
{
bAutoCorrect
=
bAutoCorrect
=
bC
ptlSttSntnc
=
bC
apitalStartSentence
=
bCptlSttWrd
=
bCptlSttWrd
=
bChkFontAttr
=
bChkFontAttr
=
bChgUserColl
=
bChgUserColl
=
...
@@ -84,7 +84,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
...
@@ -84,7 +84,7 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
SvxSwAutoFormatFlags
&
SvxSwAutoFormatFlags
::
operator
=
(
const
SvxSwAutoFormatFlags
&
rAFFlags
)
SvxSwAutoFormatFlags
&
SvxSwAutoFormatFlags
::
operator
=
(
const
SvxSwAutoFormatFlags
&
rAFFlags
)
{
{
bAutoCorrect
=
rAFFlags
.
bAutoCorrect
;
bAutoCorrect
=
rAFFlags
.
bAutoCorrect
;
bC
ptlSttSntnc
=
rAFFlags
.
bCptlSttSntnc
;
bC
apitalStartSentence
=
rAFFlags
.
bCapitalStartSentence
;
bCptlSttWrd
=
rAFFlags
.
bCptlSttWrd
;
bCptlSttWrd
=
rAFFlags
.
bCptlSttWrd
;
bChkFontAttr
=
rAFFlags
.
bChkFontAttr
;
bChkFontAttr
=
rAFFlags
.
bChkFontAttr
;
...
...
include/editeng/swafopt.hxx
Dosyayı görüntüle @
63654692
...
@@ -76,7 +76,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
...
@@ -76,7 +76,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
sal_uInt8
nRightMargin
;
sal_uInt8
nRightMargin
;
bool
bAutoCorrect
:
1
;
bool
bAutoCorrect
:
1
;
bool
bC
ptlSttSntnc
:
1
;
bool
bC
apitalStartSentence
:
1
;
bool
bCptlSttWrd
:
1
;
bool
bCptlSttWrd
:
1
;
bool
bChkFontAttr
:
1
;
bool
bChkFontAttr
:
1
;
...
...
sw/source/core/edit/autofmt.cxx
Dosyayı görüntüle @
63654692
...
@@ -1785,7 +1785,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
...
@@ -1785,7 +1785,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
if
(
m_aFlags
.
bAFormatByInput
||
if
(
m_aFlags
.
bAFormatByInput
||
(
!
m_aFlags
.
bAutoCorrect
&&
!
bReplaceQuote
&&
!
bReplaceSglQuote
&&
(
!
m_aFlags
.
bAutoCorrect
&&
!
bReplaceQuote
&&
!
bReplaceSglQuote
&&
!
m_aFlags
.
bC
ptlSttSntnc
&&
!
m_aFlags
.
bCptlSttWrd
&&
!
m_aFlags
.
bC
apitalStartSentence
&&
!
m_aFlags
.
bCptlSttWrd
&&
!
m_aFlags
.
bChgOrdinalNumber
&&
!
m_aFlags
.
bChgOrdinalNumber
&&
!
m_aFlags
.
bChgToEnEmDash
&&
!
m_aFlags
.
bSetINetAttr
&&
!
m_aFlags
.
bChgToEnEmDash
&&
!
m_aFlags
.
bSetINetAttr
&&
!
m_aFlags
.
bChgWeightUnderl
&&
!
m_aFlags
.
bAddNonBrkSpace
)
)
!
m_aFlags
.
bChgWeightUnderl
&&
!
m_aFlags
.
bAddNonBrkSpace
)
)
...
@@ -1797,7 +1797,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
...
@@ -1797,7 +1797,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
bool
bGetLanguage
=
m_aFlags
.
bChgOrdinalNumber
||
bool
bGetLanguage
=
m_aFlags
.
bChgOrdinalNumber
||
m_aFlags
.
bChgToEnEmDash
||
m_aFlags
.
bSetINetAttr
||
m_aFlags
.
bChgToEnEmDash
||
m_aFlags
.
bSetINetAttr
||
m_aFlags
.
bCptlSttWrd
||
m_aFlags
.
bC
ptlSttSntnc
||
m_aFlags
.
bCptlSttWrd
||
m_aFlags
.
bC
apitalStartSentence
||
m_aFlags
.
bAddNonBrkSpace
;
m_aFlags
.
bAddNonBrkSpace
;
m_aDelPam
.
DeleteMark
();
m_aDelPam
.
DeleteMark
();
...
@@ -1809,7 +1809,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
...
@@ -1809,7 +1809,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
SwTextFrmInfo
aFInfo
(
0
);
SwTextFrmInfo
aFInfo
(
0
);
sal_Int32
nSttPos
,
nLastBlank
=
nPos
;
sal_Int32
nSttPos
,
nLastBlank
=
nPos
;
bool
bFirst
=
m_aFlags
.
bC
ptlSttSntnc
,
bFirstSent
=
bFirst
;
bool
bFirst
=
m_aFlags
.
bC
apitalStartSentence
,
bFirstSent
=
bFirst
;
sal_Unicode
cChar
=
0
;
sal_Unicode
cChar
=
0
;
CharClass
&
rAppCC
=
GetAppCharClass
();
CharClass
&
rAppCC
=
GetAppCharClass
();
...
@@ -1973,7 +1973,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
...
@@ -1973,7 +1973,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
case
'.'
:
case
'.'
:
case
'!'
:
case
'!'
:
case
'?'
:
case
'?'
:
if
(
m_aFlags
.
bC
ptlSttSntnc
)
if
(
m_aFlags
.
bC
apitalStartSentence
)
bFirstSent
=
true
;
bFirstSent
=
true
;
/* fallthrough */
/* fallthrough */
default
:
default
:
...
@@ -2046,7 +2046,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
...
@@ -2046,7 +2046,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
pATst
->
FnCptlSttWrd
(
aACorrDoc
,
*
pText
,
nSttPos
,
nPos
,
eLang
);
pATst
->
FnCptlSttWrd
(
aACorrDoc
,
*
pText
,
nSttPos
,
nPos
,
eLang
);
}
}
// capital letter at the beginning of a sentence?
// capital letter at the beginning of a sentence?
if
(
m_aFlags
.
bC
ptlSttSntnc
&&
bFirst
)
if
(
m_aFlags
.
bC
apitalStartSentence
&&
bFirst
)
{
{
SetRedlineText
(
STR_AUTOFMTREDL_CPTL_STT_SENT
);
SetRedlineText
(
STR_AUTOFMTREDL_CPTL_STT_SENT
);
pATst
->
FnCptlSttSntnc
(
aACorrDoc
,
*
pText
,
true
,
nSttPos
,
nPos
,
eLang
);
pATst
->
FnCptlSttSntnc
(
aACorrDoc
,
*
pText
,
true
,
nSttPos
,
nPos
,
eLang
);
...
...
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