summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/textfld.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
commit7a9916abd9ead998e6b0b6442bea67827411f4b7 (patch)
tree51da9b48384426b750242e2cd1d26034f2d26cfd /sw/source/ui/shells/textfld.cxx
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit a459007bd5e462d85981eaa32e3b970555bcdea6 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:22 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit dce61127f79a7a991ff32208b72e931d2353e1cd Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit a9c85da2fa4919e2520a6db08d3836e00a2b3fa9 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit a79b457b9123b253bdadcb7c7602b8186b30d701 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit fec902aecf9b4f5cee9d0fa18e502a136bd52595 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit 8f92e60e028df8c0bd32aa3a04f7105d8446bf4a Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:38 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: writer_libreoffice-3.3.0.4
Diffstat (limited to 'sw/source/ui/shells/textfld.cxx')
-rw-r--r--sw/source/ui/shells/textfld.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 7750582e0d05..8de4dc91ed5f 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include <crsskip.hxx>
-#include <hintids.hxx> //_immer_ vor den solar-Items
+#include <hintids.hxx> //_immer_ vor den solar-Items
#include <sfx2/lnkbase.hxx>
#include <fmtfld.hxx>
@@ -85,18 +85,18 @@
using namespace nsSwDocInfoSubType;
-extern BOOL bNoInterrupt; // in mainwn.cxx
+extern BOOL bNoInterrupt; // in mainwn.cxx
String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId )
{
USHORT nResId = 0;
switch( nRedlId )
{
- case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break;
- case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break;
- case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break;
- case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break;
- case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break;
+ case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break;
+ case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break;
+ case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break;
+ case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break;
+ case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break;
}
if( nResId )
rStr += SW_RESSTR( nResId );
@@ -302,7 +302,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
SfxViewFrame* pVFrame = GetView().GetViewFrame();
if (!pVFrame->HasChildWindow(FN_INSERT_FIELD))
- pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen
+ pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen
// Flddlg auf neue TabPage umschalten
USHORT nId = SwFldDlgWrapper::GetChildWindowId();
@@ -370,7 +370,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.Push();
rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, FALSE);
pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
- rSh.Pop(FALSE); // Cursorpos restaurieren
+ rSh.Pop(FALSE); // Cursorpos restaurieren
}
if (pPostIt)
@@ -393,7 +393,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
break;
case FN_REDLINE_COMMENT:
{
- /* this code can be used once we want redline comments in the margin, all other stuff can
+ /* this code can be used once we want redline comments in the margin, all other stuff can
then be deleted
String sComment;
const SwRedline *pRedline = rSh.GetCurrRedline();
@@ -436,8 +436,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
const SwRedline *pActRed = rSh.SelPrevRedline();
if (pActRed == pRedline)
- { // Neuer Cursor steht am Anfang des Current Redlines
- rSh.Pop(); // Alten Cursor wegwerfen
+ { // Neuer Cursor steht am Anfang des Current Redlines
+ rSh.Pop(); // Alten Cursor wegwerfen
rSh.Push();
pActRed = rSh.SelPrevRedline();
}
@@ -447,13 +447,13 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.EndAction();
rSh.ClearMark();
- rSh.SelNextRedline(); // Aktueller Redline wird selektiert
+ rSh.SelNextRedline(); // Aktueller Redline wird selektiert
rSh.StartAction();
rSh.Push();
pActRed = rSh.SelNextRedline();
BOOL bNext = pActRed != 0;
- rSh.Pop(FALSE); // Cursorpos restaurieren
+ rSh.Pop(FALSE); // Cursorpos restaurieren
if( rSh.IsCrsrPtAtEnd() )
rSh.SwapPam();
@@ -654,7 +654,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
}
USHORT nTempWhich = pField ? pField->GetTyp()->Which() : USHRT_MAX;
- if( USHRT_MAX == nTempWhich ||
+ if( USHRT_MAX == nTempWhich ||
RES_POSTITFLD == nTempWhich ||
RES_SCRIPTFLD == nTempWhich ||
RES_AUTHORITY == nTempWhich )
@@ -797,7 +797,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
{
// Traveling nur bei mehr als einem Feld
if( !pSh->IsCrsrPtAtEnd() )
- pSh->SwapPam(); // Cursor hinter den Redline stellen
+ pSh->SwapPam(); // Cursor hinter den Redline stellen
pSh->Push();
const SwRedline *pActRed = pSh->SelNextRedline();