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
c647fff0
Kaydet (Commit)
c647fff0
authored
May 03, 2015
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Use auto and range-based for loops
Change-Id: I5fecd9cfb64fee9d18e4491e6219c1b90e64ea7c
üst
9eb61489
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
fefly1.cxx
sw/source/core/frmedt/fefly1.cxx
+7
-11
No files found.
sw/source/core/frmedt/fefly1.cxx
Dosyayı görüntüle @
c647fff0
...
@@ -907,9 +907,8 @@ void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr )
...
@@ -907,9 +907,8 @@ void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr )
{
{
rFillArr
.
clear
();
rFillArr
.
clear
();
for
(
sal_uInt16
n
=
0
;
n
<
mpDoc
->
GetSpzFrmFmts
()
->
size
();
++
n
)
for
(
auto
pFmt
:
*
mpDoc
->
GetSpzFrmFmts
()
)
{
{
SwFrmFmt
*
pFmt
=
(
*
mpDoc
->
GetSpzFrmFmts
())[
n
];
if
(
FLY_AT_PAGE
==
pFmt
->
GetAnchor
().
GetAnchorId
())
if
(
FLY_AT_PAGE
==
pFmt
->
GetAnchor
().
GetAnchorId
())
{
{
rFillArr
.
push_back
(
pFmt
);
rFillArr
.
push_back
(
pFmt
);
...
@@ -929,9 +928,8 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
...
@@ -929,9 +928,8 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
SwRootFrm
*
pTmpRootFrm
=
GetLayout
();
SwRootFrm
*
pTmpRootFrm
=
GetLayout
();
sal_uInt16
nMaxPage
=
pTmpRootFrm
->
GetPageNum
();
sal_uInt16
nMaxPage
=
pTmpRootFrm
->
GetPageNum
();
bool
bTmpAssert
=
false
;
bool
bTmpAssert
=
false
;
for
(
sal_uInt16
n
=
0
;
n
<
rFillArr
.
size
();
++
n
)
for
(
auto
pFmt
:
rFillArr
)
{
{
SwFrmFmt
*
pFmt
=
rFillArr
[
n
];
if
(
mpDoc
->
GetSpzFrmFmts
()
->
Contains
(
pFmt
))
if
(
mpDoc
->
GetSpzFrmFmts
()
->
Contains
(
pFmt
))
{
{
// FlyFmt is still valid, therefore process
// FlyFmt is still valid, therefore process
...
@@ -1394,17 +1392,15 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
...
@@ -1394,17 +1392,15 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
// do not search the Fly via the layout. Now we can delete a frame
// do not search the Fly via the layout. Now we can delete a frame
// without a valid layout. ( e.g. for the wizards )
// without a valid layout. ( e.g. for the wizards )
SwFrmFmts
&
rSpzArr
=
*
mpDoc
->
GetSpzFrmFmts
();
SwFrmFmts
&
rSpzArr
=
*
mpDoc
->
GetSpzFrmFmts
();
sal_uInt16
nCnt
=
rSpzArr
.
size
();
if
(
!
rSpzArr
.
empty
()
)
if
(
nCnt
)
{
{
SwNodeIndex
&
rCrsrNd
=
GetCrsr
()
->
GetPoint
()
->
nNode
;
SwNodeIndex
&
rCrsrNd
=
GetCrsr
()
->
GetPoint
()
->
nNode
;
if
(
rCrsrNd
.
GetIndex
()
>
mpDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
()
)
if
(
rCrsrNd
.
GetIndex
()
>
mpDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
()
)
// Cursor is in the body area!
// Cursor is in the body area!
return
0
;
return
0
;
for
(
sal_uInt16
n
=
0
;
n
<
nCnt
;
++
n
)
for
(
auto
pFmt
:
rSpzArr
)
{
{
SwFrmFmt
*
pFmt
=
rSpzArr
[
n
];
const
SwNodeIndex
*
pIdx
=
pFmt
->
GetCntnt
(
false
).
GetCntntIdx
();
const
SwNodeIndex
*
pIdx
=
pFmt
->
GetCntnt
(
false
).
GetCntntIdx
();
SwStartNode
*
pSttNd
;
SwStartNode
*
pSttNd
;
if
(
pIdx
&&
if
(
pIdx
&&
...
@@ -1470,7 +1466,7 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
...
@@ -1470,7 +1466,7 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
const
SwFrmFmt
*
pRet
=
0
;
const
SwFrmFmt
*
pRet
=
0
;
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
sal_uInt16
nOld
=
pDView
->
GetHitTolerancePixel
();
const
auto
nOld
=
pDView
->
GetHitTolerancePixel
();
pDView
->
SetHitTolerancePixel
(
2
);
pDView
->
SetHitTolerancePixel
(
2
);
if
(
pDView
->
PickObj
(
rPt
,
pDView
->
getHitTolLog
(),
pObj
,
pPV
,
SdrSearchOptions
::
PICKMACRO
)
&&
if
(
pDView
->
PickObj
(
rPt
,
pDView
->
getHitTolLog
(),
pObj
,
pPV
,
SdrSearchOptions
::
PICKMACRO
)
&&
...
@@ -1579,7 +1575,7 @@ const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill
...
@@ -1579,7 +1575,7 @@ const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
sal_uInt16
nOld
=
pDView
->
GetHitTolerancePixel
();
const
auto
nOld
=
pDView
->
GetHitTolerancePixel
();
// tolerance for Drawing-SS
// tolerance for Drawing-SS
pDView
->
SetHitTolerancePixel
(
pDView
->
GetMarkHdlSizePixel
()
/
2
);
pDView
->
SetHitTolerancePixel
(
pDView
->
GetMarkHdlSizePixel
()
/
2
);
...
@@ -1703,7 +1699,7 @@ ObjCntType SwFEShell::GetObjCntType( const Point &rPt, SdrObject *&rpObj ) const
...
@@ -1703,7 +1699,7 @@ ObjCntType SwFEShell::GetObjCntType( const Point &rPt, SdrObject *&rpObj ) const
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
SwDrawView
*
pDView
=
const_cast
<
SwDrawView
*>
(
Imp
()
->
GetDrawView
());
sal_uInt16
nOld
=
pDView
->
GetHitTolerancePixel
();
const
auto
nOld
=
pDView
->
GetHitTolerancePixel
();
// tolerance for Drawing-SS
// tolerance for Drawing-SS
pDView
->
SetHitTolerancePixel
(
pDView
->
GetMarkHdlSizePixel
()
/
2
);
pDView
->
SetHitTolerancePixel
(
pDView
->
GetMarkHdlSizePixel
()
/
2
);
...
...
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