This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 592094b09b Translate German (ANKER -> ANCHOR)
592094b09b is described below
commit 592094b09bff5d7bb808dc56554dbec02691ca55
Author: mseidel <[email protected]>
AuthorDate: Wed Apr 2 23:22:48 2025 +0200
Translate German (ANKER -> ANCHOR)
---
main/automation/source/server/server.cxx | 106 +++++++--------
main/helpcontent2/helpers/help_hid.lst | 12 +-
main/helpcontent2/helpers/longnames_commands.csv | 12 +-
main/helpcontent2/helpers/uno_hid.lst | 12 +-
main/sw/inc/cmdid.h | 79 ++++++-----
main/sw/inc/swcommands.h | 21 ++-
main/sw/sdi/_basesh.sdi | 137 +++++++++----------
main/sw/sdi/basesh.sdi | 19 ++-
main/sw/sdi/swriter.sdi | 21 ++-
main/sw/source/ui/app/mn.src | 90 ++++++-------
main/sw/source/ui/app/swmodule.cxx | 165 +++++++++++------------
main/sw/source/ui/ribbar/tbxanchr.cxx | 95 +++++++------
main/sw/source/ui/ribbar/tbxanchr.src | 12 +-
main/sw/source/ui/shells/basesh.cxx | 62 ++++-----
14 files changed, 410 insertions(+), 433 deletions(-)
diff --git a/main/automation/source/server/server.cxx
b/main/automation/source/server/server.cxx
index eee2f7441f..89462338c6 100644
--- a/main/automation/source/server/server.cxx
+++ b/main/automation/source/server/server.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
@@ -108,7 +106,7 @@
RemoteControlCommunicationManager::RemoteControlCommunicationManager()
else
{
SetInfoType( CM_SHORT_TEXT | CM_ALL );
- ByteString aByteString;
+ ByteString aByteString;
InfoMsg( InfoString( aByteString, CM_ALL ) ); // Anzeigen,
da� wir da sind
}
}
@@ -117,7 +115,7 @@
RemoteControlCommunicationManager::~RemoteControlCommunicationManager()
{
if ( pTimer )
delete pTimer;
- DoQuickShutdown();
+ DoQuickShutdown();
}
void RemoteControlCommunicationManager::ConnectionOpened( CommunicationLink*
pCL )
@@ -150,7 +148,7 @@ IMPL_LINK( RemoteControlCommunicationManager,
SetWinCaption, Timer*, EMPTYARG )
}
else
{ // Dann Probieren wir es eben in 1 Sekunde nochmal
- pTimer = new Timer(); // Wird im Link gel�scht
+ pTimer = new Timer(); // Wird im Link gel�scht
pTimer->SetTimeout( 1000 );
pTimer->SetTimeoutHdl( LINK( this,
RemoteControlCommunicationManager, SetWinCaption ) );
pTimer->Start();
@@ -186,13 +184,13 @@ sal_uLong RemoteControlCommunicationManager::GetPort()
bAutomate = sal_True;
break;
}
- }
+ }
// Get port from command line
- if (bAutomate)
+ if (bAutomate)
{
for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++
)
{
- if ( Application::GetCommandLineParam( i
).Copy(0,16).EqualsIgnoreCaseAscii("/automationport=")
+ if ( Application::GetCommandLineParam( i
).Copy(0,16).EqualsIgnoreCaseAscii("/automationport=")
|| Application::GetCommandLineParam( i
).Copy(0,16).EqualsIgnoreCaseAscii("-automationport="))
{
nPortIs = Application::GetCommandLineParam( i
).Copy(16).ToInt32();
@@ -239,7 +237,7 @@ sal_uLong RemoteControlCommunicationManager::GetPort()
nPortIs = aConf.ReadKey("TTPort","0").ToInt32();
- // noch pr�fen ob dieses Office getestet werden soll.
+ // noch pr�fen ob dieses Office getestet werden soll.
if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" )
nPortIs = 0;
@@ -312,11 +310,11 @@ void ExtraIdle::Timeout()
#endif
}
#if OSL_DEBUG_LEVEL > 1
- if ( nStep < 15 )
- {
+ if ( nStep < 15 )
+ {
Sound::Beep();
Sound::Beep();
- }
+ }
#endif
return;
}
@@ -585,7 +583,7 @@ void ExtraIdle::Timeout()
}
case 7:
{
- new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR
aus SW?
+ new StatementSlot( 20384 ); // FN_TOOL_ANCHOR_CHAR
from SW?
return;
}
}
@@ -745,15 +743,15 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent,
CommunicationLink*, pCL )
sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn )
{
-// return sal_True;
+// return sal_True;
sal_uInt16 nId;
if( !m_bIdleInserted )
{
#ifdef TIMERIDLE
- m_aIdleTimer.SetTimeoutHdl( LINK( this, ImplRemoteControl, IdleHdl ) );
- m_aIdleTimer.SetTimeout( 500 );
- m_aIdleTimer.Start();
+ m_aIdleTimer.SetTimeoutHdl( LINK( this, ImplRemoteControl,
IdleHdl ) );
+ m_aIdleTimer.SetTimeout( 500 );
+ m_aIdleTimer.Start();
#else
GetpApp()->InsertIdleHdl( LINK( this, ImplRemoteControl,
IdleHdl ), 1 );
#endif
@@ -786,28 +784,28 @@ sal_Bool ImplRemoteControl::QueCommands( sal_uLong
nServiceId, SvStream *pIn )
{
case SICommand:
{
- new StatementCommand( pCmdStream ); // Wird
im Konstruktor an Liste angeh�ngt
+ new StatementCommand( pCmdStream ); // Wird im
Konstruktor an Liste angeh�ngt
break;
}
case SIControl:
case SIStringControl:
{
- new StatementControl( pCmdStream, nId ); //
Wird im Konstruktor an Liste angeh�ngt
+ new StatementControl( pCmdStream, nId ); //
Wird im Konstruktor an Liste angeh�ngt
break;
}
case SISlot:
{
- new StatementSlot( pCmdStream ); // Wird im
Konstruktor an Liste angeh�ngt
+ new StatementSlot( pCmdStream ); // Wird im
Konstruktor an Liste angeh�ngt
break;
}
case SIUnoSlot:
{
- new StatementUnoSlot( pCmdStream ); // Wird
im Konstruktor an Liste angeh�ngt
+ new StatementUnoSlot( pCmdStream ); // Wird im
Konstruktor an Liste angeh�ngt
break;
}
case SIFlow:
{
- new StatementFlow( nServiceId, pCmdStream, this
); // Wird im Konstruktor an Liste angeh�ngt
+ new StatementFlow( nServiceId, pCmdStream, this
); // Wird im Konstruktor an Liste angeh�ngt
break;
}
default:
@@ -818,7 +816,7 @@ sal_Bool ImplRemoteControl::QueCommands( sal_uLong
nServiceId, SvStream *pIn )
pCmdStream->Read( nId );
else {
DBG_ERROR( "truncated input stream" );
- }
+ }
}
StatementList::bReadingCommands = sal_False;
@@ -829,17 +827,17 @@ sal_Bool ImplRemoteControl::QueCommands( sal_uLong
nServiceId, SvStream *pIn )
m_pDbgWin->AddText( String::CreateFromInt64( nServiceId ) );
m_pDbgWin->AddText( " :\n" );
#endif
- if ( !m_bInsideExecutionLoop )
- {
+ if ( !m_bInsideExecutionLoop )
+ {
#ifdef DEBUG
- m_pDbgWin->AddText( "Posting Event for CommandHdl.\n" );
+ m_pDbgWin->AddText( "Posting Event for CommandHdl.\n" );
#endif
- GetpApp()->PostUserEvent( LINK( this, ImplRemoteControl, CommandHdl )
);
- }
+ GetpApp()->PostUserEvent( LINK( this, ImplRemoteControl,
CommandHdl ) );
+ }
#ifdef DEBUG
- else
- m_bInsideExecutionLoop = sal_True;
+ else
+ m_bInsideExecutionLoop = sal_True;
#endif
return sal_True;
} // sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream
*pIn )
@@ -867,7 +865,7 @@ ImplRemoteControl::ImplRemoteControl()
m_pDbgWin->bQuiet = sal_True;
m_pDbgWin->Hide();
m_pDbgWin->bQuiet = sal_False;
- m_pDbgWin->Show();
+ m_pDbgWin->Show();
StatementList::m_pDbgWin = m_pDbgWin;
}
@@ -898,11 +896,11 @@ ImplRemoteControl::ImplRemoteControl()
ImplRemoteControl::~ImplRemoteControl()
{
- if ( MacroRecorder::HasMacroRecorder() )
- MacroRecorder::GetMacroRecorder()->SetActionRecord( sal_False ); //
Will delete MacroRecorder if necessary
+ if ( MacroRecorder::HasMacroRecorder() )
+ MacroRecorder::GetMacroRecorder()->SetActionRecord( sal_False
); // Will delete MacroRecorder if necessary
+
-
- StatementList::bDying = sal_True;
+ StatementList::bDying = sal_True;
#if OSL_DEBUG_LEVEL > 1
if ( m_pDbgWin )
m_pDbgWin->bQuiet = sal_True; // Keine Ausgabe mehr im
Debugwindow
@@ -911,7 +909,7 @@ ImplRemoteControl::~ImplRemoteControl()
#ifdef DBG_UTIL
// Zur�cksetzen, so da� nachfolgende Assertions nicht verloren gehen
DbgSetPrintTestTool( NULL );
- osl_setDebugMessageFunc( StatementCommand::pOriginal_osl_DebugMessageFunc
);
+ osl_setDebugMessageFunc(
StatementCommand::pOriginal_osl_DebugMessageFunc );
#endif
if ( StatementList::pFirst )
@@ -924,23 +922,23 @@ ImplRemoteControl::~ImplRemoteControl()
if ( pServiceMgr )
pServiceMgr->StopCommunication();
- if ( GetTTSettings()->pDisplayHidWin )
- {
- delete (Window*)(GetTTSettings()->pDisplayHidWin);
- GetTTSettings()->pDisplayHidWin = NULL;
- }
- if ( GetTTSettings()->pTranslateWin )
- {
- delete (Window*)(GetTTSettings()->pTranslateWin);
- GetTTSettings()->pTranslateWin = NULL;
- }
+ if ( GetTTSettings()->pDisplayHidWin )
+ {
+ delete (Window*)(GetTTSettings()->pDisplayHidWin);
+ GetTTSettings()->pDisplayHidWin = NULL;
+ }
+ if ( GetTTSettings()->pTranslateWin )
+ {
+ delete (Window*)(GetTTSettings()->pTranslateWin);
+ GetTTSettings()->pTranslateWin = NULL;
+ }
#if OSL_DEBUG_LEVEL > 1
delete m_pDbgWin;
#endif
if( m_bIdleInserted )
{
#ifdef TIMERIDLE
- m_aIdleTimer.Stop();
+ m_aIdleTimer.Stop();
#else
GetpApp()->RemoveIdleHdl( LINK( this, ImplRemoteControl,
IdleHdl ) );
#endif
@@ -980,10 +978,12 @@ extern "C" AUTOMATION_DLLPUBLIC void
DestroyRemoteControl()
extern "C" AUTOMATION_DLLPUBLIC void CreateEventLogger()
{
- MacroRecorder::GetMacroRecorder()->SetActionLog();
+ MacroRecorder::GetMacroRecorder()->SetActionLog();
}
extern "C" AUTOMATION_DLLPUBLIC void DestroyEventLogger()
{
- MacroRecorder::GetMacroRecorder()->SetActionLog( sal_False ); // Will
delete MacroRecorder if necessary
+ MacroRecorder::GetMacroRecorder()->SetActionLog( sal_False ); // Will
delete MacroRecorder if necessary
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/helpcontent2/helpers/help_hid.lst
b/main/helpcontent2/helpers/help_hid.lst
index e20c9dc252..61af5c8447 100644
--- a/main/helpcontent2/helpers/help_hid.lst
+++ b/main/helpcontent2/helpers/help_hid.lst
@@ -462,12 +462,12 @@ FN_TABLE_VERT_CENTER,20586,.uno:CellVertCenter
FN_TABLE_VERT_NONE,20585,.uno:CellVertTop
FN_THESAURUS_DLG,20603,.uno:ThesaurusDialog
FN_TITLE_DESCRIPTION_SHAPE,21615,
-FN_TOOL_ANKER,20349,.uno:ToggleAnchorType
-FN_TOOL_ANKER_AT_CHAR,21412,.uno:SetAnchorAtChar
-FN_TOOL_ANKER_CHAR,20384,.uno:SetAnchorToChar
-FN_TOOL_ANKER_FRAME,20366,.uno:SetAnchorToFrame
-FN_TOOL_ANKER_PAGE,20350,.uno:SetAnchorToPage
-FN_TOOL_ANKER_PARAGRAPH,20351,.uno:SetAnchorToPara
+FN_TOOL_ANCHOR,20349,.uno:ToggleAnchorType
+FN_TOOL_ANCHOR_AT_CHAR,21412,.uno:SetAnchorAtChar
+FN_TOOL_ANCHOR_CHAR,20384,.uno:SetAnchorToChar
+FN_TOOL_ANCHOR_FRAME,20366,.uno:SetAnchorToFrame
+FN_TOOL_ANCHOR_PAGE,20350,.uno:SetAnchorToPage
+FN_TOOL_ANCHOR_PARAGRAPH,20351,.uno:SetAnchorToPara
FN_TOOL_HIERARCHIE,20352,.uno:ToggleObjectLayer
FN_TO_FOOTER,20961,.uno:JumpToFooter
FN_TO_FOOTNOTE_AREA,20963,.uno:JumpToFootnoteArea
diff --git a/main/helpcontent2/helpers/longnames_commands.csv
b/main/helpcontent2/helpers/longnames_commands.csv
index 9e216f4c42..07045ba9cd 100644
--- a/main/helpcontent2/helpers/longnames_commands.csv
+++ b/main/helpcontent2/helpers/longnames_commands.csv
@@ -436,12 +436,12 @@ FN_TABLE_VERT_BOTTOM,.uno:CellVertBottom
FN_TABLE_VERT_CENTER,.uno:CellVertCenter
FN_TABLE_VERT_NONE,.uno:CellVertTop
FN_THESAURUS_DLG,.uno:ThesaurusDialog
-FN_TOOL_ANKER,.uno:ToggleAnchorType
-FN_TOOL_ANKER_AT_CHAR,.uno:SetAnchorAtChar
-FN_TOOL_ANKER_CHAR,.uno:SetAnchorToChar
-FN_TOOL_ANKER_FRAME,.uno:SetAnchorToFrame
-FN_TOOL_ANKER_PAGE,.uno:SetAnchorToPage
-FN_TOOL_ANKER_PARAGRAPH,.uno:SetAnchorToPara
+FN_TOOL_ANCHOR,.uno:ToggleAnchorType
+FN_TOOL_ANCHOR_AT_CHAR,.uno:SetAnchorAtChar
+FN_TOOL_ANCHOR_CHAR,.uno:SetAnchorToChar
+FN_TOOL_ANCHOR_FRAME,.uno:SetAnchorToFrame
+FN_TOOL_ANCHOR_PAGE,.uno:SetAnchorToPage
+FN_TOOL_ANCHOR_PARAGRAPH,.uno:SetAnchorToPara
FN_TOOL_HIERARCHIE,.uno:ToggleObjectLayer
FN_TO_FOOTER,.uno:JumpToFooter
FN_TO_FOOTNOTE_AREA,.uno:JumpToFootnoteArea
diff --git a/main/helpcontent2/helpers/uno_hid.lst
b/main/helpcontent2/helpers/uno_hid.lst
index 7416ab6ac6..e7e8744be1 100644
--- a/main/helpcontent2/helpers/uno_hid.lst
+++ b/main/helpcontent2/helpers/uno_hid.lst
@@ -436,12 +436,12 @@ FN_TABLE_VERT_BOTTOM,20587,.uno:CellVertBottom
FN_TABLE_VERT_CENTER,20586,.uno:CellVertCenter
FN_TABLE_VERT_NONE,20585,.uno:CellVertTop
FN_THESAURUS_DLG,20603,.uno:ThesaurusDialog
-FN_TOOL_ANKER,20349,.uno:ToggleAnchorType
-FN_TOOL_ANKER_AT_CHAR,21412,.uno:SetAnchorAtChar
-FN_TOOL_ANKER_CHAR,20384,.uno:SetAnchorToChar
-FN_TOOL_ANKER_FRAME,20366,.uno:SetAnchorToFrame
-FN_TOOL_ANKER_PAGE,20350,.uno:SetAnchorToPage
-FN_TOOL_ANKER_PARAGRAPH,20351,.uno:SetAnchorToPara
+FN_TOOL_ANCHOR,20349,.uno:ToggleAnchorType
+FN_TOOL_ANCHOR_AT_CHAR,21412,.uno:SetAnchorAtChar
+FN_TOOL_ANCHOR_CHAR,20384,.uno:SetAnchorToChar
+FN_TOOL_ANCHOR_FRAME,20366,.uno:SetAnchorToFrame
+FN_TOOL_ANCHOR_PAGE,20350,.uno:SetAnchorToPage
+FN_TOOL_ANCHOR_PARAGRAPH,20351,.uno:SetAnchorToPara
FN_TOOL_HIERARCHIE,20352,.uno:ToggleObjectLayer
FN_TO_FOOTER,20961,.uno:JumpToFooter
FN_TO_FOOTNOTE_AREA,20963,.uno:JumpToFootnoteArea
diff --git a/main/sw/inc/cmdid.h b/main/sw/inc/cmdid.h
index e32ba70adb..d438ba6012 100644
--- a/main/sw/inc/cmdid.h
+++ b/main/sw/inc/cmdid.h
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
/******************************************************************************
Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
erlaubt, da es von swicli.c included wird!
@@ -40,7 +38,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define SW_DISABLE_ON_PROTECTED_CURSOR 0x00000001
#define SW_DISABLE_ON_MAILBOX_EDITOR 0x00000002
-
#define FN_FILE SID_SW_START
#define FN_EDIT (SID_SW_START + 100)
#define FN_VIEW (SID_SW_START + 200)
@@ -59,12 +56,12 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_FRAME (SID_SW_START + 1300)
#define FN_INSERT2 (SID_SW_START + 1400)
#define FN_FORMAT2 (SID_SW_START + 1600)
-#define FN_EDIT2 (SID_SW_START + 1800)
+#define FN_EDIT2 (SID_SW_START + 1800)
#define FN_QUERY2 (SID_SW_START + 2000)
-#define FN_EXTRA2 (SID_SW_START + 2200)
+#define FN_EXTRA2 (SID_SW_START + 2200)
#define FN_PARAM2 (SID_SW_START + 2400)
#define FN_NOTES (SID_SW_START + 2500)
-#define FN_SIDEBAR (SID_SW_START + 2550)
+#define FN_SIDEBAR (SID_SW_START + 2550)
/* More accurately, this range should be from FN_EXTRA2 to FN_PARAM2-1, but
* FN_NUMBER_NEWSTART comes from FN_FORMAT2, and FN_PARAM_LINK_DISPLAY_NAME
@@ -88,7 +85,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_LAUNCH_REGISTRY (FN_FILE + 2 ) /* Ablage */
-#define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Globaldokument erzeugen */
+#define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Globaldokument
erzeugen */
#define FN_NEW_FILE (FN_FILE + 5 ) /* Neu */
#define FN_NEW_FILE_DLG (FN_FILE + 6 ) /* Neu Dialog */
#define FN_OPEN_FILE (FN_FILE + 7 ) /* Oeffnen */
@@ -122,12 +119,12 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_GET_DOCSTAT (FN_FILE + 33) /* Dokumentstatistik
einzeln auslesen */
-#define FN_SAVE_SELECTION (FN_FILE + 35) /* Selektion speichern */
+#define FN_SAVE_SELECTION (FN_FILE + 35) /* Selektion
speichern */
#define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Outline zu StarImpress
senden */
#define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37) /* Outline in das Clipboad
copieren */
-#define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* HTML-Dokument
"erzeugen" */
+#define FN_NEW_HTML_DOC (FN_FILE + 40 ) /*
HTML-Dokument "erzeugen" */
#define FN_APP_START (FN_FILE + 98) /* fuer Makro bei
App.Start */
#define FN_APP_END (FN_FILE + 99) /* fuer Makro
bei App.Ende */
@@ -167,12 +164,12 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_NUM_BULLET_MOVEDOWN (FN_EDIT + 35) /* nach unten schieben */
#define FN_NUM_BULLET_NONUM (FN_EDIT + 36) /* Eintrag ohne Nummer */
#ifndef FN_NUM_BULLET_OFF //in SVX already
-#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */
+#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Nummerierung aus */
#endif
// schon im SVX
-//#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit
Bullets an */
+//#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Nummerierung mit
Bullets an */
#define FN_NUM_BULLET_OUTLINE_DOWN (FN_EDIT + 39) /* Runterstufen
mit Unterpunkten */
#define FN_NUM_BULLET_OUTLINE_UP (FN_EDIT + 40) /* Raufstufen
mit Unterpunkten */
@@ -180,7 +177,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_NUM_BULLET_OUTLINE_MOVEDOWN (FN_EDIT + 42) /* nach unten schieben
mit Unterpunkten */
#define FN_UPDATE_INPUTFIELDS (FN_EDIT + 43) /*
Eingabefelder updaten */
// schon im SVX
-//#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Numerierung an */
+//#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Nummerierung an */
#define FN_NUM_OR_NONUM (FN_EDIT + 46) /* Nummer ein-/aus */
@@ -219,7 +216,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_PAGENUMBER (FN_EDIT + 80) /**/
#define FN_SELECT_AUTO_BOOKMARK (FN_EDIT + 81) /**/
#define FN_SELECT_FOOTNOTE (FN_EDIT + 82) /**/
-#define FN_SELECT_SET_AUTO_BOOKMARK (FN_EDIT + 83) /**/
+#define FN_SELECT_SET_AUTO_BOOKMARK (FN_EDIT + 83) /**/
#define FN_SELECT_TABLE (FN_EDIT + 84) /**/
#define FN_SELECT_INDEX (FN_EDIT + 85) /**/
#define FN_UP (FN_EDIT + 86) /**/
@@ -293,17 +290,17 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_TOOLBOX_SWITCH (FN_VIEW + 30) /* Auf Textshell
umschalten */
-//noch mehr Navigator
+// noch mehr Navigator
#define FN_CONTENT_LB (FN_VIEW + 32) /**/
-#define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/
-#define FN_SHOW_ROOT (FN_VIEW + 34) /**/
-#define FN_DROP_REGION (FN_VIEW + 35) /**/
-#define FN_OUTLINE_LEVEL (FN_VIEW + 36) /**/
+#define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/
+#define FN_SHOW_ROOT (FN_VIEW + 34) /**/
+#define FN_DROP_REGION (FN_VIEW + 35) /**/
+#define FN_OUTLINE_LEVEL (FN_VIEW + 36) /**/
-#define FN_PRINT_LAYOUT (FN_VIEW + 37) /* invertierter BrowseMode */
+#define FN_PRINT_LAYOUT (FN_VIEW + 37) /* invertierter
BrowseMode */
-#define FN_DROP_REGION_LINK (FN_VIEW + 38) /**/
-#define FN_DROP_REGION_COPY (FN_VIEW + 39) /**/
+#define FN_DROP_REGION_LINK (FN_VIEW + 38) /**/
+#define FN_DROP_REGION_COPY (FN_VIEW + 39) /**/
#define FN_SCROLL_NAVIGATION (FN_VIEW + 40) /* Navigationscontroller am
Scrollbar*/
#define FN_SCROLL_NEXT_PREV (FN_VIEW + 41) /* arbeitet den
MoveType ab */
@@ -343,7 +340,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_INSERT_DBFIELD (FN_INSERT + 11) /* Insert database field -
for recording */
#define FN_INSERT_FOOTNOTE_DLG (FN_INSERT + 12) /* Dialog Fussnote */
-#define FN_INSERT_REF_FIELD (FN_INSERT + 13) /* Refernzfeld einfuegen */
+#define FN_INSERT_REF_FIELD (FN_INSERT + 13) /* Referenzfeld einfügen */
#define FN_INSERT_HYPERLINK (FN_INSERT + 14) /*
Zeichendialog/HyperlinkPage*/
@@ -374,18 +371,18 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_TOOL_GROUP (FN_INSERT + 47) /* Objekte
gruppieren */
-#define FN_TOOL_UNGROUP (FN_INSERT + 48) /* Gruppierng
aufheben */
+#define FN_TOOL_UNGROUP (FN_INSERT + 48) /* Gruppierung
aufheben */
-#define FN_TOOL_ANKER (FN_INSERT + 49) /* Draw-Objekt
umankern */
-#define FN_TOOL_ANKER_PAGE (FN_INSERT + 50) /* Draw-Objekt
an Seite verankern */
-#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51) /* Draw-Objekt am
Absatz verankern */
+#define FN_TOOL_ANCHOR (FN_INSERT + 49) /* Draw-Objekt
umankern */
+#define FN_TOOL_ANCHOR_PAGE (FN_INSERT + 50) /* Draw-Objekt
an Seite verankern */
+#define FN_TOOL_ANCHOR_PARAGRAPH (FN_INSERT + 51) /* Draw-Objekt am
Absatz verankern */
#define FN_TOOL_HIERARCHIE (FN_INSERT + 52) /* Hierarchie
aendern */
-#define FN_MAILMERGE_WIZARD (FN_INSERT + 64) /* mail merge wizard */
+#define FN_MAILMERGE_WIZARD (FN_INSERT + 64) /* mail merge
wizard */
#define FN_QRY_OPEN_TABLE (FN_INSERT + 65) /* Datenbank
oeffnen (Basic) */
-#define FN_TOOL_ANKER_FRAME (FN_INSERT + 66) /* Draw-Objekt
am Rahmen verankern */
-#define FN_QRY_MERGE (FN_INSERT + 67) /* Datensatz einfuegen
(Serienbrief) */
-#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68) /*
back-to-mail-merge-wizard child window*/
+#define FN_TOOL_ANCHOR_FRAME (FN_INSERT + 66) /* Draw-Objekt am
Rahmen verankern */
+#define FN_QRY_MERGE (FN_INSERT + 67) /* Datensatz
einfuegen (Serienbrief) */
+#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68) /*
back-to-mail-merge-wizard child window*/
#define FN_INSERT_SMA (FN_INSERT + 69) /* Einfuegen
StarMath */
#define FN_QRY_GET_COLUMN_NAME (FN_INSERT + 70) /* Anzahl der Spalten
(Basic) */
@@ -400,16 +397,16 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_QRY_DELETE_RECORD (FN_INSERT + 79) /* Datensatz loeschen */
#define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80) /* Physikalische
(absolute) Datensatznummer erfragen (Basic) */
-#define FN_TOOL_ANKER_CHAR (FN_INSERT + 84) /* DrawObject
zeichengebunden */
-//#define FN_INSERT_HARDHYPHEN (FN_INSERT + 85) /* Bindestrich ohne
Umbruch*/
+#define FN_TOOL_ANCHOR_CHAR (FN_INSERT + 84) /* DrawObject
zeichengebunden */
+//#define FN_INSERT_HARDHYPHEN (FN_INSERT + 85) /* Bindestrich ohne
Umbruch*/
#define FN_QRY_INSERT (FN_INSERT + 86) /*
Datensatz-Selektion in Text einfuegen */
#define FN_QRY_MERGE_FIELD (FN_INSERT + 87) /*
Datensatz-Selektion in Felder einfuegen */
#define FN_QRY_INSERT_FIELD (FN_INSERT + 88) /*
Datenbankfeld einfuegen */
-#define FN_INSERT_CTRL (FN_INSERT + 89) /*
Werkzeugleistencontroller Einfuegen*/
-#define FN_INSERT_OBJ_CTRL (FN_INSERT + 90) /*
Werkzeugleistencontroller Einfuegen/Objekt*/
-#define FN_INSERT_FIELD_CTRL (FN_INSERT + 91) /*
Werkzeugleistencontroller Einfuegen/Feldbefehle*/
+#define FN_INSERT_CTRL (FN_INSERT + 89) /*
Werkzeugleistencontroller Einfuegen*/
+#define FN_INSERT_OBJ_CTRL (FN_INSERT + 90) /*
Werkzeugleistencontroller Einfuegen/Objekt*/
+#define FN_INSERT_FIELD_CTRL (FN_INSERT + 91) /*
Werkzeugleistencontroller Einfuegen/Feldbefehle*/
#define FN_INSERT_FLD_DATE (FN_INSERT + 92)
#define FN_INSERT_FLD_TIME (FN_INSERT + 93)
@@ -435,8 +432,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_SBA_BRW_INSERT (FN_INSERT2 + 8) /* Datensaetze
in Text einfuegen */
#define FN_SBA_BRW_MERGE (FN_INSERT2 + 9) /*
Serienbriefdruck */
#define FN_JAVAEDIT (FN_INSERT2 + 10) /*
Scriptfeld bearbeiten */
-#define FN_INSERT_HRULER (FN_INSERT2 + 11) /* horiz. Grafiklinie
einfuegen */
-#define FN_TOOL_ANKER_AT_CHAR (FN_INSERT2 + 12) /* Object zeichengebunden
*/
+#define FN_INSERT_HRULER (FN_INSERT2 + 11) /* horiz.
Grafiklinie einfuegen */
+#define FN_TOOL_ANCHOR_AT_CHAR (FN_INSERT2 + 12) /* Object zeichengebunden */
#define FN_INSERT_PAGEHEADER (FN_INSERT2 + 13) /* Standard Kopfzeile
einfuegen */
#define FN_INSERT_PAGEFOOTER (FN_INSERT2 + 14) /* Standard Fusszeile
einfuegen */
diff --git a/main/sw/inc/swcommands.h b/main/sw/inc/swcommands.h
index 1039e4fde3..76dccba67e 100644
--- a/main/sw/inc/swcommands.h
+++ b/main/sw/inc/swcommands.h
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef SW_SWCOMMANDS_HRC
#define SW_SWCOMMANDS_HRC
@@ -303,11 +302,11 @@
#define CMD_FN_ABSTRACT_STARIMPRESS
".uno:SendAbstractToStarImpress"
#define CMD_FN_OUTLINE_TO_CLIPBOARD
".uno:SendOutlineToClipboard"
#define CMD_FN_OUTLINE_TO_IMPRESS
".uno:SendOutlineToStarImpress"
-#define CMD_FN_TOOL_ANKER_AT_CHAR ".uno:SetAnchorAtChar"
-#define CMD_FN_TOOL_ANKER_CHAR ".uno:SetAnchorToChar"
-#define CMD_FN_TOOL_ANKER_FRAME ".uno:SetAnchorToFrame"
-#define CMD_FN_TOOL_ANKER_PAGE ".uno:SetAnchorToPage"
-#define CMD_FN_TOOL_ANKER_PARAGRAPH ".uno:SetAnchorToPara"
+#define CMD_FN_TOOL_ANCHOR_AT_CHAR ".uno:SetAnchorAtChar"
+#define CMD_FN_TOOL_ANCHOR_CHAR ".uno:SetAnchorToChar"
+#define CMD_FN_TOOL_ANCHOR_FRAME ".uno:SetAnchorToFrame"
+#define CMD_FN_TOOL_ANCHOR_PAGE ".uno:SetAnchorToPage"
+#define CMD_FN_TOOL_ANCHOR_PARAGRAPH ".uno:SetAnchorToPara"
#define CMD_FN_TABLE_SET_COL_WIDTH ".uno:SetColumnWidth"
#define CMD_FN_SET_EXT_MODE ".uno:SetExtSelection"
#define CMD_FN_SET_ADD_MODE ".uno:SetMultiSelection"
@@ -349,7 +348,7 @@
#define CMD_FN_DRAWTEXT_ATTR_DLG ".uno:TextAttributes"
#define CMD_FN_DRAW_WRAP_DLG ".uno:TextWrap"
#define CMD_FN_THESAURUS_DLG ".uno:ThesaurusDialog"
-#define CMD_FN_TOOL_ANKER ".uno:ToggleAnchorType"
+#define CMD_FN_TOOL_ANCHOR ".uno:ToggleAnchorType"
#define CMD_FN_TOOL_HIERARCHIE ".uno:ToggleObjectLayer"
#define CMD_FN_UNDERLINE_DOUBLE ".uno:UnderlineDouble"
#define CMD_FN_FRAME_UNCHAIN ".uno:UnhainFrames"
diff --git a/main/sw/sdi/_basesh.sdi b/main/sw/sdi/_basesh.sdi
index 7fe94de30e..cd6d5f4ff6 100644
--- a/main/sw/sdi/_basesh.sdi
+++ b/main/sw/sdi/_basesh.sdi
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,39 +7,37 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
interface BaseTextSelection
[
Automation = FALSE;
]
{
- SID_ATTR_BRUSH
- [
+ SID_ATTR_BRUSH
+ [
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ ]
- SID_DELETE // status(final|play)
+ SID_DELETE // status(final|play)
[
ExecMethod = ExecDelete ;
StateMethod = GetState ;
FastCall = FALSE ;
]
- FN_BACKSPACE // status(final|play)
+ FN_BACKSPACE // status(final|play)
[
ExecMethod = ExecDelete ;
StateMethod = GetState ;
@@ -59,7 +57,7 @@ interface BaseTextSelection
StateMethod = StateUndo ;
]
- SID_GETUNDOSTRINGS // status(final|play)
+ SID_GETUNDOSTRINGS // status(final|play)
[
StateMethod = StateUndo ;
]
@@ -70,7 +68,7 @@ interface BaseTextSelection
StateMethod = StateUndo ;
]
- SID_GETREDOSTRINGS // status(final|play)
+ SID_GETREDOSTRINGS // status(final|play)
[
StateMethod = StateUndo ;
]
@@ -89,41 +87,41 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_COPY // status(final|play)
+ SID_COPY // status(final|play)
[
ExecMethod = ExecClpbrd ;
StateMethod = StateClpbrd ;
]
- SID_PASTE // status(final|play)
+ SID_PASTE // status(final|play)
[
ExecMethod = ExecClpbrd ;
StateMethod = StateClpbrd ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_CLIPBOARD_FORMAT_ITEMS // status(final|play)
+ SID_CLIPBOARD_FORMAT_ITEMS // status(final|play)
[
StateMethod = StateClpbrd ;
ExecMethod = ExecClpbrd ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_PASTE_UNFORMATTED // status(final|play)
+ SID_PASTE_UNFORMATTED // status(final|play)
[
ExecMethod = ExecClpbrd ;
StateMethod = StateClpbrd ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_PASTE_SPECIAL // status(final|play)
+ SID_PASTE_SPECIAL // status(final|play)
[
ExecMethod = ExecClpbrd ;
StateMethod = StateClpbrd ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_REPAGINATE // status(final|play)
+ FN_REPAGINATE // status(final|play)
[
ExecMethod = Execute ;
StateMethod = NoState ;
@@ -135,7 +133,7 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_UPDATE_FIELDS // status(final|play)
+ FN_UPDATE_FIELDS // status(final|play)
[
ExecMethod = Execute ;
StateMethod = NoState ;
@@ -152,7 +150,7 @@ interface BaseTextSelection
StateMethod = NoState ;
]
- FN_UPDATE_INPUTFIELDS // status(final|play)
+ FN_UPDATE_INPUTFIELDS // status(final|play)
[
ExecMethod = Execute ;
StateMethod = NoState ;
@@ -183,7 +181,7 @@ interface BaseTextSelection
StateMethod = NoState ;
]
- FN_GOTO_PREV_MARK // status(final|play)
+ FN_GOTO_PREV_MARK // status(final|play)
[
ExecMethod = Execute ;
StateMethod = NoState ;
@@ -228,51 +226,51 @@ interface BaseTextSelection
StateMethod = GetState ;
]
- FN_INSERT_REGION // status()
+ FN_INSERT_REGION // status()
[
ExecMethod = InsertRegionDialog;
StateMethod = GetState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FORMAT_PAGE_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_FORMAT_PAGE_SETTING_DLG
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_SETTING_DLG
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_CONVERT_TABLE_TO_TEXT
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_CONVERT_TABLE_TO_TEXT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_CONVERT_TEXT_TO_TABLE
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
- FN_CONVERT_TEXT_TABLE // status(final|play)
+ FN_CONVERT_TEXT_TO_TABLE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+ FN_CONVERT_TEXT_TABLE // status(final|play)
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FORMAT_BORDER_DLG // status(final|play)
+ FN_FORMAT_BORDER_DLG // status(final|play)
[
ExecMethod = ExecDlg ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
@@ -284,20 +282,20 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_BORDER_OUTER // status()
+ SID_ATTR_BORDER_OUTER // status()
[
ExecMethod = Execute ;
StateMethod = GetBorderState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
- SID_BORDER_REDUCED_MODE
- [
- StateMethod = GetBorderState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
- FN_FORMAT_BACKGROUND_DLG // status(final|play)
+ SID_BORDER_REDUCED_MODE
+ [
+ StateMethod = GetBorderState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ FN_FORMAT_BACKGROUND_DLG // status(final|play)
[
ExecMethod = ExecDlg ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
@@ -312,7 +310,7 @@ interface BaseTextSelection
) ;
ExecMethod = Execute ;
StateMethod = StateStyle ;
- NoRecord;
+ NoRecord;
GroupId = GID_TEMPLATE ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
@@ -383,35 +381,35 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
// Methode fuer Rahmen und Objekte
- FN_TOOL_ANKER
+ FN_TOOL_ANCHOR
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TOOL_ANKER_PARAGRAPH
+ FN_TOOL_ANCHOR_PARAGRAPH
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TOOL_ANKER_CHAR
+ FN_TOOL_ANCHOR_CHAR
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TOOL_ANKER_AT_CHAR
+ FN_TOOL_ANCHOR_AT_CHAR
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TOOL_ANKER_FRAME
+ FN_TOOL_ANCHOR_FRAME
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -428,7 +426,7 @@ interface BaseTextSelection
// ab hier immer Export = FALSE
--------------------------------------------------*/
- FN_FRAME_WRAP // status()
+ FN_FRAME_WRAP // status()
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -444,7 +442,7 @@ interface BaseTextSelection
Export = FALSE;
]
- FN_FRAME_NOWRAP // status()
+ FN_FRAME_NOWRAP // status()
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -452,7 +450,7 @@ interface BaseTextSelection
Export = FALSE;
]
- FN_FRAME_WRAPTHRU // status()
+ FN_FRAME_WRAPTHRU // status()
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -522,4 +520,3 @@ interface BaseTextSelection
StateMethod = GetState;
]
}
-
diff --git a/main/sw/sdi/basesh.sdi b/main/sw/sdi/basesh.sdi
index 23cb7f0901..007167f2d9 100644
--- a/main/sw/sdi/basesh.sdi
+++ b/main/sw/sdi/basesh.sdi
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,29 +7,27 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
interface TextSelection : BaseTextSelection
[
uuid = "F23BA0A8-73A0-11d0-89CA-008029E4B0B1"
]
{
- // hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
- // nicht unterstuetzt werden
+ // hier sollen die Slots eingefügt werden, die vom Writer/WEB
+ // nicht unterstützt werden
- FN_TOOL_ANKER_PAGE
+ FN_TOOL_ANCHOR_PAGE
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -50,11 +48,10 @@ interface TextSelection : BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-} // end interface Base
+} // end interface Base
shell SwBaseShell
{
import TextSelection[Automation];
}
-
diff --git a/main/sw/sdi/swriter.sdi b/main/sw/sdi/swriter.sdi
index 8031445949..1ea6cbbff3 100644
--- a/main/sw/sdi/swriter.sdi
+++ b/main/sw/sdi/swriter.sdi
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
//--------------------------------------------------------------------------
@@ -7063,7 +7063,7 @@ SfxVoidItem SendOutlineToStarImpress FN_OUTLINE_TO_IMPRESS
]
//--------------------------------------------------------------------------
-SfxVoidItem SetAnchorAtChar FN_TOOL_ANKER_AT_CHAR
+SfxVoidItem SetAnchorAtChar FN_TOOL_ANCHOR_AT_CHAR
()
[
/* flags: */
@@ -7091,7 +7091,7 @@ SfxVoidItem SetAnchorAtChar FN_TOOL_ANKER_AT_CHAR
]
//--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToChar FN_TOOL_ANKER_CHAR
+SfxVoidItem SetAnchorToChar FN_TOOL_ANCHOR_CHAR
()
[
/* flags: */
@@ -7119,7 +7119,7 @@ SfxVoidItem SetAnchorToChar FN_TOOL_ANKER_CHAR
]
//--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToFrame FN_TOOL_ANKER_FRAME
+SfxVoidItem SetAnchorToFrame FN_TOOL_ANCHOR_FRAME
()
[
/* flags: */
@@ -7147,7 +7147,7 @@ SfxVoidItem SetAnchorToFrame FN_TOOL_ANKER_FRAME
]
//--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToPage FN_TOOL_ANKER_PAGE
+SfxVoidItem SetAnchorToPage FN_TOOL_ANCHOR_PAGE
()
[
/* flags: */
@@ -7175,7 +7175,7 @@ SfxVoidItem SetAnchorToPage FN_TOOL_ANKER_PAGE
]
//--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToPara FN_TOOL_ANKER_PARAGRAPH
+SfxVoidItem SetAnchorToPara FN_TOOL_ANCHOR_PARAGRAPH
()
[
/* flags: */
@@ -8233,7 +8233,7 @@ SfxVoidItem TextWrap FN_DRAW_WRAP_DLG
]
//--------------------------------------------------------------------------
-SfxVoidItem ToggleAnchorType FN_TOOL_ANKER
+SfxVoidItem ToggleAnchorType FN_TOOL_ANCHOR
()
[
/* flags: */
@@ -10259,4 +10259,3 @@ SvxLongLRSpaceItem SwPageLRMargin SID_ATTR_PAGE_LRSPACE
ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
-
diff --git a/main/sw/source/ui/app/mn.src b/main/sw/source/ui/app/mn.src
index 9e09317ec9..e06d402b3d 100644
--- a/main/sw/source/ui/app/mn.src
+++ b/main/sw/source/ui/app/mn.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include <svx/dialogs.hrc>
#include <svx/globlmn.hrc>
#include "cmdid.h"
@@ -38,19 +36,19 @@
#define MN_NUMBERING ITEM_FORMAT_NUMBERING
#define MN_TXT\
- MenuItem\
- {\
- ITEM_FORMAT_CHAR_DLG\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_PARA_DLG\
- };\
- MenuItem\
- {\
- Identifier = FN_FORMAT_PAGE_DLG ; \
- HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
- Text [ en-US ] = "Pa~ge..." ; \
+ MenuItem\
+ {\
+ ITEM_FORMAT_CHAR_DLG\
+ };\
+ MenuItem\
+ {\
+ ITEM_FORMAT_PARA_DLG\
+ };\
+ MenuItem\
+ {\
+ Identifier = FN_FORMAT_PAGE_DLG ; \
+ HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
+ Text [ en-US ] = "Pa~ge..." ; \
};
@@ -1006,16 +1004,16 @@ String MN_DRAW_POPUPMENU
MenuItem\
{\
RadioCheck = TRUE ; \
- Identifier = FN_TOOL_ANKER_FRAME ; \
- HelpId = CMD_FN_TOOL_ANKER_FRAME ; \
+ Identifier = FN_TOOL_ANCHOR_FRAME ; \
+ HelpId = CMD_FN_TOOL_ANCHOR_FRAME ; \
Text [ en-US ] = "To ~Frame" ; \
};
#define MN_ANCHOR \
MenuItem\
{\
- Identifier = FN_TOOL_ANKER ; \
- HelpId = CMD_FN_TOOL_ANKER ; \
+ Identifier = FN_TOOL_ANCHOR ; \
+ HelpId = CMD_FN_TOOL_ANCHOR ; \
Command = ".uno:AnchorMenu" ; \
Text [ en-US ] = "An~chor" ; \
SubMenu = Menu\
@@ -1025,29 +1023,29 @@ String MN_DRAW_POPUPMENU
MenuItem\
{\
RadioCheck = TRUE ; \
- Identifier = FN_TOOL_ANKER_PAGE ; \
- HelpId = CMD_FN_TOOL_ANKER_PAGE ; \
+ Identifier = FN_TOOL_ANCHOR_PAGE ; \
+ HelpId = CMD_FN_TOOL_ANCHOR_PAGE ; \
Text [ en-US ] = "To P~age" ; \
};\
MenuItem\
{\
RadioCheck = TRUE ; \
- Identifier = FN_TOOL_ANKER_PARAGRAPH ; \
- HelpId = CMD_FN_TOOL_ANKER_PARAGRAPH ; \
+ Identifier = FN_TOOL_ANCHOR_PARAGRAPH ; \
+ HelpId = CMD_FN_TOOL_ANCHOR_PARAGRAPH ; \
Text [ en-US ] = "To ~Paragraph" ; \
};\
MenuItem\
{\
RadioCheck = TRUE ; \
- Identifier = FN_TOOL_ANKER_AT_CHAR ; \
- HelpId = CMD_FN_TOOL_ANKER_AT_CHAR ; \
+ Identifier = FN_TOOL_ANCHOR_AT_CHAR ; \
+ HelpId = CMD_FN_TOOL_ANCHOR_AT_CHAR ; \
Text [ en-US ] = "To ~Character" ; \
};\
MenuItem\
{\
RadioCheck = TRUE ; \
- Identifier = FN_TOOL_ANKER_CHAR ; \
- HelpId = CMD_FN_TOOL_ANKER_CHAR ; \
+ Identifier = FN_TOOL_ANCHOR_CHAR ; \
+ HelpId = CMD_FN_TOOL_ANCHOR_CHAR ; \
Text [ en-US ] = "As C~haracter" ; \
};\
MN_AT_FRAME\
@@ -1275,25 +1273,25 @@ Menu MN_GRF_POPUPMENU
ItemList =
{
MN_ALIGN_FRAME
- MN_MOUSE_FRAME_WITH_CONTOUR
- // --> OD 2009-07-14 #i73249#
- SEPARATOR ;
- MN_TITLE_DESCRIPTION_SHAPE
- // <--
- SEPARATOR ;
- MenuItem
- {
- Identifier = FN_FORMAT_GRAFIC_DLG ;
- HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
- Text [ en-US ] = "~Picture..." ;
- };
- MenuItem
- {
- Identifier = FN_SAVE_GRAPHIC;
- HelpId = CMD_FN_SAVE_GRAPHIC;
- Text [ en-US ] = "Save Graphics..." ;
- };
- MN_FRM_CAPTION_ITEM
+ MN_MOUSE_FRAME_WITH_CONTOUR
+ // --> OD 2009-07-14 #i73249#
+ SEPARATOR ;
+ MN_TITLE_DESCRIPTION_SHAPE
+ // <--
+ SEPARATOR ;
+ MenuItem
+ {
+ Identifier = FN_FORMAT_GRAFIC_DLG ;
+ HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
+ Text [ en-US ] = "~Picture..." ;
+ };
+ MenuItem
+ {
+ Identifier = FN_SAVE_GRAPHIC;
+ HelpId = CMD_FN_SAVE_GRAPHIC;
+ Text [ en-US ] = "Save Graphics..." ;
+ };
+ MN_FRM_CAPTION_ITEM
MenuItem
{
ITEM_EDIT_IMAP
diff --git a/main/sw/source/ui/app/swmodule.cxx
b/main/sw/source/ui/app/swmodule.cxx
index 44335c0d7c..ae17208d9b 100644
--- a/main/sw/source/ui/app/swmodule.cxx
+++ b/main/sw/source/ui/app/swmodule.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#ifndef _SWERROR_H
#include <swerror.h>
@@ -185,27 +182,27 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
: SfxModule( SfxApplication::CreateResManager( "sw" ), sal_False,
pWebFact,
pFact, pGlobalFact, NULL ),
pModuleConfig(0),
- pUsrPref(0),
- pWebUsrPref(0),
- pPrtOpt(0),
- pWebPrtOpt(0),
- pChapterNumRules(0),
- pStdFontConfig(0),
- pNavigationConfig(0),
- pToolbarConfig(0),
- pWebToolbarConfig(0),
- pDBConfig(0),
- pColorConfig(0),
- pAccessibilityOptions(0),
- pCTLOptions(0),
- pUserOptions(0),
- pUndoOptions(0),
- pAttrPool(0),
- pView(0),
+ pUsrPref(0),
+ pWebUsrPref(0),
+ pPrtOpt(0),
+ pWebPrtOpt(0),
+ pChapterNumRules(0),
+ pStdFontConfig(0),
+ pNavigationConfig(0),
+ pToolbarConfig(0),
+ pWebToolbarConfig(0),
+ pDBConfig(0),
+ pColorConfig(0),
+ pAccessibilityOptions(0),
+ pCTLOptions(0),
+ pUserOptions(0),
+ pUndoOptions(0),
+ pAttrPool(0),
+ pView(0),
bAuthorInitialised(sal_False),
- bEmbeddedLoadSave( sal_False ),
- pDragDrop( 0 ),
- pXSelection( 0 )
+ bEmbeddedLoadSave( sal_False ),
+ pDragDrop( 0 ),
+ pXSelection( 0 )
{
SetName( String::CreateFromAscii("StarWriter") );
pSwResMgr = GetResMgr();
@@ -225,7 +222,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
pAuthorNames = new SvStringsDtor(5, 1); // Alle Redlining-Autoren
- //JP 18.10.96: SvxAutocorrect gegen die SwAutocorrect austauschen
+ // JP 18.10.96: SvxAutocorrect gegen die SwAutocorrect austauschen
SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get();
if( pACfg )
{
@@ -235,10 +232,10 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
StartListening( *SFX_APP() );
- // OD 14.02.2003 #107424# - init color configuration
- // member <pColorConfig> is created and the color configuration is applied
- // at the view options.
- GetColorConfig();
+ // OD 14.02.2003 #107424# - init color configuration
+ // member <pColorConfig> is created and the color configuration is
applied
+ // at the view options.
+ GetColorConfig();
}
//************************************************************************
@@ -248,16 +245,16 @@ SwModule::GetScannerManager()
{
if (!m_xScannerManager.is())
{
- uno::Reference< lang::XMultiServiceFactory > xMgr (
+ uno::Reference< lang::XMultiServiceFactory > xMgr (
comphelper::getProcessServiceFactory() );
if( xMgr.is() )
{
m_xScannerManager =
- uno::Reference< scanner::XScannerManager >(
+ uno::Reference< scanner::XScannerManager >(
xMgr->createInstance(
rtl::OUString::createFromAscii(
"com.sun.star.scanner.ScannerManager" ) ),
- uno::UNO_QUERY );
+ uno::UNO_QUERY );
}
}
return m_xScannerManager;
@@ -265,18 +262,18 @@ SwModule::GetScannerManager()
uno::Reference< linguistic2::XLanguageGuessing > SwModule::GetLanguageGuesser()
{
- if (!m_xLanguageGuesser.is())
- {
- uno::Reference< lang::XMultiServiceFactory > xMgr (
comphelper::getProcessServiceFactory() );
- if (xMgr.is())
- {
- m_xLanguageGuesser = uno::Reference<
linguistic2::XLanguageGuessing >(
- xMgr->createInstance(
- rtl::OUString::createFromAscii(
"com.sun.star.linguistic2.LanguageGuessing" ) ),
- uno::UNO_QUERY );
- }
- }
- return m_xLanguageGuesser;
+ if (!m_xLanguageGuesser.is())
+ {
+ uno::Reference< lang::XMultiServiceFactory > xMgr (
comphelper::getProcessServiceFactory() );
+ if (xMgr.is())
+ {
+ m_xLanguageGuesser = uno::Reference<
linguistic2::XLanguageGuessing >(
+ xMgr->createInstance(
+ rtl::OUString::createFromAscii(
"com.sun.star.linguistic2.LanguageGuessing" ) ),
+ uno::UNO_QUERY );
+ }
+ }
+ return m_xLanguageGuesser;
}
//************************************************************************
@@ -286,15 +283,15 @@ SwModule::~SwModule()
SetPool(0);
SfxItemPool::Free(pAttrPool);
delete pErrorHdl;
- EndListening( *SFX_APP() );
+ EndListening( *SFX_APP() );
}
//************************************************************************
void SwModule::CreateLngSvcEvtListener()
{
- if (!xLngSvcEvtListener.is())
- xLngSvcEvtListener = new SwLinguServiceEventListener;
+ if (!xLngSvcEvtListener.is())
+ xLngSvcEvtListener = new SwLinguServiceEventListener;
}
//************************************************************************
@@ -303,16 +300,16 @@ void SwDLL::RegisterFactories()
{
//Diese Id's duerfen nicht geaendert werden. Mittels der Id's wird vom
//Sfx die View (Dokumentansicht wiederherstellen) erzeugt.
- if ( SvtModuleOptions().IsWriter() )
- SwView::RegisterFactory ( 2 );
+ if ( SvtModuleOptions().IsWriter() )
+ SwView::RegisterFactory ( 2 );
SwWebView::RegisterFactory ( 5 );
- if ( SvtModuleOptions().IsWriter() )
- {
- SwSrcView::RegisterFactory ( 6 );
- SwPagePreView::RegisterFactory ( 7 );
- }
+ if ( SvtModuleOptions().IsWriter() )
+ {
+ SwSrcView::RegisterFactory ( 6 );
+ SwPagePreView::RegisterFactory ( 7 );
+ }
}
//************************************************************************
@@ -352,7 +349,7 @@ void SwDLL::RegisterInterfaces()
SwWebDrawFormShell::RegisterInterface(pMod);
SwWebOleShell::RegisterInterface(pMod);
SwMediaShell::RegisterInterface(pMod);
- SwAnnotationShell::RegisterInterface(pMod);
+ SwAnnotationShell::RegisterInterface(pMod);
}
//************************************************************************
@@ -360,9 +357,9 @@ void SwDLL::RegisterInterfaces()
void SwDLL::RegisterControls()
{
SwModule* pMod = SW_MOD();
- SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
- SvxTbxCtlAlign::RegisterControl(SID_OBJECT_ALIGN, pMod );
- SwTbxAnchor::RegisterControl(FN_TOOL_ANKER, pMod );
+ SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
+ SvxTbxCtlAlign::RegisterControl(SID_OBJECT_ALIGN, pMod );
+ SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
SwTbxInsertCtrl::RegisterControl(FN_INSERT_CTRL, pMod );
SwTbxInsertCtrl::RegisterControl(FN_INSERT_OBJ_CTRL, pMod );
SwTbxAutoTextCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
@@ -381,7 +378,7 @@ void SwDLL::RegisterControls()
SvxClipBoardControl::RegisterControl(SID_PASTE, pMod );
SvxUndoRedoControl::RegisterControl(SID_UNDO, pMod );
SvxUndoRedoControl::RegisterControl(SID_REDO, pMod );
- svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH,
pMod );
+
svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, pMod
);
SvxFillToolBoxControl::RegisterControl(SID_ATTR_FILL_STYLE, pMod );
SvxLineStyleToolBoxControl::RegisterControl(SID_ATTR_LINE_STYLE, pMod );
@@ -402,15 +399,15 @@ void SwDLL::RegisterControls()
SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME_INTERACT,
pMod );
SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME, pMod );
- SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_REGION, pMod );
+ SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_REGION, pMod );
SvxTableToolBoxControl::RegisterControl(FN_INSERT_TABLE, pMod );
- SvxTableToolBoxControl::RegisterControl(FN_SHOW_MULTIPLE_PAGES, pMod );
+ SvxTableToolBoxControl::RegisterControl(FN_SHOW_MULTIPLE_PAGES, pMod );
SvxFontMenuControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod );
SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod
);
SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod );
- SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
+ SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
SvxPosSizeStatusBarControl::RegisterControl(0, pMod );
SvxInsertStatusBarControl::RegisterControl(SID_ATTR_INSERT, pMod );
SvxSelectionModeControl::RegisterControl(FN_STAT_SELMODE, pMod );
@@ -418,8 +415,8 @@ void SwDLL::RegisterControls()
SwBookmarkControl::RegisterControl(FN_STAT_PAGE, pMod );
SwTemplateControl::RegisterControl(FN_STAT_TEMPLATE, pMod );
- SwViewLayoutControl::RegisterControl( SID_ATTR_VIEWLAYOUT, pMod );
- SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
+ SwViewLayoutControl::RegisterControl( SID_ATTR_VIEWLAYOUT, pMod );
+ SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
SwTableOptimizeCtrl::RegisterControl(FN_OPTIMIZE_TABLE, pMod);
@@ -429,18 +426,18 @@ void SwDLL::RegisterControls()
SvxHyperlinkDlgWrapper::RegisterChildWindow( sal_False, pMod,
SFX_CHILDWIN_FORCEDOCK );
SvxFontWorkChildWindow::RegisterChildWindow( sal_False, pMod );
SwFldDlgWrapper::RegisterChildWindow( sal_False, pMod );
- SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod );
+ SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod );
SvxContourDlgChildWindow::RegisterChildWindow( sal_False, pMod );
SwNavigationChild::RegisterChildWindowContext( pMod );
SwInputChild::RegisterChildWindow( sal_False, pMod,
SFX_CHILDWIN_FORCEDOCK );
SwRedlineAcceptChild::RegisterChildWindow( sal_False, pMod );
SwSyncChildWin::RegisterChildWindow( sal_True, pMod );
- SwMailMergeChildWindow::RegisterChildWindow( sal_False, pMod );
-// SwSendMailChildWindow::RegisterChildWindow( sal_False, pMod );
+ SwMailMergeChildWindow::RegisterChildWindow( sal_False, pMod );
+// SwSendMailChildWindow::RegisterChildWindow( sal_False, pMod );
SwInsertIdxMarkWrapper::RegisterChildWindow( sal_False, pMod );
SwInsertAuthMarkWrapper::RegisterChildWindow( sal_False, pMod );
SvxRubyChildWindow::RegisterChildWindow( sal_False, pMod);
- SwSpellDialogChildWindow::RegisterChildWindow(sal_False, pMod);
+ SwSpellDialogChildWindow::RegisterChildWindow(sal_False, pMod);
SvxGrafRedToolBoxControl::RegisterControl( SID_ATTR_GRAF_RED, pMod );
SvxGrafGreenToolBoxControl::RegisterControl( SID_ATTR_GRAF_GREEN, pMod
);
@@ -450,31 +447,29 @@ void SwDLL::RegisterControls()
SvxGrafGammaToolBoxControl::RegisterControl( SID_ATTR_GRAF_GAMMA, pMod
);
SvxGrafTransparenceToolBoxControl::RegisterControl(
SID_ATTR_GRAF_TRANSPARENCE, pMod );
SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod );
- SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod );
- SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_LEFT_TO_RIGHT, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_TOP_TO_BOTTOM, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod);
+ SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod );
+ SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_LEFT_TO_RIGHT,
pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_TOP_TO_BOTTOM,
pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod);
- SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
- SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
+ SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
+ SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
GalleryChildWindow::RegisterChildWindow(0, pMod);
::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX,
pMod);
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
- SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(sal_False, pMod);
- ::sfx2::TaskPaneWrapper::RegisterChildWindow(sal_False, pMod);
+ SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(sal_False,
pMod);
+ ::sfx2::TaskPaneWrapper::RegisterChildWindow(sal_False, pMod);
}
/*************************************************************************
-|*
-|* Modul laden (nur Attrappe fuer das Linken der DLL)
-|*
+|* Modul laden (nur Attrappe für das Linken der DLL)
\************************************************************************/
/* -----------------20.04.99 10:46-------------------
@@ -494,3 +489,5 @@ void SwModule::RemoveAttrPool()
SetPool(0);
SfxItemPool::Free(pAttrPool);
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/ribbar/tbxanchr.cxx
b/main/sw/source/ui/ribbar/tbxanchr.cxx
index cc047f4df5..a8b20ce47e 100644
--- a/main/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/main/sw/source/ui/ribbar/tbxanchr.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,25 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include <string> // HACK: prevent conflict between STLPORT and Workshop
headers
#include <vcl/timer.hxx>
#include <sfx2/app.hxx>
@@ -37,7 +33,6 @@
#endif
#include <sfx2/mnumgr.hxx>
-
#include "cmdid.h"
#include "docsh.hxx"
#include "swtypes.hxx"
@@ -49,8 +44,6 @@
#include "ribbar.hrc"
#include "tbxanchr.hxx"
-
-
SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item);
/******************************************************************************
@@ -95,8 +88,8 @@ void SwTbxAnchor::StateChanged( sal_uInt16 /*nSID*/,
SfxItemState eState, const
SfxPopupWindow* SwTbxAnchor::CreatePopupWindow()
{
- SwTbxAnchor::Click();
- return 0;
+ SwTbxAnchor::Click();
+ return 0;
}
/******************************************************************************
@@ -107,48 +100,48 @@ void SwTbxAnchor::Click()
{
PopupMenu aPopMenu(SW_RES(MN_ANCHOR_POPUP));
- SfxViewFrame* pViewFrame( 0 );
- SfxDispatcher* pDispatch( 0 );
- SfxViewShell* pCurSh( SfxViewShell::Current() );
-
- if ( pCurSh )
- {
- pViewFrame = pCurSh->GetViewFrame();
- if ( pViewFrame )
- pDispatch = pViewFrame->GetDispatcher();
- }
-
-// SfxDispatcher* pDispatch = GetBindings().GetDispatcher();
-// SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
- SwView* pActiveView = 0;
- if(pViewFrame)
- {
- const TypeId aTypeId = TYPE(SwView);
- SwView* pView = (SwView*)SfxViewShell::GetFirst(&aTypeId);
- while( pView )
- {
- if(pView->GetViewFrame() == pViewFrame)
- {
- pActiveView = pView;
- break;
- }
- pView = (SwView*)SfxViewShell::GetNext(*pView, &aTypeId);
- }
- }
- if(!pActiveView)
- {
- DBG_ERROR("No active view could be found");
- return;
- }
- SwWrtShell* pWrtShell = pActiveView->GetWrtShellPtr();
- aPopMenu.EnableItem( FN_TOOL_ANKER_FRAME, 0 != pWrtShell->IsFlyInFly()
);
+ SfxViewFrame* pViewFrame( 0 );
+ SfxDispatcher* pDispatch( 0 );
+ SfxViewShell* pCurSh( SfxViewShell::Current() );
+
+ if ( pCurSh )
+ {
+ pViewFrame = pCurSh->GetViewFrame();
+ if ( pViewFrame )
+ pDispatch = pViewFrame->GetDispatcher();
+ }
+
+// SfxDispatcher* pDispatch = GetBindings().GetDispatcher();
+// SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
+ SwView* pActiveView = 0;
+ if(pViewFrame)
+ {
+ const TypeId aTypeId = TYPE(SwView);
+ SwView* pView = (SwView*)SfxViewShell::GetFirst(&aTypeId);
+ while( pView )
+ {
+ if(pView->GetViewFrame() == pViewFrame)
+ {
+ pActiveView = pView;
+ break;
+ }
+ pView = (SwView*)SfxViewShell::GetNext(*pView,
&aTypeId);
+ }
+ }
+ if(!pActiveView)
+ {
+ DBG_ERROR("No active view could be found");
+ return;
+ }
+ SwWrtShell* pWrtShell = pActiveView->GetWrtShellPtr();
+ aPopMenu.EnableItem( FN_TOOL_ANCHOR_FRAME, 0 != pWrtShell->IsFlyInFly()
);
Rectangle aRect(GetToolBox().GetItemRect(GetId()));
sal_uInt16 nHtmlMode =
::GetHtmlMode((SwDocShell*)SfxObjectShell::Current());
sal_Bool bHtmlModeNoAnchor = ( nHtmlMode & HTMLMODE_ON) && 0 ==
(nHtmlMode & HTMLMODE_SOME_ABS_POS);
if (bHtmlModeNoAnchor || pWrtShell->IsInHeaderFooter())
- aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANKER_PAGE));
+ aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANCHOR_PAGE));
if (nActAnchorId)
aPopMenu.CheckItem(nActAnchorId);
@@ -158,5 +151,7 @@ void SwTbxAnchor::Click()
GetToolBox().EndSelection();
if (nSlotId)
- pDispatch->Execute(nSlotId,
SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+ pDispatch->Execute(nSlotId,
SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/ribbar/tbxanchr.src
b/main/sw/source/ui/ribbar/tbxanchr.src
index 2a81702f71..55e02042ba 100644
--- a/main/sw/source/ui/ribbar/tbxanchr.src
+++ b/main/sw/source/ui/ribbar/tbxanchr.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "ribbar.hrc"
#include "cmdid.h"
Menu MN_ANCHOR_POPUP
@@ -31,35 +29,35 @@ Menu MN_ANCHOR_POPUP
{
_MenuItemFlags = MIB_RADIOCHECK ;
RadioCheck = TRUE ;
- Identifier = FN_TOOL_ANKER_PAGE ;
+ Identifier = FN_TOOL_ANCHOR_PAGE ;
Text [ en-US ] = "To Page" ;
};
MenuItem
{
_MenuItemFlags = MIB_RADIOCHECK ;
RadioCheck = TRUE ;
- Identifier = FN_TOOL_ANKER_PARAGRAPH ;
+ Identifier = FN_TOOL_ANCHOR_PARAGRAPH ;
Text [ en-US ] = "To Paragraph" ;
};
MenuItem
{
_MenuItemFlags = MIB_RADIOCHECK ;
RadioCheck = TRUE ;
- Identifier = FN_TOOL_ANKER_AT_CHAR ;
+ Identifier = FN_TOOL_ANCHOR_AT_CHAR ;
Text [ en-US ] = "To Character" ;
};
MenuItem
{
_MenuItemFlags = MIB_RADIOCHECK ;
RadioCheck = TRUE ;
- Identifier = FN_TOOL_ANKER_CHAR ;
+ Identifier = FN_TOOL_ANCHOR_CHAR ;
Text [ en-US ] = "As Character" ;
};
MenuItem
{
_MenuItemFlags = MIB_RADIOCHECK ;
RadioCheck = TRUE ;
- Identifier = FN_TOOL_ANKER_FRAME ;
+ Identifier = FN_TOOL_ANCHOR_FRAME ;
Text [ en-US ] = "To Frame" ;
};
};
diff --git a/main/sw/source/ui/shells/basesh.cxx
b/main/sw/source/ui/shells/basesh.cxx
index 29a251460f..a8e921b8e9 100644
--- a/main/sw/source/ui/shells/basesh.cxx
+++ b/main/sw/source/ui/shells/basesh.cxx
@@ -1050,21 +1050,21 @@ void SwBaseShell::Execute(SfxRequest &rReq)
rSh.CallChgLnk();
}
break;
- case FN_TOOL_ANKER:
+ case FN_TOOL_ANCHOR:
break;
- case FN_TOOL_ANKER_PAGE:
- case FN_TOOL_ANKER_PARAGRAPH:
- case FN_TOOL_ANKER_CHAR:
- case FN_TOOL_ANKER_AT_CHAR:
- case FN_TOOL_ANKER_FRAME:
+ case FN_TOOL_ANCHOR_PAGE:
+ case FN_TOOL_ANCHOR_PARAGRAPH:
+ case FN_TOOL_ANCHOR_CHAR:
+ case FN_TOOL_ANCHOR_AT_CHAR:
+ case FN_TOOL_ANCHOR_FRAME:
{
- RndStdIds eSet = nSlot == FN_TOOL_ANKER_PAGE
+ RndStdIds eSet = nSlot == FN_TOOL_ANCHOR_PAGE
? FLY_AT_PAGE
- : nSlot ==
FN_TOOL_ANKER_PARAGRAPH
+ : nSlot ==
FN_TOOL_ANCHOR_PARAGRAPH
? FLY_AT_PARA
- : nSlot
== FN_TOOL_ANKER_FRAME
+ : nSlot
== FN_TOOL_ANCHOR_FRAME
? FLY_AT_FLY
-
: nSlot == FN_TOOL_ANKER_CHAR
+
: nSlot == FN_TOOL_ANCHOR_CHAR
? FLY_AS_CHAR
: FLY_AT_CHAR;
rSh.StartUndo();
@@ -1131,7 +1131,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
break;
case FLY_AT_CHAR:
- //links, von links, rechts, oben,
Durchlauf
+ // links, von links, rechts, oben,
Durchlauf
if(eSurround != SURROUND_THROUGHT)
aSet.Put(SwFmtSurround(SURROUND_THROUGHT));
@@ -1151,7 +1151,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
}
rSh.EndUndo();
- GetView().GetViewFrame()->GetBindings().Invalidate(
FN_TOOL_ANKER );
+ GetView().GetViewFrame()->GetBindings().Invalidate(
FN_TOOL_ANCHOR );
}
break;
@@ -1619,12 +1619,12 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
}
break;
- case FN_TOOL_ANKER:
- case FN_TOOL_ANKER_PAGE:
- case FN_TOOL_ANKER_PARAGRAPH:
- case FN_TOOL_ANKER_CHAR:
- case FN_TOOL_ANKER_AT_CHAR:
- case FN_TOOL_ANKER_FRAME:
+ case FN_TOOL_ANCHOR:
+ case FN_TOOL_ANCHOR_PAGE:
+ case FN_TOOL_ANCHOR_PARAGRAPH:
+ case FN_TOOL_ANCHOR_CHAR:
+ case FN_TOOL_ANCHOR_AT_CHAR:
+ case FN_TOOL_ANCHOR_FRAME:
{
sal_Bool bObj = 0 != rSh.IsObjSelected();
sal_Bool bParentCntProt =
rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
@@ -1638,22 +1638,22 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
rSh.GetFlyFrmAttr(aSet);
RndStdIds eSet =
((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetAnchorId();
const sal_Bool bSet =
- ((nWhich == FN_TOOL_ANKER_PAGE) &&
+ ((nWhich == FN_TOOL_ANCHOR_PAGE) &&
(eSet == FLY_AT_PAGE))
- || ((nWhich == FN_TOOL_ANKER_PARAGRAPH) &&
+ || ((nWhich == FN_TOOL_ANCHOR_PARAGRAPH) &&
(eSet == FLY_AT_PARA))
- || ((nWhich == FN_TOOL_ANKER_FRAME) &&
+ || ((nWhich == FN_TOOL_ANCHOR_FRAME) &&
(eSet == FLY_AT_FLY))
- || ((nWhich == FN_TOOL_ANKER_AT_CHAR) &&
+ || ((nWhich == FN_TOOL_ANCHOR_AT_CHAR) &&
(eSet == FLY_AT_CHAR))
- || ((nWhich == FN_TOOL_ANKER_CHAR) &&
+ || ((nWhich == FN_TOOL_ANCHOR_CHAR) &&
(eSet == FLY_AS_CHAR));
- if(nWhich != FN_TOOL_ANKER)
+ if(nWhich != FN_TOOL_ANCHOR)
{
sal_uInt16 nHtmlMode =
::GetHtmlMode(GetView().GetDocShell());
- if( ( nWhich ==
FN_TOOL_ANKER_PAGE &&
+ if( ( nWhich ==
FN_TOOL_ANCHOR_PAGE &&
((HTMLMODE_ON &
nHtmlMode) && (0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)))) ||
- ( nWhich == FN_TOOL_ANKER_FRAME &&
!rSh.IsFlyInFly() ) )
+ ( nWhich == FN_TOOL_ANCHOR_FRAME &&
!rSh.IsFlyInFly() ) )
rSet.DisableItem(nWhich);
else
rSet.Put(SfxBoolItem(nWhich, bSet));
@@ -1665,19 +1665,19 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
switch (eSet)
{
case FLY_AT_PAGE:
- nSlotId =
FN_TOOL_ANKER_PAGE;
+ nSlotId =
FN_TOOL_ANCHOR_PAGE;
break;
case FLY_AT_PARA:
- nSlotId =
FN_TOOL_ANKER_PARAGRAPH;
+ nSlotId =
FN_TOOL_ANCHOR_PARAGRAPH;
break;
case FLY_AS_CHAR:
- nSlotId =
FN_TOOL_ANKER_CHAR;
+ nSlotId =
FN_TOOL_ANCHOR_CHAR;
break;
case FLY_AT_CHAR:
- nSlotId =
FN_TOOL_ANKER_AT_CHAR;
+ nSlotId =
FN_TOOL_ANCHOR_AT_CHAR;
break;
case FLY_AT_FLY:
- nSlotId =
FN_TOOL_ANKER_FRAME;
+ nSlotId =
FN_TOOL_ANCHOR_FRAME;
break;
default:
;
