diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
| commit | fa88b3717d58410f6318c520b0397000f86b9720 (patch) | |
| tree | ad8f1b2135ebe8045de55e5af233ff442d901444 /sw | |
| parent | 54cd57e03e115d6b009409e6df374603452b1378 (diff) | |
| parent | a7261b424716463a7bb157f0d79084c868e10015 (diff) | |
Merge branch 'feature/killsdf'
Conflicts:
desktop/prj/build.lst
helpcontent2
l10ntools/Executable_gsicheck.mk
l10ntools/Executable_uiex.mk
regexp/inc/regexp/reclass.hxx
solenv/gbuild/AllLangResTarget.mk
Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/prj/build.lst | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/shells.src | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 0ff450fc126e..a46128c9ee0c 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw : filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL +sw sw : filter configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 937c21706b7c..0bd27b23050a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3893,7 +3893,7 @@ void wwSectionManager::InsertSegments() bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() && bThisAndPreviousAreCompatible): false; bool bInsertPageDesc = !bInsertSection; - bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disales this... + bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this... if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) { // here we have the special case that the whole document is protected, with the execption of this section. diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index da6af126a2f4..cab3649049d5 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -119,7 +119,6 @@ QueryBox DLG_IMPORT_DBNAME BUTTONS = WB_YES_NO ; DEFBUTTON = WB_DEF_NO ; Message [ en-US ] = "Use database name as default database for the document?" ; - Message [ x-comment ] = " "; }; String STR_PAGE { |