vcl/generic/glyphs/gcach_layout.cxx | 10 +++++-----
vcl/inc/generic/glyphcache.hxx | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e46c61addd616a80c40e58e021326aa798eb6921
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sun Jan 11 19:40:31 2015 +1100
vcl: ServerFontLayout::setNeedFallback() -> SetNeedFallback()
Change-Id: I28f2b4df57b8bc521e36e72b1f788fc89cfa7caf
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index d47b3d2..8719844 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -76,7 +76,7 @@ void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
}
-void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32
nCharPos,
+void ServerFontLayout::SetNeedFallback(ImplLayoutArgs& rArgs, sal_Int32
nCharPos,
bool bRightToLeft)
{
if (nCharPos < 0)
@@ -446,7 +446,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
// if needed request glyph fallback by updating LayoutArgs
if (!nGlyphIndex)
{
- rLayout.setNeedFallback(rArgs, nCharPos, bRightToLeft);
+ rLayout.SetNeedFallback(rArgs, nCharPos, bRightToLeft);
if (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags)
continue;
}
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index b45365a..d537859 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -294,7 +294,7 @@ public:
virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE;
- void setNeedFallback(
+ void SetNeedFallback(
ImplLayoutArgs& rArgs,
sal_Int32 nIndex,
bool bRightToLeft);
commit 7ac95954df17090abdd2225428c771917f2b7188
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sun Jan 11 19:23:59 2015 +1100
vcl: LayoutEngine::layout() to LayoutEngine::Layout()
Convention is that public functions used by other non-implementation classes
use uppercase function names.
Change-Id: I9a57b231b6a92dc8ac37dc417fdb8177a8c2fa11
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index abd04ba..d47b3d2 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -50,7 +50,7 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics )
const
bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
- return mrServerFont.GetLayoutEngine()->layout(*this, rArgs);
+ return mrServerFont.GetLayoutEngine()->Layout(*this, rArgs);
}
void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
@@ -316,7 +316,7 @@ public:
HbLayoutEngine(ServerFont&);
virtual ~HbLayoutEngine();
- virtual bool layout(ServerFontLayout&, ImplLayoutArgs&)
SAL_OVERRIDE;
+ virtual bool Layout(ServerFontLayout&, ImplLayoutArgs&)
SAL_OVERRIDE;
};
HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont)
@@ -351,7 +351,7 @@ struct HbScriptRun
typedef std::vector<HbScriptRun> HbScriptRuns;
-bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
+bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
{
ServerFont& rFont = rLayout.GetServerFont();
FT_Face aFtFace = rFont.GetFtFace();
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 6526cfb..b45365a 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -316,7 +316,7 @@ class ServerFontLayoutEngine
public:
virtual ~ServerFontLayoutEngine() {}
- virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
+ virtual bool Layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
};
class GlyphCachePeer
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
