summaryrefslogtreecommitdiffstats
path: root/fpicker
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/aqua/FPentry.cxx4
-rw-r--r--fpicker/source/office/fps_office.cxx3
-rw-r--r--fpicker/source/office/fpsmartcontent.cxx18
-rw-r--r--fpicker/source/office/iodlg.cxx12
-rw-r--r--fpicker/source/unx/gnome/FPentry.cxx4
-rw-r--r--fpicker/source/unx/kde/kdefpmain.cxx6
-rw-r--r--fpicker/source/unx/kde/makefile.mk4
-rw-r--r--fpicker/source/unx/kde4/KDE4FPEntry.cxx4
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.hxx1
-rw-r--r--fpicker/source/unx/kde_unx/UnxFPentry.cxx4
-rw-r--r--fpicker/source/win32/filepicker/FPentry.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/Fopentry.cxx4
-rw-r--r--fpicker/test/makefile.mk4
13 files changed, 38 insertions, 34 deletions
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 83e915bbb6ca..405f201d1058 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -70,7 +70,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -80,7 +80,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 29eb084335fc..55e4f9afd574 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -55,8 +55,7 @@ static cppu::ImplementationEntry g_entries[] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */)
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index b66cd8ac05a6..b69a12f22bbc 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -76,8 +76,18 @@ namespace svt
//--------------------------------------------------------------------
SmartContent::~SmartContent()
{
- //Do not delete the content. Because the content will be used by the cache.
- //DELETEZ( m_pContent );
+ /* This destructor originally contained the following blurb: "Do
+ not delete the content. Because the content will be used by
+ the cache." This is just plain silly, because it relies on
+ the provider caching created contents (which is done by
+ ucbhelper::ContentProviderImplHelper, but we do not actually
+ expect all providers to use that, right?) Otherwise we are
+ just leaking memory.
+
+ TODO: If there is real need for caching the content, it must
+ be done here.
+ */
+ delete m_pContent;
}
//--------------------------------------------------------------------
@@ -254,8 +264,8 @@ namespace svt
Reference< XContent > xParent( xChild->getParent(), UNO_QUERY );
if ( xParent.is() )
{
- String aParentURL = String( xParent->getIdentifier()->getContentIdentifier() );
- bRet = ( aParentURL.Len() > 0 && aParentURL != (String)(m_pContent->getURL()) );
+ const ::rtl::OUString aParentURL( xParent->getIdentifier()->getContentIdentifier() );
+ bRet = ( !aParentURL.isEmpty() && aParentURL != m_pContent->getURL() );
// now we're definately valid
m_eState = VALID;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index bda16353eb34..b98b68beedb7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -329,7 +329,7 @@ namespace
void convertStringListToUrls( const String& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash )
{
const sal_Unicode s_cSeparator =
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
';'
#else
':'
@@ -369,7 +369,7 @@ namespace
void operator()( String& _rURL )
{
INetURLObject aURL( _rURL );
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
if ( aURL.getSegmentCount() > 1 )
#endif
aURL.removeFinalSlash( );
@@ -2563,7 +2563,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt
if ( nPathTokenPos == STRING_NOTFOUND )
{
String aDelim(
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
'\\'
#else
'/'
@@ -2571,12 +2571,6 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt
);
nPathTokenPos = aReversePath.Search( aDelim );
-#if defined(OS2)
- if ( nPathTokenPos == STRING_NOTFOUND )
- {
- nPathTokenPos = aReversePath.Search( '/' );
- }
-#endif
#if !defined( UNX )
if ( nPathTokenPos == STRING_NOTFOUND )
{
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index d2463dc4c48a..c4dd0ecfd815 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -92,7 +92,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -102,7 +102,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/unx/kde/kdefpmain.cxx b/fpicker/source/unx/kde/kdefpmain.cxx
index 2300fe61a2c4..be4022664014 100644
--- a/fpicker/source/unx/kde/kdefpmain.cxx
+++ b/fpicker/source/unx/kde/kdefpmain.cxx
@@ -51,10 +51,10 @@ static KCmdLineOptions sOptions[] =
int main( int argc, char* argv[] )
{
- // we fake the name of the application to have "OpenOffice.org" in the
+ // we fake the name of the application to have "LibreOffice" in the
// title
- KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "OpenOffice.org" ),
- "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for OpenOffice.org." ),
+ KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ),
+ "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for LibreOffice." ),
KAboutData::License_LGPL,
"(c) 2004, Jan Holesovsky" );
qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index e1bc4db47d36..20b27d5c7c9a 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -48,6 +48,10 @@ dummy:
CFLAGS+= $(KDE_CFLAGS)
+.IF "$(COM)" == "GCC"
+CFLAGSCXX+=-Wno-shadow
+.ENDIF
+
# --- Files --------------------------------------------------------
SLOFILES =\
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index 0dd047c399f0..2dbf9997f320 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -51,12 +51,12 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
// the three uno functions that will be exported
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index edef224c003e..3518001d265e 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -150,6 +150,7 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException );
+ using cppu::WeakComponentImplHelperBase::disposing;
// XServiceInfo
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index 9a874329281c..bd25db73e8ed 100644
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
@@ -64,7 +64,7 @@ extern "C"
// component_getImplementationEnvironment
//////////////////////////////////////////////////////////////////////////
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -98,7 +98,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
//
//////////////////////////////////////////////////////////////////////////
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index beaa3088ff46..b18f24d3f57b 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -95,7 +95,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -105,7 +105,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 73a048c21ff7..ce9b292084d5 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -78,7 +78,7 @@ extern "C"
// component_getImplementationEnvironment
//----------------------------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -89,7 +89,7 @@ void SAL_CALL component_getImplementationEnvironment(
// returns a factory to create XFilePicker-Services
//----------------------------------------------------------------------
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 4157d339bd3a..e497e794c185 100644
--- a/fpicker/test/makefile.mk
+++ b/fpicker/test/makefile.mk
@@ -31,10 +31,6 @@ PRJNAME=SV
TARGET=svdem
LIBTARGET=NO
-.IF "$(GUI)" == "OS2"
-TARGETTYPE=GUI
-.ENDIF
-
# --- Settings -----------------------------------------------------
.INCLUDE : svpre.mk
generated by cgit (git 2.34.1) at 2024-09-11 05:25:15 +0000