[Libreoffice-commits] core.git: vcl/inc

[Chris Sherlock]

 vcl/inc/impfont.hxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit a43b7cc56e3a3a145554932025acbca4156a15f1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 29 13:39:49 2016 +1100

    vcl: move NoAsk() functions to own grouping in impfont.hxx header
    
    Change-Id: I361fa3be7dc974dbeefc05820c508cfc7098775d

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index cde8e09..74d541f 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -39,17 +39,12 @@ public:
     // device independent font functions
     const OUString&     GetFamilyName() const                           { return maFamilyName; }
     FontFamily          GetFamilyType()                                 { if(meFamily==FAMILY_DONTKNOW)  AskConfig(); return meFamily; }
-    FontFamily          GetFamilyTypeNoAsk() const                      { return meFamily; }
     const OUString&     GetStyleName() const                            { return maStyleName; }
 
     FontWeight          GetWeight()                                     { if(meWeight==WEIGHT_DONTKNOW)  AskConfig(); return meWeight; }
-    FontWeight          GetWeightNoAsk() const                          { return meWeight; }
     FontItalic          GetItalic()                                     { if(meItalic==ITALIC_DONTKNOW)  AskConfig(); return meItalic; }
-    FontItalic          GetItalicNoAsk() const                          { return meItalic; }
     FontPitch           GetPitch()                                      { if(mePitch==PITCH_DONTKNOW)    AskConfig(); return mePitch; }
-    FontPitch           GetPitchNoAsk() const                           { return mePitch; }
     FontWidth           GetWidthType()                                  { if(meWidthType==WIDTH_DONTKNOW) AskConfig(); return meWidthType; }
-    FontWidth           GetWidthTypeNoAsk() const                       { return meWidthType; }
     TextAlign           GetAlignment() const                            { return meAlign; }
     rtl_TextEncoding    GetCharSet() const                              { return meCharSet; }
 
@@ -68,6 +63,13 @@ public:
 
     void                SetSymbolFlag( const bool bSymbolFlag )         { mbSymbol = bSymbolFlag; }
 
+    // straight properties, no getting them from AskConfig()
+    FontFamily          GetFamilyTypeNoAsk() const                      { return meFamily; }
+    FontWeight          GetWeightNoAsk() const                          { return meWeight; }
+    FontItalic          GetItalicNoAsk() const                          { return meItalic; }
+    FontPitch           GetPitchNoAsk() const                           { return mePitch; }
+    FontWidth           GetWidthTypeNoAsk() const                       { return meWidthType; }
+
     // device dependent functions
     int                 GetQuality() const                              { return mnQuality; }
     OUString            GetMapNames() const                             { return maMapNames; }