diff options
Diffstat (limited to 'padmin/source')
| -rw-r--r-- | padmin/source/helper.hxx | 7 | ||||
| -rw-r--r-- | padmin/source/makefile.mk | 115 | ||||
| -rw-r--r-- | padmin/source/padialog.hxx | 2 | ||||
| -rw-r--r-- | padmin/source/padialog.src | 18 | ||||
| -rw-r--r-- | padmin/source/prtsetup.cxx | 6 |
5 files changed, 20 insertions, 128 deletions
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index b78bee96672d..5b7b710679a8 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -46,6 +46,13 @@ #endif #include <vcl/combobox.hxx> +#if defined SPA_DLLIMPLEMENTATION +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + + class Config; #define PSPRINT_PPDDIR "driver" diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk deleted file mode 100644 index 8bcbd51ef832..000000000000 --- a/padmin/source/makefile.mk +++ /dev/null @@ -1,115 +0,0 @@ -#************************************************************************* -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for GUIBASE aqua." - -.ELSE - -PRJ=.. -PRJNAME=padmin -TARGET=padmin -TARGETTYPE=GUI -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE: settings.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES=padialog.src rtsetup.src - -RESLIB1NAME=spa -RESLIB1IMAGES=$(PRJ)$/source -RESLIB1SRSFILES= $(SRS)$/padmin.srs -RESLIB1DEPN=\ - padialog.src \ - padialog.hrc \ - rtsetup.src \ - rtsetup.hrc - -.IF "$(GUI)" == "UNX" - -SLOFILES=\ - $(SLO)$/padialog.obj \ - $(SLO)$/cmddlg.obj \ - $(SLO)$/progress.obj \ - $(SLO)$/newppdlg.obj \ - $(SLO)$/prtsetup.obj \ - $(SLO)$/fontentry.obj \ - $(SLO)$/helper.obj \ - $(SLO)$/adddlg.obj \ - $(SLO)$/titlectrl.obj - - -OBJFILES=\ - $(OBJ)/pamain.obj - -SHL1TARGET= spa$(DLLPOSTFIX) -SHL1OBJS=$(SLOFILES) -SHL1STDLIBS=\ - $(SVTOOLLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -APP1TARGET=spadmin.bin -APP1DEPN+=$(SHL1TARGETN) - -APP1OBJS=\ - $(OBJ)$/desktopcontext.obj \ - $(OBJ)/pamain.obj - -APP1STDLIBS= \ - -l$(SHL1TARGET) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -UNIXTEXT = $(MISC)$/spadmin.sh - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ENDIF # GUIBASE==aqua - diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 88086e9497de..a0cee7b2af7d 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -50,7 +50,7 @@ class Printer; namespace padmin { - class PADialog : public ModalDialog + class SPA_DLLPUBLIC PADialog : public ModalDialog { private: DelListBox m_aDevicesLB; diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index 09ce29a2c682..85191f3dddf9 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -483,47 +483,47 @@ String RID_YOU_SURE Bitmap RID_BUTTERFLY { - File = "butter.png" ; + File = "source/butter.png" ; }; Bitmap RID_BMP_SMALL_PRINTER { - File = "print.png"; + File = "source/print.png"; }; Bitmap RID_BMP_SMALL_FAX { - File = "fax.png"; + File = "source/fax.png"; }; Bitmap RID_BMP_SMALL_PDF { - File = "pdf.png"; + File = "source/pdf.png"; }; Bitmap RID_BMP_PRINTER { - File = "printer_large.png"; + File = "source/printer_large.png"; }; Bitmap RID_BMP_SMALL_PRINTER_HC { - File = "printer_16_h.png"; + File = "source/printer_16_h.png"; }; Bitmap RID_BMP_SMALL_FAX_HC { - File = "fax_16_h.png"; + File = "source/fax_16_h.png"; }; Bitmap RID_BMP_SMALL_PDF_HC { - File = "printpdf_16_h.png"; + File = "source/printpdf_16_h.png"; }; Bitmap RID_BMP_PRINTER_HC { - File = "printer_40x48_h.png"; + File = "source/printer_40x48_h.png"; }; diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 2ec2707a2bcc..ad73d48ae48b 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -802,7 +802,7 @@ OString RTSPWDialog::getPassword() const extern "C" { - int Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) + int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) { int nRet = 0; RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false ); @@ -816,14 +816,14 @@ extern "C" { return nRet; } - int Sal_queryFaxNumber( String& rNumber ) + int SPA_DLLPUBLIC Sal_queryFaxNumber( String& rNumber ) { String aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) ); QueryString aQuery( NULL, aTmpString, rNumber ); return aQuery.Execute(); } - bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) + bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) { bool bRet = false; |