[ooo-build-commit] 2 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Nov 26 03:26:05 PST 2009
patches/dev300/cws-cbosdo01.diff | 61 +++++------
patches/dev300/writer-navigation-buttons.diff | 139 ++++++++------------------
2 files changed, 74 insertions(+), 126 deletions(-)
New commits:
commit bda980bb4f2f1cda50ba055cae61b79fd0da76b2
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Nov 26 12:18:59 2009 +0100
Backported some fixes from cbosdo01 CWS.
This change doesn't sync with cbosdo01 as the UI is still the original
one. It only backports fixes for the Writer options.
* patches/dev300/cws-cbosdo01.diff:
diff --git a/patches/dev300/cws-cbosdo01.diff b/patches/dev300/cws-cbosdo01.diff
index 91161e8..7c3e782 100644
--- a/patches/dev300/cws-cbosdo01.diff
+++ b/patches/dev300/cws-cbosdo01.diff
@@ -1,5 +1,5 @@
diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index 625461d..94e3090 100644
+index 8057641..d158081 100644
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1320,6 +1320,17 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
@@ -21,7 +21,7 @@ index 625461d..94e3090 100644
<!-- OldPath: AutoCorrect/Options/All -->
<!-- OldLocation: Soffice.cfg -->
diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
-index 70e0888..5d874f1 100644
+index 70e0888..f7155fd 100644
--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4437,6 +4437,17 @@
@@ -42,24 +42,6 @@ index 70e0888..5d874f1 100644
<prop oor:name="DelEmptyParagraphs" oor:type="xs:boolean">
<!-- OldPath: Writer/AutoFormat/Options -->
<!-- OldLocation: Soffice.cfg -->
-@@ -4613,6 +4624,17 @@
- </info>
- <value>true</value>
- </prop>
-+ <prop oor:name="AddNonBreakingSpace" oor:type="xs:boolean">
-+ <!-- OldPath: Writer/AutoFormat/Options -->
-+ <!-- OldLocation: Soffice.cfg -->
-+ <!-- UIHints: Tools AutoCorrect/AutoFormat Options - Add non-breaking space -->
-+ <info>
-+ <author>cedricbosdo</author>
-+ <desc>Adds a non-breaking space before the characters :!;? in french.</desc>
-+ <label>Add non-breaking space</label>
-+ </info>
-+ <value>true</value>
-+ </prop>
- <prop oor:name="ChangeToBorders" oor:type="xs:boolean">
- <!-- OldPath: Writer/AutoFormat/ByInput -->
- <!-- OldLocation: Soffice.cfg -->
diff --git svx/inc/svx/svxacorr.hxx svx/inc/svx/svxacorr.hxx
index 6771086..d414aed 100644
--- svx/inc/svx/svxacorr.hxx
@@ -95,7 +77,7 @@ index 18ae7e0..eb557ea 100644
BOOL bSetINetAttr : 1;
diff --git svx/source/cui/autocdlg.cxx svx/source/cui/autocdlg.cxx
-index f4c0a21..a517c98 100644
+index f4c0a21..15710a5 100644
--- svx/source/cui/autocdlg.cxx
+++ svx/source/cui/autocdlg.cxx
@@ -233,6 +233,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
@@ -171,7 +153,7 @@ index f4c0a21..a517c98 100644
aCheckLB.CheckEntryPos( REPLACE_HALF, CBCOL_SECOND, 0 != (nFlags & ChgFractionSymbol) );
aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash );
aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) );
-+ aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE, CBCOL_FIRST, 0 != (nFlags & AddNonBrkSpace) );
++ aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE, CBCOL_FIRST, 0 != ( pOpt->bAddNonBrkSpace ) );
+ aCheckLB.CheckEntryPos( ADD_NON_BRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) );
aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd );
aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd );
@@ -224,7 +206,7 @@ index edbd265..e207c5f 100644
/**************************************************************************/
diff --git svx/source/editeng/acorrcfg.cxx svx/source/editeng/acorrcfg.cxx
-index 95ecf61..93361ae 100644
+index 95ecf61..4dca043 100644
--- svx/source/editeng/acorrcfg.cxx
+++ svx/source/editeng/acorrcfg.cxx
@@ -128,9 +128,10 @@ Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames()
@@ -251,37 +233,32 @@ index 95ecf61..93361ae 100644
}
}
}
-@@ -408,8 +413,10 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames()
+@@ -408,8 +413,9 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames()
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily", //45
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", //46
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //47
+ "Format/Option/AddNonBreakingSpace", //48
-+ "Format/ByInput/AddNonBreakingSpace", //49
};
- const int nCount = 48;
-+ const int nCount = 50;
++ const int nCount = 49;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
-@@ -561,6 +568,8 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
+@@ -561,6 +567,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal));
}
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
+ case 48 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/Output/AddNonBreakingSpace",
-+ case 49 : rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break;// "Format/ByInput/AddNonBreakingSpace",
}
}
}
-@@ -676,6 +685,12 @@ void SvxSwAutoCorrCfg::Commit()
+@@ -676,6 +683,9 @@ void SvxSwAutoCorrCfg::Commit()
case 47 :
pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch();
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
+ case 48:
+ bVal = rSwFlags.bAddNonBrkSpace; pValues[nProp].setValue(&bVal, rType);
+ break; // "Format/Option/AddNonBreakingSpace",
-+ case 49:
-+ bVal = rSwFlags.bAddNonBrkSpace; pValues[nProp].setValue(&bVal, rType);
-+ break; // "Format/ByInput/AddNonBreakingSpace",
}
}
PutProperties(aNames, aValues);
@@ -378,6 +355,26 @@ index a6e7401..902e592 100644
( IsAutoCorrFlag( nRet = SetINetAttr ) &&
( ' ' == cChar || '\t' == cChar || 0x0a == cChar || !cChar ) &&
FnSetINetAttr( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) )
+diff --git svx/source/editeng/swafopt.cxx svx/source/editeng/swafopt.cxx
+index 0940a4e..113e6e3 100644
+--- svx/source/editeng/swafopt.cxx
++++ svx/source/editeng/swafopt.cxx
+@@ -53,6 +53,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
+ bChgEnumNum =
+ bChgFracionSymbol =
+ bChgOrdinalNumber =
++ bAddNonBrkSpace =
+ bChgToEnEmDash =
+ bChgWeightUnderl =
+ bSetINetAttr =
+@@ -117,6 +118,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
+
+ bChgFracionSymbol = rAFFlags.bChgFracionSymbol;
+ bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
++ bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
+ bChgToEnEmDash = rAFFlags.bChgToEnEmDash;
+ bChgWeightUnderl = rAFFlags.bChgWeightUnderl;
+ bSetINetAttr = rAFFlags.bSetINetAttr;
diff --git sw/inc/comcore.hrc sw/inc/comcore.hrc
index 8260814..9122841 100644
--- sw/inc/comcore.hrc
commit 5eb7df7b022d148d8ac85c81b03712a954fec1e4
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Nov 13 17:58:45 2009 +0100
Updated Maja's patch for OOO320_m4
* patches/dev300/writer-navigation-buttons.diff:
diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index acd5a89..bd27574 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -1,54 +1,8 @@
-Ovcica's writer nagivation patches
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- .../org/openoffice/Office/UI/WriterCommands.xcu | 16 ++
- .../Office/UI/WriterGlobalWindowState.xcu | 23 +++
- .../org/openoffice/Office/UI/WriterWindowState.xcu | 23 +++
- packimages/pack/image-sort.lst | 1
- sfx2/source/appl/workwin.cxx | 1
- sw/inc/cmdid.h | 3
- sw/inc/helpid.h | 1
- sw/inc/shellid.hxx | 1
- sw/sdi/_navsh.sdi | 49 ++++++
- sw/sdi/makefile.mk | 2
- sw/sdi/navsh.sdi | 34 +++++
- sw/sdi/swriter.sdi | 51 +++++++
- sw/sdi/swslots.sdi | 2
- sw/sdi/swslots.src | 8 +
- sw/source/ui/app/swmodule.cxx | 2
- sw/source/ui/inc/navmgr.hxx | 62 ++++++++
- sw/source/ui/inc/navsh.hxx | 51 +++++++
- sw/source/ui/inc/shells.hrc | 5 +
- sw/source/ui/inc/view.hxx | 3
- sw/source/ui/inc/wrtsh.hxx | 4 +
- sw/source/ui/shells/makefile.mk | 1
- sw/source/ui/shells/navsh.cxx | 151 ++++++++++++++++++++
- sw/source/ui/shells/shells.src | 37 +++++
- sw/source/ui/uiview/view.cxx | 10 +
- sw/source/ui/utlui/content.cxx | 7 +
- sw/source/ui/wrtsh/makefile.mk | 1
- sw/source/ui/wrtsh/navmgr.cxx | 73 ++++++++++
- sw/source/ui/wrtsh/wrtsh1.cxx | 6 +
- .../swriter/toolbar/navigationobjectbar.xml | 7 +
- 29 files changed, 633 insertions(+), 2 deletions(-)
- create mode 100644 sw/sdi/_navsh.sdi
- create mode 100644 sw/sdi/navsh.sdi
- create mode 100644 sw/source/ui/inc/navmgr.hxx
- create mode 100644 sw/source/ui/inc/navsh.hxx
- create mode 100644 sw/source/ui/shells/navsh.cxx
- create mode 100644 sw/source/ui/wrtsh/navmgr.cxx
- create mode 100644 sw/uiconfig/swriter/toolbar/navigationobjectbar.xml
-
-
diff --git officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
-index 33397c0..3a1de0b 100644
+index 0ba86ef..3646b88 100644
--- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
-@@ -2252,6 +2252,22 @@
+@@ -2249,6 +2249,22 @@
<value xml:lang="en-US">Continue previous numbering</value>
</prop>
</node>
@@ -152,7 +106,7 @@ index 43202b8..1118b3a 100644
uiconfig/modules/swriter/toolbar/oleobjectbar.xml
uiconfig/modules/swriter/toolbar/optimizetablebar.xml
diff --git sfx2/source/appl/workwin.cxx sfx2/source/appl/workwin.cxx
-index d6bfb67..b7a5de9 100644
+index 5e2bb23..3ea1f7d 100644
--- sfx2/source/appl/workwin.cxx
+++ sfx2/source/appl/workwin.cxx
@@ -143,6 +143,7 @@ static const ResIdToResName pToolBarResToName[] =
@@ -164,24 +118,24 @@ index d6bfb67..b7a5de9 100644
};
diff --git sw/inc/cmdid.h sw/inc/cmdid.h
-index d1ed2c6..ebc7fa7 100644
+index 900a110..26ce6ec 100644
--- sw/inc/cmdid.h
+++ sw/inc/cmdid.h
@@ -912,6 +912,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
- #define FN_UNO_PARA_CONT_PREV_SUBTREE (FN_EXTRA2 + 109)
- #define FN_UNO_PARA_NUM_STRING (FN_EXTRA2 + 110)
+ #define FN_UNO_TABLE_NAME (FN_EXTRA2 + 111)
+ #define FN_UNO_META (FN_EXTRA2 + 112)
-+#define FN_NAVIGATION_BACK (FN_EXTRA2 + 111)
-+#define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 112)
++#define FN_NAVIGATION_BACK (FN_EXTRA2 + 113)
++#define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 114)
+
/*--------------------------------------------------------------------
Bereich: Hilfe
--------------------------------------------------------------------*/
diff --git sw/inc/helpid.h sw/inc/helpid.h
-index b4afd73..8ffe632 100644
+index 3172447..1227e80 100644
--- sw/inc/helpid.h
+++ sw/inc/helpid.h
-@@ -985,3 +985,4 @@
+@@ -984,3 +984,4 @@
#define HID_MM_HEADER_12 (HID_BASE + 2279)
#define HID_MM_HEADER_13 (HID_BASE + 2280)
@@ -252,7 +206,7 @@ index 0000000..deb4fb9
+}
+
diff --git sw/sdi/makefile.mk sw/sdi/makefile.mk
-index 1a3f17a..7c707b8 100644
+index 25b75fe..0fc59ed 100644
--- sw/sdi/makefile.mk
+++ sw/sdi/makefile.mk
@@ -95,6 +95,8 @@ SVSDI1DEPEND= \
@@ -263,7 +217,7 @@ index 1a3f17a..7c707b8 100644
+ navsh.sdi \
swslots.hrc \
$(INC)$/globals.hrc \
- $(INC)$/cmdid.h
+ $(INC)$/cmdid.h \
diff --git sw/sdi/navsh.sdi sw/sdi/navsh.sdi
new file mode 100644
index 0000000..791ec99
@@ -305,10 +259,10 @@ index 0000000..791ec99
+ import _Navigation[Automation];
+}
diff --git sw/sdi/swriter.sdi sw/sdi/swriter.sdi
-index b736807..7888e1b 100644
+index 6f2914d..d1a1ae0 100644
--- sw/sdi/swriter.sdi
+++ sw/sdi/swriter.sdi
-@@ -10441,3 +10441,54 @@ SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
+@@ -10391,3 +10391,54 @@ SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
ToolBoxConfig = TRUE,
GroupId = GID_EDIT;
]
@@ -377,10 +331,10 @@ index 789301f..9997bd1 100644
diff --git sw/sdi/swslots.src sw/sdi/swslots.src
-index 5839b2b..f0b7c53 100644
+index f794901..1546a32 100644
--- sw/sdi/swslots.src
+++ sw/sdi/swslots.src
-@@ -1496,4 +1496,12 @@ SfxSlotInfo FN_VIEW_NOTES
+@@ -1500,4 +1500,12 @@ SfxSlotInfo FN_VIEW_NOTES
{
Slotname [ en-US ] = "Notes";
};
@@ -394,10 +348,10 @@ index 5839b2b..f0b7c53 100644
+}
diff --git sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx
-index 6c8d10c..0fce83e 100644
+index d4607da..ded9c5b 100644
--- sw/source/ui/app/swmodule.cxx
+++ sw/source/ui/app/swmodule.cxx
-@@ -165,6 +165,7 @@
+@@ -163,6 +163,7 @@
#include <avmedia/mediatoolbox.hxx>
#include <annotsh.hxx>
@@ -405,7 +359,7 @@ index 6c8d10c..0fce83e 100644
#include <app.hrc>
#include <svx/xmlsecctrl.hxx>
-@@ -359,6 +360,7 @@ void SwDLL::RegisterInterfaces()
+@@ -351,6 +352,7 @@ void SwDLL::RegisterInterfaces()
SwBezierShell::RegisterInterface(pMod);
SwGrfShell::RegisterInterface(pMod);
SwOleShell::RegisterInterface(pMod);
@@ -555,10 +509,10 @@ index feb200c..92a11bb 100644
#if SHELLS_ACT_END > RC_SHELLS_END
#error Resource-Id Ueberlauf in #file, #line
diff --git sw/source/ui/inc/view.hxx sw/source/ui/inc/view.hxx
-index 72c5b35..57e2fe5 100644
+index 75e5b6e..7e88191 100644
--- sw/source/ui/inc/view.hxx
+++ sw/source/ui/inc/view.hxx
-@@ -130,7 +130,8 @@ enum ShellModes
+@@ -131,7 +131,8 @@ enum ShellModes
SHELL_MODE_MEDIA,
SHELL_MODE_EXTRUDED_CUSTOMSHAPE,
SHELL_MODE_FONTWORK,
@@ -569,18 +523,18 @@ index 72c5b35..57e2fe5 100644
/*--------------------------------------------------------------------
diff --git sw/source/ui/inc/wrtsh.hxx sw/source/ui/inc/wrtsh.hxx
-index b36588c..3082ec5 100644
+index 956d06f..3f22de4 100644
--- sw/source/ui/inc/wrtsh.hxx
+++ sw/source/ui/inc/wrtsh.hxx
-@@ -36,6 +36,7 @@
- #include <sortopt.hxx>
+@@ -37,6 +37,7 @@
#include <swurl.hxx>
+ #include <IMark.hxx>
+#include "navmgr.hxx"
class Window;
class OutputDevice;
class SbxArray;
-@@ -86,6 +87,7 @@ namespace nsSelectionType
+@@ -87,6 +88,7 @@ namespace nsSelectionType
const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape
const SelectionType SEL_FONTWORK = 0x010000; // fontwork
const SelectionType SEL_POSTIT = 0x020000; //annotation
@@ -588,7 +542,7 @@ index b36588c..3082ec5 100644
}
-@@ -473,6 +475,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
+@@ -477,6 +479,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
String GetSelDescr() const;
@@ -596,7 +550,7 @@ index b36588c..3082ec5 100644
private:
SW_DLLPRIVATE void OpenMark();
-@@ -529,6 +532,7 @@ private:
+@@ -533,6 +536,7 @@ private:
} *pCrsrStack;
SwView &rView;
@@ -618,10 +572,10 @@ index 2e4a96c..44478cb 100644
$(SLO)$/tabsh.obj \
diff --git sw/source/ui/shells/navsh.cxx sw/source/ui/shells/navsh.cxx
new file mode 100644
-index 0000000..21106b9
+index 0000000..663c7eb
--- /dev/null
+++ sw/source/ui/shells/navsh.cxx
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -678,7 +632,6 @@ index 0000000..21106b9
+#include "popup.hrc"
+#include "shells.hrc"
+#define SwNavigationShell
-+#include "itemdef.hxx"
+#include "swslots.hxx"
+
+#include <unomid.h>
@@ -774,7 +727,7 @@ index 0000000..21106b9
+ }
+}
diff --git sw/source/ui/shells/shells.src sw/source/ui/shells/shells.src
-index 9140062..35e7e80 100644
+index 9243411..9f7fc0b 100644
--- sw/source/ui/shells/shells.src
+++ sw/source/ui/shells/shells.src
@@ -1033,6 +1033,43 @@ ToolBox RID_NUM_TOOLBOX
@@ -822,20 +775,18 @@ index 9140062..35e7e80 100644
{
Text [ en-US ] = "Text" ;
diff --git sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
-index 63b04d2..f6e897e 100644
+index afb41b7..deb2cc7 100644
--- sw/source/ui/uiview/view.cxx
+++ sw/source/ui/uiview/view.cxx
-@@ -105,6 +105,9 @@
- #ifndef _BEZIERSH_HXX
+@@ -77,6 +77,7 @@
+ #include <drformsh.hxx>
+ #include <drwtxtsh.hxx>
#include <beziersh.hxx>
- #endif
-+#ifndef _SWNAVIGATIONSH_HXX
+#include <navsh.hxx>
-+#endif
- #ifndef _GLOBDOC_HXX
#include <globdoc.hxx>
- #endif
-@@ -396,6 +399,13 @@ void SwView::SelectShell()
+ #include <scroll.hxx>
+ #include <globdoc.hxx>
+@@ -346,6 +347,13 @@ void SwView::SelectShell()
if ( !( nSelectionType & nsSelectionType::SEL_FOC_FRM_CTRL ) )
rDispatcher.Push( *pFormShell );
@@ -850,7 +801,7 @@ index 63b04d2..f6e897e 100644
{
eShellMode = SHELL_MODE_OBJECT;
diff --git sw/source/ui/utlui/content.cxx sw/source/ui/utlui/content.cxx
-index 6ee8f3e..d1c7dd1 100644
+index cee0116..f2f0c73 100644
--- sw/source/ui/utlui/content.cxx
+++ sw/source/ui/utlui/content.cxx
@@ -118,6 +118,7 @@
@@ -861,7 +812,7 @@ index 6ee8f3e..d1c7dd1 100644
#define CTYPE_CNT 0
#define CTYPE_CTT 1
-@@ -3171,6 +3172,12 @@ void SwContentTree::GotoContent(SwContent* pCnt)
+@@ -3188,6 +3189,12 @@ void SwContentTree::GotoContent(SwContent* pCnt)
sal_Bool bSel = sal_False;
sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
@@ -966,10 +917,10 @@ index 0000000..f5f0a93
+ _iCurrent = _entries.end(); _nCurrent = _entries.size() - 1;
+}
diff --git sw/source/ui/wrtsh/wrtsh1.cxx sw/source/ui/wrtsh/wrtsh1.cxx
-index daed60c..dd3f4b2 100644
+index e50d1b6..d63f1fb 100644
--- sw/source/ui/wrtsh/wrtsh1.cxx
+++ sw/source/ui/wrtsh/wrtsh1.cxx
-@@ -1496,6 +1496,8 @@ SelectionType SwWrtShell::GetSelectionType() const
+@@ -1527,6 +1527,8 @@ SelectionType SwWrtShell::GetSelectionType() const
return nsSelectionType::SEL_FRM;
}
@@ -978,7 +929,7 @@ index daed60c..dd3f4b2 100644
if ( IsCrsrInTbl() )
nCnt |= nsSelectionType::SEL_TBL;
-@@ -1584,6 +1586,9 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const String &rFmtName)
+@@ -1615,6 +1617,9 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const String &rFmtName)
return 0;
}
@@ -988,9 +939,9 @@ index daed60c..dd3f4b2 100644
/*------------------------------------------------------------------------
Beschreibung: Anwenden der Vorlagen
-@@ -1733,6 +1738,7 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell )
- if (IsFormProtected() && (pBM=GetNextFieldBookmark())!=NULL) {
- GotoFieldBookmark(pBM);
+@@ -1764,6 +1769,7 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell )
+ if ( IsFormProtected() && ( pBM = GetFieldmarkAfter( ) ) !=NULL ) {
+ GotoFieldmark(pBM);
}
+ aNavigationMgr.setShell(this);
}
More information about the ooo-build-commit
mailing list