[Libreoffice-commits] core.git: sw/source

[Tor Lillqvist]

 sw/source/core/text/frmpaint.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit af6d853908678a20d7f39123a68d5c886af41024
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 21 16:11:19 2013 +0300

    Hopefully fix Windows build: Use proper header
    
    numfunc::GetDefBulletFontname() returns an OUString, but there was a
    declaration in frmpaint.cxx that claimed it returned a String. I have no idea
    why the numrule.hxx header, which declares it correctly, was not used.
    
    Change-Id: Id57fd738a29de3adda054be4b60f809231c016ea

diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 4296822..d3b36a5 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -44,6 +44,7 @@
 #include <redlnitr.hxx> // SwRedlineItr
 #include <swmodule.hxx> // SW_MOD
 #include <tabfrm.hxx>   // SwTabFrm (Redlining)
+#include <numrule.hxx>
 #include <SwGrammarMarkUp.hxx>
 
 // #i12836# enhanced pdf export
@@ -52,15 +53,6 @@
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentLineNumberAccess.hxx>
 
-// variable moved to class <numfunc:GetDefBulletConfig>
-//extern const sal_Char sBulletFntName[];
-namespace numfunc
-{
-    extern const String& GetDefBulletFontname();
-    extern bool IsDefBulletFontUserDefined();
-}
-
-
 #define REDLINE_DISTANCE 567/4
 #define REDLINE_MINDIST  567/10