diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-07-24 19:22:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-07-24 19:23:32 +0200 |
| commit | c78b2702a4e8b27e1a9023350cc081a84ff55958 (patch) | |
| tree | 2c0737059007de45ddda0a192dbbeecfaea8cc93 /pyuno/demo | |
| parent | c35fad42b0b1b2084154ea61881a920928e7f777 (diff) | |
minor whitespace/makefile cleanup
Diffstat (limited to 'pyuno/demo')
| -rw-r--r-- | pyuno/demo/makefile.mk | 60 | ||||
| -rw-r--r-- | pyuno/demo/ooextract.py | 4 | ||||
| -rw-r--r-- | pyuno/demo/swriter.py | 3 | ||||
| -rw-r--r-- | pyuno/demo/swritercomp.py | 3 |
4 files changed, 32 insertions, 38 deletions
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk index e369c8c06905..e00a2fb7ca56 100644 --- a/pyuno/demo/makefile.mk +++ b/pyuno/demo/makefile.mk @@ -4,39 +4,39 @@ PRJ=.. .INCLUDE : settings.mk .INCLUDE : pyversion.mk -ROOT=$(MISC)$/pyuno-doc +ROOT=$(MISC)/pyuno-doc FILES=\ - $(ROOT)$/python-bridge.html \ - $(ROOT)$/customized_setup.png \ - $(ROOT)$/mode_component.png \ - $(ROOT)$/mode_ipc.png \ - $(ROOT)$/modes.sxd \ - $(ROOT)$/optional_components.png \ - $(ROOT)$/samples$/swriter.py \ - $(ROOT)$/samples$/swritercomp.py \ - $(ROOT)$/samples$/ooextract.py \ - $(ROOT)$/samples$/biblioaccess.py \ - $(ROOT)$/samples$/swritercompclient.py \ - $(ROOT)$/samples$/hello_world_pyuno.zip - - -$(MISC)$/pyuno-doc.zip : dirs $(FILES) - -rm -f $@ - cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc -dirs .PHONY : - -mkdir $(ROOT) - -mkdir $(ROOT)$/samples + $(ROOT)/python-bridge.html \ + $(ROOT)/customized_setup.png \ + $(ROOT)/mode_component.png \ + $(ROOT)/mode_ipc.png \ + $(ROOT)/modes.sxd \ + $(ROOT)/optional_components.png \ + $(ROOT)/samples/swriter.py \ + $(ROOT)/samples/swritercomp.py \ + $(ROOT)/samples/ooextract.py \ + $(ROOT)/samples/biblioaccess.py \ + $(ROOT)/samples/swritercompclient.py \ + $(ROOT)/samples/hello_world_pyuno.zip + + +$(MISC)/pyuno-doc.zip : dirs $(FILES) + -rm -f $@ + cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc +dirs .PHONY : + -mkdir $(ROOT) + -mkdir $(ROOT)/samples -$(ROOT)$/samples$/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu - -rm -f $@ - zip $@ hello_world_comp.py Addons.xcu +$(ROOT)/samples/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu + -rm -f $@ + zip $@ hello_world_comp.py Addons.xcu -$(ROOT)$/samples$/% : % - -rm -f $@ - cat $? > $@ +$(ROOT)/samples/% : % + -rm -f $@ + $(COPY) $? $@ -$(ROOT)$/% : ..$/doc$/% - -rm -f $@ - cat $? > $@ +$(ROOT)/% : ../doc/% + -rm -f $@ + $(COPY) $? $@ diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py index 74e072feef5d..3959bf74b200 100644 --- a/pyuno/demo/ooextract.py +++ b/pyuno/demo/ooextract.py @@ -43,8 +43,8 @@ def main(): print(filterName) if not len(args): - usage() - sys.exit() + usage() + sys.exit() ctxLocal = uno.getComponentContext() smgrLocal = ctxLocal.ServiceManager diff --git a/pyuno/demo/swriter.py b/pyuno/demo/swriter.py index 3fafcd603da6..bf40a56e99f1 100644 --- a/pyuno/demo/swriter.py +++ b/pyuno/demo/swriter.py @@ -61,9 +61,6 @@ insertTextIntoCell( table, "B1", "SecondColumn", textColor ) insertTextIntoCell( table, "C1", "ThirdColumn", textColor ) insertTextIntoCell( table, "D1", "SUM", textColor ) -values = ( (22.5,21.5,121.5), - (5615.3,615.3,-615.3), - (-2315.7,315.7,415.7) ) table.getCellByName("A2").setValue(22.5) table.getCellByName("B2").setValue(5615.3) table.getCellByName("C2").setValue(-2315.7) diff --git a/pyuno/demo/swritercomp.py b/pyuno/demo/swritercomp.py index be3109c12b44..fd7025f0426f 100644 --- a/pyuno/demo/swritercomp.py +++ b/pyuno/demo/swritercomp.py @@ -62,9 +62,6 @@ class SWriterComp(XMain,unohelper.Base): insertTextIntoCell( table, "C1", "ThirdColumn", textColor ) insertTextIntoCell( table, "D1", "SUM", textColor ) - values = ( (22.5,21.5,121.5), - (5615.3,615.3,-615.3), - (-2315.7,315.7,415.7) ) table.getCellByName("A2").setValue(22.5) table.getCellByName("B2").setValue(5615.3) table.getCellByName("C2").setValue(-2315.7) |