From 6eef57ed12811785c1c195b0c678142e2362dfbc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 18 Sep 2011 01:54:29 +0100 Subject: testtool has no need to print (doesn't under unix anyway) print support never existed under unix, and libapp is only used by testtool, which has no need to print. And the print apis, etc used are archaic --- basic/StaticLibrary_app.mk | 1 - basic/source/app/app.cxx | 16 ------ basic/source/app/app.hxx | 2 - basic/source/app/basic.hrc | 2 - basic/source/app/basic.src | 11 ----- basic/source/app/printer.cxx | 114 ------------------------------------------- basic/source/app/printer.hxx | 55 --------------------- 7 files changed, 201 deletions(-) delete mode 100644 basic/source/app/printer.cxx delete mode 100644 basic/source/app/printer.hxx (limited to 'basic') diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk index 15b7c17f1150..25f3d92fa5d5 100644 --- a/basic/StaticLibrary_app.mk +++ b/basic/StaticLibrary_app.mk @@ -55,7 +55,6 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,app,\ basic/source/app/dialogs \ basic/source/app/msgedit \ basic/source/app/mybasic \ - basic/source/app/printer \ basic/source/app/process \ basic/source/app/processw \ basic/source/app/status \ diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 09113f48773e..3f714ddf092a 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -43,7 +43,6 @@ #include "basic.hrc" #include "app.hxx" -#include "printer.hxx" #include "status.hxx" #include "appedit.hxx" #include "appbased.hxx" @@ -483,7 +482,6 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, , pStatus( NULL ) , pList( NULL ) , pWork( NULL ) -, pPrn( NULL ) { Application::SetDefDialogParent( this ); @@ -560,11 +558,6 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, pHelpMenu->SetActivateHdl( LINK( this, BasicFrame, InitMenu ) ); pHelpMenu->SetDeactivateHdl( LINK( this, BasicFrame, DeInitMenu ) ); -#ifndef UNX - pPrn = new BasicPrinter; -#else - pPrn = NULL; -#endif pList = new EditList; pStatus = new StatusLine( this ); @@ -643,7 +636,6 @@ BasicFrame::~BasicFrame() delete pBar; delete pStatus; - delete pPrn; delete pList; pBasic.Clear(); } @@ -1139,8 +1131,6 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu ) pMenu->EnableItem( RID_FILECLOSE, bHasEdit ); pMenu->EnableItem( RID_FILESAVE, bHasEdit ); pMenu->EnableItem( RID_FILESAVEAS, bHasEdit ); - pMenu->EnableItem( RID_FILEPRINT, bHasEdit ); - pMenu->EnableItem( RID_FILESETUP, bHasEdit ); pMenu->EnableItem( RID_FILELOADLIB, bNormal ); pMenu->EnableItem( RID_FILESAVELIB, bHasEdit ); @@ -1319,12 +1309,6 @@ long BasicFrame::Command( short nID, sal_Bool bChecked ) case RID_FILECLOSE: if( pWork && pWork->Close() ){}; break; - case RID_FILEPRINT: - if( pWork ) - pPrn->Print( pWork->GetText(), pWork->pDataEdit->GetText(), this ); - break; - case RID_FILESETUP: - break; case RID_QUIT: if( Close() ) aBasicApp.Quit(); break; diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index cdc776554546..b703cd501bfc 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -47,7 +47,6 @@ class AppBasEd; class MsgEdit; class AppError; class StatusLine; -class BasicPrinter; struct TTLogMsg; typedef ::std::vector< AppWin* > EditList; @@ -131,7 +130,6 @@ public: StatusLine* pStatus; // Status line EditList* pList; // List of edit windows AppWin* pWork; // Current edit window - BasicPrinter* pPrn; // Printer sal_Bool bDisas; // sal_True: disassemble sal_uInt16 nFlags; // Debugging-Flags sal_uInt16 nMaximizedWindows; // Number of maximized windows diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc index e4a69d9d2942..4517223fc733 100755 --- a/basic/source/app/basic.hrc +++ b/basic/source/app/basic.hrc @@ -53,8 +53,6 @@ #define RID_FILESAVEAS 1105 #define RID_FILELOADLIB 1106 #define RID_FILESAVELIB 1107 -#define RID_FILEPRINT 1109 -#define RID_FILESETUP 1110 #define RID_QUIT 1111 #define IDM_FILE_LRU1 1112 #define IDM_FILE_LRUn 1199 diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src index 8a1d73d0589c..aa9e1f9603da 100644 --- a/basic/source/app/basic.src +++ b/basic/source/app/basic.src @@ -466,17 +466,6 @@ Menu RID_FILE { MenuItem { SEPARATOR = TRUE; }; - MenuItem { - Identifier = RID_FILEPRINT; - TEXT[ en-US ] = "~Print"; - }; - MenuItem { - Identifier = RID_FILESETUP; - TEXT[ en-US ] = "P~rinter Setting..."; - }; - MenuItem { - SEPARATOR = TRUE; - }; MenuItem { Identifier = RID_QUIT; TEXT[ en-US ] = "~Exit"; diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx deleted file mode 100644 index 675aeed2c7e0..000000000000 --- a/basic/source/app/printer.cxx +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_basic.hxx" - -#include -#include -#include -#include -#include - -#include - -#include "app.hxx" -#include "printer.hxx" -#include "basic.hrc" -#include "resids.hrc" -#include "basrid.hxx" - -class PrintingDialog : public ModelessDialog { - String aName; - FixedText aText; - CancelButton aCancel; -public: - PrintingDialog( Window*, BasicPrinter*, ResId&, String& ); - void ChangeMessage( short ); -}; - -BasicPrinter::BasicPrinter() : mpPrinter( new Printer() ) -{ - nPage = 0; nLine = 9999; - mpPrinter->SetMapMode( MapMode( MAP_POINT ) ); - Size s( mpPrinter->GetOutputSize() ); - // Use 10 point font - Font aFont( FAMILY_MODERN, Size( 0, 10 ) ); - aFont.SetPitch( PITCH_FIXED ); - mpPrinter->SetFont( aFont ); - // Output: 6 Lines/Inch = 12 Point - nLines = (short) s.Height() / 12; - nYoff = 12; -} - -void BasicPrinter::Header() -{ - if( nPage ) mpListener->EndPage(); - nPage++; - mpListener->StartPage(); - String aHdr; - String aPage( SttResId( IDS_PAGE ) ); - aPage.Append( String::CreateFromInt32(nPage) ); - aHdr = aFile.Copy( 0, 80 - aPage.Len() ); - aHdr.Expand( 80 - aPage.Len(), ' ' ); - aHdr += aPage; - mpPrinter->DrawText( Point( 0, 0 ), aHdr ); - nLine = 2; -} - -void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *pFrame ) -{ - nPage = 0; nLine = 9999; - aFile = rFile; - // Disable PRINT-Menu - MenuBar* pBar = pFrame->GetMenuBar(); - Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE ); - pFileMenu->EnableItem( RID_FILEPRINT, sal_False ); - - mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) ); - mpListener->StartPage(); - xub_StrLen nDone=0; - while( nDone < rText.Len() ) - { - if( nLine >= nLines ) Header(); - xub_StrLen nLineEnd = std::min( rText.Search( '\n', nDone ), rText.Search( '\r', nDone ) ); - mpPrinter->DrawText( Point( 0, nLine * nYoff ), rText, nDone, nLineEnd-nDone-1 ); - nDone = nLineEnd; - if( nDone <= rText.Len() && rText.GetChar(nDone) == '\r' ) nDone++; - if( nDone <= rText.Len() && rText.GetChar(nDone) == '\n' ) nDone++; - nLine++; - } - mpListener->EndPage(); - - Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() ); - nPage = 1; - pFileMenu->EnableItem( RID_FILEPRINT, sal_True ); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx deleted file mode 100644 index b884a642e76f..000000000000 --- a/basic/source/app/printer.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BASICPRN_HXX -#define _BASICPRN_HXX - -#include "vcl/print.hxx" -#include "vcl/oldprintadaptor.hxx" - -class BasicPrinter -{ - boost::shared_ptr mpPrinter; - boost::shared_ptr mpListener; - - short nLine; // current row - short nPage; // current page - short nLines; // lines per page - short nYoff; // line spacing in points - String aFile; // file name - - void Header(); // print page header - void StartPage(); -public: - BasicPrinter(); - void Print( const String& rFile, const String& rText, BasicFrame *pFrame ); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit