[Libreoffice-commits] .: 13 commits - dbaccess/source desktop/source editeng/inc editeng/source rsc/Executable_rsc.mk rsc/inc rsc/source sax/source sfx2/inc sfx2/source solenv/bin starmath/inc starmath/source svtools/source svx/inc svx/source tools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 31 03:03:05 PDT 2011
dbaccess/source/ui/browser/brwctrlr.cxx | 137 -----------------
desktop/source/app/cmdlineargs.cxx | 10 -
desktop/source/app/cmdlineargs.hxx | 1
editeng/inc/editeng/editview.hxx | 3
editeng/source/editeng/editview.cxx | 16 --
rsc/Executable_rsc.mk | 2
rsc/inc/rscdb.hxx | 1
rsc/inc/rscinst.hxx | 245 --------------------------------
rsc/inc/rsclst.hxx | 65 --------
rsc/source/misc/rscdbl.cxx | 108 --------------
rsc/source/misc/rsclst.cxx | 54 -------
sax/source/fastparser/fastparser.cxx | 25 +--
sfx2/inc/macro.hxx | 2
sfx2/inc/sfx2/app.hxx | 8 -
sfx2/inc/sfx2/basedlgs.hxx | 3
sfx2/inc/sfx2/frmdescr.hxx | 1
sfx2/inc/sfx2/objsh.hxx | 3
sfx2/source/appl/app.cxx | 16 --
sfx2/source/appl/appdde.cxx | 47 ------
sfx2/source/control/macro.cxx | 38 ----
sfx2/source/dialog/basedlgs.cxx | 53 ------
sfx2/source/doc/frmdescr.cxx | 6
sfx2/source/doc/objmisc.cxx | 47 ------
sfx2/source/doc/objxtor.cxx | 7
solenv/bin/linkoo | 1
starmath/inc/symbol.hxx | 3
starmath/source/symbol.cxx | 14 -
svtools/source/dialogs/property.cxx | 4
svtools/source/inc/property.hxx | 1
svx/inc/svx/svdxcgv.hxx | 6
svx/source/svdraw/svdxcgv.cxx | 25 ---
tools/source/fsys/dirent.cxx | 4
tools/source/stream/strmunx.cxx | 38 ++--
unusedcode.easy | 33 ----
34 files changed, 47 insertions(+), 980 deletions(-)
New commits:
commit 67f32c6b63e46afbd69fa1b652ab9522037b9d6e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 23:42:11 2011 +0100
ByteString->rtl::OString
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 1454855..6666aa3 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1407,12 +1407,12 @@ sal_Bool DirEntry::Find( const String& rPfad, char cDelim )
cDelim = SEARCHDELIM(DEFSTYLE)[0];
sal_uInt16 nTokenCount = rPfad.GetTokenCount( cDelim );
- sal_uInt16 nIndex = 0;
+ sal_Int32 nIndex = 0;
ByteString aThis = ACCESSDELIM(DEFSTYLE);
aThis += ByteString(GetFull(), osl_getThreadTextEncoding());
for ( sal_uInt16 nToken = 0; nToken < nTokenCount; ++nToken )
{
- ByteString aPath = ByteString(rPfad, osl_getThreadTextEncoding()).GetToken( 0, cDelim, nIndex );
+ ByteString aPath = rtl::OUStringToOString(rPfad, osl_getThreadTextEncoding()).getToken( 0, cDelim, nIndex );
if ( aPath.Len() )
{
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 04d45a3..110d2d1 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -87,11 +87,12 @@ InternalStreamLock::InternalStreamLock(
m_nEndPos( nEnd ),
m_pStream( pStream )
{
- ByteString aFileName(m_pStream->GetFileName(), osl_getThreadTextEncoding());
- stat( aFileName.GetBuffer(), &m_aStat );
+ rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
+ osl_getThreadTextEncoding()));
+ stat( aFileName.getStr(), &m_aStat );
LockList::get().push_back( this );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "locked %s", aFileName.GetBuffer() );
+ fprintf( stderr, "locked %s", aFileName.getStr() );
if( m_nStartPos || m_nEndPos )
fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
fprintf( stderr, "\n" );
@@ -110,8 +111,9 @@ InternalStreamLock::~InternalStreamLock()
}
}
#if OSL_DEBUG_LEVEL > 1
- ByteString aFileName(m_pStream->GetFileName(), osl_getThreadTextEncoding());
- fprintf( stderr, "unlocked %s", aFileName.GetBuffer() );
+ rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
+ osl_getThreadTextEncoding()));
+ fprintf( stderr, "unlocked %s", aFileName.getStr() );
if( m_nStartPos || m_nEndPos )
fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
fprintf( stderr, "\n" );
@@ -123,9 +125,10 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
#ifndef BOOTSTRAP
osl::MutexGuard aGuard( LockMutex::get() );
#endif
- ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding());
+ rtl::OString aFileName(rtl::OUStringToOString(pStream->GetFileName(),
+ osl_getThreadTextEncoding()));
struct stat aStat;
- if( stat( aFileName.GetBuffer(), &aStat ) )
+ if( stat( aFileName.getStr(), &aStat ) )
return sal_False;
if( S_ISDIR( aStat.st_mode ) )
@@ -625,15 +628,16 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aFilename );
#endif
- ByteString aLocalFilename(aFilename, osl_getThreadTextEncoding());
+ rtl::OString aLocalFilename(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding()));
#ifdef DBG_UTIL
- ByteString aTraceStr( "SvFileStream::Open(): " );
- aTraceStr += aLocalFilename;
- OSL_TRACE( "%s", aTraceStr.GetBuffer() );
+ rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM(
+ "SvFileStream::Open(): "));
+ aTraceStr.append(aLocalFilename);
+ OSL_TRACE( "%s", aTraceStr.getStr() );
#endif
- if ( lstat( aLocalFilename.GetBuffer(), &buf ) == 0 )
+ if ( lstat( aLocalFilename.getStr(), &buf ) == 0 )
{
bStatValid = sal_True;
// SvFileStream soll kein Directory oeffnen
@@ -670,14 +674,14 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
if ( bStatValid && S_ISLNK( buf.st_mode ) < 0 )
{
char *pBuf = new char[ 1024+1 ];
- if ( readlink( aLocalFilename.GetBuffer(), pBuf, 1024 ) > 0 )
+ if ( readlink( aLocalFilename.getStr(), pBuf, 1024 ) > 0 )
{
- if ( unlink(aLocalFilename.GetBuffer()) == 0 )
+ if ( unlink(aLocalFilename.getStr()) == 0 )
{
#ifdef DBG_UTIL
fprintf( stderr,
"Copying file on symbolic link (%s).\n",
- aLocalFilename.GetBuffer() );
+ aLocalFilename.getStr() );
#endif
String aTmpString( pBuf, osl_getThreadTextEncoding() );
const DirEntry aSourceEntry( aTmpString );
@@ -692,7 +696,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
}
- nHandleTmp = open(aLocalFilename.GetBuffer(),nAccessRW|nAccess, nMode );
+ nHandleTmp = open(aLocalFilename.getStr(),nAccessRW|nAccess, nMode );
if ( nHandleTmp == -1 )
{
@@ -702,7 +706,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
nAccessRW = O_RDONLY;
nAccess = 0;
nMode = S_IRUSR | S_IROTH | S_IRGRP;
- nHandleTmp =open( aLocalFilename.GetBuffer(),
+ nHandleTmp =open( aLocalFilename.getStr(),
nAccessRW|nAccess,
nMode );
}
commit 0aeacaf4e8be61091b578d96d5f540cd81f84d2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 23:32:29 2011 +0100
various unused code
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index ca78c56..c11627b 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -167,13 +167,7 @@ public:
// DDE
long DdeExecute( const String& rCmd );
- long DdeGetData( const String& rItem,
- const String& rMimeType,
- ::com::sun::star::uno::Any & rValue );
- long DdeSetData( const String& rItem,
- const String& rMimeType,
- const ::com::sun::star::uno::Any & rValue );
- sal_Bool InitializeDde();
+ sal_Bool InitializeDde();
const DdeService* GetDdeService() const;
DdeService* GetDdeService();
void AddDdeTopic( SfxObjectShell* );
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index a0748d6..ab268e1 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -113,7 +113,6 @@ public:
{ return aActualURL; }
void SetActualURL( const INetURLObject& rURL );
void SetActualURL( const String& rURL );
- sal_Bool CheckContent() const;
void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
sal_Bool IsReadOnly( ) const { return bReadOnly;}
void SetEditable( sal_Bool bSet );
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index ed3695c..f5be7bd 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -121,10 +121,6 @@
#include <sfx2/mnuitem.hxx>
#endif
-#if defined( WNT )
-#define DDE_AVAILABLE
-#endif
-
#include <unotools/saveopt.hxx>
#include <unotools/undoopt.hxx>
#include <svtools/helpopt.hxx>
@@ -323,11 +319,10 @@ SfxApplication::SfxApplication()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" );
-#ifdef DDE_AVAILABLE
-#ifndef DBG_UTIL
- InitializeDde();
-#else
- if( !InitializeDde() )
+ sal_Bool bOk = InitializeDde();
+
+#ifdef DBG_UTIL
+ if( !bOk )
{
rtl::OStringBuffer aStr(
RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: "));
@@ -337,7 +332,8 @@ SfxApplication::SfxApplication()
aStr.append('?');
DBG_ASSERT( sal_False, aStr.getStr() );
}
-#endif
+#else
+ (void)bOk;
#endif
pSfxHelp = new SfxHelp;
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 1c93a63..366c49f 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -201,48 +201,6 @@ long SfxApplication::DdeExecute
return 1;
}
-//--------------------------------------------------------------------
-
-long SfxApplication::DdeGetData
-(
- const String&, // the Item to be addressed
- const String&, // in: Format
- ::com::sun::star::uno::Any& // out: requested data
-)
-
-/* [Description]
-
- This method can be overloaded by application developers, to receive
- DDE-data-requests directed to thier SfxApplication subclass.
-
- The base implementation provides no data and returns 0.
-*/
-
-{
- return 0;
-}
-
-//--------------------------------------------------------------------
-
-long SfxApplication::DdeSetData
-(
- const String&, // the Item to be addressed
- const String&, // in: Format
- const ::com::sun::star::uno::Any& // out: requested data
-)
-
-/* [Description]
-
- This method can be overloaded by application developers, to receive
- DDE-data directed to thier SfxApplication subclass.
-
- The base implementation is not receiving any data and returns 0.
-*/
-
-{
- return 0;
-}
-
long SfxObjectShell::DdeExecute
(
const String& rCmd // Expressed in our BASIC-Syntax
@@ -436,11 +394,13 @@ long SfxViewFrame::DdeSetData
sal_Bool SfxApplication::InitializeDde()
{
+ int nError = 0;
+#if defined( WNT )
DBG_ASSERT( !pAppData_Impl->pDdeService,
"Dde can not be initialized multiple times" );
pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() );
- int nError = pAppData_Impl->pDdeService->GetError();
+ nError = pAppData_Impl->pDdeService->GetError();
if( !nError )
{
pAppData_Impl->pDocTopics = new SfxDdeDocTopics_Impl;
@@ -458,6 +418,7 @@ sal_Bool SfxApplication::InitializeDde()
pAppData_Impl->pTriggerTopic = new SfxDdeTriggerTopic_Impl;
pAppData_Impl->pDdeService2->AddTopic( *pAppData_Impl->pTriggerTopic );
}
+#endif
return !nError;
}
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 383c843..8a07a7b 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -119,12 +119,6 @@ sal_Bool SfxFrameDescriptor::IsEditable() const
return pImp->bEditable;
}
-sal_Bool SfxFrameDescriptor::CheckContent() const
-{
- sal_Bool bRet = !( aURL == aActualURL );
- return bRet;
-}
-
SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
{
SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 7bc07c8..782a5e4 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.cxx
@@ -563,10 +563,6 @@ void SvPropertyLine::HideXButton()
aXButton.Hide();
Resize();
}
-sal_Bool SvPropertyLine::IsVisibleXButton()
-{
- return bHasXButton;
-}
void SvPropertyLine::ShowAsHyperLink(sal_Bool nFlag)
{
diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx
index a6ef27f..a66a9be 100644
--- a/svtools/source/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
@@ -261,7 +261,6 @@ public:
void ShowXButton();
void HideXButton();
- sal_Bool IsVisibleXButton();
void ShowAsHyperLink(sal_Bool nFlag=sal_True);
sal_Bool IsShownAsHyperlink();
diff --git a/unusedcode.easy b/unusedcode.easy
index 68144f7..f1b1219 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -763,10 +763,7 @@ SetOfByte::GetClearCount() const
SetOfByte::GetSetBit(unsigned short) const
SetOfByte::IsFull() const
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SfxApplication::DdeGetData(String const&, String const&, com::sun::star::uno::Any&)
-SfxApplication::DdeSetData(String const&, String const&, com::sun::star::uno::Any const&)
SfxApplication::EnterAsynchronCall_Impl()
-SfxApplication::InitializeDde()
SfxApplication::LeaveAsynchronCall_Impl()
SfxApplication::Main()
SfxBasicManagerHolder::isAnyContainerModified() const
@@ -794,7 +791,6 @@ SfxFoundCacheArr_Impl::Remove(SfxFoundCache_Impl const*&, unsigned short)
SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
SfxFrame::GetBroadcaster() const
SfxFrame::IsTop() const
-SfxFrameDescriptor::CheckContent() const
SfxFrameDescriptor::GetItemPos() const
SfxFrameDescriptor::GetSize() const
SfxFrameDescriptor::GetWallpaper() const
@@ -809,7 +805,6 @@ SfxItemPropertySetInfo::getMap() const
SfxItemSetHint::SfxItemSetHint(SfxItemSet*)
SfxListener::EndListening(unsigned short)
SfxLockBytesItem::SfxLockBytesItem(unsigned short, SvLockBytes*)
-SfxMacro::GenerateSource() const
SfxMacro::GetMode() const
SfxMacro::Record(SfxMacroStatement*)
SfxMacro::Remove()
@@ -949,7 +944,6 @@ SvPropertyBox::SvPropertyBox(Window*, long)
SvPropertyLine::GetName() const
SvPropertyLine::IsLineLocked()
SvPropertyLine::IsShownAsHyperlink()
-SvPropertyLine::IsVisibleXButton()
SvPropertyLine::SvPropertyLine(Window*, ResId const&)
SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
@@ -1865,7 +1859,6 @@ binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const&, unsigned short)
binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const*, unsigned short, unsigned short)
binfilter::EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::EECharAttrib const&, void*), void*)
-binfilter::EditEngine::IsModified() const
binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
@@ -1884,7 +1877,6 @@ binfilter::OUStringsSort_Impl::Remove(unsigned short, unsigned short)
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::PCodeBuffConvertor(unsigned char*, unsigned int)
-binfilter::ReadThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, char const*, com::sun::star::uno::Sequence<com::sun::star::uno::Any>, rtl::OUString const&, unsigned char)
binfilter::Registration::~Registration()
binfilter::SaveBookmarks::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SbiGlobals::~SbiGlobals()
@@ -1909,7 +1901,6 @@ binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* con
binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormats_Impl const*, unsigned short, unsigned short)
binfilter::ScConditionalFormats_Impl::Remove(binfilter::ScConditionalFormat* const&, unsigned short)
binfilter::ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
-binfilter::ScFieldChangerEditEngine::ScFieldChangerEditEngine(binfilter::SfxItemPool*, unsigned char)
binfilter::ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream&, unsigned int)
binfilter::ScMultipleWriteHeader::~ScMultipleWriteHeader()
binfilter::ScMyContentAction::~ScMyContentAction()
@@ -1922,15 +1913,11 @@ binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*,
binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationEntries_Impl const*, unsigned short, unsigned short)
binfilter::ScValidationEntries_Impl::Remove(binfilter::ScValidationData* const&, unsigned short)
binfilter::ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
-binfilter::ScViewData::ReadUserDataSequence(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-binfilter::ScXMLImportWrapper::ScXMLImportWrapper(binfilter::ScDocument&, binfilter::SfxMedium*, binfilter::SvStorage*)
-binfilter::SchXMLWrapper::SchXMLWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, binfilter::SvStorage&, unsigned char)
binfilter::ScriptTypePosInfos::Insert(binfilter::ScriptTypePosInfos const*, unsigned short, unsigned short, unsigned short)
binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsigned short)
binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsigned short, unsigned short)
binfilter::ScriptTypePosInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::ScriptTypePosInfo const&, void*), void*)
binfilter::SdXMLFilter::SdXMLFilter(binfilter::SfxMedium&, binfilter::SdDrawDocShell&, unsigned char, binfilter::SdXMLFilterMode)
-binfilter::SdrMarkList::InsertEntry(binfilter::SdrMark const&, bool)
binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&, unsigned short&)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
@@ -1941,11 +1928,9 @@ binfilter::SfxItemModifyArr_Impl::Remove(unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const&, unsigned short)
binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*)
-binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
binfilter::SfxPtrArr::Replace(void*, void*)
-binfilter::SfxSingleRecordWriter::SfxSingleRecordWriter(SvStream*, unsigned short, unsigned char)
binfilter::SfxUINT32s::Insert(binfilter::SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
binfilter::SfxUINT32s::Remove(unsigned short, unsigned short)
binfilter::SfxUINT32s::Replace(unsigned int const&, unsigned short)
@@ -1973,8 +1958,6 @@ binfilter::SvBytes::Insert(binfilter::SvBytes const*, unsigned short, unsigned s
binfilter::SvBytes::Replace(unsigned char const&, unsigned short)
binfilter::SvBytes::Replace(unsigned char const*, unsigned short, unsigned short)
binfilter::SvBytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-binfilter::SvDataPipe_Impl::addMark(unsigned int)
-binfilter::SvDataPipe_Impl::removeMark(unsigned int)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const&, unsigned short&)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const*, unsigned short)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMap_Impl const*, unsigned short, unsigned short)
commit f267b791f8eb9b32442ad98613a491737e3fc334
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 23:31:21 2011 +0100
skip solver dir itself
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5bd061e..538c70b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -255,6 +255,7 @@ sub scan_and_link_files($$$)
opendir ($dirh_toplevel, $build_path) || die "Can't open '$build_path': $!";
while (my $subdir = readdir ($dirh_toplevel)) {
$subdir =~ m/\./ && next; # eg. vcl.old,
+ $subdir eq 'solver' && next; # skip solver dir itself
my $test = "$build_path/$subdir/$target";
-d $test || next;
push @modules, $test;
commit d9a749ac97f77d61896c85181dfa4e5d7c1b3782
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 22:25:36 2011 +0100
debug code isn't going to cut it
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 50552ec..695becf 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -171,8 +171,6 @@ public:
void Record( SfxMacroStatement *pStatement );
void Replace( SfxMacroStatement *pStatement );
void Remove();
-
- String GenerateSource() const;
};
#endif
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index d3edf45..db69545 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -390,17 +390,9 @@ SfxMacro::~SfxMacro()
Virtual Destructor of the SfxMacro class. This should be overloaded in
the derived classes to save the recorded source in the mode
SFX_MACRO_RECORDINGABSOLUTE and SFX_MACRO_RECORDINGRELATIVE.
-
- [Cross-reference]
-
- <SfxMacro::GenerateSource()const>
*/
{
-#if OSL_DEBUG_LEVEL > 1
- SvFileStream aStream( String::CreateFromAscii("file:///f:/testmacro.bas" ), STREAM_STD_READWRITE | STREAM_TRUNC );
- aStream << ByteString( GenerateSource(), RTL_TEXTENCODING_UTF8 ).GetBuffer();
-#endif
delete pImp;
}
@@ -525,34 +517,4 @@ void SfxMacro::Remove()
pImp->aList.Remove( pImp->aList.Count() - 1 );
}
-//--------------------------------------------------------------------
-
-String SfxMacro::GenerateSource() const
-
-/* [Description]
-
- This function generates BASIC source code that contains the statements, but
- does not contain the header ('Sub X') and Footer ('End Sub') from recorded
- <SfxMacroStatement> since the construction of the instance until the time
- of calling this method.
-
- [Cross-reference]
-
- <SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::Repeat(SfxMacroStatement*)>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- String aSource;
- for ( sal_uInt16 n = 0; n < pImp->aList.Count(); ++n )
- {
- aSource += pImp->aList.GetObject(n)->GetStatement();
- if ( (n+1) < pImp->aList.Count() )
- aSource += DEFINE_CONST_UNICODE("\n");
- }
-
- return aSource;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit db0a8b380ba47d887ccfc33d2a020fdf659ebf33
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 19:29:00 2011 +0100
sync
diff --git a/unusedcode.easy b/unusedcode.easy
index 5b60c82..68144f7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -144,14 +144,12 @@ EditView::Drop(DropEvent const&)
EditView::GetDropPos()
EditView::GetSelectionMode() const
EditView::GetWordUnderMousePointer() const
-EditView::IndentBlock()
EditView::IsPasteEnabled() const
EditView::MatchGroup()
EditView::QueryDrop(DropEvent&)
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
-EditView::UnindentBlock()
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
EnhWMFReader::ReadGDIComment()
@@ -422,8 +420,6 @@ PopupMenu::SetSelectedEntry(unsigned short)
PropBrwMgr::GetChildWindowId()
ProposalList::Remove(rtl::OUString const&)
PushButton::GetSymbolAlign() const
-REResourceList::REResourceList()
-REResourceList::~REResourceList()
ResData::Dump()
Ruler::GetArrowCount() const
Ruler::GetArrows() const
@@ -660,12 +656,9 @@ SdrDragView::SetRubberEdgeDragging(unsigned char)
SdrDragView::SetRubberEdgeDraggingLimit(unsigned short)
SdrEditView::MoveLayer(String const&, unsigned short)
SdrEngineDefaults::LanguageHasChanged()
-SdrExchangeView::CutMarked(unsigned long)
SdrExchangeView::GetPastePos(SdrObjList*, OutputDevice*)
-SdrExchangeView::IsExchangeFormatSupported(unsigned long) const
SdrExchangeView::Paste(Bitmap const&, Point const&, SdrObjList*, unsigned int)
SdrExchangeView::Paste(GDIMetaFile const&, Point const&, SdrObjList*, unsigned int)
-SdrExchangeView::YankMarked(unsigned long)
SdrGlobalData::GetCharClass()
SdrGlobalData::~SdrGlobalData()
SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const
@@ -2375,7 +2368,6 @@ dbtools::StatementComposer::getDisposeComposer() const
dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
-desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const
desktop::Lockfile::clean()
dlgprov::DialogProviderImpl::createControlModel()
dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
commit 3b2e2d1e6929634d00a73dda8784a6b3a271ebcc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:55:18 2011 +0100
callcatcher: chop, hack
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index b19e213..f76d5c9 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -144,15 +144,9 @@ public:
sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- // Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's
- // Clipboard angenommen werden kann.
- sal_Bool IsExchangeFormatSupported(sal_uIntPtr nFormat) const;
-
sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- void CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- void YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 761b062..13ea61e 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -475,17 +475,6 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
return sal_True;
}
-sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const
-{
- return( FORMAT_PRIVATE == nFormat ||
- FORMAT_GDIMETAFILE == nFormat ||
- FORMAT_BITMAP == nFormat ||
- FORMAT_RTF == nFormat ||
- FORMAT_STRING == nFormat ||
- SOT_FORMATSTR_ID_DRAWING == nFormat ||
- SOT_FORMATSTR_ID_EDITENGINE == nFormat );
-}
-
void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions)
{
BigInt nSizX(rSiz.Width());
@@ -868,13 +857,6 @@ sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
// -----------------------------------------------------------------------------
-void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */)
-{
- OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
{
OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" );
@@ -883,13 +865,6 @@ sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
// -----------------------------------------------------------------------------
-void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/)
-{
- OSL_FAIL( "YankMarked: Not supported anymore" );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
{
OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" );
diff --git a/unusedcode.easy b/unusedcode.easy
index dd2473d..5b60c82 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -144,12 +144,14 @@ EditView::Drop(DropEvent const&)
EditView::GetDropPos()
EditView::GetSelectionMode() const
EditView::GetWordUnderMousePointer() const
+EditView::IndentBlock()
EditView::IsPasteEnabled() const
EditView::MatchGroup()
EditView::QueryDrop(DropEvent&)
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
+EditView::UnindentBlock()
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
EnhWMFReader::ReadGDIComment()
@@ -843,7 +845,6 @@ SfxRequest::IsRecording() const
SfxRequest::SetTarget(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
-SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
SfxSlotPool::NextInterface()
SfxStyleSheet::SfxStyleSheet()
SfxTabDialog::FillOutputItemSet()
@@ -2374,6 +2375,7 @@ dbtools::StatementComposer::getDisposeComposer() const
dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
+desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const
desktop::Lockfile::clean()
dlgprov::DialogProviderImpl::createControlModel()
dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
commit 6934db93b6c16041fc1e54c8cc2c93b5059d6b32
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:09:00 2011 +0100
and none of this stuff is actually used anywhere now
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 45aa832..651677d 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
))
$(eval $(call gb_Executable_add_exception_objects,rsc,\
- rsc/source/misc/rsclst \
rsc/source/parser/erscerr \
rsc/source/parser/rscdb \
rsc/source/parser/rscibas \
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b7eecdc..ff3bf48 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -42,7 +42,6 @@
#include <map>
class RscError;
-class REResourceList;
class RscTupel;
class RscCont;
class RscCmdLine;
diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
deleted file mode 100644
index 1353541..0000000
--- a/rsc/inc/rscinst.hxx
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _RSCINST_HXX
-#define _RSCINST_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rsctools.hxx>
-
-/******************* C l a s s e s F o r w a r d s *********************/
-class RscTypCont;
-class RscCmdLine;
-class REResourceList;
-class RscTop;
-class RscInstCopy;
-
-/******************* F u n c t i o n F o r w a r d s *******************/
-Atom HashId( const char * ); // Gibt zu einem String eine HashId
-const char * GetHashString( Atom ); // Gibt zu einer Atom einen String
- // NULL, wenn kein Eintrag vorhanden
-
-/******************* S t r u c t s ***************************************/
-
-/****************** C L A S S E S ****************************************/
-class RscInst
-{
- void MakeCopy( RSCINST aCopyInst );
- static RSCINST GetSysLangInst( RSCINST & rInst );
-public:
- RSCINST aInst;
-
- RscInst();
- RscInst( const RscInst & rInst );
- RscInst( RSCINST aTmpI );
- RscInst& operator = ( const RscInst& rRscInst );
- ~RscInst();
- void OverWrite( RscInstCopy & rInst );
- sal_Bool IsInst() const { return( aInst.IsInst() ); }
-
- // Listen Methoden
- ERRTYPE SetElement( const RscId & rName, RscInstCopy & rInst );
- ERRTYPE SetPosEle( sal_uInt32 nPos, RscInstCopy & rInst );
- ERRTYPE SetPosRscId( sal_uInt32 nPos, const RscId & rId );
- SUBINFO_STRUCT GetInfoEle( sal_uInt32 nPos );
- sal_uInt32 GetCount();
- RscInst GetElement( RscTop * pClass, const RscId & rName );
- RscInst GetPosEle( sal_uInt32 nPos );
- ERRTYPE MovePosEle( sal_uInt32 nDestPos, sal_uInt32 nSourcePos );
- ERRTYPE DeleteElement( RscTop * pClass, const RscId & rName );
- ERRTYPE DeletePosEle( sal_uInt32 nPos );
-
- ERRTYPE SetVar( Atom nVarName, RscInstCopy & rInst );
- ERRTYPE SetConst( Atom nVarName, Atom nConstId );
- ERRTYPE SetBool( Atom nVarName, sal_Bool );
-
- // Hack fuer X, Y, Width, Height
- static ERRTYPE SetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
- sal_Int32 lValue, sal_uInt32 nTupelIdx );
- ERRTYPE SetNumber( Atom nVarName, sal_Int32 );
-
- ERRTYPE SetString( Atom nVarName, const char * );
- ERRTYPE SetConst( Atom nConstId );
- ERRTYPE SetBool( sal_Bool );
- ERRTYPE SetNumber( sal_Int32 );
- ERRTYPE SetString( const char * );
- ERRTYPE SetRef( const RscId & rRscId );
- ERRTYPE SetDefault( Atom nVarName );
-
- RscInst GetVar( Atom nVarName );
- Atom GetConst( Atom nVarName = InvalidAtom );
- sal_uInt32 GetConstPos( Atom nVarName = InvalidAtom );
- sal_Bool GetBool( Atom nVarName = InvalidAtom );
-
- // Hack fuer X, Y, Width, Height
- static sal_Int32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
- sal_uInt32 nTupelIdx );
- sal_Int32 GetNumber( Atom nVarName = InvalidAtom );
-
- const char *GetString( Atom nVarName = InvalidAtom );
- RscId GetRef();
- sal_Bool IsDefault( Atom nVarName );
- sal_Bool IsConsistent( RscInconsList * pList );
-
- Atom GetClassEnum( Atom nVarName, sal_uInt32 nPos );
- Atom GetClassEnum( sal_uInt32 nPos );
- RscTop * GetClassType(){ return aInst.pClass; };
- Atom GetClassName();
- void EnumClassVariables( void * pData, VarEnumCallbackProc ) const;
- ERRTYPE WriteRc( RscWriteRc & aMem );
-};
-
-class RscInstCopy : public RscInst {
- void MakeCopy( RSCINST aCopyInst );
-public:
- RscInstCopy();
- RscInstCopy( const RscInstCopy & rInst );
- RscInstCopy( const RscInst & rInst );
- RscInstCopy( RSCINST aTmpI );
- RscInstCopy( RscTop * pNewType, const RscInst & rInst );
- RscInstCopy& operator = ( const RscInstCopy & rRscInst );
- RscInstCopy& operator = ( const RscInst & rRscInst );
- ~RscInstCopy();
-};
-
-class RscDataBase
-{
-friend class RscHrc;
-friend class RscSrc;
-friend class RscInst;
-
- RscCmdLine * pCmdLine;
- RscTypCont * pTC;
- LanguageType nLangType;
-public:
- RscDataBase( RscError * );
- ~RscDataBase();
-
-// void SetLanguage( LanguageType nTyp ) { nLangType = nTyp; }
- void SetLanguage( Atom nId );
- Atom GetLanguage() const;
-
- ByteString GetPath() const;
- void SetPath( const ByteString & rPath );
- // Konvertiert einen Namen in einen Typ
- RscTop* GetClassType( Atom nClassName );
- // Instanz einer Klasse erzeugen
- sal_Bool MakeConsistent( RscInconsList * pList );
- // Array mit Dateinamen
- RscFileTab* GetFileTab();
- // Eine Dateinamen-Instanz holen
- RscFile * GetFileStruct( sal_uLong lKey );
-
- sal_uLong AddSrcFile( const ByteString & rFileName );
- sal_uLong AddHrcFile( const ByteString & rFileName );
- // Traegt die Include-Dateien in die Abhaengigkeitsliste
- // von lFileKey ein
- void ScanForIncFiles( sal_uLong lFileKey );
- void RemoveFile( sal_uLong lKey );
-
- // Suche ueber alle DEFINES
- RscDefine * FindDef( const ByteString & rName );
- sal_uLong GetFileKey( const ByteString & rFileName );
-};
-
-class RscHrc
-{
-protected:
- sal_uLong lFileKey; // Index der Instanz
- RscDataBase * pDataBase;// Datenbasis
-public:
-
- // Kompilerinstanz erzeugen
- RscHrc( RscDataBase * pDBase, sal_uLong lKey );
- ~RscHrc();
-
- // Daten von Datei uebernehmen
- ERRTYPE ReadFile();
-
- sal_uLong GetFileKey() const { return lFileKey; }
-
- void SetDirty( sal_Bool bSet );
- sal_Bool IsDirty();
- void SetPathName( const ByteString & );
- ByteString GetPathName();
- void SetFileName( const ByteString & );
- ByteString GetFileName();
-
- //Depend-Datei anhaengen
- void InsertDepend( sal_uLong lKey, sal_uLong lPos );
-
- // DefineList holen
- RscDefineList * GetDefineList();
- // Suche ueber all DEFINES im Zugriff
- RscDefine * FindDef( const ByteString & rName );
- ERRTYPE NewDef( const ByteString & rMacroName, sal_Int32 lValue,
- sal_uLong lPos );
- ERRTYPE NewDef( const ByteString & rMacroName, const ByteString & rMacro,
- sal_uLong lPos );
- ERRTYPE ChangeDef( const ByteString & rMacroName, sal_Int32 lValue );
- ERRTYPE ChangeDef( const ByteString & rMacroName,
- const ByteString & rMacro );
- sal_Bool IsDefUsed( const ByteString & );
- void DeleteDef( const ByteString & rMacroName );
-
- // Dateinamen-Instanz holen
- RscFile * GetFileStruct();
- //Abhaengigkeitsliste holen holen
- RscDependList * GetDependList();
-
- // Datei schreiben
- ERRTYPE WriteFile();
-};
-
-class RscSrc : public RscHrc {
-public:
- // Kompilerinstanz erzeugen
- RscSrc( RscDataBase * pDBase, sal_uLong lKey );
- ~RscSrc();
-
-
- RscInstCopy CreateRscInst( RscTop * pClass );
- // Instanz loeschen
- ERRTYPE DeleteRscInst( RscTop * pClass, const RscId & rInstName );
- // Datenbasis nach Define Veraenderung wiederherstellen
- //Instanz global zur Verfuegung stellen
- ERRTYPE SetRscInst( const RscId & rInstName, RscInstCopy & );
- //Instanz holen
- RscInst GetRscInst( RscTop* pClass, const RscId & rInstName );
-
- // Namen und Identifier Liste fuellen
- void FillNameIdList( REResourceList * pList );
-
- // C++ Resourcekonstruktor schreiben
- ERRTYPE WriteCxxFile( const ByteString &, const ByteString & rHxxName );
- ERRTYPE WriteHxxFile( const ByteString & ); // C++ Klasskopf schreiben
-};
-
-#endif //_RSCINST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
deleted file mode 100644
index d26cbb2..0000000
--- a/rsc/inc/rsclst.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _RSCLST_HXX
-#define _RSCLST_HXX
-
-#include <rscall.h>
-
-class REResourceList;
-
-class REResourceList
-{
-protected:
- REResourceList* pParent;
- RscId aRscId; //Id und Name des Resourceobjektes
- ByteString aClassName;
- sal_Bool bVisible;
-
-public:
- REResourceList( REResourceList * pParentList,
- ByteString& rClassName,
- const RscId & rResourceID,
- sal_Bool bVisible = sal_False );
- ~REResourceList();
-
- REResourceList* GetParent() { return pParent; }
- ByteString GetObjName() { return aRscId.GetName(); }
- ByteString GetClassName() { return aClassName; }
- RscId GetRscId() { return aRscId; }
- void SetRscId( const RscId & rId ){ aRscId = rId; }
-
- void SetVisible( sal_Bool bVis )
- { bVisible = bVis; }
- sal_Bool IsVisible() { return bVisible; }
-};
-
-#endif // _RSCLST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx
deleted file mode 100644
index bd360ab..0000000
--- a/rsc/source/misc/rsclst.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_rsc.hxx"
-
-#include "rsclst.hxx"
-
-REResourceList :: REResourceList( REResourceList* pParentList,
- ByteString& rClassName,
- const RscId & rResourceID, sal_Bool bVis )
-{
- pParent = pParentList;
- aClassName = rClassName;
- aRscId = rResourceID;
- bVisible = bVis;
-}
-
-REResourceList :: ~REResourceList()
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit de396b336a6a8ac8483ab4661c1effdd4890dcd8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:03:48 2011 +0100
so nothing left that calls InsertList
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index f5cc2de..45aa832 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
))
$(eval $(call gb_Executable_add_exception_objects,rsc,\
- rsc/source/misc/rscdbl \
rsc/source/misc/rsclst \
rsc/source/parser/erscerr \
rsc/source/parser/rscdb \
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
deleted file mode 100644
index 8cce92b..0000000
--- a/rsc/source/misc/rscdbl.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_rsc.hxx"
-
-#include <stdio.h>
-#include <rscdb.hxx>
-#include <rscall.h>
-#include <rschash.hxx>
-#include <rsctree.hxx>
-#include <rsctop.hxx>
-#include "rsclst.hxx"
-
-REResourceList * InsertList( Atom nClassName, const RscId& rId,
- REResourceList * pList ) {
- REResourceList * pSubList;
- const char * pStrClass;
- ByteString aStrClass;
-
- pStrClass = pHS->getString( nClassName ).getStr();
- if( pStrClass )
- aStrClass = pStrClass;
- else
- aStrClass = rtl::OString::valueOf(static_cast<sal_Int32>(nClassName));
-
- pSubList = new REResourceList( pList, aStrClass, rId );
-
- return pSubList;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 922b8a498ecfa7098cbf587abe00e3f4e6987d68
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:02:57 2011 +0100
only thing left that calls FillSubList is itself
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 874b33a..8cce92b 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -54,21 +54,4 @@ REResourceList * InsertList( Atom nClassName, const RscId& rId,
return pSubList;
}
-void FillSubList( RSCINST & rInst, REResourceList * pList )
-{
- sal_uInt32 nCount, i;
- SUBINFO_STRUCT aInfo;
- REResourceList* pSubList;
- RSCINST aTmpI;
-
- nCount = rInst.pClass->GetCount( rInst );
- for( i = 0; i < nCount; i++ ){
- aInfo = rInst.pClass->GetInfoEle( rInst, i );
- aTmpI = rInst.pClass->GetPosEle( rInst, i );
- pSubList = InsertList( aInfo.pClass->GetId(),
- aInfo.aId, pList );
- FillSubList( aTmpI, pSubList );
- };
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bbf17fad476b9f05e12e0e96e93070e51e0facce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:02:29 2011 +0100
only thing left that calls FillListObj is itself
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index aeac4ba..874b33a 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -71,28 +71,4 @@ void FillSubList( RSCINST & rInst, REResourceList * pList )
};
}
-void FillListObj( ObjNode * pObjNode, RscTop * pRscTop,
- REResourceList * pList, sal_uLong lFileKey )
-{
- if( pObjNode ){
- if( pObjNode->GetFileKey() == lFileKey ){
- RSCINST aTmpI;
- REResourceList* pSubList;
-
- FillListObj( (ObjNode*)pObjNode->Left(), pRscTop,
- pList, lFileKey );
-
- pSubList = InsertList( pRscTop->GetId(),
- pObjNode->GetRscId(), pList );
-
- aTmpI.pClass = pRscTop;
- aTmpI.pData = pObjNode->GetRscObj();
- FillSubList( aTmpI, pSubList );
-
- FillListObj( (ObjNode*)pObjNode->Right(), pRscTop,
- pList, lFileKey );
- }
- };
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 47a81f3de584b91579491999577227ff90a247c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:01:45 2011 +0100
only thing that calls FillList is itself
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 8de91ae..aeac4ba 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -95,14 +95,4 @@ void FillListObj( ObjNode * pObjNode, RscTop * pRscTop,
};
}
-void FillList( RscTop * pRscTop, REResourceList * pList, sal_uLong lFileKey ){
- if( pRscTop ){
- FillList( (RscTop*)pRscTop->Left(), pList, lFileKey );
-
- FillListObj( pRscTop->GetObjNode(), pRscTop, pList, lFileKey );
-
- FillList( (RscTop*)pRscTop->Right(), pList, lFileKey );
- };
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8de61c9fb6a4c3be54b51c575fcffcec2067e090
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 16:00:28 2011 +0100
grabbag of unused code
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d2ca1cc..b43aa53 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2840,143 +2840,6 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const
return bIsValid;
}
-//==================================================================
-// LoadFormHelper
-//==================================================================
-
-class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XLoadListener,
- XRowSetListener>
-{
- enum STATE { STARTED, LOADED, POSITIONED, DISPOSED };
- STATE m_eState;
-
- Reference< XRowSet > m_xForm;
-
- ::osl::Mutex m_aAccessSafety;
-
-public:
- LoadFormHelper(const Reference< XRowSet > & _rxForm);
-
- // ::com::sun::star::form::XLoadListener
- virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException );
- virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException );
- virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException );
- virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException );
- virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException );
-
- // XRowSetListener
- virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException );
- virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException );
- virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException );
-
- // ::com::sun::star::lang::XEventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException );
-
- void cancel();
-
-protected:
- ~LoadFormHelper();
-
- void implDispose();
-};
-
-DBG_NAME(LoadFormHelper)
-//------------------------------------------------------------------------------
-LoadFormHelper::LoadFormHelper(const Reference< XRowSet > & _rxForm)
- :m_eState(STARTED)
- ,m_xForm(_rxForm)
-{
- DBG_CTOR(LoadFormHelper,NULL);
-
- Reference< ::com::sun::star::form::XLoadable > (m_xForm, UNO_QUERY)->addLoadListener(this);
- m_xForm->addRowSetListener(this);
-}
-
-//------------------------------------------------------------------------------
-LoadFormHelper::~LoadFormHelper()
-{
- ::osl::MutexGuard aGuard(m_aAccessSafety);
- implDispose();
-
- DBG_DTOR(LoadFormHelper,NULL);
-}
-
-//------------------------------------------------------------------------------
-void LoadFormHelper::implDispose()
-{
- if (DISPOSED != m_eState)
- {
-
- Reference< ::com::sun::star::form::XLoadable > (m_xForm, UNO_QUERY)->removeLoadListener(this);
- m_xForm->removeRowSetListener(this);
- m_xForm = NULL;
- m_eState = DISPOSED;
- }
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::loaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
-{
- ::osl::MutexGuard aGuard(m_aAccessSafety);
- OSL_ENSURE(m_eState == STARTED || m_eState == DISPOSED, "LoadFormHelper::loaded : wrong call !");
- if (m_eState == STARTED)
- m_eState = LOADED;
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::unloaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
-{
- ::osl::MutexGuard aGuard(m_aAccessSafety);
- OSL_FAIL("LoadFormHelper::unloaded : shouldn't be called !");
- implDispose();
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::unloading(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::reloading(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::reloaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::cursorMoved(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException )
-{
- ::osl::MutexGuard aGuard(m_aAccessSafety);
- if (m_eState == LOADED)
- m_eState = POSITIONED;
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::rowChanged(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException )
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::rowSetChanged(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException )
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LoadFormHelper::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException )
-{
- ::osl::MutexGuard aGuard(m_aAccessSafety);
- implDispose();
-}
-
-//------------------------------------------------------------------------------
-void LoadFormHelper::cancel()
-{
- implDispose();
-}
-
// -----------------------------------------------------------------------------
sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
{
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 6885021..f255562 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -987,16 +987,6 @@ sal_Bool CommandLineArgs::IsEmpty() const
return m_eArgumentCount == NONE;
}
-sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const
-{
- osl::MutexGuard aMutexGuard( m_aMutex );
-
- return m_eArgumentCount == NONE ||
- ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() )) ||
- ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) ||
- ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] );
-}
-
sal_Bool CommandLineArgs::WantsToLoadDocument() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index bd7e24a..9eb554c 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -188,7 +188,6 @@ class CommandLineArgs
// Special analyzed states (does not match directly to a command line parameter!)
sal_Bool IsPrinting() const;
sal_Bool IsEmpty() const;
- sal_Bool IsEmptyOrAcceptOnly() const;
private:
enum Count { NONE, ONE, MANY };
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 801a2dc..09ad527 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -114,9 +114,6 @@ public:
void SetSelection( const ESelection& rNewSel );
sal_Bool SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
- void IndentBlock();
- void UnindentBlock();
-
sal_Bool IsInsertMode() const;
void SetInsertMode( sal_Bool bInsert );
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 9f7b2c4..57efd1e 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -665,22 +665,6 @@ sal_uInt16 EditView::GetParagraph( const Point& rMousePosPixel )
return nParagraph;
}
-void EditView::IndentBlock()
-{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
- PIMPEE->IndentBlock( this, sal_True );
-}
-
-void EditView::UnindentBlock()
-{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
- PIMPEE->IndentBlock( this, sal_False );
-}
-
EESelectionMode EditView::GetSelectionMode() const
{
DBG_CHKTHIS( EditView, 0 );
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index 32d64d4..d26cbb2 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -42,7 +42,6 @@ protected:
sal_Bool bVisible;
public:
- REResourceList();
REResourceList( REResourceList * pParentList,
ByteString& rClassName,
const RscId & rResourceID,
diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx
index 132b0ae..bd360ab 100644
--- a/rsc/source/misc/rsclst.cxx
+++ b/rsc/source/misc/rsclst.cxx
@@ -31,12 +31,6 @@
#include "rsclst.hxx"
-REResourceList :: REResourceList()
-{
- bVisible = sal_False;
- pParent = NULL;
-}
-
REResourceList :: REResourceList( REResourceList* pParentList,
ByteString& rClassName,
const RscId & rResourceID, sal_Bool bVis )
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index a29c04e..14f4f17 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -196,9 +196,6 @@ public:
void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 );
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
- const sal_uInt16* GetInputRanges( const SfxItemPool& rPool );
-// void SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; }
-// const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
OKButton* GetOKButton() const { return pOKBtn; }
CancelButton* GetCancelButton() const { return pCancelBtn; }
void SetInfoLink( const Link& rLink );
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 4095952..eecb8be 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -252,14 +252,12 @@ public:
const TypeId* pType = 0,
sal_Bool bOnlyVisible = sal_True );
static SfxObjectShell* Current();
- static sal_uInt16 Count();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
GetCurrentComponent();
static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
virtual void Invalidate(sal_uInt16 nId = 0);
- void SetFlags( SfxObjectShellFlags eFlags );
SfxObjectShellFlags GetFlags( ) const ;
SfxModule* GetModule() const;
@@ -287,7 +285,6 @@ public:
sal_Bool IsDocShared() const;
::rtl::OUString GetSharedFileURL() const;
sal_Bool SwitchToShared( sal_Bool bShared, sal_Bool bSave );
- void DisconnectFromShared();
SAL_DLLPRIVATE void FreeSharedFile();
SAL_DLLPRIVATE void FreeSharedFile( const ::rtl::OUString& aTempFileURL );
SAL_DLLPRIVATE void DoNotCleanShareControlFile();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2635aba..e1d9073 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -965,57 +965,4 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink )
pImpl->m_aInfoLink = rLink;
}
-//--------------------------------------------------------------------
-// Comparison function for qsort
-
-extern "C" int SAL_CALL BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
-{
- return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
-}
-
-// -----------------------------------------------------------------------
-
-/*
- Creates the set over the Page range. the page must register the static
- method for querys on the range in SetTabPage, so the Set is delivered
- onDemand.
- */
-const sal_uInt16* SfxSingleTabDialog::GetInputRanges( const SfxItemPool& rPool )
-{
- if ( GetInputItemSet() )
- {
- OSL_FAIL( "Set already exists!" );
- return GetInputItemSet()->GetRanges();
- }
-
- if ( pRanges )
- return pRanges;
- SvUShorts aUS(16, 16);
-
- if ( fnGetRanges)
- {
- const sal_uInt16 *pTmpRanges = (fnGetRanges)();
- const sal_uInt16 *pIter = pTmpRanges;
- sal_uInt16 nLen;
- for ( nLen = 0; *pIter; ++nLen, ++pIter )
- ;
- aUS.Insert( pTmpRanges, nLen, aUS.Count() );
- }
-
- //! Remove duplicate IDs?
- sal_uInt16 nCount = aUS.Count();
-
- for ( sal_uInt16 i = 0; i < nCount; ++i )
- aUS[i] = rPool.GetWhich( aUS[i]) ;
-
- // sort
- if ( aUS.Count() > 1 )
- qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(sal_uInt16), BaseDlgsCmpUS_Impl );
-
- pRanges = new sal_uInt16[aUS.Count() + 1];
- memcpy( pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count() );
- pRanges[aUS.Count()] = 0;
- return pRanges;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index c559e61..1594060 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -618,48 +618,6 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave )
//--------------------------------------------------------------------
-void SfxObjectShell::DisconnectFromShared()
-{
- if ( IsDocShared() )
- {
- if ( pMedium && pMedium->GetStorage().is() )
- {
- // set medium to noname
- pMedium->SetName( String(), sal_True );
- pMedium->Init_Impl();
-
- // drop resource
- SetNoName();
- InvalidateName();
-
- // untitled document must be based on temporary storage
- // the medium should not dispose the storage in this case
- if ( pMedium->GetStorage() == GetStorage() )
- ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium );
-
- pMedium->Close();
- FreeSharedFile();
-
- SfxMedium* pTmpMedium = pMedium;
- ForgetMedium();
- if( !DoSaveCompleted( pTmpMedium ) )
- SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
- else
- {
- // the medium should not dispose the storage, DoSaveCompleted() has let it to do so
- pMedium->CanDisposeStorage_Impl( sal_False );
- }
-
- pMedium->GetItemSet()->ClearItem( SID_DOC_READONLY );
- pMedium->SetOpenMode( SFX_STREAM_READWRITE, sal_True, sal_True );
-
- SetTitle( String() );
- }
- }
-}
-
-//--------------------------------------------------------------------
-
void SfxObjectShell::FreeSharedFile()
{
if ( pMedium )
@@ -1680,11 +1638,6 @@ SfxObjectShellFlags SfxObjectShell::GetFlags() const
return pImp->eFlags;
}
-void SfxObjectShell::SetFlags( SfxObjectShellFlags eFlags )
-{
- pImp->eFlags = eFlags;
-}
-
void SfxHeaderAttributes_Impl::SetAttributes()
{
bAlert = sal_True;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index fd1566b..990eb6e 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -856,13 +856,6 @@ void SfxObjectShell::InitBasicManager_Impl()
//--------------------------------------------------------------------
-sal_uInt16 SfxObjectShell::Count()
-{
- return SFX_APP()->GetObjectShells_Impl().Count();
-}
-
-//--------------------------------------------------------------------
-
sal_Bool SfxObjectShell::DoClose()
{
return Close();
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index fab52c3..d72df34 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -154,9 +154,6 @@ private:
virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType);
- void Init();
- void Exit();
-
public:
SmSymbolManager();
SmSymbolManager(const SmSymbolManager& rSymbolSetManager);
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 21b9051..c3b8a74 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -127,20 +127,6 @@ void SmSymbolManager::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
}
-void SmSymbolManager::Init()
-{
- SmModule *pp = SM_MOD();
- StartListening(*pp->GetConfig());
-}
-
-
-void SmSymbolManager::Exit()
-{
- SmModule *pp = SM_MOD();
- EndListening(*pp->GetConfig());
-}
-
-
SmSymbolManager::SmSymbolManager()
{
m_bModified = false;
diff --git a/unusedcode.easy b/unusedcode.easy
index c88e255..dd2473d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -144,14 +144,12 @@ EditView::Drop(DropEvent const&)
EditView::GetDropPos()
EditView::GetSelectionMode() const
EditView::GetWordUnderMousePointer() const
-EditView::IndentBlock()
EditView::IsPasteEnabled() const
EditView::MatchGroup()
EditView::QueryDrop(DropEvent&)
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
-EditView::UnindentBlock()
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
EnhWMFReader::ReadGDIComment()
@@ -830,9 +828,6 @@ SfxMedium::GetHdl()
SfxMedium::GetReferer() const
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
-SfxObjectShell::Count()
-SfxObjectShell::DisconnectFromShared()
-SfxObjectShell::SetFlags(unsigned int)
SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
SfxOleDateProperty::SfxOleDateProperty(int, com::sun::star::util::Date const&)
SfxOleString16Property::SfxOleString16Property(int, String const&)
@@ -890,8 +885,6 @@ Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
Slider::Slider(Window*, ResId const&)
SmFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SmSymbolManager::Exit()
-SmSymbolManager::Init()
SortedPositions::Insert(SortedPositions const*, unsigned short, unsigned short)
SortedPositions::Insert(unsigned int const&, unsigned short&)
SortedPositions::Insert(unsigned int const*, unsigned short)
@@ -2367,8 +2360,6 @@ cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Reference<com::sun::
cppu::invokeStaticComponentFactory(void (*)(), rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&)
dbaccess::ORowSetNotifier::getChangedBookmarks() const
dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-dbaui::LoadFormHelper::LoadFormHelper(com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> const&)
-dbaui::LoadFormHelper::cancel()
dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*)
dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*)
dbaui::OTableDesignView::LinkStubSwitchHdl(void*, void*)
@@ -2383,7 +2374,6 @@ dbtools::StatementComposer::getDisposeComposer() const
dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
-desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const
desktop::Lockfile::clean()
dlgprov::DialogProviderImpl::createControlModel()
dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
commit 5131e0be31afb8d7686483fd5552b10cecd1c5f0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 14:43:16 2011 +0100
catch by const reference
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index e24721f..df7dcfc 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -479,19 +479,19 @@ void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXEx
entity.mxDocumentHandler->endDocument();
}
}
- catch( SAXException & )
+ catch (const SAXException&)
{
popEntity();
XML_ParserFree( entity.mpParser );
throw;
}
- catch( IOException & )
+ catch (const IOException&)
{
popEntity();
XML_ParserFree( entity.mpParser );
throw;
}
- catch( RuntimeException & )
+ catch (const RuntimeException&)
{
popEntity();
XML_ParserFree( entity.mpParser );
@@ -531,9 +531,8 @@ OUString SAL_CALL FastSaxParser::getNamespaceURL( const OUString& rPrefix ) thro
{
return GetNamespaceURL( OUStringToOString( rPrefix, RTL_TEXTENCODING_UTF8 ) );
}
- catch(Exception)
+ catch (const Exception&)
{
- ;
}
throw IllegalArgumentException();
}
@@ -842,7 +841,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char
}
}
}
- catch( Exception& e )
+ catch (const Exception& e)
{
rEntity.maSavedException <<= e;
}
@@ -864,7 +863,7 @@ void FastSaxParser::callbackEndElement( const XML_Char* )
else
xContext->endUnknownElement( pContext->maNamespace, pContext->maElementName );
}
- catch( Exception& e )
+ catch (const Exception& e)
{
rEntity.maSavedException <<= e;
}
@@ -882,7 +881,7 @@ void FastSaxParser::callbackCharacters( const XML_Char* s, int nLen )
{
xContext->characters( OUString( s, nLen, RTL_TEXTENCODING_UTF8 ) );
}
- catch( Exception& e )
+ catch (const Exception& e)
{
rEntity.maSavedException <<= e;
}
@@ -903,12 +902,12 @@ int FastSaxParser::callbackExternalEntityRef( XML_Parser parser,
OUString( publicId, strlen( publicId ), RTL_TEXTENCODING_UTF8 ) ,
OUString( systemId, strlen( systemId ), RTL_TEXTENCODING_UTF8 ) );
}
- catch( SAXParseException & e )
+ catch (const SAXParseException & e)
{
rCurrEntity.maSavedException <<= e;
bOK = false;
}
- catch( SAXException & e )
+ catch (const SAXException& e)
{
rCurrEntity.maSavedException <<= SAXParseException(
e.Message, e.Context, e.WrappedException,
@@ -933,19 +932,19 @@ int FastSaxParser::callbackExternalEntityRef( XML_Parser parser,
{
parse();
}
- catch( SAXParseException & e )
+ catch (const SAXParseException& e)
{
rCurrEntity.maSavedException <<= e;
bOK = false;
}
- catch( IOException &e )
+ catch (const IOException& e)
{
SAXException aEx;
aEx.WrappedException <<= e;
rCurrEntity.maSavedException <<= aEx;
bOK = false;
}
- catch( RuntimeException &e )
+ catch (const RuntimeException& e)
{
SAXException aEx;
aEx.WrappedException <<= e;
More information about the Libreoffice-commits
mailing list