From 5079d0966bcbc31516dea8a2e7e384269a13a8d5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 12:35:34 +0200 Subject: #i103496#: move kde_headers.h from vcl to shell --- shell/prj/build.lst | 2 +- shell/prj/d.lst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/prj') diff --git a/shell/prj/build.lst b/shell/prj/build.lst index 7a2e91f973ba..09bbf02430a9 100644 --- a/shell/prj/build.lst +++ b/shell/prj/build.lst @@ -1,4 +1,4 @@ -sl shell : l10n offuh rdbmaker tools sal vcl EXPAT:expat NULL +sl shell : l10n offuh rdbmaker tools sal EXPAT:expat NULL sl shell\inc nmake - all sl_inc NULL sl shell\source\win32 nmake - w sl_win32 sl_inc NULL sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL diff --git a/shell/prj/d.lst b/shell/prj/d.lst index 542d6c62eaa5..7e505ba8a73b 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -1,6 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\shell ..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx +..\inc\*.h %_DEST%\inc%_EXT%\shell\*.h ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a -- cgit v1.2.3 From e79a80fe458991d9e6061b54bf8748486c416b4f Mon Sep 17 00:00:00 2001 From: Tobias Krause Date: Sun, 1 Nov 2009 07:56:23 +0000 Subject: #105892# deliver new x64 libs to solver and made the client name of the ooofiltproxy depends to x86/x64 builds --- shell/prj/d.lst | 3 +++ shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'shell/prj') diff --git a/shell/prj/d.lst b/shell/prj/d.lst index 98d4a6215faf..d623a55c2d6c 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -4,6 +4,9 @@ ..\%__SRC%\lib\*.uno.so %_DEST%\lib%_EXT%\*.uno.so ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe +..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin%_EXT%\shlxthdl_x64.dll +..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin%_EXT%\ooofiltproxy_x64.dll +..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin%_EXT%\ooofilt_x64.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx index 879cf8c0115b..218ba500d368 100644 --- a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx @@ -42,6 +42,7 @@ #ifdef __MINGW32__ #include #endif +#include "internal/config.hxx" /* @@ -88,7 +89,8 @@ void Init() TCHAR buff[MAX_PATH]; GetModuleFileName(hThisLibrary, buff, (sizeof(buff)/sizeof(TCHAR))); PathTruncateFileName(buff); - lstrcat(buff, TEXT("ooofilt.dll")); + + lstrcat(buff, MODULE_NAME_FILTER); hOoofilt = LoadLibraryEx(buff, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); -- cgit v1.2.3 From 7b39c8dc2d865324cab015c2a2ed04d26376cb44 Mon Sep 17 00:00:00 2001 From: mb93783 Date: Tue, 3 Nov 2009 18:41:58 +0100 Subject: some fixes for warnings and errors found while building on more platforms --- connectivity/prj/build.lst | 2 +- connectivity/source/drivers/evoab2/makefile.mk | 2 -- connectivity/source/drivers/kab/KConnection.cxx | 2 +- connectivity/source/drivers/kab/KDEInit.cxx | 2 +- connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 2 +- connectivity/source/drivers/kab/KResultSet.hxx | 2 +- connectivity/source/drivers/kab/kcondition.hxx | 2 +- connectivity/source/drivers/kab/kfields.hxx | 2 +- connectivity/source/drivers/kab/korder.hxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 6 +++--- shell/prj/d.lst | 1 + shell/source/backends/kdebe/kdeinetlayer.hxx | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) mode change 100644 => 100755 shell/prj/d.lst mode change 100644 => 100755 shell/source/backends/kdebe/kdeinetlayer.hxx (limited to 'shell/prj') diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 238381692b3a..87e1791ba72e 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL +cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index e9bb9fdc4d70..6d7ca92fbdd6 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -77,9 +77,7 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(SVLLIB) \ - $(VCLLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(SALLIB) \ diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 1df3315f559d..356d43822be4 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -39,7 +39,7 @@ #include "KCatalog.hxx" #include #include -#include +#include using namespace connectivity::kab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 3e7c69166b1b..2736cb5c6fbc 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.cxx @@ -33,7 +33,7 @@ #include "KDEInit.h" #include #include -#include +#include namespace connectivity { diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index c210b52ec4bc..127c70cb4207 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -34,7 +34,7 @@ #include "KDatabaseMetaData.hxx" #include "kfields.hxx" #include "KDEInit.h" -#include +#include #include "FDatabaseMetaDataResultSet.hxx" #include "OTypeInfo.hxx" #include diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 72b1e618be28..51321b106042 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -33,7 +33,7 @@ #include "KStatement.hxx" #include "KResultSetMetaData.hxx" -#include +#include #include #include #include diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index bb219fcf443b..0621eef7fb8b 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -34,7 +34,7 @@ #ifndef _COMPHELPER_TYPES_H_ #include #endif -#include +#include #include namespace connectivity diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index d6f8622398b4..e73660ad7858 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -31,7 +31,7 @@ #ifndef _CONNECTIVITY_KAB_FIELDS_HXX_ #define _CONNECTIVITY_KAB_FIELDS_HXX_ -#include +#include #include #include diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 41a280050c06..dd93066074bf 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -32,7 +32,7 @@ #define _CONNECTIVITY_KAB_ORDER_HXX_ #include "rtl/ustring.hxx" -#include +#include #include diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 0887433692b9..9c3c85008569 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -455,7 +455,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM m_pMiscOptions = new SvtMiscOptions(); - m_pMiscOptions->AddListener( LINK( this, LayoutManager, OptionsChanged ) ); + m_pMiscOptions->AddListenerLink( LINK( this, LayoutManager, OptionsChanged ) ); Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) ); m_eSymbolsSize = m_pMiscOptions->GetSymbolsSize(); m_eSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle(); @@ -469,7 +469,7 @@ LayoutManager::~LayoutManager() Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); if ( m_pMiscOptions ) { - m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) ); + m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) ); delete m_pMiscOptions; m_pMiscOptions = 0; } @@ -7127,7 +7127,7 @@ throw( RuntimeException ) Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); if ( m_pMiscOptions ) { - m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) ); + m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) ); delete m_pMiscOptions; m_pMiscOptions = 0; } diff --git a/shell/prj/d.lst b/shell/prj/d.lst old mode 100644 new mode 100755 index 98d4a6215faf..82cac298367e --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -18,3 +18,4 @@ ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml ..\%__SRC%\misc\*-ucd.txt %_DEST%\bin%_EXT%\*-ucd.txt +..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx old mode 100644 new mode 100755 index 7e8053a67b7b..1a7427b1cb2c --- a/shell/source/backends/kdebe/kdeinetlayer.hxx +++ b/shell/source/backends/kdebe/kdeinetlayer.hxx @@ -10,7 +10,7 @@ #endif #include #include -#include +#include namespace css = com::sun::star ; namespace uno = css::uno ; -- cgit v1.2.3