[Libreoffice-commits] core.git: 2 commits - solenv/gbuild svx/source

[Maxim Monastirsky]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    2 +-
 svx/source/tbxctrls/tbcontrl.cxx               |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 558618e0dd75424bd2d7134ba536ee78bdb4a26a
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun May 18 16:33:55 2014 +0300

    Sort alphabetically
    
    Change-Id: I54a9bdaa306e4a9c492e2be35378b9b42f64312f

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 88e7e55..b85d36f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -82,8 +82,8 @@ gb_EXTRAMERGEDLIBS := \
 	$(if $(filter-out ANDROID IOS,$(OS)),scn) \
 	sd \
 	$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
-	storagefd \
 	spell \
+	storagefd \
 	svgfilter \
 	swd \
 	t602filter \
commit 0c4c6c1d9967d04683a68dc9fb5de23f617eea24
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun May 18 16:33:10 2014 +0300

    Correct prefix
    
    Change-Id: I767501475b0b826a76a8743513c60f25e70dea8a

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d3a055e..d1771f2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1238,21 +1238,21 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
         {
             aColorSet.SetNoSelection();
 
-            Color rColor;
+            Color aColor;
             if ( pState->ISA( SvxColorItem ) )
-                rColor = ((const SvxColorItem*)pState)->GetValue();
+                aColor = ((const SvxColorItem*)pState)->GetValue();
             else if ( pState->ISA( XLineColorItem ) )
-                rColor = ((const XLineColorItem*)pState)->GetColorValue();
+                aColor = ((const XLineColorItem*)pState)->GetColorValue();
 
             for ( size_t i = 1; i <= aColorSet.GetItemCount(); ++i )
             {
-                if ( rColor == aColorSet.GetItemColor(i) )
+                if ( aColor == aColorSet.GetItemColor(i) )
                 {
                     aColorSet.SelectItem(i);
                     return;
                 }
             }
-            if ( rColor == COL_AUTO || rColor == COL_TRANSPARENT )
+            if ( aColor == COL_AUTO || aColor == COL_TRANSPARENT )
                 aColorSet.SelectItem(0);
         }
     }