summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 22:12:21 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2013-08-31 22:41:12 +0200
commit8d6da3b8aed0b523375e00eb5b5e3c2b4ca89edf (patch)
treebd87e6ced5aed2099f8090477470b049b515a9da /vcl
parentdelete more code that was commented out (diff)
downloadcore-8d6da3b8aed0b523375e00eb5b5e3c2b4ca89edf.tar.gz
core-8d6da3b8aed0b523375e00eb5b5e3c2b4ca89edf.zip
fdo#62475 - remove visual noise
Change-Id: I7409f7a58796c9bf7542b6a7904ad40581637eeb
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx6
-rw-r--r--vcl/win/source/gdi/salprn.cxx24
2 files changed, 11 insertions, 19 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 11211621c00e..bd282b9988f1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2254,7 +2254,7 @@ ImplFontEntry* ImplPdfBuiltinFontData::CreateFontInstance( FontSelectPattern& rF
return pEntry;
}
-// -----------------------------------------------------------------------
+// - PDFWriterImpl -
sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation )
{
@@ -5136,7 +5136,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict )
{
-
// TODO: check and insert default streams
OString aStandardAppearance;
switch( rWidget.m_eType )
@@ -5838,6 +5837,7 @@ bool PDFWriterImpl::emitCatalog()
else
aLine.append( "/NeedAppearances true>>\n" );
}
+
//--->i59651
//check if there is a Metadata object
if( nOutputIntentObject )
@@ -5846,6 +5846,7 @@ bool PDFWriterImpl::emitCatalog()
aLine.append( nOutputIntentObject );
aLine.append( " 0 R]" );
}
+
if( nMetadataObject )
{
aLine.append("/Metadata ");
@@ -6408,7 +6409,6 @@ static void escapeStringXML( const OUString& rStr, OUString &rValue)
}
// emits the document metadata
-//
sal_Int32 PDFWriterImpl::emitDocumentMetadata()
{
if( !m_bIsPDF_A1 )
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index d154dbe2fc26..fb9d299dbdd1 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -90,8 +90,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ui::dialogs;
-// =======================================================================
-
static char aImplWindows[] = "windows";
static char aImplDevice[] = "device";
@@ -104,8 +102,6 @@ static LPDEVMODEW SAL_DEVMODE_W( const ImplJobSetup* pSetupData )
return pRet;
}
-// =======================================================================
-
static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus )
{
sal_uLong nStatus = 0;
@@ -162,6 +158,8 @@ static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus )
return nStatus;
}
+// - WinSalInstance -
+
void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
{
DWORD i;
@@ -360,8 +358,6 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter,
return FALSE;
}
-// -----------------------------------------------------------------------
-
static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData,
sal_Bool bIn, WinSalFrame* pVisibleDlgParent )
{
@@ -455,8 +451,6 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup
return TRUE;
}
-// -----------------------------------------------------------------------
-
#define DECLARE_DEVMODE( i )\
DEVMODEW* pDevModeW = SAL_DEVMODE_W(i);\
if( pDevModeW == NULL )\
@@ -1084,7 +1078,7 @@ static sal_Bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* p
return TRUE;
}
-// =======================================================================
+// - WinSalInstance -
SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData )
@@ -1123,6 +1117,8 @@ void WinSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
delete pPrinter;
}
+// - WinSalInfoPrinter -
+
WinSalInfoPrinter::WinSalInfoPrinter() :
mpGraphics( NULL ),
mhDC( 0 ),
@@ -1312,7 +1308,7 @@ void WinSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
rPageHeight = GetDeviceCaps( hDC, PHYSICALHEIGHT );
}
-// =======================================================================
+// - WinSalInstance -
SalPrinter* WinSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
{
@@ -1326,8 +1322,6 @@ void WinSalInstance::DestroyPrinter( SalPrinter* pPrinter )
delete pPrinter;
}
-// =======================================================================
-
BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ )
{
SalData* pSalData = GetSalData();
@@ -1391,6 +1385,8 @@ static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_
return pNewDevMode;
}
+// - WinSalPrinter -
+
WinSalPrinter::WinSalPrinter() :
mpGraphics( NULL ),
mpInfoPrinter( NULL ),
@@ -1440,15 +1436,11 @@ WinSalPrinter::~WinSalPrinter()
mbValid = false;
}
-// -----------------------------------------------------------------------
-
void WinSalPrinter::markInvalid()
{
mbValid = false;
}
-// -----------------------------------------------------------------------
-
// need wrappers for StarTocW/A to use structured exception handling
// since SEH does not mix with standard exception handling's cleanup
static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt )