[Libreoffice-commits] .: 7 commits - basctl/inc basctl/source cui/source editeng/source lotuswordpro/source sc/source sfx2/inc sfx2/source smoketestdoc/data svtools/inc svtools/source sw/inc tools/inc tools/source tools/workben unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 24 03:22:36 PDT 2011
basctl/inc/iderdll.hxx | 22 +---
basctl/source/basicide/basicbox.cxx | 6 -
basctl/source/basicide/baside2.cxx | 4
basctl/source/basicide/baside2b.cxx | 6 -
basctl/source/basicide/baside3.cxx | 14 +-
basctl/source/basicide/basides1.cxx | 10 -
basctl/source/basicide/basidesh.cxx | 25 ++--
basctl/source/basicide/basobj2.cxx | 12 +-
basctl/source/basicide/basobj3.cxx | 31 ++---
basctl/source/basicide/bastypes.cxx | 10 -
basctl/source/basicide/brkdlg.cxx | 4
basctl/source/basicide/iderdll.cxx | 98 ++++++++++++++----
basctl/source/basicide/localizationmgr.cxx | 2
basctl/source/basicide/macrodlg.cxx | 18 +--
basctl/source/basicide/moduldl2.cxx | 26 ++--
basctl/source/basicide/moduldlg.cxx | 14 +-
basctl/source/basicide/objdlg.cxx | 12 +-
basctl/source/basicide/unomodel.cxx | 2
basctl/source/dlged/dlged.cxx | 4
basctl/source/dlged/managelang.cxx | 2
cui/source/customize/cfg.cxx | 23 ++--
cui/source/customize/selector.cxx | 8 -
cui/source/options/optgdlg.cxx | 6 -
editeng/source/editeng/impedit.hxx | 10 -
editeng/source/editeng/impedit3.cxx | 41 -------
lotuswordpro/source/filter/lwpfilter.cxx | 9 -
lotuswordpro/source/filter/lwpfilter.hxx | 2
sc/source/filter/inc/lotattr.hxx | 2
sc/source/filter/lotus/lotattr.cxx | 5
sfx2/inc/bitset.hxx | 2
sfx2/inc/sfx2/mnumgr.hxx | 15 --
sfx2/source/bastyp/bitset.cxx | 54 ----------
sfx2/source/menu/mnumgr.cxx | 76 --------------
smoketestdoc/data/Global.xml | 20 ++-
smoketestdoc/data/OptionsDlg.xml | 11 +-
smoketestdoc/data/Test_10er.xml | 39 +++++++
smoketestdoc/data/content.xml | 1
svtools/inc/svtools/FilterConfigItem.hxx | 3
svtools/source/filter/FilterConfigCache.cxx | 10 -
svtools/source/filter/FilterConfigCache.hxx | 2
svtools/source/filter/FilterConfigItem.cxx | 95 -----------------
svtools/source/filter/filter.cxx | 1
sw/inc/swdll.hxx | 2
tools/inc/tools/contnr.hxx | 5
tools/inc/tools/dynary.hxx | 8 -
tools/inc/tools/list.hxx | 6 -
tools/inc/tools/ref.hxx | 21 ---
tools/inc/tools/stack.hxx | 5
tools/inc/tools/urlobj.hxx | 5
tools/source/fsys/urlobj.cxx | 6 -
tools/source/memtools/contnr.cxx | 150 ----------------------------
tools/workben/urltest.cxx | 1
unusedcode.easy | 23 ----
53 files changed, 263 insertions(+), 726 deletions(-)
New commits:
commit a47d863ddc9c7a9e3dc54264a8ddcdedd8035636
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 11:13:33 2011 +0100
hide this class
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 2b89991..04e0a38 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -29,31 +29,19 @@
#ifndef _IDERDLL_HXX
#define _IDERDLL_HXX
-namespace BasicIDEGlobals
-{
- void ensure();
-}
-
class BasicIDEShell;
class BasicIDEData;
-class BasicIDEDLL
+namespace BasicIDEGlobals
{
- friend class BasicIDEShell;
-
- BasicIDEShell* pShell;
- BasicIDEData* pExtraData;
-
-public:
- BasicIDEDLL();
- ~BasicIDEDLL();
+ void ensure();
- BasicIDEShell* GetShell() const { return pShell; }
- BasicIDEData* GetExtraData();
- static BasicIDEDLL* GetDLL();
-};
+ void ShellCreated(BasicIDEShell* pShell);
+ BasicIDEShell* GetShell();
+ void ShellDestroyed(BasicIDEShell* pShell);
-#define IDE_DLL() BasicIDEDLL::GetDLL()
+ BasicIDEData* GetExtraData();
+}
#endif //_IDERDLL_HXX
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 9dd874b..2a5a7ca 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -335,7 +335,7 @@ void BasicLibBox::NotifyIDE()
SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::makeAny( aDocument.getDocumentOrNull() ) );
String aLibName = pEntry->GetLibName();
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if ( pDispatcher )
@@ -426,7 +426,7 @@ void BasicLanguageBox::FillBox()
m_sCurrentText = GetSelectEntry();
ClearBox();
- LocalizationMgr* pCurMgr = IDE_DLL()->GetShell()->GetCurLocalizationMgr();
+ LocalizationMgr* pCurMgr = BasicIDEGlobals::GetShell()->GetCurLocalizationMgr();
if ( pCurMgr->isLibraryLocalized() )
{
Enable();
@@ -487,7 +487,7 @@ void BasicLanguageBox::SetLanguage()
{
LanguageEntry* pEntry = (LanguageEntry*)GetEntryData( GetSelectEntryPos() );
if ( pEntry )
- IDE_DLL()->GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale );
+ BasicIDEGlobals::GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale );
}
void BasicLanguageBox::Select()
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 745431a..98e1b74 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -278,7 +278,7 @@ void ModulWindow::CheckCompileBasic()
{
sal_Bool bDone = sal_False;
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
pIDEShell->GetViewFrame()->GetWindow().EnterWait();
if( bModified )
@@ -1196,7 +1196,7 @@ sal_Bool ModulWindow::IsModified()
void ModulWindow::GoOnTop()
{
- IDE_DLL()->GetShell()->GetViewFrame()->ToTop();
+ BasicIDEGlobals::GetShell()->GetViewFrame()->ToTop();
}
String ModulWindow::GetSbModuleName()
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 5a1d41b..42aadbf 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -568,7 +568,7 @@ void EditorWindow::CreateEditEngine()
// nLines*4: SetText+Formatting+DoHighlight+Formatting
// it could be cut down on one formatting but you would wait even longer
// for the text then if the source code is long...
- pProgress = new ProgressInfo( IDE_DLL()->GetShell()->GetViewFrame()->GetObjectShell(), String( IDEResId( RID_STR_GENERATESOURCE ) ), nLines*4 );
+ pProgress = new ProgressInfo( BasicIDEGlobals::GetShell()->GetViewFrame()->GetObjectShell(), String( IDEResId( RID_STR_GENERATESOURCE ) ), nLines*4 );
setTextEngineText( pEditEngine, aOUSource );
pEditView->SetStartDocPos( Point( 0, 0 ) );
@@ -897,7 +897,7 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, sal_Bool bInserted
void EditorWindow::CreateProgress( const String& rText, sal_uLong nRange )
{
DBG_ASSERT( !pProgress, "ProgressInfo existiert schon" );
- pProgress = new ProgressInfo( IDE_DLL()->GetShell()->GetViewFrame()->GetObjectShell(), rText, nRange );
+ pProgress = new ProgressInfo( BasicIDEGlobals::GetShell()->GetViewFrame()->GetObjectShell(), rText, nRange );
}
void EditorWindow::DestroyProgress()
@@ -1390,7 +1390,7 @@ IMPL_LINK_INLINE_START( WatchWindow, ButtonHdl, ImageButton *, pButton )
{
if ( pButton == &aRemoveWatchButton )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 833cc15..ebfdc5e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -201,7 +201,7 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
{
if( rKEvt.GetKeyCode() == KEY_BACKSPACE )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -233,7 +233,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
else if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if ( pDispatcher )
@@ -328,7 +328,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_DIALOG_TESTMODE:
{
// is the IDE still active?
- if( IDE_DLL()->GetShell()->GetFrame() )
+ if( BasicIDEGlobals::GetShell()->GetFrame() )
{
rSet.Put( SfxBoolItem( SID_DIALOG_TESTMODE,
(pEditor->GetMode() == DLGED_TEST) ? sal_True : sal_False) );
@@ -394,7 +394,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_SHOW_PROPERTYBROWSER:
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView()->AreObjectsMarked() )
rSet.DisableItem( nWh );
@@ -645,7 +645,7 @@ sal_Bool DialogWindow::RenameDialog( const String& rNewName )
void DialogWindow::DisableBrowser()
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : NULL;
if( pChildWin )
@@ -654,7 +654,7 @@ void DialogWindow::DisableBrowser()
void DialogWindow::UpdateBrowser()
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : NULL;
if( pChildWin )
@@ -1043,7 +1043,7 @@ sal_Bool implImportDialog( Window* pWin, const String& rCurPath, const ScriptDoc
}
}
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if( pIDEShell == NULL )
{
OSL_ASSERT( pIDEShell != NULL );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 24beb73..d693d6b 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -145,7 +145,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
if ( rItem.ISA( SvxSearchItem ) )
{
// memorize item because of the adjustments...
- IDE_DLL()->GetExtraData()->SetSearchItem( (const SvxSearchItem&)rItem );
+ BasicIDEGlobals::GetExtraData()->SetSearchItem( (const SvxSearchItem&)rItem );
sal_uInt16 nFound = 0;
sal_Bool bCanceled = sal_False;
if ( ((const SvxSearchItem&)rItem).GetCommand() == SVX_SEARCHCMD_REPLACE_ALL )
@@ -915,7 +915,7 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
case SID_SEARCH_ITEM:
{
String aSelected = GetSelectionText( sal_True );
- SvxSearchItem& rItem = IDE_DLL()->GetExtraData()->GetSearchItem();
+ SvxSearchItem& rItem = BasicIDEGlobals::GetExtraData()->GetSearchItem();
rItem.SetSearchString( aSelected );
rSet.Put( rItem );
}
@@ -1089,7 +1089,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, sal_Bool bUpdateTabBar
if ( bRememberAsCurrent )
{
- BasicIDEData* pData = IDE_DLL()->GetExtraData();
+ BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
{
sal_uInt16 nCurrentType = pCurWin->IsA( TYPE( ModulWindow ) ) ? BASICIDE_TYPE_MODULE : BASICIDE_TYPE_DIALOG;
@@ -1103,7 +1103,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, sal_Bool bUpdateTabBar
pCurWin->Init();
- if ( !IDE_DLL()->GetExtraData()->ShellInCriticalSection() )
+ if ( !BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() )
{
Window* pFrameWindow = &GetViewFrame()->GetWindow();
Window* pFocusWindow = Application::GetFocusWindow();
@@ -1249,7 +1249,7 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
if ( nWaitCount )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
for ( sal_uInt16 n = 0; n < nWaitCount; n++ )
pIDEShell->GetViewFrame()->GetWindow().EnterWait();
}
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index c8c21c8..0b969de 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -204,7 +204,7 @@ void BasicIDEShell::Init()
SvxSearchDialogWrapper::RegisterChildWindow( sal_False );
- IDE_DLL()->GetExtraData()->ShellInCriticalSection() = sal_True;
+ BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() = sal_True;
SetName( String( RTL_CONSTASCII_USTRINGPARAM( "BasicIDE" ) ) );
SetHelpId( SVX_INTERFACE_BASIDE_VIEWSH );
@@ -233,10 +233,9 @@ void BasicIDEShell::Init()
SetCurLib( ScriptDocument::getApplicationScriptDocument(), String::CreateFromAscii( "Standard" ), false, false );
- if ( IDE_DLL() && IDE_DLL()->pShell == NULL )
- IDE_DLL()->pShell = this;
+ BasicIDEGlobals::ShellCreated(this);
- IDE_DLL()->GetExtraData()->ShellInCriticalSection() = sal_False;
+ BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() = sal_False;
// It's enough to create the controller ...
// It will be public by using magic :-)
@@ -253,11 +252,11 @@ BasicIDEShell::~BasicIDEShell()
{
m_aNotifier.dispose();
- if ( IDE_DLL() && IDE_DLL()->pShell == this )
- IDE_DLL()->pShell = NULL;
+ BasicIDEGlobals::ShellDestroyed(this);
-
- IDE_DLL()->GetExtraData()->ShellInCriticalSection() = sal_True;
+ // Damit bei einem Basic-Fehler beim Speichern die Shell nicht sofort
+ // wieder hoch kommt:
+ BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() = sal_True;
SetWindow( 0 );
SetCurWindow( 0 );
@@ -281,7 +280,7 @@ BasicIDEShell::~BasicIDEShell()
if ( pListener )
pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
- IDE_DLL()->GetExtraData()->ShellInCriticalSection() = sal_False;
+ BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() = sal_False;
GnBasicIDEShellCount--;
}
@@ -352,7 +351,7 @@ void BasicIDEShell::onDocumentClosed( const ScriptDocument& _rDocument )
}
// remove lib info
- BasicIDEData* pData = IDE_DLL()->GetExtraData();
+ BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
pData->GetLibInfos().RemoveInfoFor( _rDocument );
@@ -602,7 +601,7 @@ void BasicIDEShell::ShowObjectDialog( sal_Bool bShow, sal_Bool bCreateOrDestroy
void BasicIDEShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&,
const SfxHint& rHint, const TypeId& )
{
- if ( IDE_DLL()->GetShell() )
+ if ( BasicIDEGlobals::GetShell() )
{
if ( rHint.IsA( TYPE( SfxSimpleHint ) ) )
{
@@ -788,7 +787,7 @@ void BasicIDEShell::UpdateWindows()
if ( !bProtected )
{
LibInfoItem* pLibInfoItem = 0;
- BasicIDEData* pData = IDE_DLL()->GetExtraData();
+ BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
pLibInfoItem = pData->GetLibInfos().GetInfo( LibInfoKey( *doc, aLibName ) );
@@ -934,7 +933,7 @@ void BasicIDEShell::InvalidateBasicIDESlots()
{
// only those that have an optic effect...
- if ( IDE_DLL()->GetShell() )
+ if ( BasicIDEGlobals::GetShell() )
{
SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
if ( pBindings )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index ef79e58..7954b09 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -89,7 +89,7 @@ void Organize( sal_Int16 tabId )
BasicIDEGlobals::ensure();
BasicEntryDescriptor aDesc;
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
IDEBaseWindow* pCurWin = pIDEShell->GetCurWindow();
@@ -195,7 +195,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
if ( !rDocument.renameModule( rLibName, rOldName, rNewName ) )
return false;
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
IDEBaseWindow* pWin = pIDEShell->FindWindow( rDocument, rLibName, rNewName, BASICIDE_TYPE_MODULE, sal_True );
@@ -276,7 +276,7 @@ namespace
BasicIDEGlobals::ensure();
- IDE_DLL()->GetExtraData()->ChoosingMacro() = sal_True;
+ BasicIDEGlobals::GetExtraData()->ChoosingMacro() = sal_True;
String aScriptURL;
sal_Bool bError = sal_False;
@@ -292,7 +292,7 @@ namespace
short nRetValue = pChooser->Execute();
- IDE_DLL()->GetExtraData()->ChoosingMacro() = sal_False;
+ BasicIDEGlobals::GetExtraData()->ChoosingMacro() = sal_False;
switch ( nRetValue )
{
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index c076013..f01a67e 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -81,7 +81,7 @@ namespace BasicIDE
SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -197,7 +197,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
return false;
}
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
IDEBaseWindow* pWin = pIDEShell ? pIDEShell->FindWindow( rDocument, rLibName, rOldName, BASICIDE_TYPE_DIALOG, sal_False ) : NULL;
Reference< XNameContainer > xExistingDialog;
if ( pWin )
@@ -235,7 +235,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
bool RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
DialogWindow* pDlgWin = pIDEShell->FindDlgWin( rDocument, rLibName, rDlgName, sal_False );
@@ -297,7 +297,7 @@ void MarkDocumentModified( const ScriptDocument& rDocument )
// does not have to come from a document...
if ( rDocument.isApplication() )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
pIDEShell->SetAppBasicModified();
}
@@ -314,8 +314,8 @@ void MarkDocumentModified( const ScriptDocument& rDocument )
pBindings->Update( SID_SAVEDOC );
}
-
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ // Objectcatalog updaten...
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
ObjectCatalog* pObjCatalog = pIDEShell ? pIDEShell->GetObjectCatalog() : 0;
if ( pObjCatalog )
pObjCatalog->UpdateEntries();
@@ -335,7 +335,7 @@ void RunMethod( SbMethod* pMethod )
void StopBasic()
{
StarBASIC::Stop();
- BasicIDEShell* pShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pShell = BasicIDEGlobals::GetShell();
if ( pShell )
{
IDEWindowTable& rWindows = pShell->GetIDEWindowTable();
@@ -372,7 +372,7 @@ void BasicStopped( sal_Bool* pbAppWindowDisabled,
*ppSWLockViewCount = 0;
// AppWait ?
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if( pIDEShell )
{
sal_uInt16 nWait = 0;
@@ -429,9 +429,9 @@ long HandleBasicError( StarBASIC* pBasic )
BasicIDE::BasicStopped();
// no error output during macro choosing
- if ( IDE_DLL()->GetExtraData()->ChoosingMacro() )
+ if ( BasicIDEGlobals::GetExtraData()->ChoosingMacro() )
return 1;
- if ( IDE_DLL()->GetExtraData()->ShellInCriticalSection() )
+ if ( BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() )
return 2;
long nRet = 0;
@@ -460,13 +460,13 @@ long HandleBasicError( StarBASIC* pBasic )
if ( !bProtected )
{
- pIDEShell = IDE_DLL()->GetShell();
+ pIDEShell = BasicIDEGlobals::GetShell();
if ( !pIDEShell )
{
SfxAllItemSet aArgs( SFX_APP()->GetPool() );
SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
SFX_APP()->ExecuteSlot( aRequest );
- pIDEShell = IDE_DLL()->GetShell();
+ pIDEShell = BasicIDEGlobals::GetShell();
}
}
}
@@ -487,10 +487,9 @@ SfxBindings* GetBindingsPtr()
SfxBindings* pBindings = NULL;
SfxViewFrame* pFrame = NULL;
- BasicIDEDLL* pIDEDLL = IDE_DLL();
- if ( pIDEDLL && pIDEDLL->GetShell() )
+ if ( BasicIDEGlobals::GetShell() )
{
- pFrame = pIDEDLL->GetShell()->GetViewFrame();
+ pFrame = BasicIDEGlobals::GetShell()->GetViewFrame();
}
else
{
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 4d10d02..8546d92 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -161,7 +161,7 @@ long IDEBaseWindow::Notify( NotifyEvent& rNEvt )
{
if ( aCode.IsMod1() )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
pIDEShell->NextPage( nCode == KEY_PAGEUP );
@@ -557,7 +557,7 @@ void BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeft() && ( rMEvt.GetClicks() == 2 ) && !IsInEditMode() )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -598,7 +598,7 @@ void BasicIDETabBar::Command( const CommandEvent& rCEvt )
aPopup.EnableItem(SID_BASICIDE_MODULEDLG, false);
}
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
ScriptDocument aDocument( pIDEShell->GetCurDocument() );
@@ -663,7 +663,7 @@ void BasicIDETabBar::EndRenaming()
{
SfxUInt16Item aID( SID_BASICIDE_ARG_TABID, GetEditPageId() );
SfxStringItem aNewName( SID_BASICIDE_ARG_MODULENAME, GetEditText() );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -677,7 +677,7 @@ void BasicIDETabBar::EndRenaming()
void BasicIDETabBar::Sort()
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
IDEWindowTable& aIDEWindowTable = pIDEShell->GetIDEWindowTable();
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 2cdff12..0c066a2 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -207,7 +207,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
String aEntryStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) );
aEntryStr += String::CreateFromInt32( pBrk->nLine );
aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -234,7 +234,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
if ( nEntry && !( nEntry < aComboBox.GetEntryCount() ) )
nEntry--;
aComboBox.SetText( aComboBox.GetEntry( nEntry ) );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 6de1ba9..922e228 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -63,6 +63,21 @@ using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+class BasicIDEDLL
+{
+ BasicIDEShell* m_pShell;
+ BasicIDEData* m_pExtraData;
+
+public:
+ BasicIDEDLL();
+ ~BasicIDEDLL();
+
+ BasicIDEShell* GetShell() const { return m_pShell; }
+ void SetShell(BasicIDEShell* pShell) { m_pShell = pShell; }
+ BasicIDEData* GetExtraData();
+ static BasicIDEDLL* GetDLL();
+};
+
namespace
{
//Holds a BasicIDEDLL and release it on exit, or dispose of the
@@ -84,6 +99,32 @@ namespace BasicIDEGlobals
{
theBasicIDEDLLInstance::get();
}
+
+ BasicIDEShell* GetShell()
+ {
+ BasicIDEDLL *pIDEGlobals = theBasicIDEDLLInstance::get().get();
+ return pIDEGlobals ? pIDEGlobals->GetShell() : NULL;
+ }
+
+ void ShellCreated(BasicIDEShell* pShell)
+ {
+ BasicIDEDLL *pIDEGlobals = theBasicIDEDLLInstance::get().get();
+ if (pIDEGlobals && pIDEGlobals->GetShell() == pShell)
+ pIDEGlobals->SetShell(pShell);
+ }
+
+ void ShellDestroyed(BasicIDEShell* pShell)
+ {
+ BasicIDEDLL *pIDEGlobals = theBasicIDEDLLInstance::get().get();
+ if (pIDEGlobals && pIDEGlobals->GetShell() == pShell)
+ pIDEGlobals->SetShell(NULL);
+ }
+
+ BasicIDEData* GetExtraData()
+ {
+ BasicIDEDLL *pIDEGlobals = theBasicIDEDLLInstance::get().get();
+ return pIDEGlobals ? pIDEGlobals->GetExtraData() : NULL;
+ }
}
BasicIDEDLL* BasicIDEDLL::GetDLL()
@@ -98,15 +139,15 @@ IDEResId::IDEResId( sal_uInt16 nId ):
BasicIDEDLL::~BasicIDEDLL()
{
- delete pExtraData;
+ delete m_pExtraData;
#if 0
*(BasicIDEDLL**)GetAppData(SHL_IDE) = NULL;
#endif
}
BasicIDEDLL::BasicIDEDLL()
- : pShell(0)
- , pExtraData(0)
+ : m_pShell(0)
+ , m_pExtraData(0)
{
SfxObjectFactory* pFact = &BasicDocShell::Factory();
(void)pFact;
@@ -132,9 +173,9 @@ BasicIDEDLL::BasicIDEDLL()
BasicIDEData* BasicIDEDLL::GetExtraData()
{
- if ( !pExtraData )
- pExtraData = new BasicIDEData;
- return pExtraData;
+ if (!m_pExtraData)
+ m_pExtraData = new BasicIDEData;
+ return m_pExtraData;
}
BasicIDEData::BasicIDEData() : aObjCatPos( INVPOSITION, INVPOSITION )
@@ -177,7 +218,7 @@ void BasicIDEData::SetSearchItem( const SvxSearchItem& rItem )
IMPL_LINK( BasicIDEData, GlobalBasicBreakHdl, StarBASIC *, pBasic )
{
long nRet = 0;
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
BasicManager* pBasMgr = BasicIDE::FindBasicManager( pBasic );
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index b5dcd5b..9a500b8 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -822,7 +822,7 @@ void LocalizationMgr::handleBasicStopped( void )
DialogWindow* FindDialogWindowForEditor( DlgEditor* pEditor )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
IDEWindowTable& aIDEWindowTable = pIDEShell->GetIDEWindowTable();
IDEBaseWindow* pWin = aIDEWindowTable.First();
DialogWindow* pFoundDlgWin = NULL;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index d9e20d7..688c54b 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -125,7 +125,7 @@ MacroChooser::MacroChooser( Window* pParnt, sal_Bool bCreateEntries ) :
WB_HASBUTTONS | WB_HASBUTTONSATROOT |
WB_HSCROLL );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -158,7 +158,7 @@ void MacroChooser::StoreMacroDescription()
aDesc.SetType( OBJ_TYPE_METHOD );
}
- BasicIDEData* pData = IDE_DLL()->GetExtraData();
+ BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
pData->SetLastEntryDescriptor( aDesc );
}
@@ -166,7 +166,7 @@ void MacroChooser::StoreMacroDescription()
void MacroChooser::RestoreMacroDescription()
{
BasicEntryDescriptor aDesc;
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
{
IDEBaseWindow* pCurWin = pIDEShell->GetCurWindow();
@@ -175,7 +175,7 @@ void MacroChooser::RestoreMacroDescription()
}
else
{
- BasicIDEData* pData = IDE_DLL()->GetExtraData();
+ BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
aDesc = pData->GetLastEntryDescriptor();
}
@@ -306,7 +306,7 @@ void MacroChooser::DeleteMacro()
DBG_ASSERT( pMethod, "DeleteMacro: Kein Macro !" );
if ( pMethod && QueryDelMacro( pMethod->GetName(), this ) )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -723,7 +723,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
SFX_APP()->ExecuteSlot( aRequest );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -735,7 +735,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
if ( bNewDelIsDel )
{
DeleteMacro();
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -768,7 +768,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
SFX_APP()->ExecuteSlot( aRequest );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if ( pDispatcher )
@@ -834,7 +834,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
return 0;
}
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell && pIDEShell->IsAppBasicModified() )
bForceStoreBasic = sal_True;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 496d076..f55324e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -638,7 +638,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
DBG_ASSERT( pCurEntry, "Entry?!" );
String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if ( pDispatcher )
@@ -672,7 +672,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
Reference< script::XLibraryContainer > xModLibContainer = m_aCurDocument.getLibraryContainer( E_SCRIPTS );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
pIDEShell->GetViewFrame()->GetWindow().EnterWait();
xModLibContainer->loadLibrary( aOULibName );
@@ -684,7 +684,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
Reference< script::XLibraryContainer > xDlgLibContainer = m_aCurDocument.getLibraryContainer( E_DIALOGS );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && !xDlgLibContainer->isLibraryLoaded( aOULibName ) )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
if ( pIDEShell )
pIDEShell->GetViewFrame()->GetWindow().EnterWait();
xDlgLibContainer->loadLibrary( aOULibName );
@@ -796,7 +796,7 @@ void LibPage::InsertLib()
xFltMgr->appendFilter( aTitle, aFilter );
// set display directory and filter
- String aPath( IDE_DLL()->GetExtraData()->GetAddLibPath() );
+ String aPath( BasicIDEGlobals::GetExtraData()->GetAddLibPath() );
if ( aPath.Len() )
{
xFP->setDisplayDirectory( aPath );
@@ -807,7 +807,7 @@ void LibPage::InsertLib()
xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() );
}
- String aLastFilter( IDE_DLL()->GetExtraData()->GetAddLibFilter() );
+ String aLastFilter( BasicIDEGlobals::GetExtraData()->GetAddLibFilter() );
if ( aLastFilter.Len() )
{
xFltMgr->setCurrentFilter( aLastFilter );
@@ -819,8 +819,8 @@ void LibPage::InsertLib()
if ( xFP->execute() == RET_OK )
{
- IDE_DLL()->GetExtraData()->SetAddLibPath( xFP->getDisplayDirectory() );
- IDE_DLL()->GetExtraData()->SetAddLibFilter( xFltMgr->getCurrentFilter() );
+ BasicIDEGlobals::GetExtraData()->SetAddLibPath( xFP->getDisplayDirectory() );
+ BasicIDEGlobals::GetExtraData()->SetAddLibFilter( xFltMgr->getCurrentFilter() );
// library containers for import
Reference< script::XLibraryContainer2 > xModLibContImport;
@@ -1283,7 +1283,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
xFltMgr->appendFilter( aTitle, aFilter );
// set display directory and filter
- String aPath( IDE_DLL()->GetExtraData()->GetAddLibPath() );
+ String aPath( BasicIDEGlobals::GetExtraData()->GetAddLibPath() );
if ( aPath.Len() )
{
xFP->setDisplayDirectory( aPath );
@@ -1297,7 +1297,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
if ( xFP->execute() == RET_OK )
{
- IDE_DLL()->GetExtraData()->SetAddLibPath( xFP->getDisplayDirectory() );
+ BasicIDEGlobals::GetExtraData()->SetAddLibPath( xFP->getDisplayDirectory() );
Sequence< ::rtl::OUString > aFiles = xFP->getFiles();
INetURLObject aURL( aFiles[0] );
@@ -1409,7 +1409,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
xFolderPicker->setTitle( String( IDEResId( RID_STR_EXPORTBASIC ) ) );
// set display directory and filter
- String aPath( IDE_DLL()->GetExtraData()->GetAddLibPath() );
+ String aPath( BasicIDEGlobals::GetExtraData()->GetAddLibPath() );
if( !aPath.Len() )
aPath = SvtPathOptions().GetWorkPath();
@@ -1419,7 +1419,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
if( nRet == RET_OK )
{
String aTargetURL = xFolderPicker->getDirectory();
- IDE_DLL()->GetExtraData()->SetAddLibPath( aTargetURL );
+ BasicIDEGlobals::GetExtraData()->SetAddLibPath( aTargetURL );
Reference< task::XInteractionHandler > xDummyHandler( new DummyInteractionHandler( xHandler ) );
implExportLib( aLibName, aTargetURL, xDummyHandler );
@@ -1450,7 +1450,7 @@ void LibPage::DeleteCurrent()
// inform BasicIDE
SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -1651,7 +1651,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
throw Exception();
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 786119b..b7258cf 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -131,7 +131,7 @@ sal_Bool ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const String& rN
BasicIDE::MarkDocumentModified( aDocument );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -365,7 +365,7 @@ sal_Bool ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxE
BasicEntryType eType( aSourceDesc.GetType() );
// get dispatcher
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -499,7 +499,7 @@ OrganizeDialog::OrganizeDialog( Window* pParent, sal_Int16 tabId, BasicEntryDesc
ActivatePageHdl( &aTabCtrl );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -692,7 +692,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
SFX_APP()->ExecuteSlot( aRequest );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
@@ -840,7 +840,7 @@ void ObjectPage::NewDialog()
return;
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -898,7 +898,7 @@ void ObjectPage::DeleteCurrent()
aBasicBox.GetModel()->Remove( pCurEntry );
if ( aBasicBox.GetCurEntry() ) // OV-Bug ?
aBasicBox.Select( aBasicBox.GetCurEntry() );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -1000,7 +1000,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
if ( pBasic )
pModule = pBasic->FindModule( aModName );
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 0bae4d9..38ed7c5 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -69,7 +69,7 @@ void ObjectTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( aDesc.GetType() == OBJ_TYPE_METHOD )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if( pDispatcher )
@@ -109,8 +109,8 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
CheckButtons();
- Point aPos = IDE_DLL()->GetExtraData()->GetObjectCatalogPos();
- Size aSize = IDE_DLL()->GetExtraData()->GetObjectCatalogSize();
+ Point aPos = BasicIDEGlobals::GetExtraData()->GetObjectCatalogPos();
+ Size aSize = BasicIDEGlobals::GetExtraData()->GetObjectCatalogSize();
if ( aPos.X() == INVPOSITION )
{
// centered after AppWin:
@@ -140,7 +140,7 @@ ObjectCatalog::~ObjectCatalog()
void ObjectCatalog::Move()
{
- IDE_DLL()->GetExtraData()->SetObjectCatalogPos( GetPosPixel() );
+ BasicIDEGlobals::GetExtraData()->SetObjectCatalogPos( GetPosPixel() );
}
sal_Bool ObjectCatalog::Close()
@@ -152,7 +152,7 @@ sal_Bool ObjectCatalog::Close()
void ObjectCatalog::Resize()
{
Size aOutSz = GetOutputSizePixel();
- IDE_DLL()->GetExtraData()->SetObjectCatalogSize( aOutSz );
+ BasicIDEGlobals::GetExtraData()->SetObjectCatalogSize( aOutSz );
Point aTreePos = aMacroTreeList.GetPosPixel();
Size aDescrSz = aMacroDescr.GetSizePixel();
@@ -193,7 +193,7 @@ IMPL_LINK( ObjectCatalog, ToolBoxHdl, ToolBox*, pToolBox )
SvLBoxEntry* pCurEntry = aMacroTreeList.GetCurEntry();
DBG_ASSERT( pCurEntry, "Entry?!" );
BasicEntryDescriptor aDesc( aMacroTreeList.GetEntryDescriptor( pCurEntry ) );
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
if ( aDesc.GetType() == OBJ_TYPE_MODULE ||
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 915bca1..210a6f3 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -631,7 +631,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SHOW_PROPERTYBROWSER ) : NULL;
@@ -1162,7 +1162,7 @@ sal_Bool DlgEditor::IsPasteAllowed()
void DlgEditor::ShowProperties()
{
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) )
pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER );
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index dfdf30d..caec079 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -129,7 +129,7 @@ ManageLanguageDialog::~ManageLanguageDialog()
void ManageLanguageDialog::Init()
{
// get current IDE
- BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+ BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
String sLibName = pIDEShell->GetCurLibName();
// set dialog title with library name
String sText = GetText();
commit 8d2d9ce5f4323ec2542acf57f52a26d5826bcc3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 10:04:16 2011 +0100
rearrange this to not leak search configitem
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 02e2c75..2b89991 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -29,6 +29,11 @@
#ifndef _IDERDLL_HXX
#define _IDERDLL_HXX
+namespace BasicIDEGlobals
+{
+ void ensure();
+}
+
class BasicIDEShell;
class BasicIDEData;
@@ -45,7 +50,6 @@ public:
BasicIDEShell* GetShell() const { return pShell; }
BasicIDEData* GetExtraData();
- static void Init();
static BasicIDEDLL* GetDLL();
};
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index c14f768..ef79e58 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -86,7 +86,7 @@ namespace BasicIDE
void Organize( sal_Int16 tabId )
{
- BasicIDEDLL::Init();
+ BasicIDEGlobals::ensure();
BasicEntryDescriptor aDesc;
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
@@ -274,7 +274,7 @@ namespace
{
(void)rMacroDesc;
- BasicIDEDLL::Init();
+ BasicIDEGlobals::ensure();
IDE_DLL()->GetExtraData()->ChoosingMacro() = sal_True;
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 398e927..c076013 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -425,7 +425,7 @@ void InvalidateDebuggerSlots()
long HandleBasicError( StarBASIC* pBasic )
{
- BasicIDEDLL::Init();
+ BasicIDEGlobals::ensure();
BasicIDE::BasicStopped();
// no error output during macro choosing
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index db1f3cd..6de1ba9 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -28,7 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
+
+#include <comphelper/scoped_disposing_ptr.hxx>
+#include <comphelper/processfactory.hxx>
#include <ide_pch.hxx>
@@ -61,39 +63,51 @@ using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+namespace
+{
+ //Holds a BasicIDEDLL and release it on exit, or dispose of the
+ //default XComponent, whichever comes first
+ class BasicIDEDLLInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr<BasicIDEDLL>
+ {
+ public:
+ BasicIDEDLLInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<BasicIDEDLL>(::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), ::com::sun::star::uno::UNO_QUERY_THROW), new BasicIDEDLL)
+ {
+ }
+ };
-static BasicIDEDLL* pBasicIDEDLL = 0;
+ struct theBasicIDEDLLInstance : public rtl::Static<BasicIDEDLLInstance, theBasicIDEDLLInstance> {};
+}
-BasicIDEDLL* BasicIDEDLL::GetDLL()
+namespace BasicIDEGlobals
{
- return pBasicIDEDLL;
+ void ensure()
+ {
+ theBasicIDEDLLInstance::get();
+ }
}
-IDEResId::IDEResId( sal_uInt16 nId ):
- ResId( nId, *(*(BasicIDEModule**)GetAppData(SHL_IDE))->GetResMgr() )
+BasicIDEDLL* BasicIDEDLL::GetDLL()
{
+ return theBasicIDEDLLInstance::get().get();
}
-BasicIDEDLL::BasicIDEDLL()
+IDEResId::IDEResId( sal_uInt16 nId ):
+ ResId( nId, *(*(BasicIDEModule**)GetAppData(SHL_IDE))->GetResMgr() )
{
- pBasicIDEDLL = this;
- pShell = 0;
- pExtraData = 0;
-
- GetExtraData(); // to cause GlobalErrorHdl to be set
}
BasicIDEDLL::~BasicIDEDLL()
{
delete pExtraData;
+#if 0
*(BasicIDEDLL**)GetAppData(SHL_IDE) = NULL;
+#endif
}
-void BasicIDEDLL::Init()
+BasicIDEDLL::BasicIDEDLL()
+ : pShell(0)
+ , pExtraData(0)
{
- if ( pBasicIDEDLL )
- return;
-
SfxObjectFactory* pFact = &BasicDocShell::Factory();
(void)pFact;
@@ -102,7 +116,8 @@ void BasicIDEDLL::Init()
BASIC_MOD() = new BasicIDEModule( pMgr, &BasicDocShell::Factory() );
- new BasicIDEDLL;
+ GetExtraData(); // to cause GlobalErrorHdl to be set
+
SfxModule* pMod = BASIC_MOD();
SfxObjectFactory& rFactory = BasicDocShell::Factory();
@@ -119,7 +134,7 @@ BasicIDEData* BasicIDEDLL::GetExtraData()
{
if ( !pExtraData )
pExtraData = new BasicIDEData;
- return pExtraData;
+ return pExtraData;
}
BasicIDEData::BasicIDEData() : aObjCatPos( INVPOSITION, INVPOSITION )
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 76b3057..3e59913 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception )
{
SolarMutexGuard aGuard;
- BasicIDEDLL::Init();
+ BasicIDEGlobals::ensure();
SfxObjectShell* pShell = new BasicDocShell();
return uno::Reference< uno::XInterface >( pShell->GetModel() );
}
commit 1b5ee6c7f47b56a5ca52a327bcb2712a1d8a77a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 09:51:17 2011 +0100
SW_DLL isn't used
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index 6e4fdc9..868682e 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.hxx
@@ -41,8 +41,6 @@ namespace SwGlobals
void ensure();
}
-#define SW_DLL() ( *(SwModule**) GetAppData(SHL_WRITER) )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit cb97526259e265e488a50c2747407f7289f8839c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 01:24:42 2011 +0100
callcatcher: remove various unused methods
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 5a28c17..7e730bf 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -694,16 +694,6 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const;
::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const;
- /** Decorate metafile output with verbose text comments
-
- This method is used to wrap SvxFont::QuickDrawText, to
- determine character-by-character wise, which logical text
- units like characters, words and sentences are contained in
- the output string at hand. This is necessary for slideshow
- text effects.
- */
- void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const;
-
SpellInfo * CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs );
protected:
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 41f8fd2..58ee78c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4610,45 +4610,4 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
aCompressedPortions.Remove( 0, aCompressedPortions.Count() );
}
-// redesigned to work with TextMarkingVector
-void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const
-{
- // determine relevant logical text elements for the just-rendered
- // string of characters.
- Reference< i18n::XBreakIterator > _xBI(ImplGetBreakIterator());
-
- if(_xBI.is())
- {
- sal_Int32 nDone;
- sal_Int32 nNextCellBreak(_xBI->nextCharacters(rTxt, nIdx, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
- i18n::Boundary nNextWordBoundary(_xBI->getWordBoundary(rTxt, nIdx, rLocale, i18n::WordType::ANY_WORD, sal_True));
- sal_Int32 nNextSentenceBreak(_xBI->endOfSentence(rTxt, nIdx, rLocale));
-
- const sal_Int32 nEndPos(nIdx + nLen);
- sal_Int32 i;
-
- for(i = nIdx; i < nEndPos; i++)
- {
- // create the entries for the respective break positions
- if(i == nNextCellBreak)
- {
- rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfCaracter, i - nIdx));
- nNextCellBreak = _xBI->nextCharacters(rTxt, i, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
- }
- if(i == nNextWordBoundary.endPos)
- {
- rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfWord, i - nIdx));
- nNextWordBoundary = _xBI->getWordBoundary(rTxt, i + 1, rLocale, i18n::WordType::ANY_WORD, sal_True);
- }
- if(i == nNextSentenceBreak)
- {
- rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfSentence, i - nIdx));
- nNextSentenceBreak = _xBI->endOfSentence(rTxt, i + 1, rLocale);
- }
- }
- }
-}
-
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index f6a8b19..99dd4ed 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -138,17 +138,8 @@ uno::Reference< XInterface > LWPFilterImportFilter_CreateInstance(
return uno::Reference< XInterface > ( (OWeakObject* )p );
}
-Sequence< OUString > LWPFilterImportFilter::getSupportedServiceNames_Static( void ) throw ()
-{
- Sequence< OUString > aRet(1);
- aRet.getArray()[0] = LWPFilterImportFilter::getImplementationName_Static();
- return aRet;
-}
-
LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact )
{
- //OUString sService = OUString( SwXMLImport_getImplementationName ); //STR_WRITER_IMPORTER_NAME
-
try
{
uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( STR_WRITER_IMPORTER_NAME )) ), UNO_QUERY );
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index 3471ad3..c956192 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -137,8 +137,6 @@ public:
~LWPFilterImportFilter();
public:
- static Sequence< OUString > getSupportedServiceNames_Static( void ) throw();
-
static OUString getImplementationName_Static() throw();
public:
/**
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 31d471b..e3acb2c 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -83,8 +83,6 @@ private:
ScPatternAttr* pPattAttr;
sal_uInt32 nHash0;
- ENTRY (const ScPatternAttr &r);
-
ENTRY (ScPatternAttr* p);
~ENTRY ();
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index d15ff3c..1f3a5cc 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -46,11 +46,6 @@
#include "root.hxx"
#include "scitems.hxx"
-LotAttrCache::ENTRY::ENTRY (const ScPatternAttr &r)
- : pPattAttr(new ScPatternAttr(r))
-{
-}
-
LotAttrCache::ENTRY::ENTRY (ScPatternAttr* p)
: pPattAttr(p)
{
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 98a7f58..32836ca 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -46,9 +46,7 @@ public:
sal_Bool operator!() const;
BitSet();
BitSet( const BitSet& rOrig );
- BitSet( sal_uInt16* pArray, sal_uInt16 nSize );
~BitSet();
- BitSet( const Range& rRange );
sal_uInt16 Count() const;
BitSet& operator=( const BitSet& rOrig );
BitSet& operator=( sal_uInt16 nBit );
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index c95b31b..e1fff9a 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -105,7 +105,6 @@ private:
SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
public:
- SfxPopupMenuManager( const ResId&, SfxBindings& );
SfxPopupMenuManager( PopupMenu*, SfxBindings& );
~SfxPopupMenuManager();
static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow );
@@ -116,22 +115,8 @@ public:
sal_uInt16 Execute( const Point& rPos, Window *pWindow );
sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
- sal_uInt16 Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
-
- // @deprecated (start)!!
- // Don't use these methods any longer. The whole class will be removed in the future.
- // Changing code which relies on these methods would need much more effort!
- void StartInsert();
- void EndInsert();
- void CheckItem( sal_uInt16, sal_Bool );
- void RemoveItem( sal_uInt16 );
- void InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId,
- sal_uInt16 nPos = MENU_APPEND );
- void InsertSeparator( sal_uInt16 nPos = MENU_APPEND );
- // @deprecated (end)
void RemoveDisabledEntries();
- void AddClipboardFunctions();
Menu* GetSVMenu();
};
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 6dead74..9faab1d 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -138,51 +138,6 @@ BitSet::BitSet( const BitSet& rOrig )
//--------------------------------------------------------------------
-// creates a bitset from an array
-
-BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ):
- nCount(nSize)
-{
- DBG_MEMTEST();
- // find the highest bit to set
- sal_uInt16 nMax = 0;
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- if ( pArray[n] > nMax )
- nMax = pArray[n];
-
- // if there are bits at all
- if ( nMax > 0 )
- {
- // allocate memory for all blocks needed
- nBlocks = nMax / 32 + 1;
- pBitmap = new sal_uIntPtr[nBlocks];
- memset( pBitmap, 0, 4 * nBlocks );
-
- // set all the bits
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- {
- // compute the block no. and bitvalue
- sal_uInt16 nBlock = n / 32;
- sal_uIntPtr nBitVal = 1L << (n % 32);
-
- // set a single bit
- if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 )
- {
- *(pBitmap+nBlock) |= nBitVal;
- ++nCount;
- }
- }
- }
- else
- {
- // initalize emtpy set
- nBlocks = 0;
- pBitmap = 0;
- }
-}
-
-//--------------------------------------------------------------------
-
// frees the storage
BitSet::~BitSet()
@@ -193,15 +148,6 @@ BitSet::~BitSet()
//--------------------------------------------------------------------
-// creates a bitmap with all bits in rRange set
-
-BitSet::BitSet( const Range& )
-{
- DBG_MEMTEST();
-}
-
-//--------------------------------------------------------------------
-
// assignment from another bitset
BitSet& BitSet::operator=( const BitSet& rOrig )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index d8e01e4..454b2ee 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -298,16 +298,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
return sal_True;
}
-//--------------------------------------------------------------------
-
-// don't insert Popups into ConfigManager, they are not configurable at the moment !
-SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings )
- : SfxMenuManager( rResId, rBindings )
- , pSVMenu( NULL )
-{
- DBG_MEMTEST();
-}
-
SfxPopupMenuManager::~SfxPopupMenuManager()
{
}
@@ -356,74 +346,8 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, v
return nId;
}
-//--------------------------------------------------------------------
-
-sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
-{
- DBG_MEMTEST();
-
- va_list pArgs;
- va_start(pArgs, pArg1);
- sal_uInt16 nRet = Execute( rPoint, pWindow, pArgs, pArg1 );
- va_end(pArgs);
-
- return (nRet);
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::StartInsert()
-{
- ResId aResId(GetType(),*pResMgr);
- aResId.SetRT(RSC_MENU);
- pSVMenu = new PopupMenu( aResId );
- TryToHideDisabledEntries_Impl( pSVMenu );
-}
-
//-------------------------------------------------------------------------
-void SfxPopupMenuManager::EndInsert()
-{
- pBindings->ENTERREGISTRATIONS();
- pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
- Construct( *pMenu );
- pBindings->LEAVEREGISTRATIONS();
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos )
-{
- pSVMenu->InsertSeparator( nPos );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos )
-{
- pSVMenu->InsertItem( nId, rName, nBits,nPos );
- pSVMenu->SetHelpId( nId, rHelpId );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId )
-{
- pSVMenu->RemoveItem( nId );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck )
-{
- pSVMenu->CheckItem( nId, bCheck );
-}
-
-void SfxPopupMenuManager::AddClipboardFunctions()
-{
- bAddClipboardFuncs = sal_True;
-}
-
SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
: pMenu(0),
pOldMenu(0),
diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx
index 06988af..d2c4586 100644
--- a/svtools/inc/svtools/FilterConfigItem.hxx
+++ b/svtools/inc/svtools/FilterConfigItem.hxx
@@ -76,8 +76,6 @@ class SVT_DLLPUBLIC FilterConfigItem
// 3. given default
sal_Bool ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault );
sal_Int32 ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault );
- ::com::sun::star::awt::Size
- ReadSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rDefault );
::rtl::OUString
ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault );
::com::sun::star::uno::Any
@@ -87,7 +85,6 @@ class SVT_DLLPUBLIC FilterConfigItem
// and always stores into the FilterData sequence
void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue );
void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue );
- void WriteSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rSize );
void WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString );
void WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny );
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index 3ea92f7..32674cc 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -67,11 +67,6 @@ const char* FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameLi
"epp", "ira", "era", "itg", "iti", "eti", "exp", NULL
};
-sal_Bool FilterConfigCache::FilterConfigCacheEntry::IsValid()
-{
- return sFilterName.Len() != 0;
-}
-
sal_Bool FilterConfigCache::bInitialized = sal_False;
sal_Int32 FilterConfigCache::nIndType = -1;
sal_Int32 FilterConfigCache::nIndUIName = -1;
@@ -466,11 +461,6 @@ sal_Bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat )
return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat;
}
-sal_Bool FilterConfigCache::IsImportDialog( sal_uInt16 nFormat )
-{
- return (nFormat < aImport.size()) && aImport[ nFormat ].bHasDialog;
-}
-
// ------------------------------------------------------------------------
String FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
diff --git a/svtools/source/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx
index b1579be..a944a6d 100644
--- a/svtools/source/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter/FilterConfigCache.hxx
@@ -66,7 +66,6 @@ class SVT_DLLPUBLIC FilterConfigCache
sal_Bool bIsInternalFilter : 1;
sal_Bool bIsPixelFormat : 1;
- sal_Bool IsValid();
sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry );
String GetShortName( );
@@ -116,7 +115,6 @@ class SVT_DLLPUBLIC FilterConfigCache
sal_Bool IsImportInternalFilter( sal_uInt16 nFormat );
sal_Bool IsImportPixelFormat( sal_uInt16 nFormat );
- sal_Bool IsImportDialog( sal_uInt16 nFormat );
sal_uInt16 GetExportFormatCount() const
{ return sal::static_int_cast< sal_uInt16 >(aExport.size()); };
diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index fddeec1..10428c6 100644
--- a/svtools/source/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
@@ -333,51 +333,6 @@ sal_Int32 FilterConfigItem::ReadInt32( const OUString& rKey, sal_Int32 nDefault
return nRetValue;
}
-
-Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault )
-{
- Any aAny;
- Size aRetValue( rDefault );
-
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) );
- const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) );
-
- Reference< XPropertySet > aXPropSet;
- try
- {
- PropertyValue* pPropWidth = GetPropertyValue( aFilterData, sWidth );
- PropertyValue* pPropHeight= GetPropertyValue( aFilterData, sHeight );
- if ( pPropWidth && pPropHeight )
- {
- pPropWidth->Value >>= aRetValue.Width;
- pPropHeight->Value >>= aRetValue.Height;
- }
- else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
- {
- if ( aAny >>= aXPropSet )
- {
- if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) )
- aAny >>= aRetValue.Width;
- if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) )
- aAny >>= aRetValue.Height;
- }
- }
- }
- catch ( ::com::sun::star::uno::Exception& )
- {
- OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" );
- }
- PropertyValue aWidth;
- aWidth.Name = sWidth;
- aWidth.Value <<= aRetValue.Width;
- WritePropertyValue( aFilterData, aWidth );
- PropertyValue aHeight;
- aHeight.Name = sHeight;
- aHeight.Value <<= aRetValue.Height;
- WritePropertyValue( aFilterData, aHeight );
- return aRetValue;
-}
-
OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDefault )
{
Any aAny;
@@ -484,56 +439,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
}
}
-void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue )
-{
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) );
- const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) );
-
- PropertyValue aWidth;
- aWidth.Name = sWidth;
- aWidth.Value <<= rNewValue.Width;
- WritePropertyValue( aFilterData, aWidth );
-
- PropertyValue aHeight;
- aHeight.Name = sHeight;
- aHeight.Value <<= rNewValue.Height;
- WritePropertyValue( aFilterData, aHeight );
-
- if ( xPropSet.is() )
- {
- Any aAny;
- sal_Int32 nOldWidth = rNewValue.Width;
- sal_Int32 nOldHeight = rNewValue.Height;
-
- if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
- {
- try
- {
- Reference< XPropertySet > aXPropSet;
- if ( aAny >>= aXPropSet )
- {
- if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) )
- aAny >>= nOldWidth;
- if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) )
- aAny >>= nOldHeight;
- }
- if ( ( nOldWidth != rNewValue.Width ) || ( nOldHeight != rNewValue.Height ) )
- {
- aAny <<= rNewValue.Width;
- aXPropSet->setPropertyValue( sWidth, aAny );
- aAny <<= rNewValue.Height;
- aXPropSet->setPropertyValue( sHeight, aAny );
- bModified = sal_True;
- }
- }
- catch ( ::com::sun::star::uno::Exception& )
- {
- OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" );
- }
- }
- }
-}
-
void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewValue )
{
PropertyValue aString;
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index c39e1e4..72fc266 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -2086,7 +2086,6 @@ sal_Bool GraphicFilter::Setup( sal_uInt16 )
sal_Bool GraphicFilter::HasImportDialog( sal_uInt16 )
{
return sal_True;
-// return pConfig->IsImportDialog( nFormat );
}
// ------------------------------------------------------------------------
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index ea70c17..d086d32 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -69,7 +69,6 @@ protected:
void* ImpGetObject( sal_uIntPtr nIndex ) const;
void** ImpGetOnlyNodes() const;
#endif
- void** GetObjectPtr( sal_uIntPtr nIndex );
public:
Container( sal_uInt16 nBlockSize,
@@ -81,14 +80,12 @@ public:
void Insert( void* p );
void Insert( void* p, sal_uIntPtr nIndex );
- void Insert( void* pNew, void* pOld );
void* Remove();
void* Remove( sal_uIntPtr nIndex );
void* Remove( void* p )
{ return Remove( GetPos( p ) ); }
- void* Replace( void* p );
void* Replace( void* p, sal_uIntPtr nIndex );
void* Replace( void* pNew, void* pOld )
{ return Replace( pNew, GetPos( pOld ) ); }
@@ -103,8 +100,6 @@ public:
sal_uIntPtr GetCurPos() const;
void* GetObject( sal_uIntPtr nIndex ) const;
sal_uIntPtr GetPos( const void* p ) const;
- sal_uIntPtr GetPos( const void* p, sal_uIntPtr nStartIndex,
- sal_Bool bForward = sal_True ) const;
void* Seek( sal_uIntPtr nIndex );
void* Seek( void* p ) { return Seek( GetPos( p ) ); }
diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx
index fb2fcce..7e17455 100644
--- a/tools/inc/tools/dynary.hxx
+++ b/tools/inc/tools/dynary.hxx
@@ -55,9 +55,6 @@ public:
sal_uIntPtr GetIndex( const void* p ) const
{ return Container::GetPos( p ); }
- sal_uIntPtr GetIndex( const void* p, sal_uIntPtr nStartIndex,
- sal_Bool bForward = sal_True ) const
- { return Container::GetPos( p, nStartIndex, bForward ); }
DynArray& operator =( const DynArray& rAry )
{ Container::operator =( rAry ); return *this; }
@@ -92,11 +89,6 @@ public: \
\
sal_uIntPtr GetIndex( const Type p ) const \
{ return DynArray::GetIndex( (const void*)p ); } \
- sal_uIntPtr GetIndex( const Type p, sal_uIntPtr nStartIndex, \
- sal_Bool bForward = sal_True ) const \
- { return DynArray::GetIndex( (const void*)p, \
- nStartIndex, \
- bForward ); } \
\
ClassName& operator =( const ClassName& rClassName ) \
{ DynArray::operator =( rClassName ); \
diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx
index 9f92035..22cb0be 100644
--- a/tools/inc/tools/list.hxx
+++ b/tools/inc/tools/list.hxx
@@ -105,8 +105,6 @@ public: \
{ return (Type)List::Remove( nIndex ); } \
Type Remove( Type p ) \
{ return (Type)List::Remove( (void*)p ); } \
- Type Replace( Type p ) \
- { return (Type)List::Replace( (void*)p ); } \
Type Replace( Type p, sal_uIntPtr nIndex ) \
{ return (Type)List::Replace( (void*)p, nIndex ); } \
Type Replace( Type pNew, Type pOld ) \
@@ -119,10 +117,6 @@ public: \
{ return (Type)List::GetObject( nIndex ); } \
sal_uIntPtr GetPos( const Type p ) const \
{ return List::GetPos( (const void*)p ); } \
- sal_uIntPtr GetPos( const Type p, sal_uIntPtr nStartIndex, \
- sal_Bool bForward = sal_True ) const \
- { return List::GetPos( (const void*)p, nStartIndex, \
- bForward ); } \
\
Type Seek( sal_uIntPtr nIndex ) \
{ return (Type)List::Seek( nIndex ); } \
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index 9ef9fd0..6629a4f 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -127,14 +127,11 @@ inline void Insert( EN p )\
{ CN##List::Insert( p ); p->AddRef();}\
inline void Insert( EN p, sal_uIntPtr nIndex )\
{ CN##List::Insert( p, nIndex ); p->AddRef();}\
-inline void Insert( EN p, EN pOld )\
-{ CN##List::Insert( p, pOld ); p->AddRef();}\
inline void Append( EN p )\
{ Insert( p, LIST_APPEND );}\
inline EN Remove();\
inline EN Remove( sal_uIntPtr nIndex );\
inline EN Remove( EN p );\
-inline EN Replace( EN p );\
inline EN Replace( EN p, sal_uIntPtr nIndex );\
inline EN Replace( EN pNew, EN pOld );\
inline void Append( const CN##MemberList & );\
@@ -197,11 +194,6 @@ inline EN CN##MemberList::Remove( EN p ) \
p = CN##List::Remove( p ); \
if( p ) p->ReleaseReference(); return p; \
}\
-inline EN CN##MemberList::Replace( EN p ) \
-{\
- p->AddRef(); p = CN##List::Replace( p ); \
- if( p ) p->ReleaseReference(); return p; \
-}\
inline EN CN##MemberList::Replace( EN p, sal_uIntPtr nIndex ) \
{\
p->AddRef(); p = CN##List::Replace( p, nIndex ); \
@@ -229,19 +221,15 @@ inline void CN##MemberList::Append( const CN##MemberList & rList )\
inline Class##MemberList(sal_uInt16 nInitSz,sal_uInt16 nResize);\
inline void Insert( EntryName p ); \
inline void Insert( EntryName p, sal_uIntPtr nIndex ); \
-inline void Insert( EntryName p, EntryName pOld ); \
inline void Append( EntryName p ); \
inline EntryName Remove(); \
inline EntryName Remove( sal_uIntPtr nIndex ); \
inline EntryName Remove( EntryName p ); \
-inline EntryName Replace( EntryName p ); \
inline EntryName Replace( EntryName p, sal_uIntPtr nIndex );\
inline EntryName Replace( EntryName pNew, EntryName pOld );\
inline EntryName GetCurObject() const;\
inline EntryName GetObject( sal_uIntPtr nIndex ) const;\
inline sal_uIntPtr GetPos( const EntryName ) const;\
-inline sal_uIntPtr GetPos( const EntryName, sal_uIntPtr nStartIndex,\
- sal_Bool bForward = sal_True ) const;\
inline EntryName Seek( sal_uIntPtr nIndex );\
inline EntryName Seek( EntryName p );\
inline EntryName First();\
@@ -258,8 +246,6 @@ inline void ClassName##MemberList::Insert( EntryName p )\
{BaseList::Insert(p);}\
inline void ClassName##MemberList::Insert( EntryName p, sal_uIntPtr nIdx )\
{BaseList::Insert(p,nIdx);}\
-inline void ClassName##MemberList::Insert( EntryName p, EntryName pOld )\
- {BaseList::Insert(p,pOld);}\
inline void ClassName##MemberList::Append( EntryName p )\
{BaseList::Append(p);}\
inline EntryName ClassName##MemberList::Remove()\
@@ -268,8 +254,6 @@ inline EntryName ClassName##MemberList::Remove( sal_uIntPtr nIdx )\
{return (EntryName)BaseList::Remove(nIdx);}\
inline EntryName ClassName##MemberList::Remove( EntryName p )\
{return (EntryName)BaseList::Remove(p);}\
-inline EntryName ClassName##MemberList::Replace( EntryName p )\
- {return (EntryName)BaseList::Replace(p);}\
inline EntryName ClassName##MemberList::Replace( EntryName p, sal_uIntPtr nIdx )\
{return (EntryName)BaseList::Replace(p,nIdx);}\
inline EntryName ClassName##MemberList::Replace( EntryName p, EntryName pOld )\
@@ -293,10 +277,7 @@ inline EntryName ClassName##MemberList::Prev()\
inline void ClassName##MemberList::Append( const ClassName##MemberList & rList )\
{BaseList::Append(rList);}\
inline sal_uIntPtr ClassName##MemberList::GetPos( const EntryName p) const\
- {return BaseList::GetPos( p );}\
-inline sal_uIntPtr ClassName##MemberList::GetPos\
- ( const EntryName p, sal_uIntPtr nStart, sal_Bool bForward ) const\
- {return BaseList::GetPos( p, nStart, bForward );}
+ {return BaseList::GetPos( p );}
#define SV_DECL_MEMBER_LIST(ClassName,EntryName)\
class ClassName##MemberList : public SvRefBaseMemberList\
diff --git a/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx
index d3c76d1..a8f8cb5 100644
--- a/tools/inc/tools/stack.hxx
+++ b/tools/inc/tools/stack.hxx
@@ -87,11 +87,6 @@ public: \
{ return (Type)Stack::GetObject( nIndex ); } \
sal_uIntPtr GetPos( const Type p ) const \
{ return Stack::GetPos( (const void*)p ); } \
- sal_uIntPtr GetPos( const Type p, sal_uIntPtr nStartIndex, \
- sal_Bool bForward = sal_True ) const \
- { return Stack::GetPos( (const void*)p, \
- nStartIndex, \
- bForward ); } \
\
ClassName& operator =( const ClassName& rClassName ) \
{ Stack::operator =( rClassName ); \
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 6bd6587..2c18004 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -548,11 +548,6 @@ public:
inline bool IsEmptyUser() const
{ return m_aUser.isPresent() && m_aUser.isEmpty(); }
- bool hasPassword() const;
-
- inline bool IsEmptyPass() const
- { return hasPassword() && m_aAuth.isEmpty(); }
-
inline rtl::OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 760d84d..52b90f3 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4288,12 +4288,6 @@ INetProtocol INetURLObject::CompareProtocolScheme(rtl::OUString const &
}
//============================================================================
-bool INetURLObject::hasPassword() const
-{
- return m_aAuth.isPresent() && getSchemeInfo().m_bPassword;
-}
-
-//============================================================================
rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index 9fe9bab..3430ca7 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.cxx
@@ -824,19 +824,6 @@ void Container::Insert( void* p, sal_uIntPtr nIndex )
/*************************************************************************
|*
-|* Container::Insert()
-|*
-*************************************************************************/
-
-void Container::Insert( void* pNew, void* pOld )
-{
- sal_uIntPtr nIndex = GetPos( pOld );
- if ( nIndex != CONTAINER_ENTRY_NOTFOUND )
- Insert( pNew, nIndex );
-}
-
-/*************************************************************************
-|*
|* Container::ImpRemove()
|*
|* Beschreibung Interne Methode zum Entfernen eines Pointers
@@ -956,22 +943,6 @@ void* Container::Remove( sal_uIntPtr nIndex )
|*
*************************************************************************/
-void* Container::Replace( void* p )
-{
- DBG_CHKTHIS( Container, DbgCheckContainer );
-
- if ( !nCount )
- return NULL;
- else
- return pCurBlock->Replace( p, nCurIndex );
-}
-
-/*************************************************************************
-|*
-|* Container::Replace()
-|*
-*************************************************************************/
-
void* Container::Replace( void* p, sal_uIntPtr nIndex )
{
DBG_CHKTHIS( Container, DbgCheckContainer );
@@ -1207,36 +1178,6 @@ sal_uIntPtr Container::GetCurPos() const
/*************************************************************************
|*
-|* Container::GetObjectPtr()
-|*
-|* Beschreibung Interne Methode fuer Referenz-Container
-|*
-*************************************************************************/
-
-void** Container::GetObjectPtr( sal_uIntPtr nIndex )
-{
- DBG_CHKTHIS( Container, DbgCheckContainer );
-
- // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
- if ( nCount <= nIndex )
- return NULL;
- else
- {
- // Block suchen
- CBlock* pTemp = pFirstBlock;
- while ( pTemp->Count() <= nIndex )
- {
- nIndex -= pTemp->Count();
- pTemp = pTemp->GetNextBlock();
- }
-
- // Item innerhalb des gefundenen Blocks zurueckgeben
- return pTemp->GetObjectPtr( (sal_uInt16)nIndex );
- }
-}
-
-/*************************************************************************
-|*
|* Container::GetObject()
|*
*************************************************************************/
@@ -1303,97 +1244,6 @@ sal_uIntPtr Container::GetPos( const void* p ) const
/*************************************************************************
|*
-|* Container::GetPos()
-|*
-*************************************************************************/
-
-sal_uIntPtr Container::GetPos( const void* p, sal_uIntPtr nStartIndex,
- sal_Bool bForward ) const
-{
- DBG_CHKTHIS( Container, DbgCheckContainer );
-
- // Ist Index nicht innerhalb des Containers, dann NOTFOUND zurueckgeben
- if ( nCount <= nStartIndex )
- return CONTAINER_ENTRY_NOTFOUND;
- else
- {
- void** pNodes;
- sal_uInt16 nBlockCount;
- sal_uInt16 i;
-
- // Block suchen
- CBlock* pTemp = pFirstBlock;
- sal_uIntPtr nTemp = 0;
- while ( nTemp+pTemp->Count() <= nStartIndex )
- {
- nTemp += pTemp->Count();
- pTemp = pTemp->GetNextBlock();
- }
-
- // Jetzt den Pointer suchen
- if ( bForward )
- {
- // Alle Bloecke durchrsuchen
- i = (sal_uInt16)(nStartIndex - nTemp);
- pNodes = pTemp->GetObjectPtr( i );
- do
- {
- nBlockCount = pTemp->Count();
- while ( i < nBlockCount )
- {
- if ( p == *pNodes )
- return nTemp+i;
- pNodes++;
- i++;
- }
- nTemp += nBlockCount;
- pTemp = pTemp->GetNextBlock();
- if ( pTemp )
- {
- i = 0;
- pNodes = pTemp->GetNodes();
- }
- else
- break;
- }
- while ( sal_True );
- }
- else
- {
- // Alle Bloecke durchrsuchen
- i = (sal_uInt16)(nStartIndex-nTemp)+1;
- pNodes = pTemp->GetObjectPtr( i-1 );
- do
- {
- do
- {
- if ( p == *pNodes )
- return nTemp+i-1;
- pNodes--;
- i--;
- }
- while ( i );
- nTemp -= pTemp->Count();
- pTemp = pTemp->GetPrevBlock();
- if ( pTemp )
- {
- i = pTemp->Count();
- // Leere Bloecke in der Kette darf es nicht geben. Nur
- // wenn ein Block existiert, darf dieser leer sein
- pNodes = pTemp->GetObjectPtr( i-1 );
- }
- else
- break;
- }
- while ( sal_True );
- }
- }
-
- return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*************************************************************************
-|*
|* Container::Seek()
|*
*************************************************************************/
diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index 69a5395..515e6e6 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.cxx
@@ -1505,7 +1505,6 @@ int SAL_CALL main()
url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a-b.3:/%2F?x#y")),
rtl::OUString(urlobj.GetMainURL(INetURLObject::NO_DECODE)));
bSuccess &= assertEqual(url, false, urlobj.HasUserData());
- bSuccess &= assertEqual(url, false, urlobj.hasPassword());
bSuccess &= assertEqual(url, false, urlobj.HasPort());
bSuccess &= assertEqual(
url, rtl::OUString(), rtl::OUString(urlobj.GetHost()));
diff --git a/unusedcode.easy b/unusedcode.easy
index db58558..28d716a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,8 +1,6 @@
(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()
-BitSet::BitSet(Range const&)
-BitSet::BitSet(unsigned short*, unsigned short)
BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const
BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
BitmapPalette::IsGreyPalette() const
@@ -86,10 +84,6 @@ CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&)
CommunicationLinkList::Insert(CommunicationLink const**, unsigned short)
CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short)
CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short)
-Container::GetObjectPtr(unsigned long)
-Container::GetPos(void const*, unsigned long, unsigned char) const
-Container::Insert(void*, void*)
-Container::Replace(void*)
Control::GetLineCount() const
ControlItem::ControlItem(ControlData*)
CurrencyBox::CurrencyBox(Window*, ResId const&)
@@ -192,10 +186,6 @@ FileStat::SetDateTime(String const&, DateTime const&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FillAttrLB::FillAttrLB(Window*, ResId)
FillAttrLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
-FilterConfigCache::FilterConfigCacheEntry::IsValid()
-FilterConfigCache::IsImportDialog(unsigned short)
-FilterConfigItem::ReadSize(rtl::OUString const&, com::sun::star::awt::Size const&)
-FilterConfigItem::WriteSize(rtl::OUString const&, com::sun::star::awt::Size const&)
FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&)
FixedBitmap::GetModeBitmap() const
FixedBitmap::SetModeBitmap(Bitmap const&)
@@ -276,7 +266,6 @@ HeaderBar::SetItemImage(unsigned short, Image const&)
HelpTextWindow::RegisterAccessibleParent()
HelpTextWindow::RevokeAccessibleParent()
IMapWindow::GetSdrObj(IMapObject const*) const
-INetURLObject::hasPassword() const
IconChoiceDialog::RemoveResetButton()
IconChoiceDialog::RemoveTabPage(unsigned short)
ImageAryData::ImageAryData()
@@ -289,7 +278,6 @@ ImageList::ReplaceImage(unsigned short, Image const&)
ImageMap::GetBoundRect() const
ImpBitmap::ImplDestroy()
ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&)
-ImpEditEngine::ImplFillTextMarkingVector(com::sun::star::lang::Locale const&, std::vector<EEngineData::TextMarkingClass, std::allocator<EEngineData::TextMarkingClass> >&, String const&, unsigned short, unsigned short) const
ImpEditEngine::Repeat(EditView*)
ImpEditView::CalcSelectedRegion()
ImpLabelList::ImplFirst()
@@ -324,7 +312,6 @@ KeyCode::GetSymbolName(String const&, Window*) const
KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const
KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&)
KeyboardSettings::CopyData()
-LWPFilterImportFilter::getSupportedServiceNames_Static()
Line::Enum(Link const&)
Line::NearestPoint(Point const&) const
LineInfo::isDashDotOrFatLineUsed() const
@@ -350,7 +337,6 @@ LongCurrencyFormatter::Denormalize(BigInt) const
LongCurrencyFormatter::IsValueModified() const
LongCurrencyFormatter::Normalize(BigInt) const
LongCurrencyFormatter::SetEmptyValue()
-LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -933,15 +919,6 @@ SfxOleString16Property::SfxOleString16Property(int, String const&)
SfxOrganizeDlg_Impl::OkHdl(Button*)
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPasswordDialog::SetMaxLen(unsigned short)
-SfxPopupMenuManager::AddClipboardFunctions()
-SfxPopupMenuManager::CheckItem(unsigned short, unsigned char)
-SfxPopupMenuManager::EndInsert()
-SfxPopupMenuManager::Execute(Point const&, Window*, SfxPoolItem const*, ...)
-SfxPopupMenuManager::InsertItem(unsigned short, String const&, unsigned short, rtl::OString const&, unsigned short)
-SfxPopupMenuManager::InsertSeparator(unsigned short)
-SfxPopupMenuManager::RemoveItem(unsigned short)
-SfxPopupMenuManager::SfxPopupMenuManager(ResId const&, SfxBindings&)
-SfxPopupMenuManager::StartInsert()
SfxPopupWindow::EndCascading()
SfxPopupWindow::LinkStubDelete(void*, void*)
SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
commit 7e4ed3e5b8b9209240b9608aa0037a6a6732ef1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 24 01:23:25 2011 +0100
add a macros test, and a calc placeholder example
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index f285ef5..6f9c066 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -35,7 +35,7 @@ const cParagraphBreak = 0
global const cExtensionFileName = "TestExtension.oxt"
-global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4
+global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocMacros = 5
global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
global const cTestClosureSetupDoc = 0, cTestClosureWriteStatus = 1
@@ -91,7 +91,7 @@ Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "J
Global const cUserFieldTestExtension = "Extension"
Global const cUserFieldTestOpenSaveXML = "SaveOpenXML"
Global const cUserFieldTestOpen50 = "Open50"
-Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
+Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8", cUserFieldTestMacros = "Macros"
Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
@@ -110,7 +110,7 @@ Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolea
Global bMakeExtensionTest as boolean
Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean
Global bMakeTerminateAfterTest as boolean, bShowTable as boolean
-Global bMakeSaveOpen8Test as boolean
+Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest as boolean
global sExtensionURL as string
@@ -235,12 +235,13 @@ Sub CreateStatusTable
tableHeaders(cStHTML) = "HTML"
tableHeaders(cStJava) = "Java"
- dim tableRows(4) as string
+ dim tableRows(5) as string
tableRows(cDocNew) = "new"
tableRows(cDocSaveOpen8) = "V8.0"
tableRows(cDocSaveOpenXML) = "XML"
tableRows(cDocOpen50) = "V5.0"
tableRows(cDocClose) = "close"
+ tableRows(cDocMacros) = "macros"
aDoc = gOutputDoc
@@ -255,7 +256,7 @@ Sub CreateStatusTable
xCursor.GoRight (1, False)
table = aDoc.createInstance("com.sun.star.text.TextTable")
- table.initialize(6,9)
+ table.initialize(7,9)
table.Name = "StTab1"
table.BackColor = cCoGrey
xText.insertTextContent(xCursor, table, FALSE)
@@ -341,7 +342,7 @@ Sub CreateDocState
table = aDoc.TextTables.GetByIndex (1)
for j% = 0 to 7
- for i% = 0 to 4
+ for i% = 0 to 5
sRangeName = GetRangeName(j%, i%+1)
tableCursor = table.createCursorByCellName(sRangeName)
@@ -580,6 +581,7 @@ Sub SetOptions
SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutputDoc)
SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutputDoc)
+ SetUserFieldState (cUserFieldTestMacros, -(gOptionsDialog.getControl("cbMacrosTest").getState), gOutputDoc)
SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutputDoc)
end Sub
@@ -602,6 +604,7 @@ Sub GetOptions
gOptionsDialog.getControl("cbOpen50Test").setState(0)
end If
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
+ gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
End Sub
@@ -624,6 +627,7 @@ Sub ReadOptions
bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
+ bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc)
bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
end Sub
@@ -652,6 +656,7 @@ Sub SetDefaultOptions
bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = true
+ bMakeMacrosTest = true
bMakeTerminateAfterTest = false
end Sub
@@ -685,12 +690,13 @@ Function StartTestWithDefaultOptions
component(cStJava) = "Java"
component(cStDataBase) = "Base"
component(cStExtension) = "Extensions"
- dim action(4) as string
+ dim action(5) as string
action(cDocNew) = "new"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list