Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hello Christina,

Compilation failed in padmin (even after a make -r clean && make -sr). So here is a simple patch to validate. The compilation is ok but perhaps I missed something or perhaps you planned other changes.
If it's ok for you, I can push it myself if you want.

Julien.

commit 23c62205b008c946f8334dd2dc628fccdf75e46e
Author: Julien Nabet <serval2412@yahoo.fr>
Date:   Sun Apr 10 22:45:20 2011 +0200

    some elements to change for "expunge duplicate enumerations in vcl"

diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index dbaf372..a661379 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -107,35 +107,35 @@ String FontNameDlg::fillFontEntry( FastPrintFontInfo& rInfo, const String& 
rFile
     bool bWeight = true, bItalic = true, bWidth = true;
     switch( rInfo.m_eWeight )
     {
-        case weight::Thin:                     aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt 
); break;
-        case weight::UltraLight:       aEntry.AppendAscii( ", " ); aEntry.Append( aUltraLightTxt 
); break;
-        case weight::Light:                    aEntry.AppendAscii( ", " ); aEntry.Append( 
aLightTxt ); break;
-        case weight::SemiLight:                aEntry.AppendAscii( ", " ); aEntry.Append( 
aSemiLightTxt ); break;
-        case weight::SemiBold:         aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); 
break;
-        case weight::Bold:                     aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt 
); break;
-        case weight::UltraBold:                aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraBoldTxt ); break;
+        case WEIGHT_THIN:              aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt ); 
break;
+        case WEIGHT_ULTRALIGHT:                aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraLightTxt ); break;
+        case WEIGHT_LIGHT:             aEntry.AppendAscii( ", " ); aEntry.Append( aLightTxt ); 
break;
+        case WEIGHT_SEMILIGHT:         aEntry.AppendAscii( ", " ); aEntry.Append( aSemiLightTxt ); 
break;
+        case WEIGHT_SEMIBOLD:          aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); 
break;
+        case WEIGHT_BOLD:              aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt ); 
break;
+        case WEIGHT_ULTRABOLD:         aEntry.AppendAscii( ", " ); aEntry.Append( aUltraBoldTxt ); 
break;
         default:
             bWeight = false;
             break;
     }
     switch( rInfo.m_eItalic )
     {
-        case italic::Oblique:          aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); 
break;
-        case italic::Italic:           aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); 
break;
+        case ITALIC_OBLIQUE:           aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); 
break;
+        case ITALIC_NORMAL:            aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); 
break;
         default:
             bItalic = false;
             break;
     }
     switch( rInfo.m_eWidth )
     {
-        case width::UltraCondensed:    aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraCondensedTxt ); break;
-        case width::ExtraCondensed:    aEntry.AppendAscii( ", " ); aEntry.Append( 
aExtraCondensedTxt ); break;
-        case width::Condensed:         aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); 
break;
-        case width::SemiCondensed:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aSemiCondensedTxt ); break;
-        case width::SemiExpanded:      aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt 
); break;
-        case width::Expanded:          aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); 
break;
-        case width::ExtraExpanded:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aExtraExpandedTxt ); break;
-        case width::UltraExpanded:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraExpandedTxt ); break;
+        case WIDTH_ULTRA_CONDENSED:    aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraCondensedTxt ); break;
+        case WIDTH_EXTRA_CONDENSED:    aEntry.AppendAscii( ", " ); aEntry.Append( 
aExtraCondensedTxt ); break;
+        case WIDTH_CONDENSED:          aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); 
break;
+        case WIDTH_SEMI_CONDENSED:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aSemiCondensedTxt ); break;
+        case WIDTH_SEMI_EXPANDED:      aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt 
); break;
+        case WIDTH_EXPANDED:           aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); 
break;
+        case WIDTH_EXTRA_EXPANDED:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aExtraExpandedTxt ); break;
+        case WIDTH_ULTRA_EXPANDED:     aEntry.AppendAscii( ", " ); aEntry.Append( 
aUltraExpandedTxt ); break;
         default:
             bWidth = false;
             break;

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.