[ooo-build-commit] patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Oct 22 06:41:12 PDT 2009
patches/dev300/cws-cbosdo01.diff | 96 ++++++++++++++++++++++++++++++++-------
1 file changed, 81 insertions(+), 15 deletions(-)
New commits:
commit 0941a16f3b00a9945896a2a7d57c6b0e4235f45c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Oct 22 15:00:29 2009 +0200
Non-breaking spaces fixes
Fixed fr_CA rules
Don't add a non-breaking space after a tab
Added the default values for the options in officecfg
* patches/dev300/cws-cbosdo01.diff: updated patch
diff --git a/patches/dev300/cws-cbosdo01.diff b/patches/dev300/cws-cbosdo01.diff
index 5c9301d..91161e8 100644
--- a/patches/dev300/cws-cbosdo01.diff
+++ b/patches/dev300/cws-cbosdo01.diff
@@ -1,3 +1,65 @@
+diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
+index 625461d..94e3090 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
+ </info>
+ <value>true</value>
+ </prop>
++ <prop oor:name="AddNonBreakingSpace" oor:type="xs:boolean">
++ <!-- OldPath: AutoCorrect/Options/All -->
++ <!-- 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="RemoveDoubleSpaces" oor:type="xs:boolean">
+ <!-- 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
+--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+@@ -4437,6 +4437,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="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
@@ -147,7 +209,7 @@ index ea5ee11..e3d1d3f 100644
String sRightMargin;
String sNum;
diff --git svx/source/cui/autocdlg.src svx/source/cui/autocdlg.src
-index 099f63a..47f6c62 100644
+index edbd265..e207c5f 100644
--- svx/source/cui/autocdlg.src
+++ svx/source/cui/autocdlg.src
@@ -144,6 +144,10 @@ TabDialog RID_OFA_AUTOCORR_DLG
@@ -162,7 +224,7 @@ index 099f63a..47f6c62 100644
/**************************************************************************/
diff --git svx/source/editeng/acorrcfg.cxx svx/source/editeng/acorrcfg.cxx
-index 95ecf61..9a794c2 100644
+index 95ecf61..93361ae 100644
--- svx/source/editeng/acorrcfg.cxx
+++ svx/source/editeng/acorrcfg.cxx
@@ -128,9 +128,10 @@ Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames()
@@ -193,8 +255,8 @@ index 95ecf61..9a794c2 100644
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily", //45
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", //46
"Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", //47
-+ "Format/Option/AddNonBreakSpace", //48
-+ "Format/ByInput/AddNonBreakSpace", //49
++ "Format/Option/AddNonBreakingSpace", //48
++ "Format/ByInput/AddNonBreakingSpace", //49
};
- const int nCount = 48;
+ const int nCount = 50;
@@ -224,7 +286,7 @@ index 95ecf61..9a794c2 100644
}
PutProperties(aNames, aValues);
diff --git svx/source/editeng/svxacorr.cxx svx/source/editeng/svxacorr.cxx
-index a6e7401..fd7b093 100644
+index a6e7401..902e592 100644
--- svx/source/editeng/svxacorr.cxx
+++ svx/source/editeng/svxacorr.cxx
@@ -33,6 +33,7 @@
@@ -252,7 +314,7 @@ index a6e7401..fd7b093 100644
| ChgWeightUnderl
| SetINetAttr
| ChgQuotes
-@@ -694,6 +698,50 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
+@@ -694,6 +698,54 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
return bRet;
}
@@ -268,12 +330,16 @@ index a6e7401..fd7b093 100644
+
+ if ( rLocale.Language == OUString::createFromAscii( "fr" ) )
+ {
++ OUString chars = OUString::createFromAscii( ":;!?" );
++ if ( rLocale.Country == OUString::createFromAscii( "CA" ) )
++ chars = OUString::createFromAscii( ":" );
++
+ sal_Unicode cChar = rTxt.GetChar( nEndPos );
-+ if ( cChar == ':' || cChar == ';' || cChar == '!' || cChar == '?' )
++ if ( chars.indexOf( sal_Unicode( cChar ) ) != -1 )
+ {
+ // Check the previous char
+ sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
-+ if ( cPrevChar != ':' && cPrevChar != ';' && cPrevChar != '!' && cPrevChar != '?' )
++ if ( ( chars.indexOf( sal_Unicode( cPrevChar ) ) == -1 ) && cPrevChar != '\t' )
+ {
+ // Remove any previous normal space
+ xub_StrLen nPos = nEndPos - 1;
@@ -303,7 +369,7 @@ index a6e7401..fd7b093 100644
BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
xub_StrLen nSttPos, xub_StrLen nEndPos,
-@@ -1347,6 +1395,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+@@ -1347,6 +1399,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
FnChgFractionSymbol( rDoc, rTxt, nCapLttrPos, nInsPos ) ) ||
( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) &&
FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) ||
@@ -328,10 +394,10 @@ index 8260814..9122841 100644
#endif
diff --git sw/source/core/edit/autofmt.cxx sw/source/core/edit/autofmt.cxx
-index 9622075..f4499b2 100644
+index 114ae91..cfed93c 100644
--- sw/source/core/edit/autofmt.cxx
+++ sw/source/core/edit/autofmt.cxx
-@@ -319,6 +319,7 @@ void SwAutoFormat::_SetRedlineTxt( USHORT nActionId )
+@@ -316,6 +316,7 @@ void SwAutoFormat::_SetRedlineTxt( USHORT nActionId )
case STR_AUTOFMTREDL_FRACTION:
case STR_AUTOFMTREDL_DASH:
case STR_AUTOFMTREDL_ORDINAL:
@@ -339,7 +405,7 @@ index 9622075..f4499b2 100644
nSeqNo = ++nRedlAutoFmtSeqId;
break;
}
-@@ -1885,7 +1886,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+@@ -1896,7 +1897,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
!aFlags.bCptlSttSntnc && !aFlags.bCptlSttWrd &&
!aFlags.bChgFracionSymbol && !aFlags.bChgOrdinalNumber &&
!aFlags.bChgToEnEmDash && !aFlags.bSetINetAttr &&
@@ -348,7 +414,7 @@ index 9622075..f4499b2 100644
return;
const String* pTxt = &pAktTxtNd->GetTxt();
-@@ -1894,7 +1895,8 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+@@ -1905,7 +1906,8 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
BOOL bGetLanguage = aFlags.bChgOrdinalNumber ||
aFlags.bChgToEnEmDash || aFlags.bSetINetAttr ||
@@ -358,7 +424,7 @@ index 9622075..f4499b2 100644
aDelPam.DeleteMark();
-@@ -2123,6 +2125,9 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
+@@ -2134,6 +2136,9 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
( aFlags.bChgToEnEmDash &&
SetRedlineTxt( STR_AUTOFMTREDL_DASH ) &&
pATst->FnChgToEnEmDash( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
@@ -369,7 +435,7 @@ index 9622075..f4499b2 100644
( nPos == pTxt->Len() || IsSpace( pTxt->GetChar( nPos )) ) &&
SetRedlineTxt( STR_AUTOFMTREDL_DETECT_URL ) &&
diff --git sw/source/ui/utlui/utlui.src sw/source/ui/utlui/utlui.src
-index 7a45772..3aad027 100644
+index 34d9186..03c4a84 100644
--- sw/source/ui/utlui/utlui.src
+++ sw/source/ui/utlui/utlui.src
@@ -122,6 +122,10 @@ Resource RID_SHELLRES_AUTOFMTSTRS
More information about the ooo-build-commit
mailing list