Commit e924338261c82b9a849d32ce8f2e4ad2722d61af
1 parent
0ffc370d
Exists in
master
and in
5 other branches
Corrigindo erros detectados ao tentar carregar a extensão
Showing
2 changed files
with
17 additions
and
19 deletions
Show diff stats
src/openoffice/Makefile.in
... | ... | @@ -129,7 +129,7 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb |
129 | 129 | Debug: $(BINDBG)/$(PACKAGE_NAME).oxt |
130 | 130 | |
131 | 131 | add: $(BINDBG)/$(PACKAGE_NAME).oxt |
132 | - @$(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt | |
132 | + @SHARED=false $(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt | |
133 | 133 | |
134 | 134 | $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) |
135 | 135 | @echo $@ ... |
... | ... | @@ -141,7 +141,7 @@ $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@: \ |
141 | 141 | $(CLASS_DEBUG_OBJECTS) |
142 | 142 | @echo " LD `basename $@`" |
143 | 143 | @$(MKDIR) `dirname $@` |
144 | - $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ | |
144 | + $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^ | |
145 | 145 | |
146 | 146 | |
147 | 147 | $(BINDBG)/$(PACKAGE_NAME).oxt: \ | ... | ... |
src/openoffice/service.cc
... | ... | @@ -37,27 +37,25 @@ |
37 | 37 | |
38 | 38 | /*---[ Implement ]-----------------------------------------------------------------------------------------*/ |
39 | 39 | |
40 | -using namespace pw3270_impl; | |
41 | - | |
42 | -Sequence< OUString > SAL_CALL getSupportedServiceNames_session_impl() | |
40 | +namespace pw3270_impl | |
43 | 41 | { |
44 | - Sequence<OUString> names(1); | |
45 | - names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("pw3270.session")); | |
46 | - return names; | |
47 | -} | |
42 | + Sequence< OUString > SAL_CALL getSupportedServiceNames_session_impl() | |
43 | + { | |
44 | + Sequence<OUString> names(1); | |
45 | + names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("pw3270.session")); | |
46 | + return names; | |
47 | + } | |
48 | 48 | |
49 | -OUString SAL_CALL getImplementationName_session_impl() | |
50 | -{ | |
51 | - return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.lib3270.session") ); | |
52 | -} | |
49 | + OUString SAL_CALL getImplementationName_session_impl() | |
50 | + { | |
51 | + return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.lib3270.session") ); | |
52 | + } | |
53 | 53 | |
54 | -Reference< XInterface > SAL_CALL create_session_impl(Reference< XComponentContext > const & xContext ) SAL_THROW( () ) | |
55 | -{ | |
56 | - return static_cast< lang::XTypeProvider * >( new session_impl() ); | |
57 | -} | |
54 | + Reference< XInterface > SAL_CALL create_session_impl(Reference< XComponentContext > const & xContext ) SAL_THROW( () ) | |
55 | + { | |
56 | + return static_cast< lang::XTypeProvider * >( new session_impl() ); | |
57 | + } | |
58 | 58 | |
59 | -namespace pw3270_impl | |
60 | -{ | |
61 | 59 | static struct ::cppu::ImplementationEntry s_component_entries [] = |
62 | 60 | { |
63 | 61 | { | ... | ... |