diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 11:22:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 11:22:58 +0000 |
| commit | b51ad5aa9f1692ddc4b30e22f38f1609b5ec67be (patch) | |
| tree | 1c181f3f5ca4f882e8a29eb7ac0660326f86eada /sc/source/ui/miscdlgs | |
| parent | 6149d754cfb70a0173174b82334ec5be7b919727 (diff) | |
INTEGRATION: CWS calcshare_DEV300 (1.8.116); FILE MERGED
2008/02/26 12:02:51 tbe 1.8.116.5: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2008/02/23 09:47:15 tbe 1.8.116.4: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2008/01/30 12:57:12 tbe 1.8.116.3: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2007/12/19 14:26:17 tbe 1.8.116.2: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2007/12/04 13:35:39 tbe 1.8.116.1: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
Diffstat (limited to 'sc/source/ui/miscdlgs')
| -rw-r--r-- | sc/source/ui/miscdlgs/makefile.mk | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk index 9f839754caf5..2870160bbdf4 100644 --- a/sc/source/ui/miscdlgs/makefile.mk +++ b/sc/source/ui/miscdlgs/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: kz $ $Date: 2008-03-06 15:23:12 $ +# last change: $Author: kz $ $Date: 2008-03-07 12:22:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -80,7 +80,14 @@ SLOFILES = \ $(SLO)$/redcom.obj \ $(SLO)$/linkarea.obj \ $(SLO)$/warnbox.obj \ - $(SLO)$/scuiautofmt.obj + $(SLO)$/scuiautofmt.obj \ + $(SLO)$/conflictsdlg.obj \ + $(SLO)$/sharedocdlg.obj + +EXCEPTIONSFILES = \ + $(SLO)$/acredlin.obj \ + $(SLO)$/conflictsdlg.obj \ + $(SLO)$/sharedocdlg.obj EXCEPTIONSFILES= \ $(SLO)$/optsolver.obj \ @@ -92,7 +99,9 @@ SRC1FILES = \ instbdlg.src \ acredlin.src \ highred.src \ - linkarea.src + linkarea.src \ + conflictsdlg.src \ + sharedocdlg.src LIB1TARGET = $(SLB)$/$(TARGET).lib @@ -110,7 +119,9 @@ LIB1OBJFILES = \ $(SLO)$/highred.obj \ $(SLO)$/simpref.obj \ $(SLO)$/redcom.obj \ - $(SLO)$/warnbox.obj + $(SLO)$/warnbox.obj \ + $(SLO)$/conflictsdlg.obj \ + $(SLO)$/sharedocdlg.obj # --- Tagets ------------------------------------------------------- |