[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Kohei Yoshida]

 sc/source/ui/inc/output.hxx   |    4 ++--
 sc/source/ui/view/output2.cxx |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ae13588bbeac3dbb3faeedf1f00a27ce1bf54886
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Apr 6 16:09:47 2011 -0400

    Renamed methods for consistency.

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 84d1a9c..6a16853 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -117,7 +117,7 @@ private:
         explicit DrawEditParam(const ScPatternAttr* pPattern, const SfxItemSet* pCondSet, bool bCellIsValue);
 
         bool readCellContent(ScDocument* pDoc, bool bShowNullValues, bool bShowFormulas, bool bSyntaxMode, bool bUseStyleColor, bool bForceAutoColor, bool& rWrapFields);
-        void updateEnginePattern(bool bUseStyleColor);
+        void setPatternToEngine(bool bUseStyleColor);
         void calcMargins(long& rTop, long& rLeft, long& rBottom, long& rRight, double nPPTX, double nPPTY) const;
         void calcPaperSize(Size& rPaperSize, const Rectangle& rAlignRect, double nPPTX, double nPPTY) const;
         void getEngineSize(ScFieldEditEngine* pEngine, long& rWidth, long& rHeight) const;
@@ -142,7 +142,7 @@ private:
          */
         void calcStartPosForVertical(Point& rLogicStart, long nCellWidth, long nEngineWidth, long nTopM, OutputDevice* pRefDevice);
 
-        void setAlignmentItems();
+        void setAlignmentToEngine();
         bool adjustHorAlignment(ScFieldEditEngine* pEngine);
         void adjustForRTL();
         void adjustForHyperlinkInPDF(Point aURLStart, OutputDevice* pDev);
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 707c8d8..f78ac9a 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2189,7 +2189,7 @@ bool ScOutputData::DrawEditParam::readCellContent(
     return true;
 }
 
-void ScOutputData::DrawEditParam::updateEnginePattern(bool bUseStyleColor)
+void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor)
 {
     // syntax highlighting mode is ignored here
     // StringDiffer doesn't look at hyphenate, language items
@@ -2353,7 +2353,7 @@ void ScOutputData::DrawEditParam::calcStartPosForVertical(
     }
 }
 
-void ScOutputData::DrawEditParam::setAlignmentItems()
+void ScOutputData::DrawEditParam::setAlignmentToEngine()
 {
     if (isVerticallyOriented() || mbAsianVertical)
     {
@@ -2634,8 +2634,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
     if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD )
         rParam.meVerJust = SVX_VER_JUSTIFY_TOP;
 
-    rParam.updateEnginePattern(bUseStyleColor);
-    rParam.setAlignmentItems();
+    rParam.setPatternToEngine(bUseStyleColor);
+    rParam.setAlignmentToEngine();
 
     //	Read content from cell
 
@@ -3184,8 +3184,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
     //	Fill the EditEngine (cell attributes and text)
     //
 
-    rParam.updateEnginePattern(bUseStyleColor);
-    rParam.setAlignmentItems();
+    rParam.setPatternToEngine(bUseStyleColor);
+    rParam.setAlignmentToEngine();
 
     //	Read content from cell
 
@@ -3565,8 +3565,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
     //	Fill the EditEngine (cell attributes and text)
     //
 
-    rParam.updateEnginePattern(bUseStyleColor);
-    rParam.setAlignmentItems();
+    rParam.setPatternToEngine(bUseStyleColor);
+    rParam.setAlignmentToEngine();
 
     //	Read content from cell