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
74c21e70
Kaydet (Commit)
74c21e70
authored
Mar 22, 2015
tarafından
Tomaž Vajngerl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
LinePropertyPanel - scoped_ptr -> unique_ptr
Change-Id: I52708b6ca13f76391355b1c0eefc1dcf22dcc273
üst
647b9681
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
LinePropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.cxx
+6
-6
LinePropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanel.hxx
+4
-5
No files found.
svx/source/sidebar/line/LinePropertyPanel.cxx
Dosyayı görüntüle @
74c21e70
...
@@ -166,8 +166,8 @@ LinePropertyPanel::LinePropertyPanel(
...
@@ -166,8 +166,8 @@ LinePropertyPanel::LinePropertyPanel(
mnTrans
(
0
),
mnTrans
(
0
),
meMapUnit
(
SFX_MAPUNIT_MM
),
meMapUnit
(
SFX_MAPUNIT_MM
),
mnWidthCoreValue
(
0
),
mnWidthCoreValue
(
0
),
mpStartItem
(
0
),
mpStartItem
(),
mpEndItem
(
0
),
mpEndItem
(),
maLineWidthPopup
(
this
,
::
boost
::
bind
(
&
LinePropertyPanel
::
CreateLineWidthPopupControl
,
this
,
_1
)),
maLineWidthPopup
(
this
,
::
boost
::
bind
(
&
LinePropertyPanel
::
CreateLineWidthPopupControl
,
this
,
_1
)),
maIMGNone
(
SVX_RES
(
IMG_NONE_ICON
)),
maIMGNone
(
SVX_RES
(
IMG_NONE_ICON
)),
mpIMGWidthIcon
(),
mpIMGWidthIcon
(),
...
@@ -637,7 +637,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
...
@@ -637,7 +637,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
sal_Int32
nPos
=
mpLBStart
->
GetSelectEntryPos
();
sal_Int32
nPos
=
mpLBStart
->
GetSelectEntryPos
();
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
&&
mpLBStart
->
IsValueChangedFromSaved
()
)
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
&&
mpLBStart
->
IsValueChangedFromSaved
()
)
{
{
boost
::
scoped
_ptr
<
XLineStartItem
>
pItem
;
std
::
unique
_ptr
<
XLineStartItem
>
pItem
;
if
(
nPos
==
0
)
if
(
nPos
==
0
)
pItem
.
reset
(
new
XLineStartItem
());
pItem
.
reset
(
new
XLineStartItem
());
else
if
(
mxLineEndList
.
is
()
&&
mxLineEndList
->
Count
()
>
(
long
)
(
nPos
-
1
)
)
else
if
(
mxLineEndList
.
is
()
&&
mxLineEndList
->
Count
()
>
(
long
)
(
nPos
-
1
)
)
...
@@ -652,7 +652,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
...
@@ -652,7 +652,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
sal_Int32
nPos
=
mpLBEnd
->
GetSelectEntryPos
();
sal_Int32
nPos
=
mpLBEnd
->
GetSelectEntryPos
();
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
&&
mpLBEnd
->
IsValueChangedFromSaved
()
)
if
(
nPos
!=
LISTBOX_ENTRY_NOTFOUND
&&
mpLBEnd
->
IsValueChangedFromSaved
()
)
{
{
boost
::
scoped
_ptr
<
XLineEndItem
>
pItem
;
std
::
unique
_ptr
<
XLineEndItem
>
pItem
;
if
(
nPos
==
0
)
if
(
nPos
==
0
)
pItem
.
reset
(
new
XLineEndItem
());
pItem
.
reset
(
new
XLineEndItem
());
else
if
(
mxLineEndList
.
is
()
&&
mxLineEndList
->
Count
()
>
(
long
)
(
nPos
-
1
)
)
else
if
(
mxLineEndList
.
is
()
&&
mxLineEndList
->
Count
()
>
(
long
)
(
nPos
-
1
)
)
...
@@ -668,7 +668,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
...
@@ -668,7 +668,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
if
(
LISTBOX_ENTRY_NOTFOUND
!=
nPos
&&
mpLBEdgeStyle
->
IsValueChangedFromSaved
())
if
(
LISTBOX_ENTRY_NOTFOUND
!=
nPos
&&
mpLBEdgeStyle
->
IsValueChangedFromSaved
())
{
{
boost
::
scoped
_ptr
<
XLineJointItem
>
pItem
;
std
::
unique
_ptr
<
XLineJointItem
>
pItem
;
switch
(
nPos
)
switch
(
nPos
)
{
{
...
@@ -705,7 +705,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
...
@@ -705,7 +705,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
if
(
LISTBOX_ENTRY_NOTFOUND
!=
nPos
&&
mpLBCapStyle
->
IsValueChangedFromSaved
())
if
(
LISTBOX_ENTRY_NOTFOUND
!=
nPos
&&
mpLBCapStyle
->
IsValueChangedFromSaved
())
{
{
boost
::
scoped
_ptr
<
XLineCapItem
>
pItem
;
std
::
unique
_ptr
<
XLineCapItem
>
pItem
;
switch
(
nPos
)
switch
(
nPos
)
{
{
...
...
svx/source/sidebar/line/LinePropertyPanel.hxx
Dosyayı görüntüle @
74c21e70
...
@@ -25,7 +25,6 @@
...
@@ -25,7 +25,6 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <vcl/fixed.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/field.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_array.hpp>
#include <svx/sidebar/PanelLayout.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx>
#include <svx/xtable.hxx>
...
@@ -111,16 +110,16 @@ private:
...
@@ -111,16 +110,16 @@ private:
sfx2
::
sidebar
::
ControllerItem
maEdgeStyle
;
sfx2
::
sidebar
::
ControllerItem
maEdgeStyle
;
sfx2
::
sidebar
::
ControllerItem
maCapStyle
;
sfx2
::
sidebar
::
ControllerItem
maCapStyle
;
boost
::
scoped
_ptr
<
XLineStyleItem
>
mpStyleItem
;
std
::
unique
_ptr
<
XLineStyleItem
>
mpStyleItem
;
boost
::
scoped
_ptr
<
XLineDashItem
>
mpDashItem
;
std
::
unique
_ptr
<
XLineDashItem
>
mpDashItem
;
sal_uInt16
mnTrans
;
sal_uInt16
mnTrans
;
SfxMapUnit
meMapUnit
;
SfxMapUnit
meMapUnit
;
sal_Int32
mnWidthCoreValue
;
sal_Int32
mnWidthCoreValue
;
XLineEndListRef
mxLineEndList
;
XLineEndListRef
mxLineEndList
;
XDashListRef
mxLineStyleList
;
XDashListRef
mxLineStyleList
;
boost
::
scoped
_ptr
<
XLineStartItem
>
mpStartItem
;
std
::
unique
_ptr
<
XLineStartItem
>
mpStartItem
;
boost
::
scoped
_ptr
<
XLineEndItem
>
mpEndItem
;
std
::
unique
_ptr
<
XLineEndItem
>
mpEndItem
;
//popup windows
//popup windows
LineWidthPopup
maLineWidthPopup
;
LineWidthPopup
maLineWidthPopup
;
...
...
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