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
08e7bc6a
Kaydet (Commit)
08e7bc6a
authored
Eki 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: Iea90c0e46902936bde3b51475292999fa0ead934
üst
945965e5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
mmaddressblockpage.cxx
sw/source/ui/dbui/mmaddressblockpage.cxx
+1
-2
mmaddressblockpage.hxx
sw/source/ui/dbui/mmaddressblockpage.hxx
+1
-1
mailmergehelper.cxx
sw/source/uibase/dbui/mailmergehelper.cxx
+2
-2
mailmergehelper.hxx
sw/source/uibase/inc/mailmergehelper.hxx
+2
-2
No files found.
sw/source/ui/dbui/mmaddressblockpage.cxx
Dosyayı görüntüle @
08e7bc6a
...
...
@@ -248,7 +248,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox
m_pWizard
->
UpdateRoadmap
();
}
IMPL_LINK_NOARG
(
SwMailMergeAddressBlockPage
,
AddressBlockSelectHdl_Impl
)
IMPL_LINK_NOARG
_TYPED
(
SwMailMergeAddressBlockPage
,
AddressBlockSelectHdl_Impl
,
LinkParamNone
*
,
void
)
{
const
sal_uInt16
nSel
=
m_pSettingsWIN
->
GetSelectedAddress
();
const
uno
::
Sequence
<
OUString
>
aBlocks
=
...
...
@@ -258,7 +258,6 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)
m_pWizard
->
GetConfigItem
().
SetCurrentAddressBlockIndex
(
nSel
);
GetWizard
()
->
UpdateRoadmap
();
GetWizard
()
->
enableButtons
(
WizardButtonFlags
::
NEXT
,
GetWizard
()
->
isStateEnabled
(
MM_GREETINGSPAGE
));
return
0
;
}
IMPL_LINK_TYPED
(
SwMailMergeAddressBlockPage
,
HideParagraphsHdl_Impl
,
Button
*
,
pBox
,
void
)
...
...
sw/source/ui/dbui/mmaddressblockpage.hxx
Dosyayı görüntüle @
08e7bc6a
...
...
@@ -68,7 +68,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
DECL_LINK_TYPED
(
AssignHdl_Impl
,
Button
*
,
void
);
DECL_LINK_TYPED
(
AddressBlockHdl_Impl
,
Button
*
,
void
);
DECL_LINK_TYPED
(
InsertDataHdl_Impl
,
Button
*
,
void
);
DECL_LINK
(
AddressBlockSelectHdl_Impl
,
void
*
);
DECL_LINK
_TYPED
(
AddressBlockSelectHdl_Impl
,
LinkParamNone
*
,
void
);
DECL_LINK_TYPED
(
HideParagraphsHdl_Impl
,
Button
*
,
void
);
void
EnableAddressBlock
(
bool
bAll
,
bool
bSelective
);
...
...
sw/source/uibase/dbui/mailmergehelper.cxx
Dosyayı görüntüle @
08e7bc6a
...
...
@@ -379,7 +379,7 @@ void SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt )
pImpl
->
nSelectedAddress
!=
(
sal_uInt16
)
nSelect
)
{
pImpl
->
nSelectedAddress
=
(
sal_uInt16
)
nSelect
;
m_aSelectHdl
.
Call
(
this
);
m_aSelectHdl
.
Call
(
nullptr
);
}
Invalidate
();
}
...
...
@@ -422,7 +422,7 @@ void SwAddressPreview::KeyInput( const KeyEvent& rKEvt )
pImpl
->
nSelectedAddress
!=
(
sal_uInt16
)
nSelect
)
{
pImpl
->
nSelectedAddress
=
(
sal_uInt16
)
nSelect
;
m_aSelectHdl
.
Call
(
this
);
m_aSelectHdl
.
Call
(
nullptr
);
Invalidate
();
}
}
...
...
sw/source/uibase/inc/mailmergehelper.hxx
Dosyayı görüntüle @
08e7bc6a
...
...
@@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
{
VclPtr
<
ScrollBar
>
aVScrollBar
;
SwAddressPreview_Impl
*
pImpl
;
Link
<>
m_aSelectHdl
;
Link
<
LinkParamNone
*
,
void
>
m_aSelectHdl
;
void
DrawText_Impl
(
vcl
::
RenderContext
&
rRenderContext
,
const
OUString
&
rAddress
,
const
Point
&
rTopLeft
,
const
Size
&
rSize
,
bool
bIsSelected
);
...
...
@@ -109,7 +109,7 @@ public:
static
OUString
FillData
(
const
OUString
&
rAddress
,
SwMailMergeConfigItem
&
rConfigItem
,
const
css
::
uno
::
Sequence
<
OUString
>*
pAssignments
=
0
);
void
SetSelectHdl
(
const
Link
<>&
rLink
)
{
m_aSelectHdl
=
rLink
;
}
void
SetSelectHdl
(
const
Link
<
LinkParamNone
*
,
void
>&
rLink
)
{
m_aSelectHdl
=
rLink
;
}
};
// iterate over an address block or a greeting line the iterator returns the
...
...
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