Fixed the patch, missed some additional merge conflicts in the previous one.
/Albert
On Sun, Mar 6, 2011 at 22:10, Albert Thuswaldner
<albert.thuswaldner@gmail.com> wrote:
Hi,
Some more changes that did not get pushed to master....
You can commit the patch under the terms of MPL 1.1 / GPLv3+ / LGPLv3+
triple license.
/Albert
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 3518412..642542a 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -285,15 +285,16 @@ SfxApplication* SfxApplication::GetOrCreate()
SfxApplication *pNew = new SfxApplication;
//TODO/CLEANUP
- //ist das Mutex-Handling OK?
+ //Is the Mutex-Handling OK?
static ::osl::Mutex aProtector;
::osl::MutexGuard aGuard2( aProtector );
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
pApp = pNew;
- // at the moment a bug may occur when Initialize_Impl returns FALSE, but this is only
temporary because all code that may cause such a
- // fault will be moved outside the SFX
+ // at the moment a bug may occur when Initialize_Impl returns FALSE,
+ // but this is only temporary because all code that may cause such
+ // a fault will be moved outside the SFX
pApp->Initialize_Impl();
::framework::SetImageProducer( GetImage );
@@ -341,7 +342,7 @@ SfxApplication::SfxApplication()
#else
if( !InitializeDde() )
{
- ByteString aStr( "Kein DDE-Service moeglich. Fehler: " );
+ ByteString aStr( "No DDE-Service possible. Error: " );
if( GetDdeService() )
aStr += ByteString::CreateFromInt32(GetDdeService()->GetError());
else
@@ -384,16 +385,15 @@ SfxApplication::~SfxApplication()
const String& SfxApplication::GetLastDir_Impl() const
-/* [Beschreibung]
+/* [Description]
- Interne Methode, mit der im SFx das zuletzt mit der Methode
- <SfxApplication::SetLastDir_Impl()> gesetzte Verzeichnis
- zurueckgegeben wird.
+ Internal method by which the last set directory with the method
+ <SfxApplication::SetLastDir_Impl()> in SFX is returned.
- Dieses ist i.d.R. das zuletzt durch den SfxFileDialog
- angesprochene Verzeichnis.
+ This is usually the most recently addressed by the
+ SfxFileDialog directory.
- [Querverweis]
+ [Cross-reference]
<SfxApplication::SetLastDir_Impl()>
*/
@@ -403,11 +403,11 @@ const String& SfxApplication::GetLastDir_Impl() const
const String& SfxApplication::GetLastSaveDirectory() const
-/* [Beschreibung]
+/* [Description]
- Wie <SfxApplication::GetLastDir_Impl()>, nur extern
+ As <SfxApplication::GetLastDir_Impl()>, only external
- [Querverweis]
+ [Cross-reference]
<SfxApplication::GetLastDir_Impl()>
*/
@@ -419,15 +419,15 @@ const String& SfxApplication::GetLastSaveDirectory() const
void SfxApplication::SetLastDir_Impl
(
- const String& rNewDir /* kompletter Verzeichnis-Pfad als String */
+ const String& rNewDir /* Complete directory path as a string * /
)
-/* [Beschreibung]
+/* [Description]
- Interne Methode, mit der ein Verzeichnis-Pfad gesetzt wird, der
- zuletzt (z.B. durch den SfxFileDialog) angesprochen wurde.
+ Internal Method, by which a directory path is set that was last addressed
+ (eg by the SfxFileDialog).
- [Querverweis]
+ [Cross-reference]
<SfxApplication::GetLastDir_Impl()>
*/
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 9e6b9d0..48096a1 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -122,8 +122,8 @@ Resource BMP_SFX_COLOR
SID_PASTE; // 060
SID_DELETE; // 061
SID_SELECTALL; // 062
- SID_SAVEDOC; // 063 vormals 046
- SID_EXITANDRETURN; // 064 vormals 054
+ SID_SAVEDOC; // 063 was 046
+ SID_EXITANDRETURN; // 064 was 054
SID_RECORDMACRO; // 095
SID_EDITMACRO; // 096
SID_HELPMENU; // 098
@@ -155,8 +155,8 @@ Resource BMP_SFX_MONO
SID_PASTE; // 060
SID_DELETE; // 061
SID_SELECTALL; // 062
- SID_SAVEDOC; // 063 vormals 046
- SID_EXITANDRETURN; // 064 vormals 054
+ SID_SAVEDOC; // 063 was 046
+ SID_EXITANDRETURN; // 064 was 054
SID_RECORDMACRO; // 095
SID_EDITMACRO; // 096
SID_HELPMENU; // 098
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 8d3c121..389e357 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -148,7 +148,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
BasicManager* SfxApplication::GetBasicManager()
{
if ( pAppData_Impl->nBasicCallLevel == 0 )
- // sicherheitshalber
+ // precaution
EnterBasicCall();
return BasicManagerRepository::getApplicationBasicManager( true );
@@ -194,7 +194,7 @@ void SfxApplication::EnterBasicCall()
{
DBG_TRACE( "SfxShellObject: BASIC-on-demand" );
- // zuerst das BASIC laden
+ // First load the BASIC
GetBasic();
}
}
@@ -336,8 +336,8 @@ void SfxApplication::MacroExec_Impl( SfxRequest& rReq )
DBG_MEMTEST();
if ( SfxMacroConfig::IsMacroSlot( rReq.GetSlot() ) )
{
- // SlotId referenzieren, damit nicht im Execute der Slot abgeschossen
- // werden kann
+ // Create reference to SlotId, so that the excecute in the slot
+ // is not cancelled.
GetMacroConfig()->RegisterSlotId(rReq.GetSlot());
SFX_REQUEST_ARG(rReq, pArgs, SfxStringItem,
rReq.GetSlot(), sal_False);
@@ -362,29 +362,29 @@ void SfxApplication::PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBasic )
EnterBasicCall();
sal_Bool bOK = sal_False;
- // Makro und asynch-Flag
+ // Makro and asynch-Flag
SFX_REQUEST_ARG(rReq,pMacro,SfxStringItem,SID_STATEMENT,sal_False);
SFX_REQUEST_ARG(rReq,pAsynch,SfxBoolItem,SID_ASYNCHRON,sal_False);
if ( pAsynch && pAsynch->GetValue() )
{
- // asynchron ausf"uhren
+ // run asynchronously
GetDispatcher_Impl()->Execute( SID_PLAYMACRO, SFX_CALLMODE_ASYNCHRON, pMacro, 0L );
rReq.Done();
}
else if ( pMacro )
{
- // Statement aufbereiten
+ // Process statement
DBG_ASSERT( pBasic, "no BASIC found" ) ;
String aStatement( '[' );
aStatement += pMacro->GetValue();
aStatement += ']';
- // P"aventiv den Request abschlie\sen, da er ggf. zerst"ort wird
+ // Finish the request preventatively because it maybe destroyed
rReq.Done();
rReq.ReleaseArgs();
- // Statement ausf"uhren
+ // Process statement
pBasic->Execute( aStatement );
bOK = 0 == SbxBase::GetError();
SbxBase::ResetError();
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index d1e1595..f28877a 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -515,7 +515,7 @@ BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pRefe
return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ),
*pReferer );
}
//--------------------------------------------------------------------
-// TODO/CLEANUP: wieso zwei SetOptions Methoden?
+// TODO/CLEANUP: Why two SetOptions Methods?
void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{
const SfxPoolItem *pItem = 0;
@@ -603,14 +603,14 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
aSaveOptions.SetDocInfoSave(((const SfxBoolItem *)pItem)->GetValue());
}
- // offende Dokumente merken
+ // Mark open Documents
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), TRUE, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
aSaveOptions.SetSaveWorkingSet(((const SfxBoolItem *)pItem)->GetValue());
}
- // Fenster-Einstellung speichern
+ // Save window settings
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), TRUE, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
@@ -695,16 +695,16 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
USHORT nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
aUndoOptions.SetUndoCount( nUndoCount );
- // um alle Undo-Manager zu erwischen: "uber alle Frames iterieren
+ // To catch all Undo-Managers: Iterate over all Frames
for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst();
pFrame;
pFrame = SfxViewFrame::GetNext(*pFrame) )
{
- // den Dispatcher des Frames rausholen
+ // Get the Dispatcher of the Frames
SfxDispatcher *pDispat = pFrame->GetDispatcher();
pDispat->Flush();
- // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
+ // Iterate over all SfxShells on the Dispatchers Stack
USHORT nIdx = 0;
for ( SfxShell *pSh = pDispat->GetShell(nIdx);
pSh;
@@ -812,12 +812,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
#endif
}
- // INet Session neu aufsetzen
+ // Set up INet Session again
if ( bResetSession )
{
}
- // geaenderte Daten speichern
+ // Store changed data
aInetOptions.flush();
}
@@ -826,7 +826,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
{
SvtPathOptions aPathOptions;
- // Daten werden in DocInfo und IniManager gespeichert
+ // Data is saved in DocInfo and IniManager
const SfxPoolItem *pItem = 0;
SfxItemPool &rPool = GetPool();
@@ -925,7 +925,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
//--------------------------------------------------------------------
-// alle Dokumente speichern
+// Save all Documents
BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
{
@@ -996,7 +996,6 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const
//--------------------------------------------------------------------
void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
{
-
SfxObjectShell *pDoc = rEventHint.GetObjShell();
if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
return;
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 18b885d..7b0347a 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -78,7 +78,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
SfxChildWinFactory *pF = NULL;
if ( pMod )
{
- // Modul "ubergeben, ChildwindowFactory dort suchen
+ // Abandon Module, search there for ChildwindowFactory
pFactories = pMod->GetChildWinFactories_Impl();
if ( pFactories )
{
@@ -88,7 +88,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
SfxChildWinFactory *pFac = (*pFactories)[nFactory];
if ( nId == pFac->nId )
{
- // Factory gefunden, Context dort registrieren
+ // Factory found, registrer Context here.
pF = pFac;
break;
}
@@ -98,9 +98,9 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
if ( !pF )
{
- // Factory an der Application suchen
- DBG_ASSERT( pAppData_Impl, "Keine AppDaten!" );
- DBG_ASSERT( pAppData_Impl->pFactArr, "Keine Factories!" );
+ // Search for Factory in the Application
+ DBG_ASSERT( pAppData_Impl, "No AppData!" );
+ DBG_ASSERT( pAppData_Impl->pFactArr, "No Factories!" );
pFactories = pAppData_Impl->pFactArr;
USHORT nCount = pFactories->Count();
@@ -111,10 +111,10 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT
nI
{
if ( pMod )
{
- // Wenn der Context von einem Modul registriert wurde,
- // mu\s die ChildwindowFactory auch dort zur Verf"ugung
- // stehen, sonst m"u\ste sich die Contextfactory im DLL-Exit
- // wieder abmelden !
+ // If the context of a module has been registered, then the
+ // ChildWindowFactory must also be available there,
+ // else the ContextFactory would have be unsubscribed on
+ // DLL-exit
pF = new SfxChildWinFactory( pFac->pCtor, pFac->nId,
pFac->nPos );
pMod->RegisterChildWindow( pF );
@@ -134,7 +134,7 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
return;
}
- OSL_FAIL( "Kein ChildWindow fuer diesen Context!" );
+ OSL_FAIL( "No ChildWindow for this Context!" );
}
//--------------------------------------------------------------------
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 1615c29..7a00333 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -106,7 +106,6 @@ public:
virtual BOOL Execute( const String* );
virtual BOOL StartAdviseLoop();
virtual BOOL MakeItem( const String& rItem );
-
};
@@ -118,15 +117,14 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *)
BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
const String &rCmd, const String &rEvent )
-/* [Beschreibung]
-
- Pr"uft, ob 'rCmd' das Event 'rEvent' ist (ohne '(') und baut
- aus diesem dann ein <ApplicationEvent> zusammen, das per
- <Application::AppEvent()> ausgef"uhrt werden kann. Ist 'rCmd' das
- angegegeben Event 'rEvent', dann wird TRUE zur"uckgegeben, sonst FALSE.
+/* [Description]
+ Checks if 'rCmd' of the event 'rEvent' is (without '(') and then assemble
+ this data into a <ApplicationEvent>, which can be excecuted through
+ <Application::AppEvent()>. If 'rCmd' is the given event 'rEvent', then
+ TRUE is returned, otherwise FALSE.
- [Beispiel]
+ [Example]
rCmd = "Open(\"d:\doc\doc.sdw\")"
rEvent = "Open"
@@ -141,7 +139,7 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
aData.Erase( 0, aEvent.Len() );
if ( aData.Len() > 2 )
{
- // in das ApplicationEvent-Format wandeln
+ // Transform into the ApplicationEvent Format
aData.Erase( aData.Len()-1, 1 );
for ( USHORT n = 0; n < aData.Len(); ++n )
{
@@ -165,32 +163,31 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
long SfxApplication::DdeExecute
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to thier SfxApplication subclass.
- Die Basisimplementierung versteht die API-Funktionalit"at der
- betreffenden SfxApplication-Subklasse in BASIC-Syntax. R"uckgabewerte
- k"onnen dabei leider nicht "ubertragen werden.
+ The base implementation understands the API functionality of the
+ relevant SfxApplication subclass in BASIC syntax. Return values can
+ not be transferred, unfortunately.
*/
{
- // Print oder Open-Event?
+ // Print or Open-Event?
ApplicationEvent aAppEvent;
if ( SfxAppEvent_Impl( aAppEvent, rCmd, DEFINE_CONST_UNICODE("Print") ) ||
SfxAppEvent_Impl( aAppEvent, rCmd, DEFINE_CONST_UNICODE("Open") ) )
GetpApp()->AppEvent( aAppEvent );
else
{
- // alle anderen per BASIC
+ // all others are BASIC
EnterBasicCall();
StarBASIC* pBasic = GetBasic();
- DBG_ASSERT( pBasic, "Wo ist mein Basic???" );
+ DBG_ASSERT( pBasic, "Where is the Basic???" );
SbxVariable* pRet = pBasic->Execute( rCmd );
LeaveBasicCall();
if( !pRet )
@@ -206,18 +203,17 @@ long SfxApplication::DdeExecute
long SfxApplication::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -228,18 +224,17 @@ long SfxApplication::DdeGetData
long SfxApplication::DdeSetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxApplication-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -250,15 +245,15 @@ long SfxApplication::DdeSetData
::sfx2::SvLinkSource* SfxApplication::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxApplication-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
@@ -269,21 +264,20 @@ long SfxApplication::DdeSetData
long SfxObjectShell::DdeExecute
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to the thier SfxApplication subclass.
- Die Basisimplementierung f"uhrt nichts aus und liefert 0 zur"uck.
+ The base implementation does nothing and returns 0.
*/
{
StarBASIC* pBasic = GetBasic();
- DBG_ASSERT( pBasic, "Wo ist mein Basic???" ) ;
+ DBG_ASSERT( pBasic, "Where is the Basic???" ) ;
SbxVariable* pRet = pBasic->Execute( rCmd );
if( !pRet )
{
@@ -298,18 +292,17 @@ long SfxObjectShell::DdeExecute
long SfxObjectShell::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -320,18 +313,17 @@ long SfxObjectShell::DdeGetData
long SfxObjectShell::DdeSetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxObjectShell-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -341,15 +333,15 @@ long SfxObjectShell::DdeSetData
//--------------------------------------------------------------------
::sfx2::SvLinkSource* SfxObjectShell::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxObjectShell-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
@@ -377,19 +369,18 @@ void SfxObjectShell::ReconnectDdeLinks(SfxObjectShell& rServer)
long SfxViewFrame::DdeExecute
(
- const String& rCmd // in unserer BASIC-Syntax formuliert
+ const String& rCmd // Expressed in our BASIC-Syntax
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Kommandos
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-commands directed to the thier SfxApplication subclass.
- Die Basisimplementierung versteht die API-Funktionalit"at des
- betreffenden SfxViewFrame, der darin dargestellten SfxViewShell und
- der betreffenden SfxObjectShell-Subklasse in BASIC-Syntax.
- R"uckgabewerte k"onnen dabei leider nicht "ubertragen werden.
+ The base implementation understands the API functionality of the
+ relevant SfxViewFrame, which is shown and the relevant SfxViewShell
+ and the relevant SfxApplication subclass in BASIC syntax. Return
+ values can not be transferred, unfortunately.
*/
{
@@ -403,18 +394,17 @@ long SfxViewFrame::DdeExecute
long SfxViewFrame::DdeGetData
(
- const String&, // das anzusprechende Item
+ const String&, // the Item to be addressed
const String&, // in: Format
- ::com::sun::star::uno::Any& // out: angeforderte Daten
+ ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Daten-Anforderungen
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data-requests directed to thier SfxApplication subclass.
- Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck.
+ The base implementation provides no data and returns 0.
*/
{
@@ -425,18 +415,17 @@ long SfxViewFrame::DdeGetData
long SfxViewFrame::DdeSetData
(
- const String& , // das anzusprechende Item
- const String& , // in: Format
- const ::com::sun::star::uno::Any& // out: angeforderte Daten
+ const String&, // the Item to be addressed
+ const String&, // in: Format
+ const ::com::sun::star::uno::Any& // out: requested data
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seine SfxViewFrame-Subklasse gerichtete DDE-Daten
- zu empfangen.
+ This method can be overloaded by application developers, to receive
+ DDE-data directed to thier SfxApplication subclass.
- Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck.
+ The base implementation is not receiving any data and returns 0.
*/
{
@@ -447,15 +436,15 @@ long SfxViewFrame::DdeSetData
::sfx2::SvLinkSource* SfxViewFrame::DdeCreateLinkSource
(
- const String& // das zu erzeugende Item
+ const String& // the Item to be addressed
)
-/* [Beschreibung]
+/* [Description]
- Diese Methode kann vom Applikationsentwickler "uberladen werden,
- um an seiner SfxViewFrame-Subklasse einen DDE-Hotlink einzurichten
+ This method can be overloaded by application developers, to establish
+ a DDE-hotlink to thier SfxApplication subclass.
- Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck.
+ The base implementation is not generate a link and returns 0.
*/
{
@@ -467,7 +456,7 @@ long SfxViewFrame::DdeSetData
BOOL SfxApplication::InitializeDde()
{
DBG_ASSERT( !pAppData_Impl->pDdeService,
- "Dde kann nicht mehrfach initialisiert werden" );
+ "Dde can not be initialized multiple times" );
pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() );
int nError = pAppData_Impl->pDdeService->GetError();
@@ -475,10 +464,10 @@ BOOL SfxApplication::InitializeDde()
{
pAppData_Impl->pDocTopics = new SfxDdeDocTopics_Impl;
- // wir wollen auf jedenfall RTF unterstuetzen!
+ // we certainly want to support RTF!
pAppData_Impl->pDdeService->AddFormat( FORMAT_RTF );
- // Config-Pfad als Topic wegen Mehrfachstart
+ // Config path as a topic becauseof multiple starts
INetURLObject aOfficeLockFile( SvtPathOptions().GetUserConfigPath() );
aOfficeLockFile.insertName( DEFINE_CONST_UNICODE( "soffice.lck" ) );
String aService( SfxDdeServiceName_Impl(
@@ -503,19 +492,18 @@ void SfxAppData_Impl::DeInitDDE()
void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
{
- DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
- //OV: Im Serverbetrieb ist DDE abgeklemmt!
+ DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
+ //OV: DDE is disconnected in server mode!
if( !pAppData_Impl->pDocTopics )
return;
- // doppeltes Eintragen verhindern
+ // prevent double submit
String sShellNm;
BOOL bFnd = FALSE;
for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
if( (*pAppData_Impl->pDocTopics)[ --n ]->pSh == pSh )
{
- // falls das Document unbenannt wurde, ist trotzdem ein
- // neues Topics anzulegen!
+ // If the document is untitled, is still a new Topic is created!
if( !bFnd )
{
bFnd = TRUE;
@@ -534,8 +522,8 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
{
- DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
- //OV: Im Serverbetrieb ist DDE abgeklemmt!
+ DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" );
+ //OV: DDE is disconnected in server mode!
if( !pAppData_Impl->pDocTopics )
return;
@@ -562,14 +550,14 @@ DdeService* SfxApplication::GetDdeService()
BOOL ImplDdeService::MakeTopic( const String& rNm )
{
- // Workaround gegen Event nach unserem Main() unter OS/2
- // passierte wenn man beim Beenden aus dem OffMgr die App neu startet
+ // Workaround for Event after Main() under OS/2
+ // happens when exiting starts the App again
if ( !Application::IsInExecute() )
return FALSE;
- // das Topic rNm wird gesucht, haben wir es ?
- // erstmal nur ueber die ObjectShells laufen und die mit dem
- // Namen heraussuchen:
+ // The Topic rNm is sought, do we have it?
+ // First only loop over the ObjectShells to find those
+ // with the specific name:
BOOL bRet = FALSE;
String sNm( rNm );
sNm.ToLowerAscii();
@@ -579,7 +567,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
{
String sTmp( pShell->GetTitle(SFX_TITLE_FULLNAME) );
sTmp.ToLowerAscii();
- if( sTmp == sNm ) // die wollen wir haben
+ if( sTmp == sNm )
{
SFX_APP()->AddDdeTopic( pShell );
bRet = TRUE;
@@ -595,9 +583,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
if ( aWorkPath.GetNewAbsURL( rNm, &aFile ) &&
SfxContentHelper::IsDocument( aFile.GetMainURL( INetURLObject::NO_DECODE ) ) )
{
- // File vorhanden
-
- // dann versuche die Datei zu laden:
+ // File exists? then try to load it:
SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) );
SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, TRUE);
@@ -706,7 +692,7 @@ BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
::sfx2::SvLinkSource* pNewObj = pSh->DdeCreateLinkSource( GetCurItem() );
if( pNewObj )
{
- // dann richten wir auch einen entsprechenden SvBaseLink ein
+ // then we also establish a corresponding SvBaseLink
String sNm, sTmp( Application::GetAppName() );
::sfx2::MakeLnkName( sNm, &sTmp, pSh->GetTitle(SFX_TITLE_FULLNAME), GetCurItem() );
new ::sfx2::SvBaseLink( sNm, OBJECT_DDE_EXTERN, pNewObj );
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2d3f3ec..08bbc69 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -256,8 +256,8 @@ bool SfxApplication::Initialize_Impl()
#ifdef DBG_UTIL
- // Der SimplerErrorHandler dient Debugzwecken. In der Product werden
- // nichtgehandelte Fehler durch Errorcode 1 an SFX gegeben.
+ // The SimplerErrorHandler is for debugging. In the Product errors
+ // not processed are given to SFX as Errorcode 1.
new SimpleErrorHandler;
#endif
new SfxErrorHandler(RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1);
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 4c570c5..a7b63a5 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -98,18 +98,19 @@ void SfxApplication::Init
(
)
-/* [Beschreibung]
-
- Diese virtuelle Methode wird vom SFx aus Application:a:Main() gerufen,
- bevor Execute() ausgef"uhrt wird und
- - das Intro bereits angezeigt ist,
- - das Applikationsfenster exisitiert, aber noch hidden ist,
- - die Bindings bereits existieren (Controller sind anmeldbar),
- - der Ini- und Config-Manager bereits existiert,
- - die Standard-Controller bereits exisitieren,
- - die SFx-Shells ihre Interfaces bereits registriert haben.
-
- [Querverweise]
+/* [Description]
+
+ This virtual method is called from SFx through Application::Main(),
+ before Execute() is called and:
+ - the Intro is already displayed,
+ - the Applications window exists, but it is still hidden,
+ - the Bindings already exist (Controller can be registered),
+ - the Init and Config-Manager already exists,
+ - the Standard-Controller already exists,
+ - the SFx-Shells have alredy registered their Interfaces.
+
+ [Cross-reference]
+
<SfxApplication::Exit()>
<SfxApplication::OpenClients()>
*/
@@ -120,7 +121,7 @@ void SfxApplication::Init
#else
if( !InitializeDde() )
{
- ByteString aStr( "Kein DDE-Service moeglich. Fehler: " );
+ ByteString aStr( "No DDE-Service possible. Error: " );
if( GetDdeService() )
aStr += GetDdeService()->GetError();
else
@@ -135,17 +136,17 @@ void SfxApplication::Init
void SfxApplication::Exit()
-/* [Beschreibung]
+/* [Description]
- Diese virtuelle Methode wird vom SFx aus Application::Main() gerufen,
- nachdem Execute() beendet ist und
- - die Konfiguration (SfxConfigManager) bereits gespeichert wurde,
- - die Fensterpostionen etc. in den SfxIniManager geschrieben wurden,
- - das Applikationsfenster noch existiert, aber hidden ist
- - s"amtliche Dokumente und deren Views bereits geschlossen sind.
- - Dispatcher, Bindings etc. bereits zerst"ort sind
+ This virtual method is called from SFx through Application::Main(),
+ after Execute() has finished and
+ - the configuration (SfxConfigManager) was already saved,
+ - the window postions etc. in the SfxIniManager were written,
+ - the Application widow still exists, but is hidden
+ - all Documents and their Views already are closed.
+ - Dispatcher, Bindings etc. already destroyed.
- [Querverweise]
+ [Cross-reference]
<SfxApplication::Init(int,char*[])>
*/
@@ -162,14 +163,14 @@ void SfxApplication::PreInit( )
bool SfxApplication::InitLabelResMgr( const char* _pLabelPrefix, bool _bException )
{
bool bRet = false;
- // Label-DLL mit diversen Resourcen fuer OEM-Ver. etc. (Intro, Titel, About)
+ // Label-DLL with various resources for OEM-Ver. etc. (Intro, Titel, About)
DBG_ASSERT( _pLabelPrefix, "Wrong initialisation!" );
if ( _pLabelPrefix )
{
- // versuchen, die Label-DLL zu erzeugen
+ // try to create the Label-DLL
pAppData_Impl->pLabelResMgr = CreateResManager( _pLabelPrefix );
- // keine separate Label-DLL vorhanden?
+ // no separate label-DLL available?
if ( !pAppData_Impl->pLabelResMgr )
{
if ( _bException )
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index a6f8121..909cfce 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -186,13 +186,12 @@ void SfxApplication::InitializeDisplayName_Impl()
//--------------------------------------------------------------------
SfxProgress* SfxApplication::GetProgress() const
-/* [Beschreibung]
+/* [Description]
- Liefert den f"ur die gesamte Applikation laufenden SfxProgress
- oder 0, falls keiner f"ur die gesamte Applikation l"auft.
+ Returns the running SfxProgress for the entire application or 0 if
+ none is running for the entire application.
-
- [Querverweise]
+ [Cross-reference]
<SfxProgress::GetActiveProgress(SfxViewFrame*)>
<SfxViewFrame::GetProgress()const>
@@ -210,7 +209,7 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
SvUShorts* pList = pAppData_Impl->pDisabledSlotList;
if ( !pList )
{
- // Gibt es eine Slotdatei ?
+ // Is there a slot file?
INetURLObject aUserObj( SvtPathOptions().GetUserConfigPath() );
aUserObj.insertName( DEFINE_CONST_UNICODE( "slots.cfg" ) );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aUserObj.GetMainURL(
INetURLObject::NO_DECODE ), STREAM_STD_READ );
@@ -226,7 +225,7 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
BOOL bSlots = ( pStream && !pStream->GetError() );
if( bSlots && bSlotsEnabled )
{
- // SlotDatei einlesen
+ // Read Slot file
String aTitle;
pStream->ReadByteString(aTitle);
if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL )
@@ -246,21 +245,20 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
pStream->ReadByteString(aTitle);
if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() )
{
- // Lesen schief gegangen
+ // Read failed
DELETEZ( pList );
bError = sal_True;
}
}
else
{
- // Streamerkennung fehlgeschlagen
+ // Stream detection failure
bError = sal_True;
}
}
else if ( bSlots != bSlotsEnabled )
{
- // Wenn kein Slotlist-Eintrag, dann darf auch keine SlotDatei
- // vorhanden sein
+ // If no slot list entry, then no slot file shall exist
bError = sal_True;
}
@@ -276,9 +274,9 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
if ( bError )
{
- // Wenn ein Sloteintrag vorhanden ist, aber keine oder eine fehlerhafte
- // SlotDatei, oder aber eine Slotdatei, aber kein Sloteintrag, dann
- // gilt dies als fehlerhafte Konfiguration
+ // If an entry slot is present, but no or faulty slot file, or a slot
+ // file, but no slot entry, then this is considered to be a
+ // misconfiguration
new SfxSpecialConfigError_Impl( String( SfxResId( RID_SPECIALCONFIG_ERROR ) ) );
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 97b3c37..532c331 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -153,45 +153,45 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& )
thr
SfxObjectShellRef SfxApplication::DocAlreadyLoaded
(
- const String& rName, // Name des Dokuments mit Pfad
- BOOL bSilent, // TRUE: nicht nach neuer Sicht fragen
- BOOL bActivate, // soll bestehende Sicht aktiviert werden
+ const String& rName, // Name of Documents including path
+ BOOL bSilent, // TRUE: do not ask for a new view
+ BOOL bActivate, // existing view to be activated
BOOL bForbidVisible,
const String* pPostStr
)
-/* [Beschreibung]
+/* [Description]
- Stellt fest, ob ein Dokument mit dem Namen 'rName' bereits geladen
- ist und liefert einen Pointer darauf zu"uck.
+ Determines whether a document with the name 'rName' already is loaded and
+ returns a pointer to this document.
- Ist das Dokument noch nicht geladen, wird ein 0-Pointer zur"uckgeliefert.
+ If the document is not loaded, a 0-pointer is returned.
*/
{
- // zu suchenden Namen als URL aufbereiten
+ // prepare to search for names as URL
INetURLObject aUrlToFind( rName );
DBG_ASSERT( aUrlToFind.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL" );
String aPostString;
if ( pPostStr )
aPostString = *pPostStr;
- // noch offen?
+ // still open?
SfxObjectShellRef xDoc;
if ( !aUrlToFind.HasError() )
{
- // dann bei den normal geoeffneten Docs
+ // then with the normally open Documents
if ( !xDoc.Is() )
{
- xDoc = SfxObjectShell::GetFirst( 0, FALSE ); // auch hidden Docs
+ xDoc = SfxObjectShell::GetFirst( 0, FALSE ); // also hidden Documents
while( xDoc.Is() )
{
if ( xDoc->GetMedium() &&
xDoc->GetCreateMode() == SFX_CREATE_MODE_STANDARD &&
!xDoc->IsAbortingImport() && !xDoc->IsLoading() )
{
- // Vergleiche anhand der URLs
+ // Comparisons between URLs
INetURLObject aUrl( xDoc->GetMedium()->GetName() );
if ( !aUrl.HasError() && aUrl == aUrlToFind &&
(!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, TRUE )) &&
@@ -205,11 +205,10 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
}
}
- // gefunden?
+ // Found?
if ( xDoc.Is() && bActivate )
{
- DBG_ASSERT(
- !bForbidVisible, "Unsichtbares kann nicht aktiviert werden" );
+ DBG_ASSERT(!bForbidVisible, "Invisible can not be enabled" );
SfxViewFrame* pFrame;
for( pFrame = SfxViewFrame::GetFirst( xDoc );
@@ -289,17 +288,16 @@ private:
sal_uInt32 CheckPasswd_Impl
(
SfxObjectShell* pDoc,
- SfxItemPool& /*rPool*/, // Pool, falls ein Set erzeugt werden mus
- SfxMedium* pFile // das Medium, dessen Passwort gfs. erfragt werden soll
+ SfxItemPool& /*rPool*/, // Pool, if a Set has to be created
+ SfxMedium* pFile // the Medium and its Password shold be obtained
)
-/* [Beschreibung]
+/* [Description]
- Zu einem Medium das Passwort erfragen; funktioniert nur, wenn es sich
- um einen Storage handelt.
- Wenn in der Documentinfo das Passwort-Flag gesetzt ist, wird
- das Passwort vom Benutzer per Dialog erfragt und an dem Set
- des Mediums gesetzt; das Set wird, wenn nicht vorhanden, erzeugt.
+ Ask for the password for a medium, only works if it concerns storage.
+ If the password flag is set in the Document Info, then the password is
+ requested through a user dialogue and the set at the Set of the medium.
+ If the set does not exist the it is created.
*/
{
ULONG nRet = ERRCODE_NONE;
@@ -542,7 +540,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- // keine Parameter vom BASIC nur Factory angegeben?
+ // No Parameter from BASIC only Factory given?
SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE);
SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, FALSE);
@@ -550,7 +548,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
SfxObjectShellLock xDoc;
String aTemplateRegion, aTemplateName, aTemplateFileName;
- BOOL bDirect = FALSE; // "uber FileName anstelle Region/Template
+ BOOL bDirect = FALSE; // through FileName instead of Region/Template
SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
if ( !pTemplNameItem && !pTemplFileNameItem )
{
@@ -786,8 +784,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.RemoveItem( SID_FILE_NAME );
rReq.AppendItem( SfxStringItem( SID_FILE_NAME, aURL ) );
- // synchron ausf"uhren, damit beim Reschedulen nicht schon das n"achste Dokument
- // geladen wird
+ // Run synchronous, so that not the next document is loaded
+ // when rescheduling
// TODO/LATER: use URLList argument and always remove one document after another,
each step in asychronous execution, until finished
// but only if reschedule is a problem
GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs()
);
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index c44cd04..dcbd8cb 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -75,10 +75,10 @@ BOOL SfxApplication::QueryExit_Impl()
{
BOOL bQuit = TRUE;
- // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben?
+ // Does some instance, that can not be shut down, still require the app?
if ( !bQuit )
{
- // nicht wirklich beenden, nur minimieren
+ // Not really exit, only minimize
InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) );
aInfoBox.Execute();
DBG_TRACE( "QueryExit => FALSE (in use)" );
@@ -97,14 +97,14 @@ void SfxApplication::Deinitialize()
StarBASIC::Stop();
- // ggf. BASIC speichern
+ // Save BASIC if possible
BasicManager* pBasMgr = BasicManagerRepository::getApplicationBasicManager( false );
if ( pBasMgr && pBasMgr->IsModified() )
SaveBasicManager();
SaveBasicAndDialogContainer();
- pAppData_Impl->bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit
+ pAppData_Impl->bDowning = TRUE; // due to Timer from DecAliveCount and QueryExit
DELETEZ( pAppData_Impl->pTemplates );
@@ -125,8 +125,8 @@ void SfxApplication::Deinitialize()
// call derived application-exit
Exit();
- // Controller u."a. freigeben
- // dabei sollten auch restliche Komponenten ( Beamer! ) verschwinden
+ // Release Controller and others
+ // then the remaining components should alse disapear ( Beamer! )
BasicManagerRepository::resetApplicationBasicManager();
pAppData_Impl->pBasicManager->reset( NULL );
// this will also delete pBasMgr
@@ -140,7 +140,7 @@ void SfxApplication::Deinitialize()
SfxResId::DeleteResMgr();
DELETEZ(pAppData_Impl->pOfaResMgr);
- // ab hier d"urfen keine SvObjects mehr existieren
+ // from here no SvObjects have to exists
DELETEZ(pAppData_Impl->pMatcher);
delete pAppData_Impl->pLabelResMgr;
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index e8e426b..58aec1b 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -92,7 +92,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("TbxController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("TbxController registration is not clearly defined!");
}
}
#endif
@@ -117,7 +117,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("StbController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("StbController registration is not clearly defined!");
}
}
#endif
@@ -142,7 +142,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
(pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) )
{
- DBG_WARNING("MenuController-Registrierung ist nicht eindeutig!");
+ DBG_WARNING("MenuController register is not clearly defined!");
}
}
#endif
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a3b44b9..33d3fd8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -267,7 +267,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
// if terminate() was successful, SfxApplication is now dead!
pAppData_Impl->bInQuit = FALSE;
- // Returnwert setzten, ggf. terminieren
+ // Set return value, terminate if possible
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) );
return;
}
@@ -440,13 +440,12 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_HELPTIPS:
{
- // Parameter aus werten
+ // Evaluate Parameter
SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, FALSE);
bool bOn = pOnItem
? ((SfxBoolItem*)pOnItem)->GetValue()
: !Help::IsQuickHelpEnabled();
- // ausf"uhren
if ( bOn )
Help::EnableQuickHelp();
else
@@ -455,7 +454,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Invalidate(SID_HELPTIPS);
bDone = true;
- // ggf. recorden
+ // Record if possible
if ( !rReq.IsAPI() )
rReq.AppendItem( SfxBoolItem( SID_HELPTIPS, bOn) );
break;
@@ -468,13 +467,12 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
case SID_HELPBALLOONS:
{
- // Parameter auswerten
+ // Evaluate Parameter
SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, FALSE);
bool bOn = pOnItem
? ((SfxBoolItem*)pOnItem)->GetValue()
: !Help::IsBalloonHelpEnabled();
- // ausf"uhren
if ( bOn )
Help::EnableBalloonHelp();
else
@@ -483,7 +481,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Invalidate(SID_HELPBALLOONS);
bDone = true;
- // ggf. recorden
+ // Record if possible
if ( !rReq.IsAPI() )
rReq.AppendItem( SfxBoolItem( SID_HELPBALLOONS, bOn) );
break;
@@ -676,7 +674,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
rtl::OUStringBuffer aBuf( aToolbarResName );
aBuf.append( pToolbarName->GetValue() );
- // Parameter auswerten
+ // Evaluate Parameter
rtl::OUString aToolbarName( aBuf.makeStringAndClear() );
BOOL bShow( !xLayoutManager->isElementVisible( aToolbarName ));
@@ -710,7 +708,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(),
Application::GetSettings().GetLocale() );
const USHORT *pRanges = rSet.GetRanges();
- DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
+ DBG_ASSERT(pRanges && *pRanges, "Set without range");
while ( *pRanges )
{
for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
@@ -1413,7 +1411,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
{
const USHORT *pRanges = rSet.GetRanges();
- DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
+ DBG_ASSERT(pRanges && *pRanges, "Set without Region");
while ( *pRanges )
{
for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 63da5fa..5c65c2d 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -213,8 +213,8 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
SfxChildWinFactory* pFact=0;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
- // Zuerst ChildWindow im SDT suchen; "Uberlagerungen m"ussen mit einem
- // ChildWindowContext realisiert werden
+ // First search for ChildWindow in SDT; "Overloading has to be realized
+ // by using ChildWindowContext
SfxApplication *pApp = SFX_APP();
{
SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
@@ -276,12 +276,12 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
if ( pChild )
pChild->SetFactory_Impl( pFact );
- DBG_ASSERT(pFact && (pChild || !rInfo.bVisible), "ChildWindow-Typ nicht registriert!");
+ DBG_ASSERT(pFact && (pChild || !rInfo.bVisible), "ChildWindow-Typ not registered!");
if ( pChild && !pChild->pWindow )
{
DELETEZ(pChild);
- DBG_WARNING("ChildWindow hat kein Fenster!");
+ DBG_WARNING("ChildWindow has no Window!");
}
return pChild;
@@ -392,15 +392,15 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId,
SfxChildWin
if ( aWinData.Len() )
{
- // Nach Versionskennung suchen
+ // Search for version ID
if ( aWinData.GetChar((sal_uInt16)0) != 0x0056 ) // 'V' = 56h
- // Keine Versionskennung, daher nicht verwenden
+ // A version ID, so do not use
return;
- // 'V' l"oschen
+ // Delete 'V'
aWinData.Erase(0,1);
- // Version lesen
+ // Read version
char cToken = ',';
sal_uInt16 nPos = aWinData.Search( cToken );
sal_uInt16 nActVersion = (sal_uInt16)aWinData.Copy( 0, nPos + 1 ).ToInt32();
@@ -409,7 +409,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
aWinData.Erase(0,nPos+1);
- // Sichtbarkeit laden: ist als ein char codiert
+ // Load Visibility: is coded as a char
rInfo.bVisible = (aWinData.GetChar(0) == 0x0056); // 'V' = 56h
aWinData.Erase(0,1);
nPos = aWinData.Search( cToken );
@@ -418,7 +418,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
USHORT nNextPos = aWinData.Search( cToken, 2 );
if ( nNextPos != STRING_NOTFOUND )
{
- // es gibt noch Extra-Information
+ // there is extra information
rInfo.nFlags = (sal_uInt16)aWinData.Copy( nPos+1, nNextPos - nPos - 1 ).ToInt32();
aWinData.Erase( nPos, nNextPos-nPos+1 );
rInfo.aExtraString = aWinData;
@@ -447,7 +447,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
pFact = rFactories[nFactory];
if ( pFact->nId == GetType() )
{
- DBG_ASSERT( pFact->pArr, "Kein Kontext angemeldet!" );
+ DBG_ASSERT( pFact->pArr, "No context registered!" );
if ( !pFact->pArr )
break;
@@ -479,7 +479,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
pFact = rFactories[nFactory];
if ( pFact->nId == GetType() )
{
- DBG_ASSERT( pFact->pArr, "Kein Kontext angemeldet!" );
+ DBG_ASSERT( pFact->pArr, "No context registered!" );
if ( !pFact->pArr )
break;
@@ -504,7 +504,7 @@ void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBinding
if ( !pCon )
{
- OSL_FAIL( "Kein geeigneter Context gefunden!" );
+ OSL_FAIL( "No suitable context found! ");
return;
}
@@ -539,7 +539,7 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
}
else
{
- OSL_FAIL("Kein FloatingWindow-Context!");
+ OSL_FAIL("No FloatingWindow-Context!");
return NULL;
}
}
@@ -613,7 +613,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
sal_uInt16 *pPos
) const
{
- // ung"ultig?
+ // invalid?
if ( !aExtraString.Len() )
return sal_False;
String aStr;
@@ -621,8 +621,8 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
if ( nPos == STRING_NOTFOUND )
return sal_False;
- // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn
- // er nicht vorhanden ist, liegt eine "altere Version vor
+ // Try to read the alignment string "ALIGN :(...)", but if
+ // it is not present, then use an older version
if ( nPos != STRING_NOTFOUND )
{
sal_uInt16 n1 = aExtraString.Search('(', nPos);
@@ -631,20 +631,20 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
sal_uInt16 n2 = aExtraString.Search(')', n1);
if ( n2 != STRING_NOTFOUND )
{
- // Alignment-String herausschneiden
+ // Cut out Alignment string
aStr = aExtraString.Copy(nPos, n2 - nPos + 1);
aStr.Erase(nPos, n1-nPos+1);
}
}
}
- // Zuerst das Alignment extrahieren
+ // First extract the Alignment
if ( !aStr.Len() )
return sal_False;
if ( pAlign )
*pAlign = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
- // Dann das LastAlignment
+ // then the LastAlignment
nPos = aStr.Search(',');
if ( nPos == STRING_NOTFOUND )
return sal_False;
@@ -652,10 +652,10 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
if ( pLastAlign )
*pLastAlign = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
- // Dann die Splitting-Informationen
+ // Then the splitting information
nPos = aStr.Search(',');
if ( nPos == STRING_NOTFOUND )
- // Dockt nicht in einem Splitwindow
+ // No docking in a Splitwindow
return sal_True;
aStr.Erase(0, nPos+1);
Point aChildPos;
@@ -699,8 +699,6 @@ void SfxChildWindow::Hide()
}
}
-
-
void SfxChildWindow::Show( USHORT nFlags )
{
switch ( pWindow->GetType() )
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 41f1a3e..f2d73c6 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -110,9 +110,9 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
case FILETYPE_TEXT:
if( FORMAT_FILE == nFmt )
{
- // das Medium muss in der Applikation geoffnet werden, um die
- // relativen Datei Links aufzuloesen!!!! Wird ueber den
- // LinkManager und damit von dessen Storage erledigt.
+ // The media in the application must be opened to lookup the
+ // relative file links!! This is done through the link manager
+ // of the Storage.
rData <<= rtl::OUString( sFileNm );
}
break;
@@ -127,18 +127,15 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
{
Graphic aGrf;
- // falls das Nativformat doch erwuenscht ist, muss am
- // Ende das Flag zurueckgesetzt werden.
-// wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
-// GraphicNode entfernt wird.
+ // If the native format is reqested, has to be reset at the
+ // end of the flag. Is solely in the sw/ndgrf.cxx used when
+ // the link is removed form GraphicNode.
BOOL bOldNativFormat = bNativFormat;
- // falls gedruckt werden soll, warten wir bis die
- // Daten vorhanden sind
+ // If about to print, waiting for the data to be available
if( bGetSynchron )
{
- // testhalber mal ein LoadFile rufen um das nach-
- // laden ueberahaupt anzustossen
+ // call a LoadFile every second time to test the loading
if( !xMed.Is() )
LoadFile_Impl();
@@ -154,13 +151,10 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
}
if( pDownLoadData ||
- ( !bWaitForData && ( xMed.Is() || // wurde als URL geladen
+ ( !bWaitForData && ( xMed.Is() || // was loaded as URL
( bSynchron && LoadFile_Impl() && xMed.Is() ) )) )
{
- // falls
-
- // falls es uebers Internet gesogen wurde, nicht
- // wieder versuchen
+ // If it was loaded from the Internet, do not retry
if( !bGetSynchron )
bLoadAgain = !xMed->IsRemote();
bLoadError = !GetGraphic_Impl( aGrf, xMed->GetInStream() );
@@ -206,7 +200,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
bNativFormat = bOldNativFormat;
- // alles fertig?
+ // Everything ready?
if( xMed.Is() && !bSynchron && bClearMedium )
{
xMed.Clear();
@@ -223,16 +217,12 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
return sal_True/*0 != aTypeList.Count()*/;
}
-
-
-
BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
{
if( !pLink || !pLink->GetLinkManager() )
return FALSE;
- // teste doch mal, ob nicht ein anderer Link mit der gleichen
- // Verbindung schon existiert
+ // Test if not another link of the same connection already exists
pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sFileNm, 0, &sFilter );
if( OBJECT_CLIENT_GRF == pLink->GetObjType() )
@@ -270,19 +260,18 @@ BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
SetUpdateTimeout( 0 );
- // und jetzt bei diesem oder gefundenem Pseudo-Object anmelden
+ // and now register by this or other found Pseudo-Object
AddDataAdvise( pLink, SotExchange::GetFormatMimeType( pLink->GetContentType()), 0 );
return TRUE;
}
-
BOOL SvFileObject::LoadFile_Impl()
{
- // wir sind noch im Laden!!
+ // We are still at Loading!!
if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
return FALSE;
- // z.Z. nur auf die aktuelle DocShell
+ // at the moment on the current DocShell
xMed = new SfxMedium( sFileNm, STREAM_STD_READ, TRUE );
SvLinkSource::StreamToLoadFrom aStreamToLoadFrom =
getStreamToLoadFrom();
@@ -305,7 +294,7 @@ BOOL SvFileObject::LoadFile_Impl()
bClearMedium = !xMed.Is();
if( bClearMedium )
- xMed = xTmpMed; // falls gleich im DownLoad schon schluss ist
+ xMed = xTmpMed; // If already finished in DownLoad
return bDataReady;
}
@@ -315,7 +304,7 @@ BOOL SvFileObject::LoadFile_Impl()
bLoadAgain = !xMed->IsRemote();
bWaitForData = FALSE;
- // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
+ // Graphic is finished, also send DataChanged of the Status change:
SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
return TRUE;
@@ -333,7 +322,7 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
String aEmptyStr;
int nRes;
- // vermeiden, dass ein native Link angelegt wird
+ // To avoid that a native link is created
if( ( !pStream || !pDownLoadData ) && !rGrf.IsLink() &&
!rGrf.GetContext() && !bNativFormat )
rGrf.SetLink( GfxLink() );
@@ -369,7 +358,7 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
}
else if( FALSE )
{
- // Timer aufsetzen, um zurueck zukehren
+ // Set up Timer, to return back
pDownLoadData->aTimer.Start();
}
}
@@ -383,14 +372,14 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
{
if( xMed.Is() && !pStream )
{
- DBG_WARNING3( "GrafikFehler [%d] - [%s] URL[%s]",
+ DBG_WARNING3( "Graphic error [%d] - [%s] URL[%s]",
nRes,
xMed->GetPhysicalName().GetBuffer(),
sFileNm.GetBuffer() );
}
else
{
- DBG_WARNING2( "GrafikFehler [%d] - [%s]",
+ DBG_WARNING2( "Graphic error [%d] - [%s]",
nRes, sFileNm.GetBuffer() );
}
}
@@ -457,7 +446,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
{
case OBJECT_CLIENT_GRF:
{
- nType = FILETYPE_GRF; // falls noch nicht gesetzt
+ nType = FILETYPE_GRF; // If not set already
SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK));
aDlg.EnableLink(sal_False);
@@ -516,19 +505,18 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const
Link& r
IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
{
- // wenn wir von hier kommen, kann es kein Fehler mehr sein
+ // When we come form here there it can not be an error no more.
pThis->bLoadError = FALSE;
pThis->bWaitForData = FALSE;
pThis->bInCallDownLoad = FALSE;
if( !pThis->bInNewData && !pThis->bDataReady )
{
- // Grafik ist fertig, also DataChanged von der Status-
- // aederung schicken:
+ // Graphic is finished, also send DataChanged from Status change
pThis->bDataReady = TRUE;
pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
- // und dann nochmal die Daten senden
+ // and then send the data again
pThis->NotifyDataChanged();
}
@@ -561,7 +549,7 @@ IMPL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef*, pDelMed )
IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
{
- // wenn wir von hier kommen, kann es kein Fehler mehr sein
+ // When we come form here there it can not be an error no more.
if( pThis->bInNewData )
return 0;
@@ -572,13 +560,11 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
{
pThis->pDownLoadData = new Impl_DownLoadData(
STATIC_LINK( pThis, SvFileObject, LoadGrfNewData_Impl ) );
-
- // Null-Link setzen, damit keine temporaeren Grafiken
- // rausgeswapt werden; der Filter prueft, ob schon
- // ein Link gesetzt ist => falls dies zutrifft, wird
- // _kein_ neuer Link gesetzt; der Link muss hier gesetzt werden,
- // (bevor das erste Mal gefiltert wird), um zu verhindern,
- // dass der Kontext zurueckgesetzt wird (aynchrones Laden)
+ // Set Zero-link, so that no temporary graphics can be swapped out,
+ // the filter checks whether a link is set already => if so, is _no_
+ // new link set, the link here must be set (before it is first
+ // filtered), to prevent, that the context will be reset
+ // (aynchronous loading)
if( !pThis->bNativFormat )
{
static GfxLink aDummyLink;
@@ -594,7 +580,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
if( ERRCODE_IO_PENDING == pStrm->GetError() )
pStrm->ResetError();
- // im DataChanged ein DataReady?
+ // a DataReady in DataChanged?
else if( pThis->bWaitForData && pThis->pDownLoadData )
{
pThis->bLoadError = TRUE;
@@ -603,8 +589,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
if( pThis->bDataReady )
{
- // Grafik ist fertig, also DataChanged von der Status-
- // aederung schicken:
+ // Graphic is finished, also send DataChanged from Status change
pThis->SendStateChg_Impl( pStrm->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR :
sfx2::LinkManager::STATE_LOAD_OK );
}
@@ -638,14 +623,14 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
return 0;
}
-/* [Beschreibung]
+/* [Description]
+
+ The method determines whether the data-object can be read from a DDE.
- Die Methode stellt fest, ob aus einem DDE-Object die Daten gelesen
- werden kann.
- Zurueckgegeben wird:
- ERRCODE_NONE wenn sie komplett gelesen wurde
- ERRCODE_SO_PENDING wenn sie noch nicht komplett gelesen wurde
- ERRCODE_SO_FALSE sonst
+ The following can be returned:
+ ERRCODE_NONE if it has been completely read
+ ERRCODE_SO_PENDING if it has not been completely read
+ ERRCODE_SO_FALSE otherwise
*/
BOOL SvFileObject::IsPending() const
{
@@ -678,10 +663,10 @@ BOOL SvFileObject::IsDataComplete() const
void SvFileObject::CancelTransfers()
{
- // und aus dem Cache austragen, wenn man mitten im Laden ist
+ // unsubscribe from the cache if in the middle of loading
if( !bDataReady )
{
- // nicht noch mal aufsetzen
+ // Do not set-up again
bLoadAgain = FALSE;
bDataReady = bLoadError = bWaitForData = TRUE;
SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 622a125..57f5ba9 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -83,8 +83,7 @@ public:
virtual BOOL Connect( sfx2::SvBaseLink* );
virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl );
- // erfrage ob das man direkt auf die Daten zugreifen kann oder ob das
- // erst angestossen werden muss
+ // Ask whether you can access data directly or whether it has to be triggered
virtual BOOL IsPending() const;
virtual BOOL IsDataComplete() const;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 6ee5e26..6b60c98 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -237,8 +237,6 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection->GetError() )
{
- // kann man denn das System-Topic ansprechen ?
- // dann ist der Server oben, kennt nur nicht das Topic!
// Is it possible to address the system-Topic?
// then the server is up, it just does not know the topic!
if( sTopic.EqualsIgnoreCaseAscii( "SYSTEM" ) )
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 7b27b38..5782c9d 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -119,11 +119,7 @@ void LinkManager::CloseCachedComps()
maCachedComps.clear();
}
-/************************************************************************
-|* LinkManager::Remove()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void LinkManager::Remove( SvBaseLink *pLink )
{
@@ -343,7 +339,7 @@ void LinkManager::UpdateAllLinks(
if( USHRT_MAX == nFndPos )
continue; // was not available!
- // Graphic-Links not to update jet
+ // Graphic-Links not to update yet
if( !pLink->IsVisible() ||
( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() ))
continue;
@@ -361,11 +357,7 @@ void LinkManager::UpdateAllLinks(
CloseCachedComps();
}
-/************************************************************************
-|* SvBaseLink::CreateObject()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
{
@@ -522,7 +514,7 @@ ULONG LinkManager::RegisterStatusInfoId()
// nFormat = Exchange::RegisterFormatName( "StatusInfo vom SvxInternalLink" );
nFormat = SotExchange::RegisterFormatName(
String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
- "StatusInfo vom SvxInternalLink" )));
+ "StatusInfo from SvxInternalLink" )));
}
return nFormat;
}
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 23711d6..7d5fac6 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -14,7 +14,7 @@
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+zd * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-
#include <sfx2/lnkbase.hxx>
#include <sot/exchange.hxx>
#include <com/sun/star/uno/Any.hxx>
@@ -131,12 +130,7 @@ public:
BOOL IsInDTOR() const { return bIsInDTOR; }
};
-
-/************************************************************************
-|* SvBaseLink::SvBaseLink()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
SvBaseLink::SvBaseLink()
{
@@ -147,11 +141,7 @@ SvBaseLink::SvBaseLink()
bWasLastEditOK = FALSE;
}
-/************************************************************************
-|* SvBaseLink::SvBaseLink()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
{
@@ -167,11 +157,7 @@ SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
pImplData->ClientType.bIntrnlLnk = FALSE;
}
-/************************************************************************
-|* SvBaseLink::SvBaseLink()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSource* pObj )
{
@@ -208,11 +194,7 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType,
SvLinkSourc
xObj = pObj;
}
-/************************************************************************
-|* SvBaseLink::~SvBaseLink()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
SvBaseLink::~SvBaseLink()
{
@@ -242,11 +224,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
return 0;
}
-/************************************************************************
-|* SvBaseLink::SetObjType()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void SvBaseLink::SetObjType( USHORT nObjTypeP )
{
@@ -256,33 +234,21 @@ void SvBaseLink::SetObjType( USHORT nObjTypeP )
nObjType = nObjTypeP;
}
-/************************************************************************
-|* SvBaseLink::SetName()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void SvBaseLink::SetName( const String & rNm )
{
aLinkName = rNm;
}
-/************************************************************************
-|* SvBaseLink::GetName()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
String SvBaseLink::GetName() const
{
return aLinkName;
}
-/************************************************************************
-|* SvBaseLink::SetObj()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void SvBaseLink::SetObj( SvLinkSource * pObj )
{
@@ -293,11 +259,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj )
xObj = pObj;
}
-/************************************************************************
-|* SvBaseLink::SetLinkSourceName()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
{
@@ -315,23 +277,14 @@ void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
ReleaseRef(); // should be superfluous
}
-/************************************************************************
-|* SvBaseLink::GetLinkSourceName()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
String SvBaseLink::GetLinkSourceName() const
{
return aLinkName;
}
-
-/************************************************************************
-|* SvBaseLink::SetUpdateMode()
-|*
-|* Description
-*************************************************************************/
+//--------------------------------------------------------------------------
void SvBaseLink::SetUpdateMode( USHORT nMode )
{
@@ -376,6 +329,7 @@ BOOL SvBaseLink::Update()
if( xObj->GetData( aData, sMimeType ) )
{
DataChanged( sMimeType, aData );
+
//for manual Updates there is no need to hold the ServerObject
if( OBJECT_CLIENT_DDE == nObjType &&
LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 77d7c57..70288b3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -197,7 +197,7 @@ SfxSlotPool* SfxModule::GetSlotPool() const
void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
{
- DBG_ASSERT( pImpl, "No real Modul!" );
+ DBG_ASSERT( pImpl, "No real Module!" );
if (!pImpl->pFactArr)
pImpl->pFactArr = new SfxChildWinFactArr_Impl;
@@ -221,7 +221,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
void SfxModule::RegisterChildWindowContext( USHORT nId,
SfxChildWinContextFactory *pFact)
{
- DBG_ASSERT( pImpl, "No real Modul!" );
+ DBG_ASSERT( pImpl, "No real Module!" );
USHORT nCount = pImpl->pFactArr->Count();
for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4097661..4379dae 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -597,7 +597,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
m_aProgressBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar"
))
{
DBG_CTOR(SfxWorkWindow, 0);
- DBG_ASSERT (pBindings, "Keine Bindings!");
+ DBG_ASSERT (pBindings, "No Bindings!");
pBindings->SetWorkWindow_Impl( this );
@@ -1028,7 +1028,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
SfxChildAlignment eAlign, BOOL bCanGetFocus )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
- DBG_ASSERT( pChilds->Count() < 255, "too many childs" );
+ DBG_ASSERT( pChilds->Count() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
DBG_ASSERT( !FindChild_Impl(rWindow), "child registered more than once" );
@@ -2531,7 +2531,6 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
void SfxWorkWindow::ResetChildWindows_Impl()
{
-
for ( USHORT n = 0; n < pChildWins->Count(); ++n )
{
(*pChildWins)[n]->nId = 0;
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.