[Libreoffice-commits] .: 7 commits - basctl/source cui/source dbaccess/source lotuswordpro/source sfx2/inc sfx2/source sot/inc sot/Library_sot.mk sot/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source tools/bootstrp tools/source unusedcode.easy xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 25 01:42:50 PDT 2011
basctl/source/basicide/iderdll.cxx | 6
cui/source/dialogs/cuigaldlg.cxx | 10 -
cui/source/inc/cuigaldlg.hxx | 1
dbaccess/source/ui/control/FieldDescControl.cxx | 2
lotuswordpro/source/filter/lwpfilter.cxx | 5
lotuswordpro/source/filter/lwpfilter.hxx | 2
sfx2/inc/sfx2/basedlgs.hxx | 2
sfx2/inc/sfx2/dispatch.hxx | 3
sfx2/inc/sfx2/minarray.hxx | 4
sfx2/inc/sfx2/minstack.hxx | 2
sfx2/inc/sfx2/mnuitem.hxx | 6
sfx2/inc/sfx2/mnumgr.hxx | 5
sfx2/inc/sfx2/module.hxx | 2
sfx2/inc/sfx2/new.hxx | 13 -
sfx2/inc/sfx2/tbxctrl.hxx | 6
sfx2/inc/sfx2/viewfac.hxx | 1
sfx2/source/appl/module.cxx | 31 ---
sfx2/source/bastyp/minarray.cxx | 20 --
sfx2/source/control/dispatch.cxx | 47 -----
sfx2/source/dialog/basedlgs.cxx | 19 --
sfx2/source/doc/new.cxx | 52 ------
sfx2/source/menu/mnuitem.cxx | 37 ----
sfx2/source/menu/mnumgr.cxx | 39 ----
sfx2/source/toolbox/tbxitem.cxx | 35 ----
sfx2/source/view/viewfac.cxx | 6
sot/Library_sot.mk | 1
sot/inc/sot/stg.hxx | 9 -
sot/inc/sot/storage.hxx | 8
sot/source/sdstor/storage.cxx | 56 ------
sot/source/sdstor/ucbstorage.cxx | 30 ---
sot/source/sdstor/unostorageholder.cxx | 199 ------------------------
sot/source/sdstor/unostorageholder.hxx | 79 ---------
svl/inc/svl/rectitem.hxx | 1
svl/inc/svl/slstitm.hxx | 1
svl/inc/svl/style.hxx | 8
svl/inc/svl/szitem.hxx | 1
svl/source/items/rectitem.cxx | 9 -
svl/source/items/slstitm.cxx | 49 -----
svl/source/items/style.cxx | 16 -
svl/source/items/szitem.cxx | 9 -
svtools/inc/svtools/fileview.hxx | 3
svtools/inc/svtools/framestatuslistener.hxx | 2
svtools/source/contnr/fileview.cxx | 60 -------
svtools/source/contnr/templwin.hxx | 1
svtools/source/uno/framestatuslistener.cxx | 43 -----
svx/inc/svx/charmap.hxx | 3
svx/inc/svx/drawitem.hxx | 1
svx/inc/svx/simptabl.hxx | 1
svx/inc/svx/txencbox.hxx | 4
svx/source/dialog/charmap.cxx | 7
svx/source/dialog/simptabl.cxx | 7
svx/source/dialog/txencbox.cxx | 22 --
svx/source/items/drawitem.cxx | 7
tools/bootstrp/rscdep.cxx | 9 -
tools/source/fsys/unx.cxx | 4
tools/source/inet/inetstrm.cxx | 16 +
tools/source/rc/resmgr.cxx | 15 +
unusedcode.easy | 63 -------
xmloff/inc/xmloff/xmlaustp.hxx | 10 -
xmloff/source/style/impastp4.cxx | 55 ------
xmloff/source/style/impastpl.hxx | 4
xmloff/source/style/xmlaustp.cxx | 49 -----
62 files changed, 28 insertions(+), 1190 deletions(-)
New commits:
commit 24b0d0a0a247cf1cb39b8c2f544f48ce1aecc45d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 25 09:41:17 2011 +0100
ByteString->rtl::OString
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index b6ec4ec..3595137 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -89,8 +89,7 @@ int main( int argc, char** argv )
sal_Bool bSource = sal_False;
ByteString aRespArg;
// who needs anything but '/' ?
-// String aDelim = String(DirEntry::GetAccessDelimiter());
- String aDelim = '/';
+ sal_Char cDelim = '/';
RscHrcDep *pDep = new RscHrcDep;
@@ -212,7 +211,7 @@ int main( int argc, char** argv )
String aOutPath = aOutEntry.GetPath().GetFull();
String aFileName( aOutPath );
- aFileName += aDelim;
+ aFileName += cDelim;
aFileName += aCwd;
aFileName += String(".", osl_getThreadTextEncoding());
aFileName += aSrsBaseName;
@@ -226,7 +225,7 @@ int main( int argc, char** argv )
printf("further arguments : ");
#endif
aString = ByteString( pSrsFileName );
- aString.SearchAndReplaceAll('\\', ByteString( aDelim, RTL_TEXTENCODING_ASCII_US ));
+ aString.SearchAndReplaceAll('\\', cDelim);
aString += ByteString(" : " );
while ( optind < argc )
@@ -260,7 +259,7 @@ int main( int argc, char** argv )
for ( size_t j = 0; j < nCount; j++ )
{
ByteString *pStr = (*pLst)[ j ];
- pStr->SearchAndReplaceAll('\\', ByteString( aDelim, RTL_TEXTENCODING_ASCII_US ));
+ pStr->SearchAndReplaceAll('\\', cDelim);
if ( j != (nCount-1) )
*pStr += ByteString( "\\" );
aOutStream.WriteLine( *pStr );
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index bd315db..34d4b5b 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -319,14 +319,14 @@ sal_uInt16 DirReader_Impl::Read()
if ( ( pDir->eAttrMask & FSYS_KIND_DIR || pDir->eAttrMask & FSYS_KIND_FILE ) &&
( ( pDosEntry = readdir( pDosDir ) ) != NULL ) )
{
- String aD_Name(pDosEntry->d_name, osl_getThreadTextEncoding());
+ String aD_Name(pDosEntry->d_name, osl_getThreadTextEncoding());
if ( pDir->aNameMask.Matches( aD_Name ) )
{
DirEntryFlag eFlag =
0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT
: 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
: FSYS_FLAG_NORMAL;
- DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX );
+ DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX);
if ( pParent )
pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False);
FileStat aStat( *pTemp );
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 6243889..6fc8df2 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -30,6 +30,7 @@
#include "precompiled_tools.hxx"
#include <sal/types.h>
#include <rtl/memory.h>
+#include <rtl/strbuf.hxx>
#include <tools/cachestr.hxx>
#include <tools/debug.hxx>
#include <tools/inetmsg.hxx>
@@ -1441,13 +1442,14 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
if (pMsg->IsMultipart())
{
// Insert multipart delimiter.
- ByteString aDelim ("--");
- aDelim += pMsg->GetMultipartBoundary();
- aDelim += "\r\n";
-
- rtl_copyMemory (
- pData, aDelim.GetBuffer(), aDelim.Len());
- return aDelim.Len();
+ rtl::OStringBuffer aDelim(
+ RTL_CONSTASCII_STRINGPARAM("--"));
+ aDelim.append(pMsg->GetMultipartBoundary());
+ aDelim.append("\r\n");
+
+ rtl_copyMemory(pData, aDelim.getStr(),
+ aDelim.getLength());
+ return aDelim.getLength();
}
}
else
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index b6532d2..8dc52aa 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -932,9 +932,10 @@ void ResMgr::Init( const OUString& rFileName )
if ( !pImpRes )
{
#ifdef DBG_UTIL
- ByteString aStr( "Resourcefile not found:\n" );
- aStr += ByteString( OUStringToOString( rFileName, RTL_TEXTENCODING_UTF8 ) );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(
+ RTL_CONSTASCII_STRINGPARAM("Resourcefile not found:\n"));
+ aStr.append(OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL(aStr.getStr());
#endif
RscException_Impl();
}
@@ -950,9 +951,11 @@ void ResMgr::Init( const OUString& rFileName )
InternalResMgr::FreeGlobalRes( aResHandle, pVoid );
else
{
- ByteString aStr( "Wrong version:\n" );
- aStr += ByteString( OUStringToOString( pImpRes->aFileName, RTL_TEXTENCODING_UTF8 ) );
- DbgError( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(
+ RTL_CONSTASCII_STRINGPARAM("Wrong version:\n"));
+ aStr.append(rtl::OUStringToOString(pImpRes->aFileName,
+ RTL_TEXTENCODING_UTF8));
+ DbgError(aStr.getStr());
}
}
#endif
commit 005f5d443e432130b902e1c78283c5f57f34d2b5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 25 09:40:40 2011 +0100
remove freshly unused methods
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 9a0b4f9..ac2ec04 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -140,9 +140,6 @@ friend class SfxHelp;
void _Execute( SfxShell &rShell, const SfxSlot &rSlot,
SfxRequest &rReq,
SfxCallMode eCall = SFX_CALLMODE_STANDARD);
- const SfxPoolItem* _Execute( sal_uInt16 nSlot, SfxCallMode eCall,
- va_list pArgs, const SfxPoolItem *pArg1 );
-
#endif
protected:
void FlushImpl();
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 4905116..62ebce6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -85,12 +85,9 @@ class SfxUnoMenuControl : public SfxMenuControl
SfxUnoControllerItem* pUnoCtrl;
public:
SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
- SfxBindings&, SfxVirtualMenu* );
- SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
const String&,
SfxBindings&, SfxVirtualMenu* );
~SfxUnoMenuControl();
- void Select();
};
typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & );
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 58d412b..6b65fe9 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -89,7 +89,6 @@ public:
class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager
{
private:
- DECL_LINK( SelectHdl, void * );
Menu* pSVMenu;
// when #i107205 gets fixed this one should be superfluous.
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 0b0b7c4..58a2d0c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1333,53 +1333,6 @@ const SfxPoolItem* SfxDispatcher::Execute
}
//--------------------------------------------------------------------
-const SfxPoolItem* SfxDispatcher::_Execute
-(
- sal_uInt16 nSlot, // the Id of the executing function
- SfxCallMode eCall, // SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or
- //..._SLOT
- va_list pVarArgs, // Parameter list from the 2nd parameter
- const SfxPoolItem* pArg1 // First parameter
-)
-
-/* [Description]
-
- Method to excecute a <SfxSlot>s over the Slot-Id.
-
- [Return value]
-
- const SfxPoolItem* Pointer to the SfxPoolItem valid to the next run
- though the Message-Loop, which contains the return
- value.
-
- Or a NULL-Pointer, when the function was not
- executed (for example canceled by the user).
-*/
-
-{
- if ( IsLocked(nSlot) )
- return 0;
-
- SfxShell *pShell = 0;
- const SfxSlot *pSlot = 0;
- if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, sal_False,
- SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) )
- {
- SfxAllItemSet aSet( pShell->GetPool() );
-
- for ( const SfxPoolItem *pArg = pArg1;
- pArg;
- pArg = va_arg( pVarArgs, const SfxPoolItem* ) )
- MappedPut_Impl( aSet, *pArg );
-
- SfxRequest aReq( nSlot, eCall, aSet );
- _Execute( *pShell, *pSlot, aReq, eCall );
- return aReq.GetReturnValue();
- }
- return 0;
-}
-
-//--------------------------------------------------------------------
const SfxPoolItem* SfxDispatcher::Execute
(
sal_uInt16 nSlot, // the Id of the executing function
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 560f51a..2054759 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -469,17 +469,6 @@ SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, rBindings, pVirt);
}
-SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId,
- Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt )
- : SfxMenuControl( nSlotId, rBindings )
-{
- Bind( pVirt, nSlotId, rMenu.GetItemText(nSlotId), rBindings);
- UnBind();
- pUnoCtrl = new SfxUnoControllerItem( this, rBindings, rCmd );
- pUnoCtrl->acquire();
- pUnoCtrl->GetNewDispatch();
-}
-
SfxUnoMenuControl::SfxUnoMenuControl(
const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
const String& rItemText,
@@ -499,9 +488,4 @@ SfxUnoMenuControl::~SfxUnoMenuControl()
pUnoCtrl->release();
}
-void SfxUnoMenuControl::Select()
-{
- pUnoCtrl->Execute();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index fc42a3e..3bc9252 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -307,14 +307,6 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
return nVal;
}
-//--------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
-{
- return 1;
-}
-IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
-
//-------------------------------------------------------------------------
SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 1f809bc..4f478c0 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -65,11 +65,6 @@ pointer to the <SfxStyleSheetBase>. The actions are:
The following methods already broadcast themself
-SfxStyleSheetHint(SFX_STYLESHEET_MODIFIED) from:
- SfxStyleSheetBase::SetName( const String& rName )
- SfxStyleSheetBase::SetParent( const String& rName )
- SfxStyleSheetBase::SetFollow( const String& rName )
-
SfxSimpleHint(SFX_HINT_DYING) from:
SfxStyleSheetBasePool::~SfxStyleSheetBasePool()
@@ -346,7 +341,6 @@ class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
public:
TYPEINFO();
- SfxStyleSheetHint( sal_uInt16 );
SfxStyleSheetHint( sal_uInt16, SfxStyleSheetBase& );
SfxStyleSheetBase* GetStyleSheet() const
{ return pStyleSh; }
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index ffaaf83..8bf6776 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -51,7 +51,6 @@ public:
SfxImpStringList() { nRefCount = 1; }
~SfxImpStringList();
- void Sort( sal_Bool bAscending);
};
//------------------------------------------------------------------------
@@ -62,45 +61,6 @@ SfxImpStringList::~SfxImpStringList()
nRefCount = 0xffff;
}
-//------------------------------------------------------------------------
-
-void SfxImpStringList::Sort( sal_Bool bAscending)
-{
- sal_uLong nCount = aList.size();
- if( nCount > 1 )
- {
- nCount -= 2;
- // Bubble Dir Einen
- sal_Bool bSwapped = sal_True;
- while( bSwapped )
- {
- bSwapped = sal_False;
- for( sal_uLong nCur = 0; nCur <= nCount; nCur++ )
- {
- String aStr1 = aList[nCur];
- String aStr2 = aList[nCur+1];
- // COMPARE_GREATER => pStr2 ist groesser als pStr1
- StringCompare eCompare = aStr1.CompareIgnoreCaseToAscii( aStr2 ); //@@@
- sal_Bool bSwap = sal_False;
- if( bAscending )
- {
- if( eCompare == COMPARE_LESS )
- bSwap = sal_True;
- }
- else if( eCompare == COMPARE_GREATER )
- bSwap = sal_True;
-
- if( bSwap )
- {
- bSwapped = sal_True;
- aList[nCur+1] = aStr1;
- aList[nCur] = aStr2;
- }
- }
- }
- }
-}
-
// class SfxStringListItem -----------------------------------------------
SfxStringListItem::SfxStringListItem() :
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 1830f25..1078c7f 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -101,14 +101,6 @@ SfxStyleSheetHint::SfxStyleSheetHint
nHint( nAction )
{}
-SfxStyleSheetHint::SfxStyleSheetHint
-(
- sal_uInt16 nAction // SFX_STYLESHEET_... (s.o.)
-)
-: pStyleSh( NULL ),
- nHint( nAction )
-{}
-
//=========================================================================
class SfxStyleSheetBasePool_Impl
diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index ba909d3..3e5b871 100644
--- a/svtools/inc/svtools/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
@@ -56,8 +56,6 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
virtual ~FrameStatusListener();
- void updateStatus( const rtl::OUString aCommandURL );
-
// methods to support status forwarder, known by the old sfx2 toolbox controller implementation
void addStatusListener( const rtl::OUString& aCommandURL );
void removeStatusListener( const rtl::OUString& aCommandURL );
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index a86fb21..a0cefd6 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -380,49 +380,6 @@ void FrameStatusListener::unbindListener()
}
}
-void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL )
-{
- Reference< XDispatch > xDispatch;
- Reference< XStatusListener > xStatusListener;
- com::sun::star::util::URL aTargetURL;
-
- {
- SolarMutexGuard aSolarMutexGuard;
-
- if ( !m_bInitialized )
- return;
-
- // Try to find a dispatch object for the requested command URL
- Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY );
- if ( m_xServiceManager.is() && xDispatchProvider.is() )
- {
- Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
- UNO_QUERY );
- aTargetURL.Complete = aCommandURL;
- xURLTransformer->parseStrict( aTargetURL );
- xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 );
- }
- }
-
- if ( xDispatch.is() && xStatusListener.is() )
- {
- // Catch exception as we release our mutex, it is possible that someone else
- // has already disposed this instance!
- // Add/remove status listener to get a update status information from the
- // requested command.
- try
- {
- xDispatch->addStatusListener( xStatusListener, aTargetURL );
- xDispatch->removeStatusListener( xStatusListener, aTargetURL );
- }
- catch ( Exception& )
- {
- }
- }
-}
-
} // svt
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index a3e3814..64f8bed 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -953,7 +953,6 @@ SfxUShortRanges::Contains(unsigned short) const
SfxUShortRanges::Intersects(SfxUShortRanges const&) const
SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
-SfxUnoMenuControl::Select()
SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
SfxVersionTableDtor::GetVersions() const
SfxViewFactory::~SfxViewFactory()
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index d6032f5..cea98dd 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -267,29 +267,6 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
return bRet;
}
-OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
- const OUString& rParent )
-{
- sal_uLong nPos;
-
- XMLFamilyData_Impl *pFamily = 0;
- XMLFamilyData_Impl aTmp( nFamily );
- if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
- {
- pFamily = maFamilyList.GetObject( nPos );
- }
-
- DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Add: unknown family" );
- if( pFamily )
- {
- if( !pFamily->pCache )
- pFamily->pCache = new SvXMLAutoStylePoolCache_Impl();
- if( pFamily->pCache->size() < MAX_CACHE_SIZE )
- pFamily->pCache->push_back( new OUString( rParent ) );
- }
-
- return rParent;
-}
///////////////////////////////////////////////////////////////////////////////
//
// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list
@@ -324,38 +301,6 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
return sName;
}
-OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) const
-{
- OUString sName;
-
- sal_uLong nPos;
- XMLFamilyData_Impl aTmp( nFamily );
- XMLFamilyData_Impl *pFamily = 0;
- if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
- {
- pFamily = maFamilyList.GetObject( nPos );
- }
-
- DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Find: unknown family" );
-
- if( pFamily )
- {
- DBG_ASSERT( pFamily->pCache, "family doesn't have a cache" );
-
- // The cache may be empty already. This happens if it was filled
- // completly.
- if( pFamily->pCache && !pFamily->pCache->empty() )
- {
- OUString *pName = (*pFamily->pCache)[ 0 ];
- pFamily->pCache->erase( pFamily->pCache->begin() );
- sName = *pName;
- delete pName;
- }
- }
-
- return sName;
-}
-
///////////////////////////////////////////////////////////////////////////////
//
// export
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 7759725..5225a44 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -200,13 +200,9 @@ public:
const ::rtl::OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties );
- ::rtl::OUString AddToCache( sal_Int32 nFamily,
- const ::rtl::OUString& rParent );
::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties ) const;
- ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const;
-
void exportXML( sal_Int32 nFamily,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
const SvXMLUnitConverter& rUnitConverter,
commit 01f5362e7982cc1e5b8c9fa7216c892667971737
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 23:18:26 2011 +0100
String::CreateFromInt64->rtl::OUString::valueOf
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index f7a7065..4e285f9 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -558,7 +558,7 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
break;
case FIELD_PROPERTY_TEXTLEN:
if (pTextLen)
- return String::CreateFromInt64(pTextLen->GetValue());
+ return rtl::OUString::valueOf(static_cast<sal_Int64>(pTextLen->GetValue()));
case FIELD_PROPERTY_NUMTYPE:
if (pNumType)
return pNumType->GetSelectEntry();
commit 2d1c4141bafea812c9db2db5cb8bf0b248b05242
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 22:57:23 2011 +0100
UnoStorageHolder is never ctored, follow logical consequences of that
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index bf2a814..dd7cc8d 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,sot,\
sot/source/sdstor/storage \
sot/source/sdstor/storinfo \
sot/source/sdstor/ucbstorage \
- sot/source/sdstor/unostorageholder \
))
# vim: set noet sw=4 ts=4:
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index df43ca7..c8d18da 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -45,11 +45,6 @@
#include "sot/storinfo.hxx"
#include "sot/sotdllapi.h"
-#include <list>
-
-class UNOStorageHolder;
-typedef ::std::list< UNOStorageHolder* > UNOStorageHolderList;
-
class Storage;
class StorageStream;
class StgIo;
@@ -371,10 +366,6 @@ public:
sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
- // HACK to avoid incompatible build, can be done since this feature is only for development
- // should be removed before release
- UNOStorageHolderList* GetUNOStorageHolderList();
-
//#if _SOLAR__PRIVATE
UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const;
sal_Bool CopyStorageElement_Impl( UCBStorageElement_Impl& rElement,
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 32a7cdb..26258bc 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -232,8 +232,6 @@ public:
static sal_Bool IsOLEStorage( const String & rFileName );
static sal_Bool IsOLEStorage( SvStream* pStream );
- void RemoveUNOStorageHolder( UNOStorageHolder* pHolder );
-
static SotStorage* OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
const String& rEleName, StreamMode = STREAM_STD_READWRITE );
static sal_Int32 GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index d2e3cd7..593de58 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -50,8 +50,6 @@
#include <unotools/ucbhelper.hxx>
#include <comphelper/processfactory.hxx>
-#include "unostorageholder.hxx"
-
using namespace ::com::sun::star;
/************** class SotStorageStream ***********************************/
@@ -711,25 +709,6 @@ SotStorage::~SotStorage()
}
/*************************************************************************
-|* SotStorage::RemoveUNOStorageHolder()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotStorage::RemoveUNOStorageHolder( UNOStorageHolder* pHolder )
-{
- UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
- if ( pStg )
- {
- pStg->GetUNOStorageHolderList()->remove( pHolder );
- pHolder->release();
- }
- else
- {
- OSL_FAIL("Not implemented!");
- }
-}
-
-/*************************************************************************
|* SotStorage::CreateMemoryStream()
|*
|* Beschreibung
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index dfc5024..6f95d2a 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -73,8 +73,6 @@
#include <sot/formats.hxx>
#include "sot/clsids.hxx"
-#include "unostorageholder.hxx"
-
#include <vector>
using namespace ::com::sun::star::lang;
@@ -513,7 +511,6 @@ public:
sal_Bool m_bRepairPackage;
Reference< XProgressHandler > m_xProgressHandler;
- UNOStorageHolderList* m_pUNOStorageHolderList;
UCBStorage_Impl( const ::ucbhelper::Content&, const String&, StreamMode, UCBStorage*, sal_Bool, sal_Bool, sal_Bool = sal_False, Reference< XProgressHandler > = Reference< XProgressHandler >() );
UCBStorage_Impl( const String&, StreamMode, UCBStorage*, sal_Bool, sal_Bool, sal_Bool = sal_False, Reference< XProgressHandler > = Reference< XProgressHandler >() );
UCBStorage_Impl( SvStream&, UCBStorage*, sal_Bool );
@@ -1662,8 +1659,6 @@ UCBStorage_Impl::UCBStorage_Impl( const ::ucbhelper::Content& rContent, const St
, m_aClassId( SvGlobalName() )
, m_bRepairPackage( bIsRepair )
, m_xProgressHandler( xProgressHandler )
- , m_pUNOStorageHolderList( NULL )
-
{
String aName( rName );
if( !aName.Len() )
@@ -1697,7 +1692,6 @@ UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStor
, m_aClassId( SvGlobalName() )
, m_bRepairPackage( bIsRepair )
, m_xProgressHandler( xProgressHandler )
- , m_pUNOStorageHolderList( NULL )
{
String aName( rName );
if( !aName.Len() )
@@ -1748,7 +1742,6 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, sal_B
, m_nFormat( 0 )
, m_aClassId( SvGlobalName() )
, m_bRepairPackage( sal_False )
- , m_pUNOStorageHolderList( NULL )
{
// opening in direct mode is too fuzzy because the data is transferred to the stream in the Commit() call,
// which will be called in the storages' dtor
@@ -2176,21 +2169,6 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
UCBStorage_Impl::~UCBStorage_Impl()
{
- if ( m_pUNOStorageHolderList )
- {
- for ( UNOStorageHolderList::iterator aIter = m_pUNOStorageHolderList->begin();
- aIter != m_pUNOStorageHolderList->end(); ++aIter )
- if ( *aIter )
- {
- (*aIter)->InternalDispose();
- (*aIter)->release();
- (*aIter) = NULL;
- }
-
- m_pUNOStorageHolderList->clear();
- DELETEZ( m_pUNOStorageHolderList );
- }
-
// first delete elements!
for ( size_t i = 0, n = m_aChildrenList.size(); i < n; ++i )
delete m_aChildrenList[ i ];
@@ -3512,12 +3490,4 @@ sal_Bool UCBStorage::GetProperty( const String& rEleName, const String& rName, :
return sal_False;
}
-UNOStorageHolderList* UCBStorage::GetUNOStorageHolderList()
-{
- if ( !pImp->m_pUNOStorageHolderList )
- pImp->m_pUNOStorageHolderList = new UNOStorageHolderList;
-
- return pImp->m_pUNOStorageHolderList;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
deleted file mode 100644
index dbb54e0..0000000
--- a/sot/source/sdstor/unostorageholder.cxx
+++ /dev/null
@@ -1,199 +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_sot.hxx"
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include <comphelper/processfactory.hxx>
-
-#include "unostorageholder.hxx"
-#include "sot/storinfo.hxx"
-
-
-using namespace ::com::sun::star;
-
-UNOStorageHolder::UNOStorageHolder( SotStorage& aParentStorage,
- SotStorage& aStorage,
- uno::Reference< embed::XStorage > xStorage,
- ::utl::TempFile* pTempFile )
-: m_pParentStorage( &aParentStorage )
-, m_rSotStorage( &aStorage )
-, m_xStorage( xStorage )
-, m_pTempFile( pTempFile )
-{
- OSL_ENSURE( m_xStorage.is() && m_pTempFile, "Wrong initialization!\n" );
- if ( !m_xStorage.is() || !m_pTempFile )
- throw uno::RuntimeException();
-
- uno::Reference< embed::XTransactionBroadcaster > xTrBroadcast( m_xStorage, uno::UNO_QUERY );
- if ( !xTrBroadcast.is() )
- throw uno::RuntimeException();
-
- xTrBroadcast->addTransactionListener( (embed::XTransactionListener*)this );
-}
-
-void UNOStorageHolder::InternalDispose()
-{
- uno::Reference< embed::XTransactionBroadcaster > xTrBroadcast( m_xStorage, uno::UNO_QUERY );
- if ( xTrBroadcast.is() )
- xTrBroadcast->removeTransactionListener( (embed::XTransactionListener*)this );
-
- uno::Reference< lang::XComponent > xComponent( m_xStorage, uno::UNO_QUERY );
- if ( xComponent.is() )
- xComponent->dispose();
- m_xStorage = uno::Reference< embed::XStorage >();
-
- if ( m_pParentStorage )
- m_pParentStorage = NULL;
-
- if ( m_pTempFile )
- {
- delete m_pTempFile;
- m_pTempFile = NULL;
- }
-
- if ( m_rSotStorage.Is() )
- m_rSotStorage = NULL;
-}
-
-String UNOStorageHolder::GetStorageName()
-{
- if ( m_rSotStorage.Is() )
- return m_rSotStorage->GetName();
-
- return String();
-}
-
-void SAL_CALL UNOStorageHolder::preCommit( const lang::EventObject& /*aEvent*/ )
- throw ( uno::Exception,
- uno::RuntimeException )
-{
- // do nothing
-}
-
-void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ )
- throw ( uno::RuntimeException )
-{
- ::utl::TempFile aTmpStorFile;
- if ( !aTmpStorFile.GetURL().Len() )
- throw uno::RuntimeException();
-
- uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
- ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory")) ),
- uno::UNO_QUERY );
-
- OSL_ENSURE( xStorageFactory.is(), "Can't create storage factory!\n" );
- if ( !xStorageFactory.is() )
- throw uno::RuntimeException();
-
- uno::Sequence< uno::Any > aArg( 2 );
- aArg[0] <<= ::rtl::OUString( aTmpStorFile.GetURL() );
- aArg[1] <<= embed::ElementModes::READWRITE;
- uno::Reference< embed::XStorage > xTempStorage( xStorageFactory->createInstanceWithArguments( aArg ), uno::UNO_QUERY );
-
- OSL_ENSURE( xTempStorage.is(), "Can't open storage!\n" );
- if ( !xTempStorage.is() )
- throw uno::RuntimeException();
-
- m_xStorage->copyToStorage( xTempStorage );
-
- uno::Reference< lang::XComponent > xComp( xTempStorage, uno::UNO_QUERY );
- if ( !xComp.is() )
- throw uno::RuntimeException();
-
- xComp->dispose();
-
- SotStorageRef rTempStorage = new SotStorage( sal_True, aTmpStorFile.GetURL(), STREAM_WRITE, STORAGE_TRANSACTED );
- if ( !rTempStorage.Is() || rTempStorage->GetError() != ERRCODE_NONE )
- throw uno::RuntimeException();
-
- SvStorageInfoList aSubStorInfoList;
- m_rSotStorage->FillInfoList( &aSubStorInfoList );
- for ( sal_uInt32 nInd = 0; nInd < aSubStorInfoList.size(); nInd++ )
- {
- m_rSotStorage->Remove( aSubStorInfoList[nInd].GetName() );
- if ( m_rSotStorage->GetError() )
- {
- m_rSotStorage->ResetError();
- throw uno::RuntimeException();
- }
- }
-
- rTempStorage->CopyTo( m_rSotStorage );
-
- // CopyTo does not transport unknown media type
- // just workaround it
- uno::Any aMediaType;
- if ( rTempStorage->GetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType ) )
- m_rSotStorage->SetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType );
-
- m_rSotStorage->Commit();
-}
-
-void SAL_CALL UNOStorageHolder::preRevert( const lang::EventObject& /*aEvent*/ )
- throw ( uno::Exception,
- uno::RuntimeException )
-{
- // do nothing
-}
-
-void SAL_CALL UNOStorageHolder::reverted( const lang::EventObject& /*aEvent*/ )
- throw ( uno::RuntimeException )
-{
- // do nothing, since reverting of the duplicate storage just means
- // not to copy changes done for it to the original storage
-}
-
-void SAL_CALL UNOStorageHolder::disposing( const lang::EventObject& /*Source*/ )
- throw ( uno::RuntimeException )
-{
- if ( m_pTempFile )
- {
- delete m_pTempFile;
- m_pTempFile = NULL;
- }
-
- if ( m_rSotStorage.Is() )
- m_rSotStorage = NULL;
-
- if ( m_pParentStorage )
- {
- SotStorage* pTmp = m_pParentStorage;
- m_pParentStorage = NULL;
- pTmp->RemoveUNOStorageHolder( this ); // this statement can lead to destruction of the holder
- }
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/unostorageholder.hxx b/sot/source/sdstor/unostorageholder.hxx
deleted file mode 100644
index 13743c6..0000000
--- a/sot/source/sdstor/unostorageholder.hxx
+++ /dev/null
@@ -1,79 +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 _UNOSTORAGEHOLDER_HXX
-#define _UNOSTORAGEHOLDER_HXX
-
-#include <com/sun/star/embed/XTransactionListener.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-#include <unotools/tempfile.hxx>
-#include <sot/storage.hxx>
-
-class SotStorage;
-class UNOStorageHolder : public ::cppu::WeakImplHelper1<
- ::com::sun::star::embed::XTransactionListener >
-
-{
- SotStorage* m_pParentStorage; // parent storage
- SotStorageRef m_rSotStorage; // original substorage
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; // duplicate storage
- ::utl::TempFile* m_pTempFile; // temporary file used by duplicate storage
-
-public:
- UNOStorageHolder( SotStorage& aParentStorage,
- SotStorage& aStorage,
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage,
- ::utl::TempFile* pTempFile );
-
- void InternalDispose();
- String GetStorageName();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetDuplicateStorage() { return m_xStorage; }
-
- virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent )
- throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent )
- throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
- throw ( ::com::sun::star::uno::RuntimeException );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index c67fa1e..a3e3814 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1552,8 +1552,6 @@ TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor co
TypeName::TypeName(char*, unsigned int, unsigned int, unsigned short, int, int)
UCBStorage::IsStorageFile(String const&)
UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&)
-UNOStorageHolder::GetStorageName()
-UNOStorageHolder::UNOStorageHolder(SotStorage&, SotStorage&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage>, utl::TempFile*)
UShortCont::Sort()
UniqueIndex::Replace(unsigned long, void*)
UnoComboBoxControl::getActionListeners()
commit ac1530a37e4544378c22c9358e57ca8a596c1aa8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 22:31:19 2011 +0100
callcatcher: yet more unused code
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index c099128..47d3ba8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1044,16 +1044,6 @@ void TPGalleryThemeProperties::SearchFiles()
// ------------------------------------------------------------------------
-IMPL_LINK( TPGalleryThemeProperties, ClickCloseBrowserHdl, void *, EMPTYARG )
-{
- if( bInputAllowed )
- aPreviewTimer.Stop();
-
- return 0L;
-}
-
-// ------------------------------------------------------------------------
-
IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
{
if( bInputAllowed )
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1009ce0..8add0f8 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -354,7 +354,6 @@ class TPGalleryThemeProperties : public SfxTabPage
void DoPreview();
DECL_LINK( ClickPreviewHdl, void* );
- DECL_LINK( ClickCloseBrowserHdl, void* );
DECL_LINK( ClickSearchHdl, void* );
DECL_LINK( ClickTakeHdl, void* );
DECL_LINK( ClickTakeAllHdl, void* );
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 428e486..a29c04e 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -109,8 +109,6 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
protected:
SfxModelessDialog( SfxBindings*, SfxChildWindow*,
Window*, const ResId& );
- SfxModelessDialog( SfxBindings*, SfxChildWindow*,
- Window*, WinBits nWinStyle = WB_STDMODELESS );
~SfxModelessDialog();
virtual sal_Bool Close();
virtual void Resize();
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index d17151d..bcaa792 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -324,7 +324,6 @@ public:
void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
void Insert( sal_uInt16 nPos, void* rElem );
void Append( void* rElem );
- sal_Bool Replace( void* pOldElem, void* pNewElem );
sal_Bool Remove( void* rElem );
sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
sal_uInt16 Count() const { return nUsed; }
@@ -371,9 +370,6 @@ public:\
void Append( T aElement ) {\
SfxPtrArr::Append((void *)aElement);\
}\
- sal_Bool Replace( T aOldElem, T aNewElem ) {\
- return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\
- }\
void Remove( T aElement ) {\
SfxPtrArr::Remove((void*)aElement);\
}\
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index 4c98ec5..5a64e31 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -78,8 +78,6 @@ public: \
\
sal_uInt16 Count() const { return ARR##arr_::Count(); } \
void Push( T rElem ) { Append( rElem ); } \
- sal_Bool Replace( T rOldElem, T rNewElem ) \
- { return ARR##arr_::Replace( rOldElem, rNewElem ); } \
T Top( sal_uInt16 nLevel = 0 ) const \
{ return (*this)[Count()-nLevel-1]; } \
T Bottom() const { return (*this)[0]; } \
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5d39f17..4905116 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -70,14 +70,11 @@ public:
String GetTitle() const;
SfxVirtualMenu* GetPopupMenu() const;
virtual PopupMenu* GetPopup() const;
- void SetOwnMenu( SfxVirtualMenu* pMenu );
- void RemovePopup();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
- static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 4dcd035..98fff66 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -86,7 +86,6 @@ public:
void RegisterToolBoxControl(SfxTbxCtrlFactory*);
void RegisterChildWindow(SfxChildWinFactory*);
- void RegisterChildWindowContext( sal_uInt16, SfxChildWinContextFactory* );
void RegisterStatusBarControl(SfxStbCtrlFactory*);
void RegisterMenuControl(SfxMenuCtrlFactory*);
@@ -94,7 +93,6 @@ public:
Window* pParent,
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0);
- sal_Bool IsActive() const;
/*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index bb1250a..fbff13a 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -56,19 +56,6 @@ class MoreButton;
#define RET_TEMPLATE_LOAD 100
-class SFX2_DLLPUBLIC SfxPreviewWin: public Window
-{
- SfxObjectShellLock &rDocShell;
-protected:
- virtual void Paint( const Rectangle& rRect );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
-public:
- SfxPreviewWin( Window* pParent,
- const ResId& rResId,
- SfxObjectShellLock &rDocSh );
-};
-
class SfxNewFileDialog_Impl;
class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxModalDialog
{
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index cef2730..d8f35b3 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -142,7 +142,6 @@ protected:
void UnbindListener();
void AddStatusListener( const rtl::OUString& rCommandURL );
void RemoveStatusListener( const rtl::OUString& rCommandURL );
- void UpdateStatus( const rtl::OUString& rCommandURL );
// SfxStatusListenerInterface
using FloatingWindow::StateChanged;
@@ -159,10 +158,6 @@ public:
SfxPopupWindow( sal_uInt16 nId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
Window* pParentWindow,
- const ResId &rId );
- SfxPopupWindow( sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- Window* pParentWindow,
WinBits nBits );
~SfxPopupWindow();
@@ -170,7 +165,6 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt );
void StartCascading();
- void EndCascading();
SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink )
{
m_aDeleteLink = rLink;
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index da4d790..590dc5d 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -49,7 +49,6 @@ public:
~SfxViewFactory();
SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
- void InitFactory();
sal_uInt16 GetOrdinal() const { return nOrd; }
/// returns a legacy view name. This is "view" with an appended ordinal/ID.
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 8048e4b..8fa50b3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -219,29 +219,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
//-------------------------------------------------------------------------
-void SfxModule::RegisterChildWindowContext( sal_uInt16 nId,
- SfxChildWinContextFactory *pFact)
-{
- DBG_ASSERT( pImpl, "No real Module!" );
-
- sal_uInt16 nCount = pImpl->pFactArr->Count();
- for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
- {
- SfxChildWinFactory *pF = (*pImpl->pFactArr)[nFactory];
- if ( nId == pF->nId )
- {
- if ( !pF->pArr )
- pF->pArr = new SfxChildWinContextArr_Impl;
- pF->pArr->C40_INSERT( SfxChildWinContextFactory, pFact, pF->pArr->Count() );
- return;
- }
- }
-
- OSL_FAIL( "No ChildWindow for this Context!" );
-}
-
-//-------------------------------------------------------------------------
-
void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
{
if (!pImpl->pTbxCtrlFac)
@@ -372,14 +349,6 @@ void SfxModule::Invalidate( sal_uInt16 nId )
Invalidate_Impl( pFrame->GetBindings(), nId );
}
-sal_Bool SfxModule::IsActive() const
-{
- SfxViewFrame* pFrame = SfxViewFrame::Current();
- if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this )
- return sal_True;
- return sal_False;
-}
-
bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const
{
if ( i_nId != SID_TASKPANE )
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 70e4bfb..891baa7 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -198,26 +198,6 @@ sal_Bool SfxPtrArr::Remove( void* aElem )
// -----------------------------------------------------------------------
-sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
-{
- DBG_MEMTEST();
- // simple tasks ...
- if ( nUsed == 0 )
- return sal_False;
-
- // backwards, since most of the last is first removed
- void* *pIter = pData + nUsed - 1;
- for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
- if ( *pIter == aOldElem )
- {
- pData[nUsed-n-1] = aNewElem;
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool SfxPtrArr::Contains( const void* rItem ) const
{
DBG_MEMTEST();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 81f0d6e..2635aba 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -345,25 +345,6 @@ IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
// -----------------------------------------------------------------------
SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
- SfxChildWindow *pCW,
- Window* pParent, WinBits nWinBits ) :
- ModelessDialog (pParent, nWinBits),
- pBindings(pBindinx),
- pImp( new SfxModelessDialog_Impl )
-{
- pImp->pMgr = pCW;
- pImp->bConstructed = sal_False;
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- if ( pBindinx )
- pImp->StartListening( *pBindinx );
- pImp->aMoveTimer.SetTimeout(50);
- pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
-}
-
-// -----------------------------------------------------------------------
-
-SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
SfxChildWindow *pCW, Window *pParent,
const ResId& rResId ) :
ModelessDialog(pParent, rResId),
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index b54b292..cc7c004 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -147,58 +147,6 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect )
ImpPaint( rRect, pMetaFile.get(), this );
}
-SfxPreviewWin::SfxPreviewWin(
- Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh )
- : Window(pParent, rResId), rDocShell( rDocSh )
-{
- SetHelpId( HID_PREVIEW_FRAME );
-
- // adjust contrast mode initially
- SetDrawMode( OUTPUT_DRAWMODE_COLOR );
-
- // This preview window is for document previews. Therefore
- // right-to-left mode should be off
- EnableRTL( sal_False );
-}
-
-void SfxPreviewWin::Paint( const Rectangle& rRect )
-{
- SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &rDocShell );
- if ( pFrame && pFrame->GetViewShell() &&
- pFrame->GetViewShell()->GetPrinter() &&
- pFrame->GetViewShell()->GetPrinter()->IsPrinting() )
- {
- return;
- }
-
- Size aTmpSize( rDocShell->GetFirstPageSize() );
- GDIMetaFile aMtf;
- VirtualDevice aDevice;
-
- DBG_ASSERT( aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
-
- aMtf.SetPrefSize( aTmpSize );
- aDevice.EnableOutput( sal_False );
- aDevice.SetMapMode( rDocShell->GetMapUnit() );
- aDevice.SetDrawMode( GetDrawMode() );
- aMtf.Record( &aDevice );
- rDocShell->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), ASPECT_THUMBNAIL );
- aMtf.Stop();
- aMtf.WindStart();
- SfxPreviewWin_Impl::ImpPaint( rRect, &aMtf, this );
-}
-
-void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
-{
- Window::DataChanged( rDCEvt );
-
- if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
- (rDCEvt.GetFlags() & SETTINGS_STYLE) )
- {
- SetDrawMode( OUTPUT_DRAWMODE_COLOR );
- }
-}
-
class SfxNewFileDialog_Impl
{
FixedText aRegionFt;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 62e88fe..560f51a 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -122,16 +122,6 @@ void SfxEnumMenu::Select()
//--------------------------------------------------------------------
-void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu )
-{
- pOwnMenu = pMenu;
- if ( pSubMenu )
- pSubMenu->SetParentMenu( pMenu );
-}
-
-
-//--------------------------------------------------------------------
-
// binds the instance to the specified id and assignes the title
void SfxMenuControl::Bind(
@@ -221,11 +211,6 @@ SfxMenuControl::~SfxMenuControl()
delete pSubMenu;
}
-void SfxMenuControl::RemovePopup()
-{
- DELETEZ( pSubMenu );
-}
-
//--------------------------------------------------------------------
// changes the state in the virtual menu
@@ -478,12 +463,6 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
}
SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
- sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
-{
- return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
-}
-
-SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
sal_uInt16 nId, Menu& rMenu, const String& sItemText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index da30425..24b1f89 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1271,27 +1271,6 @@ SfxPopupWindow::SfxPopupWindow(
//--------------------------------------------------------------------
-SfxPopupWindow::SfxPopupWindow(
- sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- Window* pParentWindow,
- const ResId &rId ) :
- FloatingWindow( pParentWindow, rId )
- , m_bFloating(sal_False)
- , m_bCascading( sal_False )
- , m_nId( nId )
- , m_xFrame( rFrame )
- , m_pStatusListener( 0 )
-{
- m_xServiceManager = ::comphelper::getProcessServiceFactory();
-
- Window* pWindow = GetTopMostParentSystemWindow( this );
- if ( pWindow )
- ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
-}
-
-//--------------------------------------------------------------------
-
SfxPopupWindow::~SfxPopupWindow()
{
if ( m_xStatusListener.is() )
@@ -1360,15 +1339,6 @@ void SfxPopupWindow::RemoveStatusListener( const rtl::OUString& rCommandURL )
//--------------------------------------------------------------------
-void SfxPopupWindow::UpdateStatus( const rtl::OUString& rCommandURL )
-{
- GetOrCreateStatusListener();
- if ( m_xStatusListener.is() )
- m_pStatusListener->updateStatus( rCommandURL );
-}
-
-//--------------------------------------------------------------------
-
sal_Bool SfxPopupWindow::Close()
{
m_bFloating = sal_False;
@@ -1439,11 +1409,6 @@ void SfxPopupWindow::StartCascading()
m_bCascading= sal_True;
}
-void SfxPopupWindow::EndCascading()
-{
- m_bCascading = sal_False;
-}
-
//--------------------------------------------------------------------
SfxPopupWindow* SfxPopupWindow::Clone() const
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 16fd685..1514c57 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -44,12 +44,6 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell
return (*fnCreate)(pFrame, pOldSh);
}
-void SfxViewFactory::InitFactory()
-{
- DBG_CHKTHIS(SfxViewFactory, 0);
- (*fnInit)();
-}
-
String SfxViewFactory::GetLegacyViewName() const
{
::rtl::OUStringBuffer aViewName;
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index a71332b..32a7cdb 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -137,9 +137,6 @@ public:
SotStorage( sal_Bool bUCBStorage, const String &,
StreamMode = STREAM_STD_READWRITE,
StorageMode = 0 );
- SotStorage( const ::ucbhelper::Content& rContent, const String &,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = 0 );
SotStorage( BaseStorage * );
SotStorage( SvStream & rStm );
SotStorage( sal_Bool bUCBStorage, SvStream & rStm );
@@ -214,9 +211,6 @@ public:
SotStorage * OpenUCBStorage( const String & rEleName,
StreamMode = STREAM_STD_READWRITE,
StorageMode = STORAGE_TRANSACTED );
- SotStorage * OpenOLEStorage( const String & rEleName,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = STORAGE_TRANSACTED );
// Abfrage auf Storage oder Stream
virtual sal_Bool IsStream( const String & rEleName ) const;
virtual sal_Bool IsStorage( const String & rEleName ) const;
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 3d99b0a..d2e3cd7 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -502,20 +502,6 @@ SotStorage::SotStorage()
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <ucbhelper/content.hxx>
-SotStorage::SotStorage( const ::ucbhelper::Content& rContent, const String & rName, StreamMode nMode, StorageMode nStorageMode )
- INIT_SotStorage()
-{
- m_aName = rName; // Namen merken
- m_pOwnStg = new UCBStorage( rContent, m_aName, nMode, (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True );
-
- SetError( m_pOwnStg->GetError() );
-
- if ( IsOLEStorage() )
- m_nVersion = SOFFICE_FILEFORMAT_50;
-
- SignAsRoot( m_pOwnStg->IsRoot() );
-}
-
SotStorage::SotStorage( const String & rName, StreamMode nMode, StorageMode nStorageMode )
INIT_SotStorage()
{
@@ -1067,27 +1053,6 @@ SotStorage * SotStorage::OpenUCBStorage( const String & rEleName,
return pStor;
}
-SotStorage * SotStorage::OpenOLEStorage( const String & rEleName,
- StreamMode nMode,
- StorageMode nStorageMode )
-{
- SotStorage * pStor = NULL;
- DBG_ASSERT( Owner(), "must be owner" );
- if( m_pOwnStg )
- {
- nMode |= STREAM_SHARE_DENYALL;
- ErrCode nE = m_pOwnStg->GetError();
- BaseStorage * p = m_pOwnStg->OpenOLEStorage( rEleName, nMode,
- (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True );
- pStor = new SotStorage( p );
- if( !nE )
- m_pOwnStg->ResetError(); // kein Fehler setzen
- }
- else
- SetError( SVSTREAM_GENERALERROR );
- return pStor;
-}
-
/*************************************************************************
|* SotStorage::IsStream()
|* SotStorage::IsStorage()
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 31f5717..0d0119f 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -47,7 +47,6 @@ public:
TYPEINFO();
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
- SfxRectangleItem( sal_uInt16 nWhich, SvStream & );
SfxRectangleItem( const SfxRectangleItem& );
~SfxRectangleItem() {
DBG_DTOR(SfxRectangleItem, 0); }
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 3aa181d..18dff40 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -75,7 +75,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const;
- void Sort( sal_Bool bAscending = sal_True);
virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 );
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 5a7899f..1f809bc 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -362,8 +362,6 @@ public:
TYPEINFO();
SfxStyleSheetHintExtended(
- sal_uInt16, const String& rOld );
- SfxStyleSheetHintExtended(
sal_uInt16, const String& rOld,
SfxStyleSheetBase& );
const String& GetOldName() { return aName; }
diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index b3b78d9..a02ee3c 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -48,7 +48,6 @@ public:
TYPEINFO();
SfxSizeItem();
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
- SfxSizeItem( sal_uInt16 nWhich, SvStream & );
SfxSizeItem( const SfxSizeItem& );
~SfxSizeItem() { DBG_DTOR(SfxSizeItem, 0); }
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index ddf1920..2b782d4 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -64,15 +64,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) :
// -----------------------------------------------------------------------
-SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, SvStream &rStream ) :
- SfxPoolItem( nW )
-{
- DBG_CTOR(SfxRectangleItem, 0);
- rStream >> aVal;
-}
-
-// -----------------------------------------------------------------------
-
SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 74239d4..ffaaf83 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -332,15 +332,6 @@ int SfxStringListItem::IsPoolable() const
#endif
-//------------------------------------------------------------------------
-
-void SfxStringListItem::Sort( sal_Bool bAscending)
-{
- DBG_ASSERT(GetRefCount()==0,"Sort:RefCount!=0");
- if( pImp )
- pImp->Sort( bAscending);
-}
-
//----------------------------------------------------------------------------
void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList )
{
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 1250451..1830f25 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -83,14 +83,6 @@ TYPEINIT1(SfxStyleSheetPoolHint, SfxHint);
SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
(
sal_uInt16 nAction, // SFX_STYLESHEET_... (s.o.)
- const String& rOldName
-)
-: SfxStyleSheetHint( nAction ),
- aName( rOldName )
-{}
-SfxStyleSheetHintExtended::SfxStyleSheetHintExtended
-(
- sal_uInt16 nAction, // SFX_STYLESHEET_... (s.o.)
const String& rOldName,
SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer
)
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 4bb7238..720db8f 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -64,15 +64,6 @@ SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
// -----------------------------------------------------------------------
-SfxSizeItem::SfxSizeItem( sal_uInt16 nW, SvStream &rStream ) :
- SfxPoolItem( nW )
-{
- DBG_CTOR(SfxSizeItem, 0);
- rStream >> aVal;
-}
-
-// -----------------------------------------------------------------------
-
SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index 75422e4..37d8e2f 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -85,8 +85,6 @@ private:
::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList;
- SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents );
-
DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * );
DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * );
@@ -186,7 +184,6 @@ public:
);
void SetNoSelection();
- void ResetCursor();
void SetSelectHdl( const Link& rHdl );
void SetDoubleClickHdl( const Link& rHdl );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index f9267de..404c667 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1283,59 +1283,6 @@ SvtFileView::~SvtFileView()
// -----------------------------------------------------------------------
-void SvtFileView::OpenFolder( const Sequence< OUString >& aContents )
-{
- mpImp->mpView->ClearAll();
- const OUString* pFileProperties = aContents.getConstArray();
- sal_uInt32 i, nCount = aContents.getLength();
- for ( i = 0; i < nCount; ++i )
- {
- String aRow( pFileProperties[i] );
- // extract columns
- // the columns are: title, type, size, date, target url, is folder, image url
- String aTitle, aType, aSize, aDate, aURL, aImageURL;
- xub_StrLen nIdx = 0;
- aTitle = aRow.GetToken( 0, '\t', nIdx );
- aType = aRow.GetToken( 0, '\t', nIdx );
- aSize = aRow.GetToken( 0, '\t', nIdx );
- aDate = aRow.GetToken( 0, '\t', nIdx );
- aURL = aRow.GetToken( 0, '\t', nIdx );
- sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0);
- sal_Bool bIsFolder = ( '1' == cFolder );
- if ( nIdx != STRING_NOTFOUND )
- aImageURL = aRow.GetToken( 0, '\t', nIdx );
-
- if ( mpImp->mbOnlyFolder && !bIsFolder )
- continue;
-
- // build new row
- String aNewRow = aTitle;
- aNewRow += '\t';
- aNewRow += aType;
- aNewRow += '\t';
- aNewRow += aSize;
- aNewRow += '\t';
- aNewRow += aDate;
- // detect image
- sal_Bool bDoInsert = sal_True;
- INetURLObject aObj( aImageURL.Len() > 0 ? aImageURL : aURL );
- Image aImage = SvFileInformationManager::GetImage( aObj, sal_False );
-
- if ( bDoInsert )
- {
- // insert entry and set user data
- SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( aNewRow, aImage, aImage, NULL );
- SvtContentEntry* pUserData = new SvtContentEntry( aURL, bIsFolder );
- pEntry->SetUserData( pUserData );
- }
- }
-
- mpImp->InitSelection();
- mpImp->ResetCursor();
-}
-
-// -----------------------------------------------------------------------
-
String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const
{
String aURL;
@@ -1568,13 +1515,6 @@ void SvtFileView::GetFocus()
// -----------------------------------------------------------------------
-void SvtFileView::ResetCursor()
-{
- mpImp->ResetCursor();
-}
-
-// -----------------------------------------------------------------------
-
void SvtFileView::SetSelectHdl( const Link& rHdl )
{
mpImp->SetSelectHandler( rHdl );
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index ebc0e39..248eafa 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -149,7 +149,6 @@ public:
inline void SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); }
inline void SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); }
inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; }
- inline void ResetCursor() { aFileView.ResetCursor(); }
inline sal_Bool IsTemplateFolder() const { return bIsTemplateFolder; }
inline String GetFolderURL() const { return aFolderURL; }
inline String GetRootURL() const { return aCurrentRootURL; }
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index db15cef..4ae2bc8 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -84,9 +84,6 @@ public:
sal_uInt16 GetRowPos(sal_uInt16 _nPos) const;
sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const;
- void ImplFireAccessibleEvent( short nEventId,
- const ::com::sun::star::uno::Any& rOldValue,
- const ::com::sun::star::uno::Any& rNewValue );
ScrollBar* getScrollBar();
void ReleaseAccessible();
sal_Int32 getMaxCharCount() const;
diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index ae864cc..42fbfd2 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -202,7 +202,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XDashList* GetDashList() const { return pDashList; }
- void SetDashList( XDashList* pList );
};
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index fb12e34..9867707 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -49,7 +49,6 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
public:
- SvxSimpleTableContainer( Window* pParent, WinBits nWinStyle = WB_BORDER );
SvxSimpleTableContainer( Window* pParent, const ResId& rResId );
void SetTable(SvxSimpleTable* pTable);
diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index 7358e19..c1bce0a 100644
--- a/svx/inc/svx/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
@@ -104,16 +104,12 @@ public:
const String& rEntry,
sal_uInt16 nPos = LISTBOX_APPEND );
- void RemoveTextEncoding( const rtl_TextEncoding nEnc );
-
void SelectTextEncoding( const rtl_TextEncoding nEnc,
sal_Bool bSelect = sal_True );
rtl_TextEncoding GetSelectTextEncoding() const;
const String& GetSelectTextString() const;
-
- sal_Bool IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
};
#endif
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 5f1a2a6..517d5c6 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -689,12 +689,7 @@ void SvxShowCharSet::ReleaseAccessible()
return aFind->second;
}
-// -----------------------------------------------------------------------------
-void SvxShowCharSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue )
-{
- if( m_pAccessible )
- m_pAccessible->fireEvent( nEventId, rOldValue, rNewValue );
-}
+
// -----------------------------------------------------------------------------
ScrollBar* SvxShowCharSet::getScrollBar()
{
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 1e10126..9e79c54 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -39,13 +39,6 @@
// SvxSimpleTableContainer ------------------------------------------------------
-SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, WinBits nStyle)
- : Control(pParent, nStyle)
- , m_pTable(NULL)
-{
- SetBorderStyle(WINDOW_BORDER_NOBORDER);
-}
-
SvxSimpleTableContainer::SvxSimpleTableContainer( Window* pParent, const ResId& rResId)
: Control(pParent, rResId)
, m_pTable(NULL)
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 99e8fc8..27f6796 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -212,16 +212,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI
//------------------------------------------------------------------------
-void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
-{
- sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
-
- if ( nAt != LISTBOX_ENTRY_NOTFOUND )
- RemoveEntry( nAt );
-}
-
-//------------------------------------------------------------------------
-
rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
{
sal_uInt16 nPos = GetSelectEntryPos();
@@ -242,16 +232,4 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bo
SelectEntryPos( nAt, bSelect );
}
-//------------------------------------------------------------------------
-
-sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
-{
- sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
-
- if ( nAt != LISTBOX_ENTRY_NOTFOUND )
- return IsEntryPosSelected( nAt );
- else
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index d19325d..50b2b95 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -468,13 +468,6 @@ bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
return false;
}
-// -----------------------------------------------------------------------
-
-void SvxDashListItem::SetDashList( XDashList* pList )
-{
- pDashList = pList;
-}
-
//==================================================================
//
// SvxLineEndListItem
diff --git a/unusedcode.easy b/unusedcode.easy
index d5fc25f..c67fa1e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -899,12 +899,6 @@ SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned cha
SfxMailModel::GetCount() const
SfxMedium::GetHdl()
SfxMedium::GetReferer() const
-SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*)
-SfxMenuControl::RemovePopup()
-SfxMenuControl::SetOwnMenu(SfxVirtualMenu*)
-SfxModelessDialog::SfxModelessDialog(SfxBindings*, SfxChildWindow*, Window*, long)
-SfxModule::IsActive() const
-SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxObjectShell::Count()
@@ -918,29 +912,20 @@ SfxOleString16Property::SfxOleString16Property(int, String const&)
SfxOrganizeDlg_Impl::OkHdl(Button*)
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPasswordDialog::SetMaxLen(unsigned short)
-SfxPopupWindow::EndCascading()
SfxPopupWindow::LinkStubDelete(void*, void*)
SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
-SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&)
-SfxPopupWindow::UpdateStatus(rtl::OUString const&)
-SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&)
SfxProgress::GetWaitMode() const
SfxProgress::Lock()
SfxProgress::SetWaitMode(unsigned char)
-SfxPtrArr::Replace(void*, void*)
SfxRangeItem::SfxRangeItem(unsigned short, SvStream&)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&)
SfxRequest::IsRecording() const
SfxRequest::SetTarget(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
-SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
SfxSlotPool::NextInterface()
-SfxStringListItem::Sort(unsigned char)
SfxStyleSheet::SfxStyleSheet()
-SfxStyleSheetHintExtended::SfxStyleSheetHintExtended(unsigned short, String const&)
SfxTabDialog::FillOutputItemSet()
SfxTabDialog::GetApplyButton()
SfxTabDialog::GetApplyButton() const
@@ -971,7 +956,6 @@ SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
SfxUnoMenuControl::Select()
SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
SfxVersionTableDtor::GetVersions() const
-SfxViewFactory::InitFactory()
SfxViewFactory::~SfxViewFactory()
SfxViewFrame::Hide()
SfxViewShell::PlugInsActive() const
@@ -996,8 +980,6 @@ SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::da
SotFactory::TestInvariant()
SotObject::RemoveOwnerLock()
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
-SotStorage::OpenOLEStorage(String const&, unsigned short, short)
-SotStorage::SotStorage(ucbhelper::Content const&, String const&, unsigned short, short)
SourceTreeIterator::EndExecute()
SpinButton::SpinButton(Window*, ResId const&)
SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char)
@@ -1093,13 +1075,6 @@ SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::s
SvXMLAttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
-SvXMLAutoStylePoolP::Add(rtl::OUString&, int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&)
-SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::AddAndCache(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::Find(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) const
-SvXMLAutoStylePoolP::FindAndRemoveCached(int) const
-SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const
SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*)
SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, char const*, unsigned char, unsigned char)
@@ -1155,8 +1130,6 @@ SvtExtendedSecurityOptions::GetSecureExtensionList() const
SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const
SvtExtendedSecurityOptions::IsSecureHyperlink(rtl::OUString const&) const
SvtExtendedSecurityOptions::SetOpenHyperlinkMode(SvtExtendedSecurityOptions::OpenHyperlinkMode)
-SvtFileView::OpenFolder(com::sun::star::uno::Sequence<rtl::OUString> const&)
-SvtFileView::ResetCursor()
SvtFilterOptions::SetUseEnhancedFields(unsigned char)
SvtFontOptions::EnableReplacementTable(unsigned char)
SvtFontOptions::IsReplacementTableEnabled() const
@@ -1293,7 +1266,6 @@ SvxContourDlg::SetGraphic(Graphic const&)
SvxContourDlg::SetGraphicLinked(unsigned char)
SvxContourDlg::SetPolyPolygon(PolyPolygon const&)
SvxContourDlgChildWindow::UpdateContourDlg(Graphic const&, unsigned char, PolyPolygon const*, void*)
-SvxDashListItem::SetDashList(XDashList*)
SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
SvxDrawPage::GetPageForSdrPage(SdrPage*)
@@ -1382,10 +1354,8 @@ SvxShape::getMaster()
SvxShape::getMaster() const
SvxShapePolyPolygonBezier::GetPolygonKind() const
SvxShapeText::SvxShapeText()
-SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
SvxSimpleTable::ClearAll()
SvxSimpleTable::TableToTop()
-SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
SvxStringArray::GetStringByType(long) const
SvxStringArray::GetValueByStr(String const&) const
SvxSuperContourDlg::DoAutoCreate()
@@ -1400,8 +1370,6 @@ SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
SvxTextEditSource::GetSdrObject() const
-SvxTextEncodingBox::IsTextEncodingSelected(unsigned short) const
-SvxTextEncodingBox::RemoveTextEncoding(unsigned short)
SvxUnoFontDescriptor::getPropertyState(SfxItemSet const&)
SvxUnoTextBase::InsertField(SvxFieldItem const&)
SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
@@ -1567,7 +1535,6 @@ TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned short,
TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short)
TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short)
TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*)
-TPGalleryThemeProperties::LinkStubClickCloseBrowserHdl(void*, void*)
TTBasic::CreateMyBasic()
TTProfiler::Dec(unsigned long)
TTProperties::Img(Bitmap*)
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index 1eb26a7..ba77834 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
@@ -76,7 +76,6 @@ public:
SvXMLAutoStylePoolP( SvXMLExport& rExport);
- SvXMLAutoStylePoolP();
virtual ~SvXMLAutoStylePoolP();
SvXMLExport& GetExport() const;
@@ -107,7 +106,6 @@ public:
/// Add an item set to the pool and return its generated name.
::rtl::OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
::rtl::OUString Add( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false );
- sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties );
/// Add an item set with a pre-defined name (needed for saving sheets separately in Calc).
@@ -115,16 +113,8 @@ public:
const ::std::vector< XMLPropertyState >& rProperties );
/// Find an item set's name.
- ::rtl::OUString Find( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ) const;
::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const;
- // Add a property set to the pool and cache its name.
- ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
- ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties );
- ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::rtl::OUString& rParent );
-
- ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const;
-
/** Export all item sets ofs a certain class in the order in that they have been added. */
void exportXML( sal_Int32 nFamily
, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 669a4a1..7f6efeb 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -277,12 +277,6 @@ void SvXMLAutoStylePoolP::exportStyleContent(
}
}
-SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
-{
- OSL_FAIL("This constuctor is obsoleted and should not be used!");
- pImpl = NULL;
-}
-
SvXMLAutoStylePoolP::SvXMLAutoStylePoolP( SvXMLExport& rExport )
{
pImpl = new SvXMLAutoStylePoolP_Impl( rExport );
@@ -366,12 +360,6 @@ OUString SvXMLAutoStylePoolP::Add( sal_Int32 nFamily,
return sName;
}
-sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties )
-{
- OUString sEmpty;
- return pImpl->Add(rName, nFamily, sEmpty, rProperties);
-}
-
sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties )
{
return pImpl->Add(rName, nFamily, rParent, rProperties);
@@ -384,37 +372,6 @@ sal_Bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily
return pImpl->AddNamed(rName, nFamily, rParent, rProperties);
}
-OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily,
- const vector< XMLPropertyState >& rProperties )
-{
- OUString sEmpty;
- OUString sName;
- pImpl->Add(sName, nFamily, sEmpty, rProperties, sal_True );
- return sName;
-}
-
-OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily,
- const OUString& rParent,
- const vector< XMLPropertyState >& rProperties )
-{
- OUString sName;
- pImpl->Add(sName, nFamily, rParent, rProperties, sal_True );
- return sName;
-}
-
-OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily,
- const OUString& rParent )
-{
- return pImpl->AddToCache( nFamily, rParent );
-}
-
-OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily,
- const vector< XMLPropertyState >& rProperties ) const
-{
- OUString sEmpty;
- return pImpl->Find( nFamily, sEmpty, rProperties );
-}
-
OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily,
const OUString& rParent,
const vector< XMLPropertyState >& rProperties ) const
@@ -422,12 +379,6 @@ OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily,
return pImpl->Find( nFamily, rParent, rProperties );
}
-OUString SvXMLAutoStylePoolP::FindAndRemoveCached( sal_Int32 nFamily ) const
-{
- return pImpl->FindAndRemoveCached( nFamily );
-}
-
-
void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily,
const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &,
const SvXMLUnitConverter&,
commit 798496c5be43771ee478a0ee4288188b28583a8d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 21:36:25 2011 +0100
regenerate list
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 99dd4ed..4533222 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -181,11 +181,6 @@ void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent
rImporter->setTargetDocument( xDoc );
}
-OUString LWPFilterImportFilter::getImplementationName_Static() throw()
-{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME ));
-}
-
OUString LWPFilterImportFilter::getImplementationName() throw()
{
return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME ));
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index c956192..8d50f3c 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -137,8 +137,6 @@ public:
~LWPFilterImportFilter();
public:
- static OUString getImplementationName_Static() throw();
-public:
/**
* @descr see LWPFilterReader::filter.
*/
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index e1fff9a..58d412b 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -28,8 +28,6 @@
#ifndef _SFXMNUMGR_HXX
#define _SFXMNUMGR_HXX
-#include <stdarg.h>
-
#include <vcl/menu.hxx>
#include <tools/wintypes.hxx>
#include <tools/link.hxx>
@@ -69,7 +67,6 @@ friend class SfxPopupMenuManager;
protected:
SfxMenuManager( Menu*, SfxBindings& );
- SfxMenuManager( const ResId&, SfxBindings& );
~SfxMenuManager();
sal_uInt16 GetItemPos( sal_uInt16 nId );
sal_uInt32 GetType() { return nType; }
@@ -114,7 +111,6 @@ public:
static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow );
sal_uInt16 Execute( const Point& rPos, Window *pWindow );
- sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
void RemoveDisabledEntries();
Menu* GetSVMenu();
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 454b2ee..fc42a3e 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -105,19 +105,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu )
}
}
-//-------------------------------------------------------------------------
-
-SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings )
-: pMenu(0),
- pOldMenu(0),
- pBindings(&rBindings),
- pResMgr(rResId.GetResMgr()),
- nType( rResId.GetId() )
-{
- bAddClipboardFuncs = sal_False;
- DBG_MEMTEST();
-}
-
//--------------------------------------------------------------------
SfxMenuManager::~SfxMenuManager()
@@ -328,24 +315,6 @@ IMPL_LINK_INLINE_START( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
}
IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
-
-//--------------------------------------------------------------------
-
-sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
-{
- DBG_MEMTEST();
-
- PopupMenu* pPopMenu = ( (PopupMenu*)GetMenu()->GetSVMenu() );
- pPopMenu->SetSelectHdl( LINK( this, SfxPopupMenuManager, SelectHdl ) );
- sal_uInt16 nId = pPopMenu->Execute( pWindow, rPoint );
- pPopMenu->SetSelectHdl( Link() );
-
- if ( nId )
- GetBindings().GetDispatcher()->_Execute( nId, SFX_CALLMODE_RECORD, pArgs, pArg1 );
-
- return nId;
-}
-
//-------------------------------------------------------------------------
SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
diff --git a/unusedcode.easy b/unusedcode.easy
index 6322620..d5fc25f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
-BasicIDEDLL::~BasicIDEDLL()
BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const
BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
BitmapPalette::IsGreyPalette() const
@@ -1334,7 +1333,6 @@ SvxMSConvertOCXControls::OCX_Factory(String const&)
SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(SotStorageStreamRef&, com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, com::sun::star::awt::Size const&, String&)
SvxMSDffManager::GetAutoForm(MSO_SPT) const
SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
-SvxMSDffManager::ReadObjText(SvStream&, SdrObject*)
SvxMSDffManager::Scale(PolyPolygon&) const
SvxMSDffManager::Scale(Rectangle&) const
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&)
@@ -2688,29 +2686,8 @@ framework::UIElementWrapperBase::dispose()
gcc3::RTTI::~RTTI()
graphite2::Segment::append(graphite2::Segment const&)
graphite2::Slot::update(int, int, graphite2::Position&)
-graphite2::TtfUtil::FontAscent(void const*)
-graphite2::TtfUtil::FontDescent(void const*)
-graphite2::TtfUtil::FontOs2Style(void const*, bool&, bool&)
-graphite2::TtfUtil::Get30EngFamilyInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get30EngFullFontInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get31EngFamilyInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get31EngFullFontInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::GetLangsForNames(void const*, int, int, int*, int, short*)
-graphite2::TtfUtil::GlyfBox(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int&, int&, int&, int&)
-graphite2::TtfUtil::GlyfContourCount(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, unsigned long&)
-graphite2::TtfUtil::GlyfContourEndPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int*, unsigned long)
-graphite2::TtfUtil::GlyfPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int const*, unsigned long, int*, int*, bool*, unsigned long)
-graphite2::TtfUtil::HeadTableCheckSum(void const*)
-graphite2::TtfUtil::HeadTableCreateTime(void const*, unsigned int*, unsigned int*)
-graphite2::TtfUtil::HeadTableModifyTime(void const*, unsigned int*, unsigned int*)
-graphite2::TtfUtil::IsDeepComposite(unsigned short, void const*, void const*, unsigned long, long, void const*)
-graphite2::TtfUtil::IsItalic(void const*)
-graphite2::TtfUtil::LocaGlyphCount(unsigned long, void const*)
-graphite2::TtfUtil::MaxCompositeComponentCount(void const*)
-graphite2::TtfUtil::MaxCompositeLevelCount(void const*)
-graphite2::TtfUtil::PostLookup(void const*, unsigned long, void const*, char const*)
-graphite2::TtfUtil::SwapWString(void*, unsigned long)
-graphite2::TtfUtil::TableIdTag(graphite2::TtfUtil::TableId)
+graphite2::TtfUtil::GetNameInfo(void const*, int, int, int, int, unsigned long&, unsigned long&)
+graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*)
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
commit 50db59bbac75a9b1cf1bd95c07f6cafc597245f8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 21:32:22 2011 +0100
no longer need GetDLL
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 922e228..45761d1 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -75,7 +75,6 @@ public:
BasicIDEShell* GetShell() const { return m_pShell; }
void SetShell(BasicIDEShell* pShell) { m_pShell = pShell; }
BasicIDEData* GetExtraData();
- static BasicIDEDLL* GetDLL();
};
namespace
@@ -127,11 +126,6 @@ namespace BasicIDEGlobals
}
}
-BasicIDEDLL* BasicIDEDLL::GetDLL()
-{
- return theBasicIDEDLLInstance::get().get();
-}
-
IDEResId::IDEResId( sal_uInt16 nId ):
ResId( nId, *(*(BasicIDEModule**)GetAppData(SHL_IDE))->GetResMgr() )
{
More information about the Libreoffice-commits
mailing list