Download as
Browse Code »

Commit c33f261427964d0c96ee1336a24deba5940b16c8

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

Work in progress

Showing 4 changed files with 15 additions and 6 deletions   Show diff stats
src/oxt/Makefile.in
  Diff comments   View file @c33f261
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
26 26
27 SOURCES=info.cc 27 SOURCES=info.cc
28 28
  29 +UNO_CLASSES=XWeak RuntimeException
  30 +
29 #---[ LibreOffice SDK ]-------------------------------------------------------- 31 #---[ LibreOffice SDK ]--------------------------------------------------------
30 32
31 OO_SDK_HOME=@OO_SDK_HOME@ 33 OO_SDK_HOME=@OO_SDK_HOME@
@@ -91,7 +93,9 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ @@ -91,7 +93,9 @@ OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
91 @$(MKDIR) `dirname $@` 93 @$(MKDIR) `dirname $@`
92 @$(REGMERGE) $@ /UCR $< 94 @$(REGMERGE) $@ /UCR $<
93 95
94 -$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp include/com/sun/star/uno/XWeak.hpp *.hpp Makefile 96 +$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
  97 + $(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \
  98 + *.hpp Makefile
95 @echo $< ... 99 @echo $< ...
96 @mkdir -p `dirname $@` 100 @mkdir -p `dirname $@`
97 $(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< 101 $(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $<
src/oxt/globals.hpp
  Diff comments   View file @c33f261
@@ -47,11 +47,12 @@ @@ -47,11 +47,12 @@
47 #endif 47 #endif
48 48
49 49
50 - #include <cppuhelper/implbase2.hxx> // "3" implementing three interfaces 50 + #include <cppuhelper/implbase3.hxx> // "3" implementing three interfaces
51 #include <cppuhelper/factory.hxx> 51 #include <cppuhelper/factory.hxx>
  52 + #include <com/sun/star/lang/XInitialization.hpp>
52 // #include <cppuhelper/implementationentry.hxx> 53 // #include <cppuhelper/implementationentry.hxx>
53 #include <com/sun/star/lang/XServiceInfo.hpp> 54 #include <com/sun/star/lang/XServiceInfo.hpp>
54 -// #include <com/sun/star/lang/IllegalArgumentException.hpp> 55 + #include <com/sun/star/uno/RuntimeException.hpp>
55 56
56 #include <pw3270/lib3270.hpp> 57 #include <pw3270/lib3270.hpp>
57 58
@@ -64,8 +65,11 @@ @@ -64,8 +65,11 @@
64 namespace pw3270_impl 65 namespace pw3270_impl
65 { 66 {
66 // https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes 67 // https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes
67 - class session_impl : public ::cppu::WeakImplHelper2< ::pw3270::lib3270, lang::XServiceInfo > 68 + class session_impl : public ::cppu::WeakImplHelper3< ::pw3270::lib3270, lang::XServiceInfo, lang::XInitialization >
68 { 69 {
  70 + public:
  71 + OUString getImplementationName() throw (RuntimeException);
  72 +
69 }; 73 };
70 74
71 /* 75 /*
src/oxt/info.cc
  Diff comments   View file @c33f261
@@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
38 38
39 using namespace pw3270_impl; 39 using namespace pw3270_impl;
40 40
41 -/*  
42 // XServiceInfo implementation 41 // XServiceInfo implementation
43 OUString session_impl::getImplementationName() throw (RuntimeException) 42 OUString session_impl::getImplementationName() throw (RuntimeException)
44 { 43 {
@@ -46,6 +45,7 @@ OUString session_impl::getImplementationName() throw (RuntimeException) @@ -46,6 +45,7 @@ OUString session_impl::getImplementationName() throw (RuntimeException)
46 return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.pw3270_impl.session") ); 45 return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.pw3270_impl.session") );
47 } 46 }
48 47
  48 +/*
49 49
50 sal_Bool session_impl::supportsService( OUString const & serviceName ) throw (RuntimeException) 50 sal_Bool session_impl::supportsService( OUString const & serviceName ) throw (RuntimeException)
51 { 51 {
src/oxt/pw3270.idl
  Diff comments   View file @c33f261
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 */ 33 */
34 34
35 #include <com/sun/star/uno/XInterface.idl> 35 #include <com/sun/star/uno/XInterface.idl>
36 -#include <com/sun/star/lang/XTypeProvider.idl> 36 +#include <com/sun/star/lang/XInitialization.idl>
37 37
38 module pw3270 38 module pw3270
39 { 39 {
@@ -48,6 +48,7 @@ module pw3270 @@ -48,6 +48,7 @@ module pw3270
48 service session 48 service session
49 { 49 {
50 interface lib3270; 50 interface lib3270;
  51 + interface com::sun::star::lang::XInitialization;
51 }; 52 };
52 }; 53 };
53 54