[Libreoffice-commits] .: 3 commits - binfilter/bf_svx binfilter/bf_sw

[Caolán McNamara]

 binfilter/bf_svx/source/items/svx_svxfont.cxx     |   11 -----------
 binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx |    6 +-----
 binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx |    3 ++-
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit c9dd8275d047a8f0ae33c8461ef8d34ac108e675
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 12:14:27 2011 +0100

    Let's leave the binfilter smallcaps at its original historical value
    
    i.e. reverts 6619f525a6602546b253e61ecd0bc9906be92df9 while leaving
    the modern bit changed, now using the compatibilty flag to keep pre
    change docs unmodified.

diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
index 9f28680..b09121e 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
@@ -47,7 +47,8 @@ namespace binfilter {
 using namespace ::com::sun::star::i18n;
 
 
-#define KAPITAELCHENPROP 80
+#define KAPITAELCHENPROP 66
+
 /*************************************************************************
  *						class SwCapitalInfo
  *
commit 3914839bb15e828902fe415e0509049222d25765
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 12:10:11 2011 +0100

    remove unused defines etc.

diff --git a/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx
index 71734ca..3680ae8 100644
--- a/binfilter/bf_svx/source/items/svx_svxfont.cxx
+++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx
@@ -42,17 +42,6 @@
 #include "svxfont.hxx"
 namespace binfilter {
 
-// Minimum: Prozentwert fuers kernen
-#define MINKERNPERCENT 5
-
-// prop. Groesse der Kleinbuchstaben bei Kapitaelchen
-#define KAPITAELCHENPROP 80
-
-#ifndef REDUCEDSVXFONT
-    const sal_Unicode CH_BLANK = sal_Unicode(' ');  	// ' ' Leerzeichen
-    static sal_Char const sDoubleSpace[] = "  ";
-#endif
-
 /*************************************************************************
  *						class SvxFont
  *************************************************************************/
commit cbb543f02dc5ca2b39fd05ed5c41ad4ffaf8f2d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 12:09:49 2011 +0100

    WaE: throw out some warnings

diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index eb8a3bb..7d07c96 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -265,7 +265,6 @@ static OldFormats aOldGetSetExpFmt30[] =
 /*N*/ 					// uns voruebergehend mal im Subtyp, sofern es
 /*N*/ 					// ueberhaupt als entsprechendes Format in Frage kommt.
 /*N*/ 					if( RES_SETEXPFLD==rWhich &&
-/*N*/ 						rFmt >= (USHORT)SVX_NUM_CHARS_UPPER_LETTER &&
 /*N*/ 						rFmt <= (USHORT)SVX_NUM_BITMAP )
 /*N*/ 					{
 /*N*/ 						rSubType = (USHORT)rFmt;
@@ -1754,8 +1753,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
 /*N*/ 	// Hack: fuer Seq-Felder wurde das Original-Format im Subtyp uebergeben,
 /*N*/ 	// aber nur, wenn es auch als entsprechendes Format in Frage kommt.
 /*N*/ 	// (SUB_VISIBLE und SUB_CMD sind disjunkt).
-/*N*/ 	if( nSubType >= (USHORT)SVX_NUM_CHARS_UPPER_LETTER &&
-/*N*/ 		nSubType <= (USHORT)SVX_NUM_BITMAP )
+/*N*/ 	if( nSubType <= (USHORT)SVX_NUM_BITMAP )
 /*N*/ 	{
 /*N*/ 		if( GSE_SEQ & nType )
 /*N*/ 			rFmt = nSubType;
@@ -2303,8 +2301,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
         OSL_ENSURE( !rIo.IsSw31Export(),
                 "Wer will denn da ein Script-Feld exportieren" );
 
-        ((SwScriptField*)pFld)->IsCodeURL() ? 0x01 : 0x00;
-
         String aCode;
         if( ((SwScriptField*)pFld)->IsCodeURL() )
         {