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
2db5b484
Kaydet (Commit)
2db5b484
authored
Eyl 16, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert Link<> to typed
Change-Id: I17104bc529d67ca816415025d14e8e26c2531b29
üst
fcb55127
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
14 deletions
+12
-14
svdibrow.hxx
svx/inc/svdibrow.hxx
+6
-6
svdibrow.cxx
svx/source/svdraw/svdibrow.cxx
+6
-8
No files found.
svx/inc/svdibrow.hxx
Dosyayı görüntüle @
2db5b484
...
@@ -36,8 +36,8 @@ friend class ImpItemEdit;
...
@@ -36,8 +36,8 @@ friend class ImpItemEdit;
long
nAktPaintRow
;
long
nAktPaintRow
;
VclPtr
<
Edit
>
pEditControl
;
VclPtr
<
Edit
>
pEditControl
;
OUString
aWNamMerk
;
OUString
aWNamMerk
;
Link
<>
aEntryChangedHdl
;
Link
<
_SdrItemBrowserControl
&
,
void
>
aEntryChangedHdl
;
Link
<>
aSetDirtyHdl
;
Link
<
_SdrItemBrowserControl
&
,
void
>
aSetDirtyHdl
;
ImpItemListRow
*
pAktChangeEntry
;
ImpItemListRow
*
pAktChangeEntry
;
long
nLastWhichOfs
;
long
nLastWhichOfs
;
sal_uInt16
nLastWhich
;
sal_uInt16
nLastWhich
;
...
@@ -90,8 +90,8 @@ public:
...
@@ -90,8 +90,8 @@ public:
const
ImpItemListRow
*
GetAktChangeEntry
()
const
{
return
pAktChangeEntry
;
}
const
ImpItemListRow
*
GetAktChangeEntry
()
const
{
return
pAktChangeEntry
;
}
OUString
GetNewEntryValue
()
const
{
return
pEditControl
->
GetText
();
}
OUString
GetNewEntryValue
()
const
{
return
pEditControl
->
GetText
();
}
void
SetEntryChangedHdl
(
const
Link
<>&
rLink
)
{
aEntryChangedHdl
=
rLink
;
}
void
SetEntryChangedHdl
(
const
Link
<
_SdrItemBrowserControl
&
,
void
>&
rLink
)
{
aEntryChangedHdl
=
rLink
;
}
void
SetSetDirtyHdl
(
const
Link
<>&
rLink
)
{
aSetDirtyHdl
=
rLink
;
}
void
SetSetDirtyHdl
(
const
Link
<
_SdrItemBrowserControl
&
,
void
>&
rLink
)
{
aSetDirtyHdl
=
rLink
;
}
};
};
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
...
@@ -118,8 +118,8 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
...
@@ -118,8 +118,8 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
private
:
private
:
static
vcl
::
Window
*
ImpGetViewWin
(
SdrView
&
rView
);
static
vcl
::
Window
*
ImpGetViewWin
(
SdrView
&
rView
);
DECL_LINK_TYPED
(
IdleHdl
,
Idle
*
,
void
);
DECL_LINK_TYPED
(
IdleHdl
,
Idle
*
,
void
);
DECL_LINK
(
ChangedHdl
,
_SdrItemBrowserControl
*
);
DECL_LINK
_TYPED
(
ChangedHdl
,
_SdrItemBrowserControl
&
,
void
);
DECL_LINK
(
SetDirtyHdl
,
void
*
);
DECL_LINK
_TYPED
(
SetDirtyHdl
,
_SdrItemBrowserControl
&
,
void
);
public
:
public
:
SdrItemBrowser
(
SdrView
&
rView
);
SdrItemBrowser
(
SdrView
&
rView
);
void
ForceParent
();
void
ForceParent
();
...
...
svx/source/svdraw/svdibrow.cxx
Dosyayı görüntüle @
2db5b484
...
@@ -426,7 +426,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
...
@@ -426,7 +426,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
void
_SdrItemBrowserControl
::
SetDirty
()
void
_SdrItemBrowserControl
::
SetDirty
()
{
{
aSetDirtyHdl
.
Call
(
this
);
aSetDirtyHdl
.
Call
(
*
this
);
}
}
Rectangle
_SdrItemBrowserControl
::
GetFieldCharacterBounds
(
sal_Int32
/*_nRow*/
,
sal_Int32
/*_nColumnPos*/
,
sal_Int32
/*nIndex*/
)
Rectangle
_SdrItemBrowserControl
::
GetFieldCharacterBounds
(
sal_Int32
/*_nRow*/
,
sal_Int32
/*_nColumnPos*/
,
sal_Int32
/*nIndex*/
)
...
@@ -531,7 +531,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
...
@@ -531,7 +531,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
{
{
bool
bRet
=
false
;
bool
bRet
=
false
;
if
(
pEditControl
!=
nullptr
)
{
if
(
pEditControl
!=
nullptr
)
{
aEntryChangedHdl
.
Call
(
this
);
aEntryChangedHdl
.
Call
(
*
this
);
pEditControl
.
disposeAndClear
();
pEditControl
.
disposeAndClear
();
delete
pAktChangeEntry
;
delete
pAktChangeEntry
;
pAktChangeEntry
=
NULL
;
pAktChangeEntry
=
NULL
;
...
@@ -1145,16 +1145,16 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
...
@@ -1145,16 +1145,16 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
Undirty
();
Undirty
();
}
}
IMPL_LINK
(
SdrItemBrowser
,
ChangedHdl
,
_SdrItemBrowserControl
*
,
pBrowse
)
IMPL_LINK
_TYPED
(
SdrItemBrowser
,
ChangedHdl
,
_SdrItemBrowserControl
&
,
rBrowse
,
void
)
{
{
const
ImpItemListRow
*
pEntry
=
pBrowse
->
GetAktChangeEntry
();
const
ImpItemListRow
*
pEntry
=
rBrowse
.
GetAktChangeEntry
();
if
(
pEntry
!=
NULL
)
if
(
pEntry
!=
NULL
)
{
{
SfxItemSet
aSet
(
pView
->
GetModel
()
->
GetItemPool
());
SfxItemSet
aSet
(
pView
->
GetModel
()
->
GetItemPool
());
pView
->
GetAttributes
(
aSet
);
pView
->
GetAttributes
(
aSet
);
SfxItemSet
aNewSet
(
*
aSet
.
GetPool
(),
pEntry
->
nWhichId
,
pEntry
->
nWhichId
);
SfxItemSet
aNewSet
(
*
aSet
.
GetPool
(),
pEntry
->
nWhichId
,
pEntry
->
nWhichId
);
OUString
aNewText
(
pBrowse
->
GetNewEntryValue
());
OUString
aNewText
(
rBrowse
.
GetNewEntryValue
());
bool
bDel
(
aNewText
==
"del"
bool
bDel
(
aNewText
==
"del"
||
aNewText
==
"Del"
||
aNewText
==
"Del"
||
aNewText
==
"DEL"
||
aNewText
==
"DEL"
...
@@ -1257,13 +1257,11 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
...
@@ -1257,13 +1257,11 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
}
}
pView
->
SetAttributes
(
aNewSet
,
bDel
);
pView
->
SetAttributes
(
aNewSet
,
bDel
);
}
}
return
0
;
}
}
IMPL_LINK_NOARG
(
SdrItemBrowser
,
SetDirtyHdl
)
IMPL_LINK_NOARG
_TYPED
(
SdrItemBrowser
,
SetDirtyHdl
,
_SdrItemBrowserControl
&
,
void
)
{
{
SetDirty
();
SetDirty
();
return
0
;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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