sw/source/uibase/dbui/dbmgr.cxx | 66 ++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 33 deletions(-)
New commits:
commit bcf3897db4f3e58e802a4278e02b636ddafce9a4
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Mar 11 16:13:09 2015 +0000
WaE: -Werror=maybe-uninitialized
Change-Id: I20827fc39d49f4dc77b399abb1e0127aac9330db
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index bcd7537..448c23a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1167,7 +1167,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
//#i72517# put the styles to the target document
//if the source uses headers or footers each new
copy need to copy a new page styles
- SwPageDesc* pTargetPageDesc;
+ SwPageDesc* pTargetPageDesc(NULL);
if(bPageStylesWithHeaderFooter)
{
//create a new pagestyle
commit 3318400ad44a076fcadfd372f1e6c7613769f6be
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Mar 11 16:12:41 2015 +0000
fix indent
Change-Id: I708c306afab92ff574d671d3580088ea1caf5606
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 85f7fa8..bcd7537 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1183,45 +1183,45 @@ bool SwDBManager::MergeMailFiles(SwWrtShell*
pSourceShell,
lcl_CopyFollowPageDesc( *pTargetShell,
*pWorkPageDesc, *pTargetPageDesc, nDocNo );
}
}
- else if( rMergeDescriptor.nMergeType ==
DBMGR_MERGE_PRINTER )
- {
- assert(!bCreateSingleFile);
- if( 1 == nDocNo ) // set up printing only once at
the beginning
+ else if( rMergeDescriptor.nMergeType ==
DBMGR_MERGE_PRINTER )
{
- // printing should be done synchronously
otherwise the document
- // might already become invalid during the
process
- uno::Sequence< beans::PropertyValue >
aOptions( rMergeDescriptor.aPrintOptions );
-
- aOptions.realloc( 2 );
- aOptions[ 0 ].Name = "Wait";
- aOptions[ 0 ].Value <<= sal_True;
- aOptions[ 1 ].Name = "MonitorVisible";
- aOptions[ 1 ].Value <<= sal_False;
- // move print options
- const beans::PropertyValue* pPrintOptions =
rMergeDescriptor.aPrintOptions.getConstArray();
- for( sal_Int32 nOption = 0, nIndex = 1 ;
nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption)
+ assert(!bCreateSingleFile);
+ if( 1 == nDocNo ) // set up printing only once
at the beginning
{
- if( pPrintOptions[nOption].Name ==
"CopyCount" || pPrintOptions[nOption].Name == "FileName"
- || pPrintOptions[nOption].Name ==
"Collate" || pPrintOptions[nOption].Name == "Pages"
- || pPrintOptions[nOption].Name ==
"Wait" || pPrintOptions[nOption].Name == "PrinterName" )
+ // printing should be done synchronously
otherwise the document
+ // might already become invalid during the
process
+ uno::Sequence< beans::PropertyValue >
aOptions( rMergeDescriptor.aPrintOptions );
+
+ aOptions.realloc( 2 );
+ aOptions[ 0 ].Name = "Wait";
+ aOptions[ 0 ].Value <<= sal_True;
+ aOptions[ 1 ].Name = "MonitorVisible";
+ aOptions[ 1 ].Value <<= sal_False;
+ // move print options
+ const beans::PropertyValue* pPrintOptions
= rMergeDescriptor.aPrintOptions.getConstArray();
+ for( sal_Int32 nOption = 0, nIndex = 1 ;
nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption)
{
- // add an option
- aOptions.realloc( nIndex + 1 );
- aOptions[ nIndex ].Name =
pPrintOptions[nOption].Name;
- aOptions[ nIndex++ ].Value =
pPrintOptions[nOption].Value ;
+ if( pPrintOptions[nOption].Name ==
"CopyCount" || pPrintOptions[nOption].Name == "FileName"
+ || pPrintOptions[nOption].Name ==
"Collate" || pPrintOptions[nOption].Name == "Pages"
+ || pPrintOptions[nOption].Name ==
"Wait" || pPrintOptions[nOption].Name == "PrinterName" )
+ {
+ // add an option
+ aOptions.realloc( nIndex + 1 );
+ aOptions[ nIndex ].Name =
pPrintOptions[nOption].Name;
+ aOptions[ nIndex++ ].Value =
pPrintOptions[nOption].Value ;
+ }
}
- }
- pWorkView->StartPrint( aOptions,
IsMergeSilent(), rMergeDescriptor.bPrintAsync );
- SfxPrinter* pDocPrt =
pWorkView->GetPrinter(false);
- JobSetup aJobSetup = pDocPrt ?
pDocPrt->GetJobSetup() : pWorkView->GetJobSetup();
- Printer::PreparePrintJob(
pWorkView->GetPrinterController(), aJobSetup );
+ pWorkView->StartPrint( aOptions,
IsMergeSilent(), rMergeDescriptor.bPrintAsync );
+ SfxPrinter* pDocPrt =
pWorkView->GetPrinter(false);
+ JobSetup aJobSetup = pDocPrt ?
pDocPrt->GetJobSetup() : pWorkView->GetJobSetup();
+ Printer::PreparePrintJob(
pWorkView->GetPrinterController(), aJobSetup );
#if ENABLE_CUPS
-
psp::PrinterInfoManager::get().startBatchPrint();
+
psp::PrinterInfoManager::get().startBatchPrint();
#endif
+ }
+ if( !Printer::ExecutePrintJob(
pWorkView->GetPrinterController()))
+ bCancel = true;
}
- if( !Printer::ExecutePrintJob(
pWorkView->GetPrinterController()))
- bCancel = true;
- }
else
pTargetPageDesc =
pTargetShell->FindPageDescByName( sModifiedStartingPageDesc );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
