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
53155997
Kaydet (Commit)
53155997
authored
Mar 15, 2011
tarafından
os
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
#i116336# mail merge to single documents fixed
üst
53c1143e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
1 deletion
+39
-1
swabstdlg.hxx
sw/inc/swabstdlg.hxx
+5
-0
dbmgr.cxx
sw/source/ui/dbui/dbmgr.cxx
+7
-1
swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.cxx
+17
-0
swdlgfact.hxx
sw/source/ui/dialog/swdlgfact.hxx
+4
-0
mailmrge.hxx
sw/source/ui/inc/mailmrge.hxx
+6
-0
No files found.
sw/inc/swabstdlg.hxx
Dosyayı görüntüle @
53155997
...
...
@@ -164,6 +164,11 @@ public:
virtual
const
::
rtl
::
OUString
&
GetSaveFilter
()
const
=
0
;
virtual
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Any
>
GetSelection
()
const
=
0
;
virtual
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
sdbc
::
XResultSet
>
GetResultSet
()
const
=
0
;
virtual
bool
IsSaveIndividualDocs
()
const
=
0
;
virtual
bool
IsGenerateFromDataBase
()
const
=
0
;
virtual
String
GetColumnName
()
const
=
0
;
virtual
String
GetPath
()
const
=
0
;
};
class
AbstractMailMergeCreateFromDlg
:
public
VclAbstractDialog
//add for SwMailMergeCreateFromDlg
{
...
...
sw/source/ui/dbui/dbmgr.cxx
Dosyayı görüntüle @
53155997
...
...
@@ -2598,7 +2598,13 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
SwMergeDescriptor
aMergeDesc
(
pImpl
->
pMergeDialog
->
GetMergeType
(),
pView
->
GetWrtShell
(),
aDescriptor
);
aMergeDesc
.
sSaveToFilter
=
pImpl
->
pMergeDialog
->
GetSaveFilter
();
aMergeDesc
.
bCreateSingleFile
=
true
;
aMergeDesc
.
bCreateSingleFile
=
!
pImpl
->
pMergeDialog
->
IsSaveIndividualDocs
();
if
(
!
aMergeDesc
.
bCreateSingleFile
&&
pImpl
->
pMergeDialog
->
IsGenerateFromDataBase
()
)
{
aMergeDesc
.
sAddressFromColumn
=
pImpl
->
pMergeDialog
->
GetColumnName
();
aMergeDesc
.
sSubject
=
pImpl
->
pMergeDialog
->
GetPath
();
}
MergeNew
(
aMergeDesc
);
pWorkDoc
->
SetNewDBMgr
(
pWorkDBMgr
);
...
...
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @
53155997
...
...
@@ -526,6 +526,23 @@ uno::Reference< sdbc::XResultSet> AbstractMailMergeDlg_Impl::GetResultSet() cons
{
return
pDlg
->
GetResultSet
();
}
bool
AbstractMailMergeDlg_Impl
::
IsSaveIndividualDocs
()
const
{
return
pDlg
->
IsSaveIndividualDocs
();
}
bool
AbstractMailMergeDlg_Impl
::
IsGenerateFromDataBase
()
const
{
return
pDlg
->
IsGenerateFromDataBase
();
}
String
AbstractMailMergeDlg_Impl
::
GetColumnName
()
const
{
return
pDlg
->
GetColumnName
();
}
String
AbstractMailMergeDlg_Impl
::
GetPath
()
const
{
return
pDlg
->
GetPath
();
}
// AbstractMailMergeDlg_Impl end
// AbstractMailMergeCreateFromDlg_Impl begin
sal_Bool
AbstractMailMergeCreateFromDlg_Impl
::
IsThisDocument
()
const
...
...
sw/source/ui/dialog/swdlgfact.hxx
Dosyayı görüntüle @
53155997
...
...
@@ -332,6 +332,10 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
virtual
const
::
rtl
::
OUString
&
GetSaveFilter
()
const
;
virtual
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Any
>
GetSelection
()
const
;
virtual
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
sdbc
::
XResultSet
>
GetResultSet
()
const
;
virtual
bool
IsSaveIndividualDocs
()
const
;
virtual
bool
IsGenerateFromDataBase
()
const
;
virtual
String
GetColumnName
()
const
;
virtual
String
GetPath
()
const
;
};
//for SwMailMergeDlg end
//for SwMailMergeCreateFromDlg begin
...
...
sw/source/ui/inc/mailmrge.hxx
Dosyayı görüntüle @
53155997
...
...
@@ -156,6 +156,12 @@ public:
~
SwMailMergeDlg
();
inline
sal_uInt16
GetMergeType
()
{
return
nMergeType
;
}
bool
IsSaveIndividualDocs
()
const
{
return
aSaveIndividualRB
.
IsChecked
();
}
bool
IsGenerateFromDataBase
()
const
{
return
aGenerateFromDataBaseCB
.
IsChecked
();
}
String
GetColumnName
()
const
{
return
aColumnLB
.
GetSelectEntry
();}
String
GetPath
()
const
{
return
aPathED
.
GetText
();}
const
::
rtl
::
OUString
&
GetSaveFilter
()
const
{
return
m_sSaveFilter
;}
inline
const
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
uno
::
Any
>
GetSelection
()
const
{
return
m_aSelection
;
}
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
sdbc
::
XResultSet
>
GetResultSet
()
const
;
...
...
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