From 474ebc9319d01cb4f858ad63dfd6d7f03e8c050f Mon Sep 17 00:00:00 2001
From: Robert DARGAUD <libo@bobiciel.com>
Date: Sun, 10 Apr 2011 14:03:12 +0200
Subject: [PATCH 2/2] Conditional formatting with unlimited number of rules

---
 editeng/inc/editeng/charreliefitem.hxx |    2 +-
 svx/source/dialog/fntctrl.cxx          |   58 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index d32f3b4..c470b14 100755
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -34,7 +34,7 @@
 #include <vcl/fntstyle.hxx>
 #include <editeng/editengdllapi.h>
 
-// class SvxCharRotateItem ----------------------------------------------
+// class SvxCharReliefItem ----------------------------------------------
 
 /* [Description]
 
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 1fc210d..16e1d68 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -52,39 +52,39 @@
 
 #include <svx/fntctrl.hxx>
 #include <svx/dialogs.hrc>
-#define TEXT_WIDTH	20
 
-// RMQ voir si tous ces include sont indispensables
-#include <editeng/editids.hrc>
-#include "editeng/fontitem.hxx"
-#include <editeng/postitem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/crsditem.hxx>
-#include <editeng/cntritem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/escpitem.hxx>
-#include <editeng/prszitem.hxx>
-#include <editeng/wrlmitem.hxx>
-#include <editeng/cmapitem.hxx>
-#include <editeng/kernitem.hxx>
-#include <editeng/blnkitem.hxx>
-#include "editeng/flstitem.hxx"
-#include <editeng/akrnitem.hxx>
-#include <editeng/brshitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/emphitem.hxx>
-#include <editeng/charreliefitem.hxx>
-#include <editeng/twolinesitem.hxx>
-#include <editeng/charhiddenitem.hxx>
-#include <svl/stritem.hxx>
-#include <editeng/charscaleitem.hxx>
-#include <editeng/charrotateitem.hxx>
+#include <editeng/editids.hrc>      // #define SID_ATTR_*
+#include "editeng/fontitem.hxx"     // SvxFontItem
+#include <editeng/postitem.hxx>     // SvxPostureItem
+#include <editeng/udlnitem.hxx>     // SvxUnderlineItem
+#include <editeng/crsditem.hxx>     // SvxCrossedOutItem
+#include <editeng/cntritem.hxx>     // SvxContourItem
+//#include <editeng/langitem.hxx>   // SvxLanguageItem
+#include <editeng/wghtitem.hxx>     // SvxWeightItem
+#include <editeng/fhgtitem.hxx>     // SvxFontHeightItem
+#include <editeng/shdditem.hxx>     // SvxShadowedItem
+#include <editeng/escpitem.hxx>     // SvxEscapementItem
+//#include <editeng/prszitem.hxx>   // SvxPropSizeItem
+#include <editeng/wrlmitem.hxx>     // SvxWordLineModeItem
+#include <editeng/cmapitem.hxx>     // SvxWordLineModeItem
+#include <editeng/kernitem.hxx>     // SvxKerningItem
+//#include <editeng/blnkitem.hxx>   // SvxBlinkItem
+//#include "editeng/flstitem.hxx"   // SvxFontListItem
+//#include <editeng/akrnitem.hxx>   // SvxAutoKernItem
+#include <editeng/brshitem.hxx>     // SvxBrushItem
+#include <editeng/colritem.hxx>     // SvxColorItem
+#include <editeng/emphitem.hxx>     // SvxEmphasisMarkItem
+#include <editeng/charreliefitem.hxx>       // SvxCharReliefItem
+#include <editeng/twolinesitem.hxx>         // SvxTwoLinesItem
+// #include <editeng/charhiddenitem.hxx>    // SvxCharHiddenItem
+#include <editeng/charscaleitem.hxx>        // SvxCharScaleWidthItem
+// #include <editeng/charrotateitem.hxx>    // SvxCharRotateItem
+
+#include <svl/stritem.hxx>                  // SfxStringItem
 
 // define ----------------------------------------------------------------
 
+#define TEXT_WIDTH	20
 #define ISITEMSET	rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT
 
 using namespace ::com::sun::star::uno;
-- 
1.7.1
