[Libreoffice-commits] .: 3 commits - basic/source connectivity/source fpicker/source xmloff/util
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 16 11:16:50 PST 2011
basic/source/app/processw.hxx | 4 -
basic/source/inc/object.hxx | 4 -
connectivity/source/dbtools/makefile.mk | 4 -
fpicker/source/office/iodlg.cxx | 71 +-------------------------------
xmloff/util/makefile.mk | 5 --
5 files changed, 9 insertions(+), 79 deletions(-)
New commits:
commit f47441f9de6a160afbb03106b28615ce8b831765
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 19:02:37 2011 +0100
Remove some dead code
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 699081a..e3f24cc 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -86,7 +86,6 @@
#include <osl/file.h>
#include <vcl/waitobj.hxx>
-// #97148# ------------------------------------
#include <com/sun/star/task/XInteractionHandler.hpp>
#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
#include "fpinteraction.hxx"
@@ -237,7 +236,6 @@ namespace
{
// check if it is a real file extension, and not only the "post-dot" part in
// a directory name
- // 28.03.2002 - 98337 - fs at openoffice.org
sal_Bool bRealExtensions = sal_True;
if ( STRING_NOTFOUND != aExt.Search( '/' ) )
bRealExtensions = sal_False;
@@ -258,7 +256,6 @@ namespace
}
if ( INET_PROT_FILE == aURL.GetProtocol() )
{
- // #97148# & #102204# -----
try
{
bRealExtensions = !_pDialog->ContentIsFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -799,7 +796,6 @@ void SvtFileDialog::Init_Impl
if ( WB_SAVEAS & nStyle )
{
// different help ids if in save-as mode
- // 90744 - 09.08.2001 - frank.schoenheit at sun.com
SetHelpId( HID_FILESAVE_DIALOG );
_pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL );
@@ -815,7 +811,6 @@ void SvtFileDialog::Init_Impl
// for the extra use cases, and separated _pLbFileVersion
// I did not find out in which cases the help ID is really needed HID_FILESAVE_TEMPLATE - all
// tests I made lead to a dialog where _no_ of the three list boxes was present.
- // 96930 - 15.08.2002 - fs at openoffice.org
if ( _pImp->_pLbFileVersion )
_pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE );
if ( _pImp->_pLbTemplates )
@@ -871,7 +866,6 @@ IMPL_STATIC_LINK_NOINSTANCE( SvtFileDialog, ViewHdl_Impl, ImageButton*, EMPTYARG
return 0;
}
-//*****************************************************************************
//-----------------------------------------------------------------------------
sal_Bool SvtFileDialog::createNewUserFilter( const String& _rNewFilter, sal_Bool _bAllowUserDefExt )
{
@@ -887,7 +881,6 @@ sal_Bool SvtFileDialog::createNewUserFilter( const String& _rNewFilter, sal_Bool
SetDefaultExt( _rNewFilter.Copy( 2 ) );
// TODO: this is nonsense. In the whole file there are a lotta places where we assume that a user filter
// is always "*.<something>". But changing this would take some more time than I have now ...
- // 05.12.2001 - 95486 - fs at openoffice.org
// now, the default extension is set to the one of the user filter (or empty)
// if the former is not allowed (_bAllowUserDefExt = <FALSE/>), we have to use the ext of the current filter
@@ -1023,7 +1016,6 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
// if an entry is selected in the view ....
if ( pThis->_pFileView->GetSelectionCount() )
{ // -> use this one. This will allow us to step down this folder
- // #i8928# - 2002-12-20 - fs at openoffice.org
aFileName = pThis->_pFileView->GetCurrentURL();
}
}
@@ -1126,7 +1118,6 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
// error messages for the same content a second time ....
pThis->m_aContent.bindTo( ::rtl::OUString( ) );
- // #97148# & #102204# ---------
if ( aFileName.Len() )
{
// Make sure we have own Interaction Handler in place. We do not need
@@ -1264,7 +1255,6 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
// if content does not exist: at least its path must exist
INetURLObject aPathObj = aFileObj;
aPathObj.removeSegment();
- // #97148# & #102204# ------------
BOOL bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
if ( !bFolder )
{
@@ -1279,12 +1269,10 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
case FILEDLG_MODE_OPEN:
{
// do an existence check herein, again
- // 16.11.2001 - 93107 - frank.schoenheit at sun.com
if ( INET_PROT_FILE == aFileObj.GetProtocol( ) )
{
sal_Bool bExists = sal_False;
- // #102204# --------------
bExists = pThis->m_aContent.is( aFileObj.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -1767,7 +1755,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
if ( !rKeyCode.GetModifier() &&
KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
{
- nRet = 0; //! (long)_pFileView->DoBeamerKeyInput( *rNEvt.GetKeyEvent() );
+ nRet = 0;
if ( !nRet && _pImp->_pBtnUp->IsEnabled() )
{
@@ -1775,15 +1763,6 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
nRet = 1;
}
}
-// else if ( rKeyCode.IsMod1() && ( KEY_C == nCode || KEY_V == nCode || KEY_X == nCode ) )
-// {
-/* (mhu)
- String aVerb = KEY_C == nCode ? UniString(RTL_CONSTASCII_USTRINGPARAM(SVT_MENUPART_VERB_COPY)) :
- ( KEY_V == nCode ? UniString(RTL_CONSTASCII_USTRINGPARAM(SVT_MENUPART_VERB_PASTE)) : UniString(RTL_CONSTASCII_USTRINGPARAM(SVT_MENUPART_VERB_CUT)) );
-//(dv) if ( !CntPopupMenu::DoVerbCommand( aVerb, _pFileView->GetView() ) )
-//(dv) Sound::Beep();
-*/
-// }
}
return nRet ? nRet : ModalDialog::Notify( rNEvt );
}
@@ -1879,7 +1858,6 @@ String SvtFileDialog::implGetInitialURL( const String& _rPath, const String& _rF
if ( bIsInvalid && m_bHasFilename && !aURLParser.hasFinalSlash() )
{ // check if the parent folder exists
- // #108429# - 2003-03-26 - fs at openoffice.org
INetURLObject aParent( aURLParser );
aParent.removeSegment( );
aParent.setFinalSlash( );
@@ -1939,9 +1917,7 @@ short SvtFileDialog::Execute()
// nur bei File-URL's und nicht bei virtuelle Folder
// das ausgew"ahlte Verzeichnis merken
sal_Int32 nLevel = aURL.getSegmentCount();
- // #97148# & #102204# ------
sal_Bool bDir = m_aContent.isFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- // BOOL bClassPath = ( ( _pImp->_nStyle & SFXWB_CLASSPATH ) == SFXWB_CLASSPATH );
if ( nLevel > 1 && ( FILEDLG_TYPE_FILEDLG == _pImp->_eDlgType || !bDir ) )
aURL.removeSegment();
}
@@ -1956,7 +1932,6 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
PrepareExecute();
// Start des Dialogs.
-// _bIsInExecute = TRUE;
ModalDialog::StartExecuteModal( rEndDialogHdl );
}
@@ -2093,21 +2068,7 @@ short SvtFileDialog::PrepareExecute()
}
else
{
-// @@@ KSO 05/18/2006: support for removable media currently hardcoded/incomplete in OSL
-//
-// do
-// {
-// // check, whether child is a removable volume
-// if ( xRow->getBoolean( 1 ) && !xRow->wasNull() )
-// {
-// if ( xRow->getBoolean( 2 ) && !xRow->wasNull() )
-// {
bEmpty = false;
-// break;
-// }
-// }
-// }
-// while ( xResultSet->next() );
}
if ( bEmpty )
@@ -2126,16 +2087,14 @@ short SvtFileDialog::PrepareExecute()
}
}
- // #102204# ---------------
if ( ( _pImp->_nStyle & WB_SAVEAS ) && m_bHasFilename )
// when doing a save-as, we do not want the handler to handle "this file does not exist" messages
// - finally we're going to save that file, aren't we?
- // #105812# - 2002-12-02 - fs at openoffice.org
m_aContent.enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::E_DOESNOTEXIST);
else
m_aContent.enableDefaultInteractionHandler();
- // #53016# evtl. nur ein Filename ohne Pfad?
+ // evtl. nur ein Filename ohne Pfad?
String aFileNameOnly;
if( _aPath.Len() && (_pImp->_eMode == FILEDLG_MODE_SAVE)
&& (_aPath.Search(':') == STRING_NOTFOUND)
@@ -2152,7 +2111,7 @@ short SvtFileDialog::PrepareExecute()
// dann das Standard-Dir verwenden
_aPath = lcl_ensureFinalSlash( _pImp->GetStandardDir() );
- // #53016# vorgegebener Dateiname an Pfad anh"angen
+ // vorgegebener Dateiname an Pfad anh"angen
if ( aFileNameOnly.Len() )
_aPath += aFileNameOnly;
}
@@ -2219,7 +2178,6 @@ short SvtFileDialog::PrepareExecute()
_pImp->_pDefaultFilter = _pImp->GetCurFilter();
- // HACK #50065#
// ggf. Filter isolieren.
String aFilter;
@@ -2231,7 +2189,6 @@ short SvtFileDialog::PrepareExecute()
{
_pImp->_pEdFileName->SetText( aFilter );
}
- // HACK #50065#
// Instanz fuer den gesetzten Pfad erzeugen und anzeigen.
INetURLObject aFolderURL( _aPath );
@@ -2256,9 +2213,6 @@ short SvtFileDialog::PrepareExecute()
// Somebody might want to enable some controls acording to the current filter
FilterSelect();
- // Zustand der Steuerelemente anpassen.
-// EndListeningAll();
-
ViewHdl_Impl( this, NULL );
OpenURL_Impl( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -2427,8 +2381,6 @@ void SvtFileDialog::AddFilterGroup( const String& _rFilter, const Sequence< Stri
implAddFilter( pSubFilters->First, pSubFilters->Second );
}
-//*****************************************************************************
-
//-----------------------------------------------------------------------------
void SvtFileDialog::SetCurFilter( const String& rFilter )
{
@@ -2568,7 +2520,6 @@ void SvtFileDialog::implArrangeControls()
// (including the FixedTexts is important - not for tabbing order (they're irrelevant there),
// but for working keyboard shortcuts)
- // 96861 - 23.01.2002 - fs at openoffice.org
};
// loop through all these controls and adjust the z-order
@@ -2670,8 +2621,6 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
return TRUE;
}
-//*****************************************************************************
-
//-----------------------------------------------------------------------------
void SvtFileDialog::implUpdateImages( )
{
@@ -2824,8 +2773,6 @@ void SvtFileDialog::Resize()
_pFileNotifier->notify( DIALOG_SIZE_CHANGED, 0 );
}
-//*****************************************************************************
-
//-----------------------------------------------------------------------------
Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool _bLabelControl ) const
{
@@ -3063,7 +3010,6 @@ void SvtFileDialog::AddControls_Impl( )
// This is strange. During the re-factoring during 96930, I discovered that this help id
// is set in the "Templates mode". This was hidden in the previous implementation.
// Shouldn't this be a more meaningfull help id.
- // 96930 - 15.08.2002 - fs at openoffice.org
}
else if ( _nExtraBits & SFX_EXTRA_IMAGE_TEMPLATE )
{
@@ -3141,15 +3087,6 @@ sal_Bool SvtFileDialog::setShowState( sal_Bool /*bShowState*/ )
// of the file dialog dynamically
// support for set/getShowState is opionally
// see com::sun::star::ui::dialogs::XFilePreview
- /*
- if ( _pPrevBmp )
- {
- _pPrevBmp->Show( bShowState );
- return sal_True;
- }
- else
- return sal_False;
- */
return sal_False;
}
@@ -3406,8 +3343,6 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
}
}
-// -----------------------------------------------------------------------
-
// QueryFolderNameDialog -------------------------------------------------------
namespace svtools {
commit f3920dc5e245e7b5c66a86cb89b56de700dd5769
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 13:26:34 2011 +0100
Remove SCO support
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 1dab5a6..294c9a0 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -67,8 +67,8 @@ SHL1STDLIBS=\
# NETBSD: somewhere we have to instantiate the static data members.
# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
-# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+# MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
SHL1STDLIBS+=$(UCBHELPERLIB)
.ENDIF
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 5427467..fb0979f 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -69,11 +69,6 @@ SHL1STDLIBS= \
$(UNOTOOLSLIB) \
$(BASEGFXLIB)
-# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "(OS)"=="SCO"
-SHL1STDLIBS+=-licg617mxp
-.ENDIF
-
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1LIBS= $(LIB1TARGET)
commit 6f49031fca5662a820a521129a8d06eba80b166b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 12:54:03 2011 +0100
Remove HPUX support
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index 983f266..9d45044 100644
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -39,12 +39,12 @@ class ProcessWrapper : public SbxObject
using SbxVariable::GetInfo;
// Definition of a table entry. This is done here because
// through this methods and property can declared as private.
-#if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 )
+#if defined ( ICC ) || defined ( C50 ) || defined ( C52 )
public:
#endif
typedef void( ProcessWrapper::*pMeth )
( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
-#if defined ( ICC ) || defined ( HPUX )
+#if defined ( ICC )
private:
#endif
diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index bd659bb..4bdb3d1 100644
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/object.hxx
@@ -55,12 +55,12 @@ using SbxVariable::GetInfo;
// Definition eines Tabelleneintrags. Dies wird hier gemacht,
// da dadurch die Methoden und Properties als private deklariert
// werden koennen.
-#if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 )
+#if defined ( ICC ) || defined ( C50 ) || defined ( C52 )
public:
#endif
typedef void( SampleObject::*pMeth )
( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
-#if defined ( ICC ) || defined ( HPUX )
+#if defined ( ICC )
private:
#endif
More information about the Libreoffice-commits
mailing list