From 23a61a9969af9d099ce87d1169b7c2aeb5f6bb1e Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 27 Jan 2010 11:41:30 +0100 Subject: renaissance1: #i107215# First draft of the new slide sorter design. --- sd/util/makefile.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'sd/util') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index d74700307291..5c0c16e4a71e 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -54,6 +54,7 @@ RESLIB1SRSFILES=\ $(SRS)$/notes.srs \ $(SRS)$/animui.srs \ $(SRS)$/slideshow.srs \ + $(SRS)$/slsview.srs \ $(SRS)$/uitable.srs \ $(SRS)$/view.srs \ $(SRS)$/uiannotations.srs \ -- cgit From ab518ae9111d251a4e6267ae9f40836b8a7a3913 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 12 Feb 2010 13:58:24 +0100 Subject: renaissance1: #i107215# Adaption to latest changes of the spec. --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/util') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 5c0c16e4a71e..9897a8d13045 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -90,7 +90,7 @@ SHL1STDLIBS+= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(VOSLIB) \ - $(CANVASLIB) \ + $(CANVASTOOLSLIB) \ $(SALLIB) \ $(AVMEDIALIB) -- cgit From 436416a6320037855846fce127a0cfa77ac45270 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 8 Jul 2010 12:27:24 +0200 Subject: renaissance1: resolved merge conflicts, cleanup. --- sd/util/exports.dxp | 0 sd/util/hidother.hrc | 0 sd/util/hidother.src | 0 sd/util/makefile.mk | 0 sd/util/makefile.pmk | 0 sd/util/sd.flt | 0 sd/util/sdfilt.map | 0 sd/util/sdui.map | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 sd/util/exports.dxp mode change 100644 => 100755 sd/util/hidother.hrc mode change 100644 => 100755 sd/util/hidother.src mode change 100644 => 100755 sd/util/makefile.mk mode change 100644 => 100755 sd/util/makefile.pmk mode change 100644 => 100755 sd/util/sd.flt mode change 100644 => 100755 sd/util/sdfilt.map mode change 100644 => 100755 sd/util/sdui.map (limited to 'sd/util') diff --git a/sd/util/exports.dxp b/sd/util/exports.dxp old mode 100644 new mode 100755 diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc old mode 100644 new mode 100755 diff --git a/sd/util/hidother.src b/sd/util/hidother.src old mode 100644 new mode 100755 diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk old mode 100644 new mode 100755 diff --git a/sd/util/sd.flt b/sd/util/sd.flt old mode 100644 new mode 100755 diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map old mode 100644 new mode 100755 diff --git a/sd/util/sdui.map b/sd/util/sdui.map old mode 100644 new mode 100755 -- cgit From 0f77ea10ee512a4ccf3d2f6bc11f13cab40b60d6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- sd/util/makefile.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sd/util') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 6b1e6ebf1676..b8642e5951c5 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -55,8 +55,7 @@ RESLIB1SRSFILES=\ $(SRS)$/animui.srs \ $(SRS)$/slideshow.srs \ $(SRS)$/uitable.srs \ - $(SRS)$/uiannotations.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/uiannotations.srs # --- StarDraw DLL -- cgit From a8b05714d1358d2af230d0defe225669c3841ae5 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- sd/util/makefile.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'sd/util') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 719ed566c6f8..0bf5b83e2f33 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -53,7 +53,6 @@ RESLIB1SRSFILES=\ $(SRS)$/uitable.srs \ $(SRS)$/view.srs \ $(SRS)$/uiannotations.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs # --- StarDraw DLL -- cgit From 66be8992043f8728beb915ce13475ffd93d370fa Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- sd/util/hidother.src | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) mode change 100644 => 100755 sd/util/hidother.src (limited to 'sd/util') diff --git a/sd/util/hidother.src b/sd/util/hidother.src old mode 100644 new mode 100755 index 1a15c421b419..bd378fb6d75f --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -24,28 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "../inc/helpids.h" -#include "hidother.hrc" -#include "../inc/app.hrc" - -hidspecial SID_NOTESMODE { HelpId = SID_NOTESMODE; }; -hidspecial SID_HANDOUTMODE { HelpId = SID_HANDOUTMODE; }; - -hidspecial SD_IF_SDAPP { HelpId = SD_IF_SDAPP; }; -hidspecial SD_IF_SDDRAWDOCSHELL { HelpId = SD_IF_SDDRAWDOCSHELL; }; -hidspecial SD_IF_SDVIEWSHELL { HelpId = SD_IF_SDVIEWSHELL; }; -hidspecial SD_IF_SDDRAWVIEWSHELL { HelpId = SD_IF_SDDRAWVIEWSHELL; }; -hidspecial SD_IF_SDSLIDEVIEWSHELL { HelpId = SD_IF_SDSLIDEVIEWSHELL; }; -hidspecial SD_IF_SDOUTLINEVIEWSHELL { HelpId = SD_IF_SDOUTLINEVIEWSHELL; }; -hidspecial SD_IF_SDDRAWSTDOBJECTBAR { HelpId = SD_IF_SDDRAWSTDOBJECTBAR; }; -hidspecial SD_IF_SDDRAWTEXTOBJECTBAR { HelpId = SD_IF_SDDRAWTEXTOBJECTBAR; }; -hidspecial SD_IF_SDDRAWBEZIEROBJECTBAR { HelpId = SD_IF_SDDRAWBEZIEROBJECTBAR; }; -hidspecial SD_IF_SDDRAWGLUEPOINTSOBJECTBAR { HelpId = SD_IF_SDDRAWGLUEPOINTSOBJECTBAR; }; -hidspecial SD_IF_SDGRAPHICDOCSHELL { HelpId = SD_IF_SDGRAPHICDOCSHELL; }; -hidspecial SD_IF_SDGRAPHICVIEWSHELL { HelpId = SD_IF_SDGRAPHICVIEWSHELL; }; -hidspecial SD_IF_SDGRAPHICSTDOBJECTBAR { HelpId = SD_IF_SDGRAPHICSTDOBJECTBAR; }; -hidspecial SD_IF_SDDRAWGRAFOBJECTBAR { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; }; -hidspecial SD_IF_SDPRESVIEWSHELL { HelpId = SD_IF_SDPRESVIEWSHELL; }; hidspecial HID_SD_PRINT_OPTIONS { HelpId = HID_SD_PRINT_OPTIONS; }; hidspecial HID_SD_OPTIONS_SNAP { HelpId = HID_SD_OPTIONS_SNAP; }; @@ -130,8 +110,6 @@ hidspecial HID_SD_NAMEDIALOG_LINEEND { HelpId = HID_SD_NAMEDIALOG_LINEEND; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_SLIDE { HelpId = HID_SD_TABPAGE_HEADERFOOTER_SLIDE; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT { HelpId = HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT; }; -hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; }; - hidspecial HID_SD_TASK_PANE { HelpId = HID_SD_TASK_PANE; }; hidspecial HID_SD_SLIDE_DESIGNS { HelpId = HID_SD_SLIDE_DESIGNS; }; hidspecial HID_SD_CURRENT_MASTERS { HelpId = HID_SD_CURRENT_MASTERS; }; @@ -194,8 +172,6 @@ hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX { HelpId = HID_S hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; }; -hidspecial SID_SAVEGRAPHIC { HelpId = SID_SAVEGRAPHIC; }; - hidspecial HID_SD_SLIDESHOW_DISPLAY { HelpId = HID_SD_SLIDESHOW_DISPLAY; }; hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_SD_RULER_HORIZONTAL; }; -- cgit From a0cb17e25ec80250a4c7e4547a63bf090aea04d3 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 10 Sep 2010 13:10:07 +0200 Subject: sb129: #i113189# change UNO components to use passive registration --- sd/util/exports.dxp | 1 - sd/util/makefile.mk | 13 +++++++ sd/util/sd.component | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ sd/util/sdd.component | 34 +++++++++++++++++ 4 files changed, 149 insertions(+), 1 deletion(-) mode change 100644 => 100755 sd/util/exports.dxp create mode 100644 sd/util/sd.component create mode 100644 sd/util/sdd.component (limited to 'sd/util') diff --git a/sd/util/exports.dxp b/sd/util/exports.dxp old mode 100644 new mode 100755 index 0c2e3e7cddd7..0cb5620a1603 --- a/sd/util/exports.dxp +++ b/sd/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory \ No newline at end of file diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 8cc7bd3345e6..ac01158b5b85 100755 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -276,3 +276,16 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo Making: $@ @$(TYPE) sd.flt > $@ +ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component + +$(MISC)/sd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sd.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sd.component + +$(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + sdd.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt sdd.component diff --git a/sd/util/sd.component b/sd/util/sd.component new file mode 100644 index 000000000000..0d0011b4839e --- /dev/null +++ b/sd/util/sd.component @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sd/util/sdd.component b/sd/util/sdd.component new file mode 100644 index 000000000000..51160d0f04fe --- /dev/null +++ b/sd/util/sdd.component @@ -0,0 +1,34 @@ + + + + + + + + -- cgit