[Libreoffice-commits] .: 2 commits - basegfx/source bridges/source editeng/inc editeng/source framework/source sfx2/inc sfx2/source svx/inc svx/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Sep 6 00:53:00 PDT 2011
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 58 --------------
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 23 ++---
bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 4 -
editeng/inc/editeng/AccessibleParaManager.hxx | 4 -
editeng/source/accessibility/AccessibleParaManager.cxx | 5 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 38 ---------
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1
sfx2/inc/sfx2/app.hxx | 7 +
sfx2/inc/sfx2/fcontnr.hxx | 3
sfx2/source/appl/app.cxx | 21 -----
sfx2/source/appl/appdata.cxx | 53 ++++++-------
sfx2/source/appl/appdde.cxx | 47 ++++++++++-
sfx2/source/bastyp/fltfnc.cxx | 3
sfx2/source/bastyp/helper.cxx | 33 --------
sfx2/source/bastyp/progress.cxx | 3
sfx2/source/inc/appdata.hxx | 1
sfx2/source/inc/helper.hxx | 2
svx/inc/svx/AccessibleTextHelper.hxx | 4 -
svx/inc/svx/gridctrl.hxx | 11 --
svx/source/accessibility/AccessibleTextHelper.cxx | 11 --
svx/source/fmcomp/gridctrl.cxx | 64 ----------------
unusedcode.easy | 24 ------
22 files changed, 81 insertions(+), 339 deletions(-)
New commits:
commit a1ce4fb4f0dbc3c4141f510e5b2b732a24d862c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 6 08:46:33 2011 +0100
callcatcher: various unused methods
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 074cfd9..388f79f 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -178,64 +178,6 @@ namespace basegfx
return false;
}
- void lcl_skipNumber(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
- {
- bool bSignAllowed(true);
-
- while(io_rPos < nLen && lcl_isOnNumberChar(rStr, io_rPos, bSignAllowed))
- {
- bSignAllowed = false;
- ++io_rPos;
- }
- }
-
- void lcl_skipDouble(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 /*nLen*/)
- {
- sal_Unicode aChar( rStr[io_rPos] );
-
- if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
- aChar = rStr[++io_rPos];
-
- while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
- || sal_Unicode('.') == aChar)
- {
- aChar = rStr[++io_rPos];
- }
-
- if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
- {
- aChar = rStr[++io_rPos];
-
- if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
- aChar = rStr[++io_rPos];
-
- while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
- {
- aChar = rStr[++io_rPos];
- }
- }
- }
- void lcl_skipNumberAndSpacesAndCommas(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
- {
- lcl_skipNumber(io_rPos, rStr, nLen);
- lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
- }
-
- // #100617# Allow to skip doubles, too.
- void lcl_skipDoubleAndSpacesAndCommas(sal_Int32& io_rPos,
- const ::rtl::OUString& rStr,
- const sal_Int32 nLen)
- {
- lcl_skipDouble(io_rPos, rStr, nLen);
- lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
- }
-
void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr,
double fValue )
{
diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx
index b211603..a84af97 100644
--- a/editeng/inc/editeng/AccessibleParaManager.hxx
+++ b/editeng/inc/editeng/AccessibleParaManager.hxx
@@ -164,10 +164,6 @@ namespace accessibility
*/
void SetAdditionalChildStates( const VectorOfStates& rChildStates );
- /** Returns the additional accessible states for children.
- */
- const VectorOfStates& GetAdditionalChildStates() const;
-
/** Set the number of paragraphs
@param nNumPara
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index c0b95ef..3c9898f 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -78,11 +78,6 @@ namespace accessibility
maChildStates = rChildStates;
}
- const AccessibleParaManager::VectorOfStates& AccessibleParaManager::GetAdditionalChildStates() const
- {
- return maChildStates;
- }
-
void AccessibleParaManager::SetNum( sal_Int32 nNumParas )
{
if( (size_t)nNumParas < maChildren.size() )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 2b86258..247b1e5 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1784,44 +1784,6 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
aWriteLock.unlock();
}
-void ToolbarLayoutManager::implts_writeNewWindowStateData( const rtl::OUString aName, const uno::Reference< awt::XWindow >& xWindow )
-{
- bool bVisible( false );
- bool bFloating( true );
- awt::Rectangle aPos;
- awt::Size aSize;
-
- if ( xWindow.is() )
- {
- uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
- if ( xDockWindow.is() )
- bFloating = xDockWindow->isFloating();
-
- uno::Reference< awt::XWindow2 > xWindow2( xWindow, uno::UNO_QUERY );
- if( xWindow2.is() )
- {
- aPos = xWindow2->getPosSize();
- aSize = xWindow2->getOutputSize(); // always use output size for consistency
- bVisible = xWindow2->isVisible();
- }
-
- WriteGuard aWriteLock( m_aLock );
- UIElement& rUIElement = impl_findToolbar( aName );
- if ( rUIElement.m_xUIElement.is() )
- {
- rUIElement.m_bVisible = bVisible;
- rUIElement.m_bFloating = bFloating;
- if ( bFloating )
- {
- rUIElement.m_aFloatingData.m_aPos = awt::Point(aPos.X, aPos.Y);
- rUIElement.m_aFloatingData.m_aSize = aSize;
- }
- }
- implts_writeWindowStateData( rUIElement );
- aWriteLock.unlock();
- }
-}
-
/******************************************************************************
LOOKUP PART FOR TOOLBARS
******************************************************************************/
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 0667d2e..16a42b9 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -297,7 +297,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
//---------------------------------------------------------------------------------------------------------
sal_Bool implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData );
void implts_writeWindowStateData( const UIElement& rElementData );
- void implts_writeNewWindowStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow );
//---------------------------------------------------------------------------------------------------------
// members
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index c11627b..87c32f5 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -166,11 +166,15 @@ public:
static ResMgr* CreateResManager( const char *pPrefix );
// DDE
+#if defined( WNT )
long DdeExecute( const String& rCmd );
+#endif
sal_Bool InitializeDde();
const DdeService* GetDdeService() const;
DdeService* GetDdeService();
+#if defined( WNT )
void AddDdeTopic( SfxObjectShell* );
+#endif
void RemoveDdeTopic( SfxObjectShell* );
// "static" methods
@@ -261,9 +265,6 @@ public:
SAL_DLLPRIVATE const String& GetLastDir_Impl() const;
SAL_DLLPRIVATE void SetLastDir_Impl( const String & );
- SAL_DLLPRIVATE void EnterAsynchronCall_Impl();
- SAL_DLLPRIVATE bool IsInAsynchronCall_Impl() const;
- SAL_DLLPRIVATE void LeaveAsynchronCall_Impl();
SAL_DLLPRIVATE void Registrations_Impl();
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const;
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 5138466..a6187a6 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -109,12 +109,9 @@ public:
const String GetName() const;
const SfxFilter* GetAnyFilter( SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- const SfxFilter* GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4EA( const String& rEA, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4Extension( const String& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f5be7bd..49b825c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -552,27 +552,6 @@ void SfxApplication::ReleaseIndex(sal_uInt16 i)
//--------------------------------------------------------------------
-void SfxApplication::EnterAsynchronCall_Impl()
-{
- ++pAppData_Impl->nAsynchronCalls;
-}
-
-//--------------------------------------------------------------------
-
-void SfxApplication::LeaveAsynchronCall_Impl()
-{
- --pAppData_Impl->nAsynchronCalls;
-}
-
-//--------------------------------------------------------------------
-
-bool SfxApplication::IsInAsynchronCall_Impl() const
-{
- return pAppData_Impl->nAsynchronCalls > 0;
-}
-
-//--------------------------------------------------------------------
-
Window* SfxApplication::GetTopWindow() const
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() );
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 81fabb9..0c46146 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -88,33 +88,32 @@ void SfxBasicManagerCreationListener::onBasicManagerCreated( const Reference< XM
m_rAppData.OnApplicationBasicManagerCreated( _rBasicManager );
}
-SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) :
- pDdeService( 0 ),
- pDocTopics( 0 ),
- pTriggerTopic(0),
- pDdeService2(0),
- pFactArr(0),
- pTopFrames( new SfxFrameArr_Impl ),
- pInitLinkList(0),
- pMatcher( 0 ),
- pBasicResMgr( 0 ),
- pSvtResMgr( 0 ),
- pAppDispatch(NULL),
- pTemplates( 0 ),
- pPool(0),
- pDisabledSlotList( 0 ),
- pSecureURLs(0),
- pSaveOptions( 0 ),
- pUndoOptions( 0 ),
- pHelpOptions( 0 ),
- pProgress(0),
- pTemplateCommon( 0 ),
- nDocModalMode(0),
- nAutoTabPageId(0),
- nRescheduleLocks(0),
- nInReschedule(0),
- nAsynchronCalls(0),
- m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessServiceFactory()))
+SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
+ : pDdeService( 0 )
+ , pDocTopics( 0 )
+ , pTriggerTopic(0)
+ , pDdeService2(0)
+ , pFactArr(0)
+ , pTopFrames( new SfxFrameArr_Impl )
+ , pInitLinkList(0)
+ , pMatcher( 0 )
+ , pBasicResMgr( 0 )
+ , pSvtResMgr( 0 )
+ , pAppDispatch(NULL)
+ , pTemplates( 0 )
+ , pPool(0)
+ , pDisabledSlotList( 0 )
+ , pSecureURLs(0)
+ , pSaveOptions( 0 )
+ , pUndoOptions( 0 )
+ , pHelpOptions( 0 )
+ , pProgress(0)
+ , pTemplateCommon( 0 )
+ , nDocModalMode(0)
+ , nAutoTabPageId(0)
+ , nRescheduleLocks(0)
+ , nInReschedule(0)
+ , m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessServiceFactory()))
, pTbxCtrlFac(0)
, pStbCtrlFac(0)
, pViewFrames(0)
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 04f99ef..5dbbdd0 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -53,6 +53,7 @@
#include "helper.hxx"
#include <sfx2/docfile.hxx>
#include <comphelper/string.hxx>
+#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
//========================================================================
@@ -85,6 +86,41 @@ public:
};
//--------------------------------------------------------------------
+namespace
+{
+ sal_Bool lcl_IsDocument( const String& rContent )
+ {
+ using namespace com::sun::star;
+
+ sal_Bool bRet = sal_False;
+ INetURLObject aObj( rContent );
+ DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
+
+ try
+ {
+ ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
+ bRet = aCnt.isDocument();
+ }
+ catch( const ucb::CommandAbortedException& )
+ {
+ DBG_WARNING( "CommandAbortedException" );
+ }
+ catch( const ucb::IllegalIdentifierException& )
+ {
+ DBG_WARNING( "IllegalIdentifierException" );
+ }
+ catch( const ucb::ContentCreationException& )
+ {
+ DBG_WARNING( "IllegalIdentifierException" );
+ }
+ catch( const uno::Exception& )
+ {
+ DBG_ERRORFILE( "Any other exception" );
+ }
+
+ return bRet;
+ }
+}
sal_Bool ImplDdeService::MakeTopic( const String& rNm )
{
@@ -119,7 +155,7 @@ sal_Bool ImplDdeService::MakeTopic( const String& rNm )
INetURLObject aWorkPath( SvtPathOptions().GetWorkPath() );
INetURLObject aFile;
if ( aWorkPath.GetNewAbsURL( rNm, &aFile ) &&
- SfxContentHelper::IsDocument( aFile.GetMainURL( INetURLObject::NO_DECODE ) ) )
+ lcl_IsDocument( aFile.GetMainURL( INetURLObject::NO_DECODE ) ) )
{
// File exists? then try to load it:
SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -172,7 +208,6 @@ sal_Bool ImplDdeService::SysTopicExecute( const String* pStr )
{
return (sal_Bool)SFX_APP()->DdeExecute( *pStr );
}
-
#endif
class SfxDdeTriggerTopic_Impl : public DdeTopic
@@ -254,8 +289,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
return sal_False;
}
-//-------------------------------------------------------------------------
-
+#if defined( WNT )
long SfxApplication::DdeExecute
(
const String& rCmd // Expressed in our BASIC-Syntax
@@ -291,6 +325,7 @@ long SfxApplication::DdeExecute
}
return 1;
}
+#endif
long SfxObjectShell::DdeExecute
(
@@ -521,8 +556,7 @@ void SfxAppData_Impl::DeInitDDE()
DELETEZ( pDdeService );
}
-//--------------------------------------------------------------------
-
+#if defined( WNT )
void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
{
DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
@@ -552,6 +586,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
pAppData_Impl->pDocTopics->Count() );
pAppData_Impl->pDdeService->AddTopic( *pTopic );
}
+#endif
void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
{
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 0b500f1..63add66 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -167,12 +167,9 @@ const SfxFilter* SfxFilterContainer::aMethod( ArgType aArg, SfxFilterFlags nMust
return aMatch.aMethod( aArg, nMust, nDont ); \
}
-IMPL_FORWARD_LOOP( GetFilter4Mime, const String&, rMime );
-IMPL_FORWARD_LOOP( GetFilter4ClipBoardId, sal_uInt32, nId );
IMPL_FORWARD_LOOP( GetFilter4EA, const String&, rEA );
IMPL_FORWARD_LOOP( GetFilter4Extension, const String&, rExt );
IMPL_FORWARD_LOOP( GetFilter4FilterName, const String&, rName );
-IMPL_FORWARD_LOOP( GetFilter4UIName, const String&, rName );
const SfxFilter* SfxFilterContainer::GetAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) const
{
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index e00fbda..ba762ff 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -88,39 +88,6 @@ void AppendDateTime_Impl( const util::DateTime rDT,
// -----------------------------------------------------------------------
-sal_Bool SfxContentHelper::IsDocument( const String& rContent )
-{
- sal_Bool bRet = sal_False;
- INetURLObject aObj( rContent );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
-
- try
- {
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- bRet = aCnt.isDocument();
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_WARNING( "CommandAbortedException" );
- }
- catch( const ucb::IllegalIdentifierException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const ucb::ContentCreationException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- }
-
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
{
StringList_Impl* pList = NULL;
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 2ea27dc..c1768d1 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -529,9 +529,6 @@ void SfxProgress::Reschedule()
SfxApplication* pApp = SFX_APP();
if ( pImp->bLocked && 0 == pApp->Get_Impl()->nRescheduleLocks )
{
- DBG_ASSERTWARNING( pApp->IsInAsynchronCall_Impl(),
- "Reschedule in synchron-call-stack" );
-
SfxAppData_Impl *pAppData = pApp->Get_Impl();
++pAppData->nInReschedule;
Application::Reschedule();
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 5e31a7b..b807f5c 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -138,7 +138,6 @@ public:
sal_uInt16 nAutoTabPageId;
sal_uInt16 nRescheduleLocks;
sal_uInt16 nInReschedule;
- sal_uInt16 nAsynchronCalls;
rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow;
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 36b8ee9..85a3b27 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -42,8 +42,6 @@
class SfxContentHelper
{
public:
- static sal_Bool IsDocument( const String& rContent );
-
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
GetResultSet( const String& rURL );
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx
index 4110468..6f15d58 100644
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/svx/inc/svx/AccessibleTextHelper.hxx
@@ -279,10 +279,6 @@ namespace accessibility
*/
void SetAdditionalChildStates( const VectorOfStates& rChildStates );
- /** Returns the additional accessible states for children.
- */
- const VectorOfStates& GetAdditionalChildStates() const;
-
/** Update the visible children
@attention Might fire state change events, therefore,
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index cbdba40..e27fa3e 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -444,9 +444,6 @@ public:
// to update, to insert or to restore, the according options are ignored. If the grid isn't
// connected to a data source, all options except OPT_READONLY are ignored.
- void SetMultiSelection(sal_Bool bMulti);
- sal_Bool GetMultiSelection() const {return m_bMultiSelection;}
-
const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;}
// positioning
@@ -478,18 +475,11 @@ public:
sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; }
void setDisplaySynchron(sal_Bool bSync);
- void forceSyncDisplay();
// when set to sal_False, the display is no longer in sync with the current cursor position
// (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition)
// when using this, you should know what you are doing, because for example entering data
// in a row in the display that is not in sync with the position of the cursor can be very critical
- sal_Bool isForcedROController() const { return m_bForceROController; }
- void forceROController(sal_Bool bForce);
- // when set to sal_True, the GridControl always has a ::com::sun::star::frame::Controler which is
- // read-only though. Additionally, the edit row of the controller is configured in a way
- // that its selection stays displayed on focus loss.
-
const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;}
void SetStateProvider(const Link& rProvider) { m_aMasterStateProvider = rProvider; }
@@ -512,7 +502,6 @@ public:
@seealso EnableNavigationBar
*/
void ForceHideScrollbars( sal_Bool _bForce );
- sal_Bool IsForceHideScrollbars() const;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
getServiceManager() const { return m_xServiceFactory; }
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index fe80bc2..11288f3 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -155,7 +155,6 @@ namespace accessibility
}
void SetAdditionalChildStates( const VectorOfStates& rChildStates );
- const VectorOfStates& GetAdditionalChildStates() const;
sal_Bool IsSelected() const;
@@ -432,11 +431,6 @@ namespace accessibility
maParaManager.SetAdditionalChildStates( rChildStates );
}
- const AccessibleTextHelper_Impl::VectorOfStates& AccessibleTextHelper_Impl::GetAdditionalChildStates() const
- {
- return maParaManager.GetAdditionalChildStates();
- }
-
void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
@@ -1915,11 +1909,6 @@ namespace accessibility
mpImpl->SetAdditionalChildStates( rChildStates );
}
- const AccessibleTextHelper::VectorOfStates& AccessibleTextHelper::GetAdditionalChildStates() const
- {
- return mpImpl->GetAdditionalChildStates();
- }
-
void AccessibleTextHelper::UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException))
{
#ifdef DBG_UTIL
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index a8c1a88..f74fdff 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1366,12 +1366,6 @@ void DbGridControl::ForceHideScrollbars( sal_Bool _bForce )
}
//------------------------------------------------------------------------------
-sal_Bool DbGridControl::IsForceHideScrollbars() const
-{
- return m_bHideScrollbars;
-}
-
-//------------------------------------------------------------------------------
void DbGridControl::EnablePermanentCursor(sal_Bool bEnable)
{
if (IsPermanentCursorEnabled() == bEnable)
@@ -1416,18 +1410,6 @@ void DbGridControl::refreshController(sal_uInt16 _nColId, GrantControlAccess /*_
}
//------------------------------------------------------------------------------
-void DbGridControl::SetMultiSelection(sal_Bool bMulti)
-{
- m_bMultiSelection = bMulti;
- if (m_bMultiSelection)
- m_nMode |= BROWSER_MULTISELECTION;
- else
- m_nMode &= ~BROWSER_MULTISELECTION;
-
- SetMode(m_nMode);
-}
-
-//------------------------------------------------------------------------------
void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt16 nOpts)
{
if (!_xCursor.is() && !m_pDataCursor)
@@ -2252,52 +2234,6 @@ void DbGridControl::setDisplaySynchron(sal_Bool bSync)
}
//------------------------------------------------------------------------------
-void DbGridControl::forceSyncDisplay()
-{
- sal_Bool bOld = getDisplaySynchron();
- setDisplaySynchron(sal_True);
- if (!bOld)
- setDisplaySynchron(bOld);
-}
-
-//------------------------------------------------------------------------------
-void DbGridControl::forceROController(sal_Bool bForce)
-{
- if (m_bForceROController == bForce)
- return;
-
- m_bForceROController = bForce;
- // alle Columns durchgehen und denen Bescheid geben
- for ( size_t i=0; i < m_aColumns.size(); ++i )
- {
- DbGridColumn* pColumn = m_aColumns[ i ];
- if (!pColumn)
- continue;
-
- CellController* pReturn = &pColumn->GetController();
- if (!pReturn)
- continue;
-
- // nur wenn es eine Edit-Zeile ist, kann ich ihr das forced read-only mitgeben
- if (!pReturn->ISA(EditCellController) && !pReturn->ISA(SpinCellController))
- continue;
-
- Edit& rEdit = (Edit&)pReturn->GetWindow();
- rEdit.SetReadOnly(m_bForceROController);
- if (m_bForceROController)
- rEdit.SetStyle(rEdit.GetStyle() | WB_NOHIDESELECTION);
- else
- rEdit.SetStyle(rEdit.GetStyle() & ~WB_NOHIDESELECTION);
- }
-
- // die aktive Zelle erneut aktivieren, da sich ihr Controller geaendert haben kann
- if (IsEditing())
- DeactivateCell();
- ActivateCell();
-}
-
-
-//------------------------------------------------------------------------------
void DbGridControl::AdjustDataSource(sal_Bool bFull)
{
TRACE_RANGE("DbGridControl::AdjustDataSource");
diff --git a/unusedcode.easy b/unusedcode.easy
index 16c3bbe..2825fc2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -94,13 +94,11 @@ DateBox::RemoveDate(Date const&)
DateFormatter::GetRealDate() const
DateFormatter::IsDateModified() const
DateTime::MakeDateTimeFromSec(Date const&, unsigned long)
-DbGridControl::IsForceHideScrollbars() const
-DbGridControl::SetMultiSelection(unsigned char)
-DbGridControl::forceROController(unsigned char)
-DbGridControl::forceSyncDisplay()
DdeGetPutItem::DdeGetPutItem(DdeItem const&)
DdeService::AddFormat(unsigned long)
+DdeService::AddTopic(DdeTopic const&)
DdeService::DdeService(String const&)
+DdeTopic::DdeTopic(String const&)
DdeTopic::RemoveItem(DdeItem const&)
DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const&)
@@ -751,23 +749,15 @@ SetOfByte::GetClearCount() const
SetOfByte::GetSetBit(unsigned short) const
SetOfByte::IsFull() const
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SfxApplication::AddDdeTopic(SfxObjectShell*)
-SfxApplication::DdeExecute(String const&)
-SfxApplication::EnterAsynchronCall_Impl()
-SfxApplication::LeaveAsynchronCall_Impl()
SfxApplication::Main()
SfxBasicManagerHolder::isAnyContainerModified() const
SfxBrushItemLink::Set(SfxBrushItemLink*)
SfxChildWindow::SetPosSizePixel(Point const&, Size&)
SfxChildWindowContext::GetAlignment() const
-SfxContentHelper::IsDocument(String const&)
SfxControllerItem::GetCoreMetric() const
SfxControllerItem::UpdateSlot()
SfxDateTimeItem::SfxDateTimeItem(unsigned short)
SfxDockingWrapper::GetChildWindowId()
-SfxFilterContainer::GetFilter4ClipBoardId(unsigned int, unsigned long, unsigned long) const
-SfxFilterContainer::GetFilter4Mime(String const&, unsigned long, unsigned long) const
-SfxFilterContainer::GetFilter4UIName(String const&, unsigned long, unsigned long) const
SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
SfxFlagItem::SetFlag(unsigned char, int)
SfxFoundCacheArr_Impl::Insert(SfxFoundCacheArr_Impl const*, unsigned short, unsigned short)
@@ -1606,7 +1596,6 @@ accessibility::AccessibleStaticTextBase::GetParagraphCount() const
accessibility::AccessibleStaticTextBase::GetParagraphIndex() const
accessibility::AccessibleTextEventQueue::Append(SfxHint const&)
accessibility::AccessibleTextEventQueue::Append(SfxSimpleHint const&)
-accessibility::AccessibleTextHelper::GetAdditionalChildStates() const
accessibility::ChildrenManagerImpl::GetChild(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&)
accessibility::ChildrenManagerImpl::GetChildIndex(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) const
accessibility::DGColorNameLookUp::~DGColorNameLookUp()
@@ -1714,8 +1703,6 @@ basegfx::testtools::Plotter::Plotter(std::basic_ostream<char, std::char_traits<c
basegfx::testtools::Plotter::plot(basegfx::B2DPolyPolygon const&)
basegfx::testtools::Plotter::plot(basegfx::B2DRange const&)
basegfx::testtools::Plotter::~Plotter()
-basegfx::tools::(anonymous namespace)::lcl_skipDoubleAndSpacesAndCommas(int&, rtl::OUString const&, int)
-basegfx::tools::(anonymous namespace)::lcl_skipNumberAndSpacesAndCommas(int&, rtl::OUString const&, int)
basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DPolygon const&)
basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DRange const&)
basegfx::tools::B2DClipState::intersectClipState(basegfx::tools::B2DClipState const&)
@@ -2150,7 +2137,6 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&, unsigned short)
binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
-binfilter::bf_OfficeWrapper::impl_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
cairocanvas::CanvasHelper::flush() const
cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
@@ -2400,10 +2386,8 @@ framework::ShareableMutex::getShareableOslMutex()
framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short)
framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
framework::ToolBarManager::LinkStubHighlight(void*, void*)
-framework::ToolbarLayoutManager::implts_writeNewWindowStateData(rtl::OUString, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&)
framework::UIConfigElementWrapperBase::dispose()
framework::UIElementWrapperBase::dispose()
-gcc3::RTTI::~RTTI()
graphite2::Segment::append(graphite2::Segment const&)
graphite2::Slot::update(int, int, graphite2::Position&)
graphite2::TtfUtil::GetNameInfo(void const*, int, int, int, int, unsigned long&, unsigned long&)
@@ -3080,10 +3064,6 @@ utl::OConfigurationValueContainer::getServiceFactory() const
utl::OConfigurationValueContainer::registerNullValueExchangeLocation(char const*, com::sun::star::uno::Any*)
utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const
vcl::Clipboard_getSupportedServiceNames()
-vcl::I18NStatus::addChoice(String const&, void*)
-vcl::I18NStatus::clearChoices()
-vcl::I18NStatus::getStatusText() const
-vcl::I18NStatus::toTop() const
vcl::I18nHelper::GetDate(Date const&) const
vcl::I18nHelper::getLocale() const
vcl::LabeledElement::setLabel(boost::shared_ptr<vcl::WindowArranger> const&)
commit ebded7f2f5d19489811ee4ed2a0da9d09371a5ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 5 22:47:15 2011 +0100
what happens if we try and do it right ?
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index e841bc0..74b2b73 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -37,6 +37,7 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
@@ -230,6 +231,11 @@ static void deleteException( void * pExc )
}
}
+namespace
+{
+ struct theRTTI : public rtl::Static<RTTI, theRTTI> {};
+}
+
//==================================================================================================
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
@@ -262,21 +268,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
// destruct uno exception
::uno_any_destruct( pUnoExc, 0 );
// avoiding locked counts
- static RTTI * s_rtti = 0;
- if (! s_rtti)
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if (! s_rtti)
- {
-#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
-#else
- static RTTI rtti_data;
- s_rtti = &rtti_data;
-#endif
- }
- }
- rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
+ static RTTI &rRTTI = theRTTI::get();
+ rtti = rRTTI.getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
TYPELIB_DANGER_RELEASE( pTypeDescr );
OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
if (! rtti)
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index f8b6d8e..acc590b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -44,10 +44,6 @@ ENABLE_EXCEPTIONS=TRUE
"$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3" || \
"$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYXgcc3" \
-.IF "$(cppu_no_leak)" == ""
-CFLAGS += -DLEAK_STATIC_DATA
-.ENDIF
-
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
More information about the Libreoffice-commits
mailing list