[Libreoffice-commits] .: 2 commits - framework/source vcl/source

[Libreoffice Gerrit user]

 framework/source/layoutmanager/helpers.cxx       |    4 ++--
 framework/source/services/substitutepathvars.cxx |    3 +--
 vcl/source/window/builder.cxx                    |    9 ++++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 2dd0712a125a8dcdb5510bc36f06d103d6abdf58
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 12 09:22:23 2012 +0100

    loplugin: unused Strings
    
    Change-Id: Ie9c888a48716e4bfd24ae78eef5f6e4a54dd1810

diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 064407a..1f9a037 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -218,7 +218,7 @@ WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
     {
         sal_Int32       nIndex = 0;
         ::rtl::OUString aPathPart   = aResourceURL.copy( aUIResourceURL.getLength() );
-        ::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+        aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
 
         return aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
     }
@@ -233,7 +233,7 @@ void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElemen
     {
         sal_Int32       nIndex = 0;
         ::rtl::OUString aPathPart   = aResourceURL.copy( aUIResourceURL.getLength() );
-        ::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+        aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
 
         aElementType = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
         aElementName = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index fbab8a4..f554854 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1161,8 +1161,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
         aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
 
     Any             aAny;
-    ::rtl::OUString aTmp;
-    String          aResult;
 
     // Get inspath and userpath from bootstrap mechanism in every case as file URL
     ::utl::Bootstrap::PathStatus aState;
@@ -1235,6 +1233,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PATH ] = GetPathVariableValue();
 
     // Set $(temp)
+    OUString aTmp;
     osl::FileBase::getTempDirURL( aTmp );
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
 }
commit 5551d2776dbfa921d5520e8b09bf5caf4649a545
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 11 21:29:24 2012 +0100

    handle ui-previewer on .ui in cwd
    
    Change-Id: If13c5494ffb960e943fa8d2c99f2da28b5f95736

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 53ffa37..75d2523 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -78,7 +78,14 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri
     {
         OUStringBuffer aTransBuf;
         sal_Int32 nLastSlash = sUri.lastIndexOf('/');
-        aTransBuf.append(sUri.copy(0, nLastSlash)).append("/res/").append(aLocale.Language);
+        if (nLastSlash != -1)
+            aTransBuf.append(sUri.copy(0, nLastSlash));
+        else
+        {
+            aTransBuf.append('.');
+            nLastSlash = 0;
+        }
+        aTransBuf.append("/res/").append(aLocale.Language);
         switch (i)
         {
             case 0: