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
0950700b
Kaydet (Commit)
0950700b
authored
Şub 13, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool->bool
Change-Id: I49b58a10fc89868aa5406d62eec3f2bc7186611c
üst
8b34d05c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
28 deletions
+29
-28
AccessibleCell.cxx
sc/source/ui/Accessibility/AccessibleCell.cxx
+17
-16
AccessibleCellBase.cxx
sc/source/ui/Accessibility/AccessibleCellBase.cxx
+3
-3
AccessiblePreviewCell.cxx
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+1
-1
AccessibleCell.hxx
sc/source/ui/inc/AccessibleCell.hxx
+6
-6
AccessibleCellBase.hxx
sc/source/ui/inc/AccessibleCellBase.hxx
+1
-1
AccessiblePreviewCell.hxx
sc/source/ui/inc/AccessiblePreviewCell.hxx
+1
-1
No files found.
sc/source/ui/Accessibility/AccessibleCell.cxx
Dosyayı görüntüle @
0950700b
...
@@ -320,17 +320,17 @@ uno::Sequence< OUString> SAL_CALL
...
@@ -320,17 +320,17 @@ uno::Sequence< OUString> SAL_CALL
//==== internal =========================================================
//==== internal =========================================================
sal_B
ool
ScAccessibleCell
::
IsDefunc
(
b
ool
ScAccessibleCell
::
IsDefunc
(
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
{
{
return
ScAccessibleContextBase
::
IsDefunc
()
||
(
mpDoc
==
NULL
)
||
(
mpViewShell
==
NULL
)
||
!
getAccessibleParent
().
is
()
||
return
ScAccessibleContextBase
::
IsDefunc
()
||
(
mpDoc
==
NULL
)
||
(
mpViewShell
==
NULL
)
||
!
getAccessibleParent
().
is
()
||
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
DEFUNC
));
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
DEFUNC
));
}
}
sal_B
ool
ScAccessibleCell
::
IsEditable
(
b
ool
ScAccessibleCell
::
IsEditable
(
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
{
{
sal_Bool
bEditable
(
sal_T
rue
);
bool
bEditable
(
t
rue
);
if
(
rxParentStates
.
is
()
&&
!
rxParentStates
->
contains
(
AccessibleStateType
::
EDITABLE
)
&&
if
(
rxParentStates
.
is
()
&&
!
rxParentStates
->
contains
(
AccessibleStateType
::
EDITABLE
)
&&
mpDoc
)
mpDoc
)
{
{
...
@@ -344,11 +344,11 @@ sal_Bool ScAccessibleCell::IsEditable(
...
@@ -344,11 +344,11 @@ sal_Bool ScAccessibleCell::IsEditable(
return
bEditable
;
return
bEditable
;
}
}
sal_B
ool
ScAccessibleCell
::
IsOpaque
(
b
ool
ScAccessibleCell
::
IsOpaque
(
const
uno
::
Reference
<
XAccessibleStateSet
>&
/* rxParentStates */
)
const
uno
::
Reference
<
XAccessibleStateSet
>&
/* rxParentStates */
)
{
{
// test whether there is a background color
// test whether there is a background color
sal_Bool
bOpaque
(
sal_T
rue
);
bool
bOpaque
(
t
rue
);
if
(
mpDoc
)
if
(
mpDoc
)
{
{
const
SvxBrushItem
*
pItem
=
(
const
SvxBrushItem
*
)
mpDoc
->
GetAttr
(
const
SvxBrushItem
*
pItem
=
(
const
SvxBrushItem
*
)
mpDoc
->
GetAttr
(
...
@@ -360,7 +360,7 @@ sal_Bool ScAccessibleCell::IsOpaque(
...
@@ -360,7 +360,7 @@ sal_Bool ScAccessibleCell::IsOpaque(
return
bOpaque
;
return
bOpaque
;
}
}
sal_B
ool
ScAccessibleCell
::
IsSelected
()
b
ool
ScAccessibleCell
::
IsSelected
()
{
{
if
(
IsFormulaMode
())
if
(
IsFormulaMode
())
{
{
...
@@ -369,10 +369,10 @@ sal_Bool ScAccessibleCell::IsSelected()
...
@@ -369,10 +369,10 @@ sal_Bool ScAccessibleCell::IsSelected()
{
{
return
pSheet
->
IsScAddrFormulaSel
(
maCellAddress
);
return
pSheet
->
IsScAddrFormulaSel
(
maCellAddress
);
}
}
return
sal_F
alse
;
return
f
alse
;
}
}
sal_B
ool
bResult
(
false
);
b
ool
bResult
(
false
);
if
(
mpViewShell
&&
mpViewShell
->
GetViewData
())
if
(
mpViewShell
&&
mpViewShell
->
GetViewData
())
{
{
const
ScMarkData
&
rMarkdata
=
mpViewShell
->
GetViewData
()
->
GetMarkData
();
const
ScMarkData
&
rMarkdata
=
mpViewShell
->
GetViewData
()
->
GetMarkData
();
...
@@ -565,16 +565,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAtt
...
@@ -565,16 +565,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAtt
return
aAttribs
;
return
aAttribs
;
}
}
sal_B
ool
ScAccessibleCell
::
IsFormulaMode
()
b
ool
ScAccessibleCell
::
IsFormulaMode
()
{
{
ScAccessibleSpreadsheet
*
pSheet
=
static_cast
<
ScAccessibleSpreadsheet
*>
(
mxParent
.
get
());
ScAccessibleSpreadsheet
*
pSheet
=
static_cast
<
ScAccessibleSpreadsheet
*>
(
mxParent
.
get
());
if
(
pSheet
)
if
(
pSheet
)
{
{
return
pSheet
->
IsFormulaMode
();
return
pSheet
->
IsFormulaMode
();
}
}
return
sal_F
alse
;
return
f
alse
;
}
}
sal_Bool
ScAccessibleCell
::
IsDropdown
()
bool
ScAccessibleCell
::
IsDropdown
()
{
{
sal_uInt16
nPosX
=
maCellAddress
.
Col
();
sal_uInt16
nPosX
=
maCellAddress
.
Col
();
sal_uInt16
nPosY
=
sal_uInt16
(
maCellAddress
.
Row
());
sal_uInt16
nPosY
=
sal_uInt16
(
maCellAddress
.
Row
());
...
@@ -584,13 +585,13 @@ sal_Bool ScAccessibleCell::IsDropdown()
...
@@ -584,13 +585,13 @@ sal_Bool ScAccessibleCell::IsDropdown()
{
{
const
ScValidationData
*
pData
=
mpDoc
->
GetValidationEntry
(
nValidation
);
const
ScValidationData
*
pData
=
mpDoc
->
GetValidationEntry
(
nValidation
);
if
(
pData
&&
pData
->
HasSelectionList
()
)
if
(
pData
&&
pData
->
HasSelectionList
()
)
return
sal_T
rue
;
return
t
rue
;
}
}
ScMergeFlagAttr
*
pAttr
;
ScMergeFlagAttr
*
pAttr
;
pAttr
=
(
ScMergeFlagAttr
*
)
mpDoc
->
GetAttr
(
nPosX
,
nPosY
,
nTab
,
ATTR_MERGE_FLAG
);
pAttr
=
(
ScMergeFlagAttr
*
)
mpDoc
->
GetAttr
(
nPosX
,
nPosY
,
nTab
,
ATTR_MERGE_FLAG
);
if
(
pAttr
->
HasAutoFilter
()
)
if
(
pAttr
->
HasAutoFilter
()
)
{
{
return
sal_T
rue
;
return
t
rue
;
}
}
else
else
{
{
...
@@ -619,11 +620,11 @@ sal_Bool ScAccessibleCell::IsDropdown()
...
@@ -619,11 +620,11 @@ sal_Bool ScAccessibleCell::IsDropdown()
{
{
bHasScenario
=
(
aRange
.
aStart
.
Col
()
==
nPosX
&&
aRange
.
aStart
.
Row
()
==
nPosY
+
1
);
bHasScenario
=
(
aRange
.
aStart
.
Col
()
==
nPosX
&&
aRange
.
aStart
.
Row
()
==
nPosY
+
1
);
}
}
if
(
bHasScenario
)
return
sal_T
rue
;
if
(
bHasScenario
)
return
t
rue
;
}
}
}
}
}
}
return
sal_F
alse
;
return
f
alse
;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/Accessibility/AccessibleCellBase.cxx
Dosyayı görüntüle @
0950700b
...
@@ -311,12 +311,12 @@ uno::Sequence<sal_Int8> SAL_CALL
...
@@ -311,12 +311,12 @@ uno::Sequence<sal_Int8> SAL_CALL
return
theScAccessibleCellBaseImplementationId
::
get
().
getSeq
();
return
theScAccessibleCellBaseImplementationId
::
get
().
getSeq
();
}
}
sal_B
ool
ScAccessibleCellBase
::
IsEditable
(
b
ool
ScAccessibleCellBase
::
IsEditable
(
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
const
uno
::
Reference
<
XAccessibleStateSet
>&
rxParentStates
)
{
{
sal_B
ool
bEditable
(
false
);
b
ool
bEditable
(
false
);
if
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
EDITABLE
))
if
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
EDITABLE
))
bEditable
=
sal_T
rue
;
bEditable
=
t
rue
;
return
bEditable
;
return
bEditable
;
}
}
...
...
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
Dosyayı görüntüle @
0950700b
...
@@ -259,7 +259,7 @@ sal_Bool ScAccessiblePreviewCell::IsDefunc(
...
@@ -259,7 +259,7 @@ sal_Bool ScAccessiblePreviewCell::IsDefunc(
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
DEFUNC
));
(
rxParentStates
.
is
()
&&
rxParentStates
->
contains
(
AccessibleStateType
::
DEFUNC
));
}
}
sal_B
ool
ScAccessiblePreviewCell
::
IsEditable
(
b
ool
ScAccessiblePreviewCell
::
IsEditable
(
const
uno
::
Reference
<
XAccessibleStateSet
>&
/* rxParentStates */
)
const
uno
::
Reference
<
XAccessibleStateSet
>&
/* rxParentStates */
)
{
{
return
false
;
return
false
;
...
...
sc/source/ui/inc/AccessibleCell.hxx
Dosyayı görüntüle @
0950700b
...
@@ -159,16 +159,16 @@ private:
...
@@ -159,16 +159,16 @@ private:
ScSplitPos
meSplitPos
;
ScSplitPos
meSplitPos
;
sal_B
ool
IsDefunc
(
b
ool
IsDefunc
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
virtual
sal_B
ool
IsEditable
(
virtual
b
ool
IsEditable
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
sal_B
ool
IsOpaque
(
b
ool
IsOpaque
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
sal_B
ool
IsSelected
();
b
ool
IsSelected
();
ScDocument
*
GetDocument
(
ScTabViewShell
*
mpViewShell
);
ScDocument
*
GetDocument
(
ScTabViewShell
*
mpViewShell
);
...
@@ -182,8 +182,8 @@ private:
...
@@ -182,8 +182,8 @@ private:
void
AddRelation
(
const
ScRange
&
rRange
,
void
AddRelation
(
const
ScRange
&
rRange
,
const
sal_uInt16
aRelationType
,
const
sal_uInt16
aRelationType
,
::
utl
::
AccessibleRelationSetHelper
*
pRelationSet
);
::
utl
::
AccessibleRelationSetHelper
*
pRelationSet
);
sal_B
ool
IsFormulaMode
();
b
ool
IsFormulaMode
();
sal_B
ool
IsDropdown
();
b
ool
IsDropdown
();
};
};
...
...
sc/source/ui/inc/AccessibleCellBase.hxx
Dosyayı görüntüle @
0950700b
...
@@ -134,7 +134,7 @@ protected:
...
@@ -134,7 +134,7 @@ protected:
sal_Int32
mnIndex
;
sal_Int32
mnIndex
;
private
:
private
:
virtual
sal_B
ool
IsEditable
(
virtual
b
ool
IsEditable
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
protected
:
protected
:
...
...
sc/source/ui/inc/AccessiblePreviewCell.hxx
Dosyayı görüntüle @
0950700b
...
@@ -98,7 +98,7 @@ private:
...
@@ -98,7 +98,7 @@ private:
sal_Bool
IsDefunc
(
sal_Bool
IsDefunc
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
virtual
sal_B
ool
IsEditable
(
virtual
b
ool
IsEditable
(
const
com
::
sun
::
star
::
uno
::
Reference
<
const
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
::
com
::
sun
::
star
::
accessibility
::
XAccessibleStateSet
>&
rxParentStates
);
sal_Bool
IsOpaque
(
sal_Bool
IsOpaque
(
...
...
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