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
abf56d46
Kaydet (Commit)
abf56d46
authored
Tem 27, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: replace boost::ptr_set with std::map<std::unique_ptr>
Change-Id: I2af80c8223ec3074058c013be7302ebf8edad95c
üst
27825a35
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
uiregionsw.cxx
sw/source/ui/dialog/uiregionsw.cxx
+6
-4
regionsw.hxx
sw/source/uibase/inc/regionsw.hxx
+4
-3
No files found.
sw/source/ui/dialog/uiregionsw.cxx
Dosyayı görüntüle @
abf56d46
...
@@ -142,7 +142,7 @@ private:
...
@@ -142,7 +142,7 @@ private:
SwFormatNoBalancedColumns
m_Balance
;
SwFormatNoBalancedColumns
m_Balance
;
SvxFrameDirectionItem
m_FrmDirItem
;
SvxFrameDirectionItem
m_FrmDirItem
;
SvxLRSpaceItem
m_LRSpaceItem
;
SvxLRSpaceItem
m_LRSpaceItem
;
size_t
m_nArrPos
;
const
size_t
m_nArrPos
;
// shows, if maybe textcontent is in the region
// shows, if maybe textcontent is in the region
bool
m_bContent
:
1
;
bool
m_bContent
:
1
;
// for multiselection, mark at first, then work with TreeListBox!
// for multiselection, mark at first, then work with TreeListBox!
...
@@ -816,9 +816,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
...
@@ -816,9 +816,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
pEntry
=
m_pTree
->
Next
(
pEntry
);
pEntry
=
m_pTree
->
Next
(
pEntry
);
}
}
for
(
SectRepr
Arr
::
reverse_iterator
aI
=
aSectReprArr
.
rbegin
(),
aEnd
=
aSectReprArr
.
rend
();
aI
!=
aEnd
;
++
aI
)
for
(
SectRepr
s_t
::
reverse_iterator
it
=
m_SectReprs
.
rbegin
(),
aEnd
=
m_SectReprs
.
rend
();
it
!=
aEnd
;
++
it
)
{
{
SwSectionFormat
*
pFormat
=
aOrigArray
[
aI
->
GetArrPos
()
];
assert
(
it
->
first
==
it
->
second
->
GetArrPos
());
SwSectionFormat
*
pFormat
=
aOrigArray
[
it
->
second
->
GetArrPos
()
];
const
size_t
nNewPos
=
rDocFormats
.
GetPos
(
pFormat
);
const
size_t
nNewPos
=
rDocFormats
.
GetPos
(
pFormat
);
if
(
SIZE_MAX
!=
nNewPos
)
if
(
SIZE_MAX
!=
nNewPos
)
rSh
.
DelSectionFormat
(
nNewPos
);
rSh
.
DelSectionFormat
(
nNewPos
);
...
@@ -930,7 +931,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
...
@@ -930,7 +931,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
bool
bRestart
=
false
;
bool
bRestart
=
false
;
if
(
pSectRepr
->
IsSelected
())
if
(
pSectRepr
->
IsSelected
())
{
{
aSectReprArr
.
insert
(
pSectRepr
);
m_SectReprs
.
insert
(
std
::
make_pair
(
pSectRepr
->
GetArrPos
(),
std
::
unique_ptr
<
SectRepr
>
(
pSectRepr
)));
while
(
(
pChild
=
m_pTree
->
FirstChild
(
pEntry
)
)
!=
0
)
while
(
(
pChild
=
m_pTree
->
FirstChild
(
pEntry
)
)
!=
0
)
{
{
// because of the repositioning we have to start at the beginning again
// because of the repositioning we have to start at the beginning again
...
...
sw/source/uibase/inc/regionsw.hxx
Dosyayı görüntüle @
abf56d46
...
@@ -44,7 +44,8 @@
...
@@ -44,7 +44,8 @@
#include <svx/paraprev.hxx>
#include <svx/paraprev.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <boost/ptr_container/ptr_set.hpp>
#include <memory>
#include <map>
class
SwWrtShell
;
class
SwWrtShell
;
...
@@ -56,7 +57,7 @@ namespace sfx2
...
@@ -56,7 +57,7 @@ namespace sfx2
// dialog "edit regions"
// dialog "edit regions"
class
SectRepr
;
class
SectRepr
;
typedef
boost
::
ptr_set
<
SectRepr
>
SectReprArr
;
typedef
std
::
map
<
size_t
,
std
::
unique_ptr
<
SectRepr
>>
SectReprs_t
;
class
SwEditRegionDlg
:
public
SfxModalDialog
class
SwEditRegionDlg
:
public
SfxModalDialog
{
{
...
@@ -91,7 +92,7 @@ class SwEditRegionDlg : public SfxModalDialog
...
@@ -91,7 +92,7 @@ class SwEditRegionDlg : public SfxModalDialog
ImageList
aImageIL
;
ImageList
aImageIL
;
SwWrtShell
&
rSh
;
SwWrtShell
&
rSh
;
SectRepr
Arr
aSectReprArr
;
SectRepr
s_t
m_SectReprs
;
const
SwSection
*
pCurrSect
;
const
SwSection
*
pCurrSect
;
sfx2
::
DocumentInserter
*
m_pDocInserter
;
sfx2
::
DocumentInserter
*
m_pDocInserter
;
VclPtr
<
vcl
::
Window
>
m_pOldDefDlgParent
;
VclPtr
<
vcl
::
Window
>
m_pOldDefDlgParent
;
...
...
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