Download as
Browse Code »

Commit 0043521e3feb3d5e9d153dc49f15a45046ccb3e2

Authored by perry.werneck@gmail.com
1 parent 0b0e5b0e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Work in progress

Showing 3 changed files with 21 additions and 8 deletions   Show diff stats
src/openoffice/Makefile.in
  Diff comments   View file @0043521
@@ -56,7 +56,7 @@ MKDIR=@MKDIR_P@ @@ -56,7 +56,7 @@ MKDIR=@MKDIR_P@
56 CLASSLIBDIR=../classlib 56 CLASSLIBDIR=../classlib
57 include $(CLASSLIBDIR)/class.mak 57 include $(CLASSLIBDIR)/class.mak
58 58
59 -#---[ lib3270 common class ]--------------------------------------------------- 59 +#---[ Paths ]------------------------------------------------------------------
60 60
61 OBJDIR=.obj 61 OBJDIR=.obj
62 BINDIR=.bin 62 BINDIR=.bin
@@ -78,6 +78,16 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ @@ -78,6 +78,16 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
78 78
79 #---[ Rules ]------------------------------------------------------------------ 79 #---[ Rules ]------------------------------------------------------------------
80 80
  81 +include/com/sun/star/uno/%.hpp: %.rdb
  82 + @echo $@ ...
  83 + @$(MKDIR) `dirname $@`
  84 + @$(CPPUMAKER) -O./include $(TYPES_RDB) $<
  85 +
  86 +include/com/sun/star/registry/%.hpp: %.rdb
  87 + @echo $@ ...
  88 + @$(MKDIR) `dirname $@`
  89 + $(CPPUMAKER) -O./include $(TYPES_RDB) $<
  90 +
81 %.urd: %.idl 91 %.urd: %.idl
82 @echo $@ ... 92 @echo $@ ...
83 @$(MKDIR) `dirname $@` 93 @$(MKDIR) `dirname $@`
@@ -88,6 +98,11 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ @@ -88,6 +98,11 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
88 @$(MKDIR) `dirname $@` 98 @$(MKDIR) `dirname $@`
89 @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< 99 @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
90 100
  101 +%.urd: /usr/share/idl/libreoffice/com/sun/star/registry/%.idl
  102 + @echo $@ ...
  103 + @$(MKDIR) `dirname $@`
  104 + @$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
  105 +
91 %.rdb: %.urd 106 %.rdb: %.urd
92 @echo $@ ... 107 @echo $@ ...
93 @$(MKDIR) `dirname $@` 108 @$(MKDIR) `dirname $@`
@@ -101,7 +116,6 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ @@ -101,7 +116,6 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
101 $(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< 116 $(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $<
102 # $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) -DLIBNAME=\"$(BINDBG)/$(PROGRAM_NAME).uno@DLLEXT@\" -o $@ -c $< 117 # $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) -DLIBNAME=\"$(BINDBG)/$(PROGRAM_NAME).uno@DLLEXT@\" -o $@ -c $<
103 118
104 -  
105 #---[ UNO targets ]------------------------------------------------------------ 119 #---[ UNO targets ]------------------------------------------------------------
106 120
107 include/pw3270/lib3270.hpp: pw3270.rdb 121 include/pw3270/lib3270.hpp: pw3270.rdb
@@ -109,11 +123,6 @@ include/pw3270/lib3270.hpp: pw3270.rdb @@ -109,11 +123,6 @@ include/pw3270/lib3270.hpp: pw3270.rdb
109 @$(MKDIR) `dirname $@` 123 @$(MKDIR) `dirname $@`
110 @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $< 124 @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $<
111 125
112 -include/com/sun/star/uno/%.hpp: %.rdb  
113 - @echo $@ ...  
114 - @$(MKDIR) `dirname $@`  
115 - @$(CPPUMAKER) -O./include $(TYPES_RDB) $<  
116 -  
117 126
118 #---[ Debug targets ]---------------------------------------------------------- 127 #---[ Debug targets ]----------------------------------------------------------
119 128
src/openoffice/loffice3270.cbp
  Diff comments   View file @0043521
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <CodeBlocks_project_file> 2 <CodeBlocks_project_file>
3 <FileVersion major="1" minor="6" /> 3 <FileVersion major="1" minor="6" />
4 <Project> 4 <Project>
5 - <Option title="pw3270 LibreOffice" /> 5 + <Option title="pw3270 openOffice" />
6 <Option makefile_is_custom="1" /> 6 <Option makefile_is_custom="1" />
7 <Option pch_mode="2" /> 7 <Option pch_mode="2" />
8 <Option compiler="gcc" /> 8 <Option compiler="gcc" />
src/openoffice/testprogram.cc
  Diff comments   View file @0043521
@@ -28,12 +28,16 @@ @@ -28,12 +28,16 @@
28 */ 28 */
29 29
30 #include "globals.hpp" 30 #include "globals.hpp"
  31 + #include <com/sun/star/registry/DefaultRegistry.hpp>
31 #include "pw3270/lib3270.hpp" 32 #include "pw3270/lib3270.hpp"
32 33
33 /*---[ Implement ]-----------------------------------------------------------------------------------------*/ 34 /*---[ Implement ]-----------------------------------------------------------------------------------------*/
34 35
  36 +using namespace ::com::sun::star::registry;
  37 +
35 int SAL_CALL main(int argc, char **argv) 38 int SAL_CALL main(int argc, char **argv)
36 { 39 {
  40 + Reference< XSimpleRegistry > xReg = DefaultRegistry();
37 /* 41 /*
38 42
39 Reference< XSimpleRegistry > xReg = createSimpleRegistry(); 43 Reference< XSimpleRegistry > xReg = createSimpleRegistry();